From 455caa96df75dff9d6e5266b978d74ff16601eda Mon Sep 17 00:00:00 2001 From: Marcin Owsiany Date: Mon, 7 Sep 2026 12:02:09 +0200 Subject: [PATCH 1/2] chore: change central compat test to roxie --- .../emailsender-central-compatibility.yaml | 4 ++ .../central_compatibility/central-values.yaml | 47 ------------------- .../central_compatibility/roxie-config.yaml | 13 +++++ .../run_compatibility_test.sh | 24 ++++------ 4 files changed, 27 insertions(+), 61 deletions(-) delete mode 100644 scripts/ci/central_compatibility/central-values.yaml create mode 100644 scripts/ci/central_compatibility/roxie-config.yaml diff --git a/.github/workflows/emailsender-central-compatibility.yaml b/.github/workflows/emailsender-central-compatibility.yaml index e160702bae..948413bf4d 100644 --- a/.github/workflows/emailsender-central-compatibility.yaml +++ b/.github/workflows/emailsender-central-compatibility.yaml @@ -49,6 +49,10 @@ jobs: registry: quay.io username: ${{ secrets.QUAY_RHACS_ENG_RO_USERNAME }} password: ${{ secrets.QUAY_RHACS_ENG_RO_PASSWORD }} + - name: Install roxie + uses: stackrox/actions/roxie/install-cli@43bb707aa4f32ead5bfb8d5ab11fb409f971ffc8 # ratchet:stackrox/actions@v1 + with: + version: "v0.4.11-test1" # TODO: drop once released, to get latest - name: Checkout this repository uses: actions/checkout@v7 with: diff --git a/scripts/ci/central_compatibility/central-values.yaml b/scripts/ci/central_compatibility/central-values.yaml deleted file mode 100644 index 55dca363a7..0000000000 --- a/scripts/ci/central_compatibility/central-values.yaml +++ /dev/null @@ -1,47 +0,0 @@ -env: - managedServices: true -allowNonstandardNamespace: true -central: - resources: - requests: - memory: "200Mi" - cpu: "150m" - limits: - memory: "300Mi" - cpu: "200m" - db: - resources: - requests: - memory: "200Mi" - cpu: "200m" - limits: - memory: "300Mi" - cpu: "300m" - persistence: - persistentVolumeClaim: - size: 10Gi - persistence: - none: true - adminPassword: - value: "letmein" -scanner: - disable: true - replicas: 1 - resources: - requests: - memory: "200Mi" - cpu: "200m" - limits: - memory: "300Mi" - cpu: "300m" - dbResources: - requests: - memory: "200Mi" - cpu: "200m" - limits: - memory: "300Mi" - cpu: "300m" -customize: - central: - envVars: - ROX_ACSCS_EMAIL_URL: "http://emailsender.rhacs.svc:443" diff --git a/scripts/ci/central_compatibility/roxie-config.yaml b/scripts/ci/central_compatibility/roxie-config.yaml new file mode 100644 index 0000000000..17464d61dd --- /dev/null +++ b/scripts/ci/central_compatibility/roxie-config.yaml @@ -0,0 +1,13 @@ +central: + metadataAnnotations: + platform.stackrox.io/managed-services: true + spec: + customize: + envVars: + - name: ROX_ACSCS_EMAIL_URL + value: "http://emailsender.rhacs.svc:443" + # Disabling scanner to reduce resource usage, it is not important for this test + scanner: + scannerComponent: Disabled + scannerV4: + scannerComponent: Disabled diff --git a/scripts/ci/central_compatibility/run_compatibility_test.sh b/scripts/ci/central_compatibility/run_compatibility_test.sh index 32947414bc..a8c8d51b5a 100755 --- a/scripts/ci/central_compatibility/run_compatibility_test.sh +++ b/scripts/ci/central_compatibility/run_compatibility_test.sh @@ -10,7 +10,6 @@ SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" EMAILSENDER_NS="rhacs" CENTRAL_NS="rhacs-tenant" -export ADMIN_PW="letmein" cd "$ROOT_DIR" @@ -70,25 +69,22 @@ IMG_NAMES=( "main" "central-db" ) -MAIN_IMG="$IMG_REPO/main:$ACS_VERSION" IMG_WAIT_TIMEOUT_SECONDS="${IMG_WAIT_TIMEOUT_SECONDS:-1200}" for imgname in "${IMG_NAMES[@]}"; do wait_for_img "$IMG_REPO/$imgname:$ACS_VERSION" "$IMG_WAIT_TIMEOUT_SECONDS" pull_to_kind "$IMG_REPO/$imgname:$ACS_VERSION" "$imgname" done -ROXCTL="docker run --rm --user $(id -u):$(id -g) -v $(pwd):/tmp/stackrox-charts/ $MAIN_IMG" -# --remove to make this script rerunnable on a local machine -$ROXCTL helm output central-services --image-defaults opensource --remove --output-dir /tmp/stackrox-charts/central-chart - -# Using ACS_VERSION explicitly here since it would otherwise not use the nightly build tag -helm upgrade --install -n $CENTRAL_NS stackrox-central-services ./central-chart \ - -f "${SOURCE_DIR}/central-values.yaml" \ - --set "central.adminPassword.values=$ADMIN_PW" \ - --set "central.image.tag=$ACS_VERSION" \ - --set "central.db.image.tag=$ACS_VERSION" \ - --set "scannerV4.disable=true" \ - --set "scanner.disable=true" # Disabling scanner to reduce resource usage, it is not important for this test +roxie_envrc="$(mktemp)" + +roxie deploy central --verbose --resources auto --tag "${ACS_VERSION}" \ + --envrc "${roxie_envrc}" \ + --set central.namespace="${CENTRAL_NS}" \ + --config "${SOURCE_DIR}/roxie-config.yaml" + +# shellcheck source=/dev/null +source "${roxie_envrc}" +export ADMIN_PW="${ROX_ADMIN_PASSWORD}" KUBECTL="$(which kubectl)" wait_for_container_to_become_ready "$CENTRAL_NS" "app=central" "central" From 4dad1e4031d08094874af41cc617e5ae22236726 Mon Sep 17 00:00:00 2001 From: Marcin Owsiany Date: Tue, 8 Sep 2026 08:54:02 +0200 Subject: [PATCH 2/2] bump to latest (0.4.11) --- .github/workflows/emailsender-central-compatibility.yaml | 2 -- scripts/ci/central_compatibility/roxie-config.yaml | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/emailsender-central-compatibility.yaml b/.github/workflows/emailsender-central-compatibility.yaml index 948413bf4d..c62221f863 100644 --- a/.github/workflows/emailsender-central-compatibility.yaml +++ b/.github/workflows/emailsender-central-compatibility.yaml @@ -51,8 +51,6 @@ jobs: password: ${{ secrets.QUAY_RHACS_ENG_RO_PASSWORD }} - name: Install roxie uses: stackrox/actions/roxie/install-cli@43bb707aa4f32ead5bfb8d5ab11fb409f971ffc8 # ratchet:stackrox/actions@v1 - with: - version: "v0.4.11-test1" # TODO: drop once released, to get latest - name: Checkout this repository uses: actions/checkout@v7 with: diff --git a/scripts/ci/central_compatibility/roxie-config.yaml b/scripts/ci/central_compatibility/roxie-config.yaml index 17464d61dd..f21874eeba 100644 --- a/scripts/ci/central_compatibility/roxie-config.yaml +++ b/scripts/ci/central_compatibility/roxie-config.yaml @@ -1,6 +1,7 @@ central: - metadataAnnotations: - platform.stackrox.io/managed-services: true + metadata: + annotations: + platform.stackrox.io/managed-services: true spec: customize: envVars: