From ca6fcca8eb8f1ec54eeec3b3fbf8b5cec5a79b81 Mon Sep 17 00:00:00 2001 From: Vladimir Ischenko Date: Thu, 23 Jan 2025 23:15:23 +0300 Subject: [PATCH] Test OCI --- .github/workflows/ci-oci-install.yml | 3 +-- install/OneClickInstall/docspace-install.sh | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/ci-oci-install.yml b/.github/workflows/ci-oci-install.yml index 7844b36a4f..938165ca67 100644 --- a/.github/workflows/ci-oci-install.yml +++ b/.github/workflows/ci-oci-install.yml @@ -76,7 +76,6 @@ jobs: run: | matrix=$(echo '{ "include": [ - {"execute": '${{ github.event.inputs.centos9s || true }}', "name": "CentOS9S", "os": "centos9s", "distr": "generic"}, {"execute": '${{ github.event.inputs.ubuntu2204 || true }}', "name": "Ubuntu22.04", "os": "ubuntu2204", "distr": "generic"}, {"execute": '${{ github.event.inputs.fedora41 || true }}', "name": "Fedora41", "os": "41-cloud-base", "distr": "fedora"} ] @@ -177,7 +176,7 @@ jobs: DISTR='${{ matrix.distr }}' \ OS='${{matrix.os}}' \ RAM='8192' \ - CPU='3' \ + CPU='4' \ DOWNLOAD_SCRIPT='-ds false' \ TEST_REPO='-tr true' \ ARGUMENTS="-arg '--skiphardwarecheck true --localscripts true'" \ diff --git a/install/OneClickInstall/docspace-install.sh b/install/OneClickInstall/docspace-install.sh index 148b4c4e23..361ea4c1a4 100644 --- a/install/OneClickInstall/docspace-install.sh +++ b/install/OneClickInstall/docspace-install.sh @@ -141,10 +141,8 @@ if command_exists docker &> /dev/null && docker ps -a --format '{{.Names}}' | gr PARAMETERS="-u true $PARAMETERS" elif command_exists apt-get &> /dev/null && dpkg -s ${product}-api >/dev/null 2>&1; then DOCKER="false" - PARAMETERS="-u true $PARAMETERS" elif command_exists yum &> /dev/null && rpm -q ${product}-api >/dev/null 2>&1; then DOCKER="false" - PARAMETERS="-u true $PARAMETERS" fi if [ -z "$DOCKER" ]; then