From 7afd8a903af4860b1e78c7ca796d2f2108a90cae Mon Sep 17 00:00:00 2001 From: taimurhafeez Date: Tue, 23 Jun 2026 13:37:31 +0100 Subject: [PATCH] Changed job names cause e2e suite name in CaC-compliance-operator repo got changed from config to scan-config --- ...anceAsCode-compliance-operator-master.yaml | 4 +- ...compliance-operator-master-presubmits.yaml | 44 +++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/ci-operator/config/ComplianceAsCode/compliance-operator/ComplianceAsCode-compliance-operator-master.yaml b/ci-operator/config/ComplianceAsCode/compliance-operator/ComplianceAsCode-compliance-operator-master.yaml index d420daf0788e0..180f5f1e80e0a 100644 --- a/ci-operator/config/ComplianceAsCode/compliance-operator/ComplianceAsCode-compliance-operator-master.yaml +++ b/ci-operator/config/ComplianceAsCode/compliance-operator/ComplianceAsCode-compliance-operator-master.yaml @@ -141,7 +141,7 @@ tests: requests: cpu: 100m workflow: ipi-aws -- as: e2e-aws-config +- as: e2e-aws-scan-config skip_if_only_changed: ^.*(md|adoc)$|^LICENSE$|^.github/workflows/* steps: cluster_profile: quay-aws @@ -150,7 +150,7 @@ tests: test: - as: test cli: latest - commands: make e2e-config + commands: make e2e-scan-config dependencies: - env: IMAGE_FROM_CI name: compliance-operator diff --git a/ci-operator/jobs/ComplianceAsCode/compliance-operator/ComplianceAsCode-compliance-operator-master-presubmits.yaml b/ci-operator/jobs/ComplianceAsCode/compliance-operator/ComplianceAsCode-compliance-operator-master-presubmits.yaml index 05ce60f208935..93f07a3d7dc03 100644 --- a/ci-operator/jobs/ComplianceAsCode/compliance-operator/ComplianceAsCode-compliance-operator-master-presubmits.yaml +++ b/ci-operator/jobs/ComplianceAsCode/compliance-operator/ComplianceAsCode-compliance-operator-master-presubmits.yaml @@ -6,7 +6,7 @@ presubmits: - ^master$ - ^master- cluster: build06 - context: ci/prow/e2e-aws-config + context: ci/prow/e2e-aws-deployment decorate: true decoration_config: sparse_checkout_files: @@ -18,8 +18,8 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: quay-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-ComplianceAsCode-compliance-operator-master-e2e-aws-config - rerun_command: /test e2e-aws-config + name: pull-ci-ComplianceAsCode-compliance-operator-master-e2e-aws-deployment + rerun_command: /test e2e-aws-deployment skip_if_only_changed: ^.*(md|adoc)$|^LICENSE$|^.github/workflows/* spec: containers: @@ -29,7 +29,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-config + - --target=e2e-aws-deployment command: - ci-operator env: @@ -85,14 +85,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-config,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-deployment,?($|\s.*) - agent: kubernetes always_run: false branches: - ^master$ - ^master- cluster: build06 - context: ci/prow/e2e-aws-deployment + context: ci/prow/e2e-aws-parallel decorate: true decoration_config: sparse_checkout_files: @@ -101,11 +101,11 @@ presubmits: - images/testcontent/Dockerfile.ci labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: quay-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-stackrox ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-ComplianceAsCode-compliance-operator-master-e2e-aws-deployment - rerun_command: /test e2e-aws-deployment + name: pull-ci-ComplianceAsCode-compliance-operator-master-e2e-aws-parallel + rerun_command: /test e2e-aws-parallel skip_if_only_changed: ^.*(md|adoc)$|^LICENSE$|^.github/workflows/* spec: containers: @@ -115,7 +115,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-deployment + - --target=e2e-aws-parallel command: - ci-operator env: @@ -171,14 +171,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-deployment,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-parallel,?($|\s.*) - agent: kubernetes always_run: false branches: - ^master$ - ^master- cluster: build06 - context: ci/prow/e2e-aws-parallel + context: ci/prow/e2e-aws-parallel-arm decorate: true decoration_config: sparse_checkout_files: @@ -187,11 +187,11 @@ presubmits: - images/testcontent/Dockerfile.ci labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws-stackrox + ci-operator.openshift.io/cloud-cluster-profile: quay-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-ComplianceAsCode-compliance-operator-master-e2e-aws-parallel - rerun_command: /test e2e-aws-parallel + name: pull-ci-ComplianceAsCode-compliance-operator-master-e2e-aws-parallel-arm + rerun_command: /test e2e-aws-parallel-arm skip_if_only_changed: ^.*(md|adoc)$|^LICENSE$|^.github/workflows/* spec: containers: @@ -201,7 +201,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-parallel + - --target=e2e-aws-parallel-arm command: - ci-operator env: @@ -257,14 +257,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-parallel,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-parallel-arm,?($|\s.*) - agent: kubernetes always_run: false branches: - ^master$ - ^master- cluster: build06 - context: ci/prow/e2e-aws-parallel-arm + context: ci/prow/e2e-aws-scan-config decorate: true decoration_config: sparse_checkout_files: @@ -276,8 +276,8 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: quay-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-ComplianceAsCode-compliance-operator-master-e2e-aws-parallel-arm - rerun_command: /test e2e-aws-parallel-arm + name: pull-ci-ComplianceAsCode-compliance-operator-master-e2e-aws-scan-config + rerun_command: /test e2e-aws-scan-config skip_if_only_changed: ^.*(md|adoc)$|^LICENSE$|^.github/workflows/* spec: containers: @@ -287,7 +287,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-parallel-arm + - --target=e2e-aws-scan-config command: - ci-operator env: @@ -343,7 +343,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-parallel-arm,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-scan-config,?($|\s.*) - agent: kubernetes always_run: false branches: