From 05529cb66aaf4ee7e494568e269d09bb265acc50 Mon Sep 17 00:00:00 2001 From: bazhou Date: Fri, 6 Feb 2026 23:15:16 +0800 Subject: [PATCH 1/4] Add testing v1 jobs --- .../openshift-insights-operator-master.yaml | 142 +++++++++++++++++ ...t-insights-operator-master-presubmits.yaml | 144 ++++++++++++++++++ 2 files changed, 286 insertions(+) diff --git a/ci-operator/config/openshift/insights-operator/openshift-insights-operator-master.yaml b/ci-operator/config/openshift/insights-operator/openshift-insights-operator-master.yaml index f95f1d0f6e8e9..7ceab0dc8b654 100644 --- a/ci-operator/config/openshift/insights-operator/openshift-insights-operator-master.yaml +++ b/ci-operator/config/openshift/insights-operator/openshift-insights-operator-master.yaml @@ -355,6 +355,148 @@ tests: requests: cpu: 100m workflow: ipi-gcp +- as: e2e-test-v1-techpreview + steps: + cluster_profile: gcp + env: + FEATURE_SET: TechPreviewNoUpgrade + pre: + - chain: ipi-gcp-pre + - ref: insights-live + test: + - as: test + cli: latest + commands: pytest.sh -k "not tp_only and not UI and not serial and not interval" + --junitxml=$(pwd)/test-report.xml --rp_enabled --rp_name=Insights_operator_e2e_tests_pr_checks + credentials: + - collection: "" + mount_path: /secrets + name: insights-qa + namespace: test-credentials + - collection: "" + mount_path: /secret/aws/aws-bucket + name: aws-bucket + namespace: test-credentials + - collection: "" + mount_path: /secret/aws/aws-access-key-id + name: aws-access-key-id + namespace: test-credentials + - collection: "" + mount_path: /secret/aws/aws-region + name: aws-region + namespace: test-credentials + - collection: "" + mount_path: /secret/aws/aws-secret-access-key + name: aws-secret-access-key + namespace: test-credentials + - collection: "" + mount_path: /secret/slack-bot-token + name: slack-bot-token + namespace: test-credentials + - collection: "" + mount_path: /secret/slack-webhook-url + name: slack-webhook-url + namespace: test-credentials + - collection: "" + mount_path: /secret/ocm-access/ + name: insights-ocm-token + namespace: test-credentials + - collection: "" + mount_path: /secret/insights-rp-access/ + name: insights-rp-token + namespace: test-credentials + env: + - default: /secret/aws/aws-access-key-id/aws-access-key-id + name: AWS_ACCESS_KEY_ID_PATH + - default: /secret/aws/aws-bucket/aws-bucket + name: AWS_BUCKET_PATH + - default: /secret/aws/aws-region/aws-region + name: AWS_REGION_PATH + - default: /secret/aws/aws-secret-access-key/aws-secret-access-key + name: AWS_SECRET_ACCESS_KEY_PATH + - default: /secret/slack-bot-token/slack-bot-token + name: SLACK_BOT_TOKEN + - default: /secret/slack-webhook-url/slack-webhook-url + name: SLACK_WEBHOOK_URL + - default: /secret/insights-rp-access/insights-rp-token + name: RP_API_KEY + from: insights-operator-tests + resources: + requests: + cpu: 100m + timeout: 3h0m0s + workflow: ipi-gcp +- as: e2e-test-v1-serial + steps: + cluster_profile: gcp + env: + FEATURE_SET: TechPreviewNoUpgrade + pre: + - chain: ipi-gcp-pre + - ref: insights-live + test: + - as: test + cli: latest + commands: pytest.sh -m "not UI and not tp_only and serial" --junitxml=$(pwd)/test-report.xml + --rp_enabled --rp_name=Insights_operator_e2e_tests_techpreview + credentials: + - collection: "" + mount_path: /secrets + name: insights-qa + namespace: test-credentials + - collection: "" + mount_path: /secret/aws/aws-bucket + name: aws-bucket + namespace: test-credentials + - collection: "" + mount_path: /secret/aws/aws-access-key-id + name: aws-access-key-id + namespace: test-credentials + - collection: "" + mount_path: /secret/aws/aws-region + name: aws-region + namespace: test-credentials + - collection: "" + mount_path: /secret/aws/aws-secret-access-key + name: aws-secret-access-key + namespace: test-credentials + - collection: "" + mount_path: /secret/slack-bot-token + name: slack-bot-token + namespace: test-credentials + - collection: "" + mount_path: /secret/slack-webhook-url + name: slack-webhook-url + namespace: test-credentials + - collection: "" + mount_path: /secret/ocm-access/ + name: insights-ocm-token + namespace: test-credentials + - collection: "" + mount_path: /secret/insights-rp-access/ + name: insights-rp-token + namespace: test-credentials + env: + - default: /secret/aws/aws-access-key-id/aws-access-key-id + name: AWS_ACCESS_KEY_ID_PATH + - default: /secret/aws/aws-bucket/aws-bucket + name: AWS_BUCKET_PATH + - default: /secret/aws/aws-region/aws-region + name: AWS_REGION_PATH + - default: /secret/aws/aws-secret-access-key/aws-secret-access-key + name: AWS_SECRET_ACCESS_KEY_PATH + - default: /secret/slack-bot-token/slack-bot-token + name: SLACK_BOT_TOKEN + - default: /secret/slack-webhook-url/slack-webhook-url + name: SLACK_WEBHOOK_URL + - default: /secret/insights-rp-access/insights-rp-token + name: RP_API_KEY + from: insights-operator-tests + resources: + requests: + cpu: 100m + timeout: 3h0m0s + workflow: ipi-gcp - always_run: false as: e2e-metal-ipi-ovn-ipv6 capabilities: diff --git a/ci-operator/jobs/openshift/insights-operator/openshift-insights-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/insights-operator/openshift-insights-operator-master-presubmits.yaml index 11be957dfbbeb..0aabb12b1f8dc 100644 --- a/ci-operator/jobs/openshift/insights-operator/openshift-insights-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/insights-operator/openshift-insights-operator-master-presubmits.yaml @@ -292,6 +292,150 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^master$ + - ^master- + cluster: build08 + context: ci/prow/e2e-test-v1-serial + decorate: true + labels: + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-insights-operator-master-e2e-test-v1-serial + rerun_command: /test e2e-test-v1-serial + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-test-v1-serial + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-test-v1-serial,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^master$ + - ^master- + cluster: build08 + context: ci/prow/e2e-test-v1-techpreview + decorate: true + labels: + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-insights-operator-master-e2e-test-v1-techpreview + rerun_command: /test e2e-test-v1-techpreview + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-test-v1-techpreview + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-test-v1-techpreview,?($|\s.*) - agent: kubernetes always_run: true branches: From a9468d104328ccf4ba816223317df8b9ad274b44 Mon Sep 17 00:00:00 2001 From: bazhou Date: Sat, 7 Feb 2026 00:05:02 +0800 Subject: [PATCH 2/4] Extend timeout --- .../openshift-insights-operator-master.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci-operator/config/openshift/insights-operator/openshift-insights-operator-master.yaml b/ci-operator/config/openshift/insights-operator/openshift-insights-operator-master.yaml index 7ceab0dc8b654..48130677a213a 100644 --- a/ci-operator/config/openshift/insights-operator/openshift-insights-operator-master.yaml +++ b/ci-operator/config/openshift/insights-operator/openshift-insights-operator-master.yaml @@ -424,7 +424,7 @@ tests: resources: requests: cpu: 100m - timeout: 3h0m0s + timeout: 5h0m0s workflow: ipi-gcp - as: e2e-test-v1-serial steps: @@ -437,7 +437,7 @@ tests: test: - as: test cli: latest - commands: pytest.sh -m "not UI and not tp_only and serial" --junitxml=$(pwd)/test-report.xml + commands: pytest.sh -m "not UI and not tp_only and serial and interval" --junitxml=$(pwd)/test-report.xml --rp_enabled --rp_name=Insights_operator_e2e_tests_techpreview credentials: - collection: "" @@ -495,7 +495,7 @@ tests: resources: requests: cpu: 100m - timeout: 3h0m0s + timeout: 5h0m0s workflow: ipi-gcp - always_run: false as: e2e-metal-ipi-ovn-ipv6 From 71a4494e6f81667f1cc42b67ef6265aaa9013783 Mon Sep 17 00:00:00 2001 From: bazhou Date: Sat, 7 Feb 2026 21:22:47 +0800 Subject: [PATCH 3/4] update label --- .../insights-operator/openshift-insights-operator-master.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/config/openshift/insights-operator/openshift-insights-operator-master.yaml b/ci-operator/config/openshift/insights-operator/openshift-insights-operator-master.yaml index 48130677a213a..0f6270e0efb04 100644 --- a/ci-operator/config/openshift/insights-operator/openshift-insights-operator-master.yaml +++ b/ci-operator/config/openshift/insights-operator/openshift-insights-operator-master.yaml @@ -437,7 +437,7 @@ tests: test: - as: test cli: latest - commands: pytest.sh -m "not UI and not tp_only and serial and interval" --junitxml=$(pwd)/test-report.xml + commands: pytest.sh -m "(not UI and not tp_only) and (serial or interval)" --junitxml=$(pwd)/test-report.xml --rp_enabled --rp_name=Insights_operator_e2e_tests_techpreview credentials: - collection: "" From adb02a9dce86a7383934d45cf5a454c7d6a10cc6 Mon Sep 17 00:00:00 2001 From: bazhou Date: Sat, 7 Feb 2026 22:12:18 +0800 Subject: [PATCH 4/4] add periodic_only label --- .../openshift-insights-operator-master.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci-operator/config/openshift/insights-operator/openshift-insights-operator-master.yaml b/ci-operator/config/openshift/insights-operator/openshift-insights-operator-master.yaml index 0f6270e0efb04..055e9c937d64a 100644 --- a/ci-operator/config/openshift/insights-operator/openshift-insights-operator-master.yaml +++ b/ci-operator/config/openshift/insights-operator/openshift-insights-operator-master.yaml @@ -366,8 +366,8 @@ tests: test: - as: test cli: latest - commands: pytest.sh -k "not tp_only and not UI and not serial and not interval" - --junitxml=$(pwd)/test-report.xml --rp_enabled --rp_name=Insights_operator_e2e_tests_pr_checks + commands: pytest.sh -k "not tp_only and not UI and not serial and not interval + and not periodic_only" --junitxml=$(pwd)/test-report.xml --rp_enabled --rp_name=Insights_operator_e2e_tests_pr_checks credentials: - collection: "" mount_path: /secrets @@ -437,8 +437,8 @@ tests: test: - as: test cli: latest - commands: pytest.sh -m "(not UI and not tp_only) and (serial or interval)" --junitxml=$(pwd)/test-report.xml - --rp_enabled --rp_name=Insights_operator_e2e_tests_techpreview + commands: pytest.sh -m "(not UI and not tp_only and not periodic_only) and (serial + or interval)" --junitxml=$(pwd)/test-report.xml --rp_enabled --rp_name=Insights_operator_e2e_tests_techpreview credentials: - collection: "" mount_path: /secrets