From 27d7d4c53954f16ee8280b284a5686466ed01ab2 Mon Sep 17 00:00:00 2001 From: Pavol Loffay Date: Tue, 18 Aug 2026 21:17:58 +0200 Subject: [PATCH 1/4] TRACING-6644 | Sse 4.22 for OTEL FIPS test with PQC ML-KEM Signed-off-by: Pavol Loffay --- ...elemetry-product-ocp-4.22-fips-stage.yaml} | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) rename ci-operator/config/openshift/open-telemetry-opentelemetry-operator/{openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.17-fips-stage.yaml => openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.22-fips-stage.yaml} (79%) diff --git a/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.17-fips-stage.yaml b/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.22-fips-stage.yaml similarity index 79% rename from ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.17-fips-stage.yaml rename to ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.22-fips-stage.yaml index 810f4156860da..aed3b4356763a 100644 --- a/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.17-fips-stage.yaml +++ b/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.22-fips-stage.yaml @@ -1,12 +1,12 @@ base_images: cli: - name: "4.17" + name: "4.22" namespace: ocp tag: cli - upi-installer: - name: "4.17" + tls-scanner-tool: + name: "4.22" namespace: ocp - tag: upi-installer + tag: tls-scanner-tool build_root: image_stream_tag: name: builder @@ -22,7 +22,7 @@ releases: latest: release: channel: stable - version: "4.17" + version: "4.22" resources: '*': requests: @@ -42,10 +42,11 @@ tests: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{end}}' steps: - cluster_profile: gcp-observability + cluster_profile: aws-observability env: + BASE_DOMAIN: devobscluster.devcluster.openshift.com FIPS_ENABLED: "true" - MULTISTAGE_PARAM_OVERRIDE_OTEL_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:1155558 + MULTISTAGE_PARAM_OVERRIDE_OTEL_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:1155557 MULTISTAGE_PARAM_OVERRIDE_OTEL_TESTS_BRANCH: rhosdt-3.10 OPERATORS: | [ @@ -53,19 +54,21 @@ tests: {"name": "opentelemetry-product", "source": "otel-catalogsource", "channel": "stable", "install_namespace": "opentelemetry-operator-system", "target_namespaces": "", "operator_group": "opentelemetry-operator-system"}, {"name": "amq-streams", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-operators", "target_namespaces": ""}, {"name": "cluster-observability-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-operators", "target_namespaces": ""}, - {"name": "loki-operator", "source": "redhat-operators", "channel": "stable-6.1", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, - {"name": "cluster-logging", "source": "redhat-operators", "channel": "stable-6.1", "install_namespace": "openshift-logging","target_namespaces": "", "operator_group": "openshift-logging"} + {"name": "loki-operator", "source": "redhat-operators", "channel": "stable-6.4", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, + {"name": "cluster-logging", "source": "redhat-operators", "channel": "stable-6.4", "install_namespace": "openshift-logging","target_namespaces": "", "operator_group": "openshift-logging"} ] - SKIP_TESTS: tests/e2e/smoke-ip-families tests/e2e-otel/*aws* tests/e2e-otel/oidcauthextension - tests/e2e-openshift/export-to-cluster-logging-lokistack tests/e2e-otel/google* - tests/e2e/smoke-ports tests/e2e-instrumentation/instrumentation-go + PQC_CHECK: "true" + SCAN_NAMESPACE: opentelemetry-operator-system + SKIP_TESTS: tests/e2e/smoke-ip-families tests/e2e-otel/*aws* tests/e2e-otel/google* + tests/e2e-instrumentation/instrumentation-go test: - ref: distributed-tracing-install-otel-konflux-catalogsource - ref: install-operators - ref: distributed-tracing-tests-opentelemetry-stage - workflow: cucushift-installer-rehearse-gcp-ipi + - ref: tls-scanner-run + workflow: cucushift-installer-rehearse-aws-ipi zz_generated_metadata: branch: main org: openshift repo: open-telemetry-opentelemetry-operator - variant: opentelemetry-product-ocp-4.17-fips-stage + variant: opentelemetry-product-ocp-4.22-fips-stage From 483916e561db47dfcbe98933d99102282646d75b Mon Sep 17 00:00:00 2001 From: Pavol Loffay Date: Tue, 18 Aug 2026 21:29:39 +0200 Subject: [PATCH 2/4] gcp Signed-off-by: Pavol Loffay --- ...-main__opentelemetry-product-ocp-4.22-fips-stage.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.22-fips-stage.yaml b/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.22-fips-stage.yaml index aed3b4356763a..88e589b161774 100644 --- a/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.22-fips-stage.yaml +++ b/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.22-fips-stage.yaml @@ -3,6 +3,10 @@ base_images: name: "4.22" namespace: ocp tag: cli + upi-installer: + name: "4.22" + namespace: ocp + tag: upi-installer tls-scanner-tool: name: "4.22" namespace: ocp @@ -42,9 +46,8 @@ tests: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{end}}' steps: - cluster_profile: aws-observability + cluster_profile: gcp-observability env: - BASE_DOMAIN: devobscluster.devcluster.openshift.com FIPS_ENABLED: "true" MULTISTAGE_PARAM_OVERRIDE_OTEL_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:1155557 MULTISTAGE_PARAM_OVERRIDE_OTEL_TESTS_BRANCH: rhosdt-3.10 @@ -66,7 +69,7 @@ tests: - ref: install-operators - ref: distributed-tracing-tests-opentelemetry-stage - ref: tls-scanner-run - workflow: cucushift-installer-rehearse-aws-ipi + workflow: cucushift-installer-rehearse-gcp-ipi zz_generated_metadata: branch: main org: openshift From 9a66b49c3e29ec7cb7befccb35fecab79e2e2fba Mon Sep 17 00:00:00 2001 From: Pavol Loffay Date: Tue, 18 Aug 2026 21:30:48 +0200 Subject: [PATCH 3/4] iib Signed-off-by: Pavol Loffay --- ...perator-main__opentelemetry-product-ocp-4.22-fips-stage.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.22-fips-stage.yaml b/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.22-fips-stage.yaml index 88e589b161774..5208da6dd0974 100644 --- a/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.22-fips-stage.yaml +++ b/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.22-fips-stage.yaml @@ -49,7 +49,7 @@ tests: cluster_profile: gcp-observability env: FIPS_ENABLED: "true" - MULTISTAGE_PARAM_OVERRIDE_OTEL_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:1155557 + MULTISTAGE_PARAM_OVERRIDE_OTEL_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:1155558 MULTISTAGE_PARAM_OVERRIDE_OTEL_TESTS_BRANCH: rhosdt-3.10 OPERATORS: | [ From 5c0cf229a49fd9cf5de74f99816867fb0df09be9 Mon Sep 17 00:00:00 2001 From: Pavol Loffay Date: Wed, 19 Aug 2026 13:15:29 +0200 Subject: [PATCH 4/4] Review comments Signed-off-by: Pavol Loffay --- ...telemetry-product-ocp-4.22-fips-stage.yaml | 18 +-- ...opentelemetry-operator-main-periodics.yaml | 112 +++++++++--------- ...pentelemetry-operator-main-presubmits.yaml | 98 +++++++-------- 3 files changed, 114 insertions(+), 114 deletions(-) diff --git a/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.22-fips-stage.yaml b/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.22-fips-stage.yaml index 5208da6dd0974..2cf5c6e63d49a 100644 --- a/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.22-fips-stage.yaml +++ b/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.22-fips-stage.yaml @@ -3,14 +3,14 @@ base_images: name: "4.22" namespace: ocp tag: cli - upi-installer: - name: "4.22" - namespace: ocp - tag: upi-installer tls-scanner-tool: name: "4.22" namespace: ocp tag: tls-scanner-tool + upi-installer: + name: "4.22" + namespace: ocp + tag: upi-installer build_root: image_stream_tag: name: builder @@ -57,18 +57,18 @@ tests: {"name": "opentelemetry-product", "source": "otel-catalogsource", "channel": "stable", "install_namespace": "opentelemetry-operator-system", "target_namespaces": "", "operator_group": "opentelemetry-operator-system"}, {"name": "amq-streams", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-operators", "target_namespaces": ""}, {"name": "cluster-observability-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-operators", "target_namespaces": ""}, - {"name": "loki-operator", "source": "redhat-operators", "channel": "stable-6.4", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, - {"name": "cluster-logging", "source": "redhat-operators", "channel": "stable-6.4", "install_namespace": "openshift-logging","target_namespaces": "", "operator_group": "openshift-logging"} + {"name": "loki-operator", "source": "redhat-operators", "channel": "stable-6.6", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}, + {"name": "cluster-logging", "source": "redhat-operators", "channel": "stable-6.6", "install_namespace": "openshift-logging","target_namespaces": "", "operator_group": "openshift-logging"} ] PQC_CHECK: "true" SCAN_NAMESPACE: opentelemetry-operator-system - SKIP_TESTS: tests/e2e/smoke-ip-families tests/e2e-otel/*aws* tests/e2e-otel/google* - tests/e2e-instrumentation/instrumentation-go + SKIP_TESTS: tests/e2e/smoke-ip-families tests/e2e-otel/*aws* tests/e2e-otel/oidcauthextension + tests/e2e-otel/google* tests/e2e/smoke-ports tests/e2e-instrumentation/instrumentation-go test: - ref: distributed-tracing-install-otel-konflux-catalogsource - ref: install-operators - - ref: distributed-tracing-tests-opentelemetry-stage - ref: tls-scanner-run + - ref: distributed-tracing-tests-opentelemetry-stage workflow: cucushift-installer-rehearse-gcp-ipi zz_generated_metadata: branch: main diff --git a/ci-operator/jobs/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main-periodics.yaml b/ci-operator/jobs/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main-periodics.yaml index cbc8246247e20..b125ca63dfcec 100644 --- a/ci-operator/jobs/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main-periodics.yaml +++ b/ci-operator/jobs/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main-periodics.yaml @@ -289,7 +289,7 @@ periodics: secret: secretName: result-aggregator - agent: kubernetes - cluster: build08 + cluster: build04 cron: 0 0 30 2 * decorate: true decoration_config: @@ -303,12 +303,10 @@ periodics: sparse_checkout_files: - tests/e2e-openshift/Dockerfile labels: - ci-operator.openshift.io/cloud: gcp - ci-operator.openshift.io/cloud-cluster-profile: gcp-observability - ci-operator.openshift.io/variant: opentelemetry-product-ocp-4.17-fips-stage + ci-operator.openshift.io/variant: opentelemetry-product-ocp-4.17-ibm-p-stage ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.17-fips-stage-opentelemetry-stage-tests + name: periodic-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.17-ibm-p-stage-opentelemetry-stage-tests reporter_config: slack: channel: '#distributed-tracing-qe' @@ -329,7 +327,7 @@ periodics: - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - --target=opentelemetry-stage-tests - - --variant=opentelemetry-product-ocp-4.17-fips-stage + - --variant=opentelemetry-product-ocp-4.17-ibm-p-stage command: - ci-operator env: @@ -400,10 +398,12 @@ periodics: sparse_checkout_files: - tests/e2e-openshift/Dockerfile labels: - ci-operator.openshift.io/variant: opentelemetry-product-ocp-4.17-ibm-p-stage + ci-operator.openshift.io/cloud: azure4 + ci-operator.openshift.io/cloud-cluster-profile: azure-observability + ci-operator.openshift.io/variant: opentelemetry-product-ocp-4.19-stage ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.17-ibm-p-stage-opentelemetry-stage-tests + name: periodic-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.19-stage-opentelemetry-stage-tests reporter_config: slack: channel: '#distributed-tracing-qe' @@ -424,7 +424,7 @@ periodics: - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - --target=opentelemetry-stage-tests - - --variant=opentelemetry-product-ocp-4.17-ibm-p-stage + - --variant=opentelemetry-product-ocp-4.19-stage command: - ci-operator env: @@ -482,7 +482,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build04 - cron: 0 0 30 2 * + cron: 30 3 * * 2 decorate: true decoration_config: sparse_checkout_files: @@ -497,10 +497,10 @@ periodics: labels: ci-operator.openshift.io/cloud: azure4 ci-operator.openshift.io/cloud-cluster-profile: azure-observability - ci-operator.openshift.io/variant: opentelemetry-product-ocp-4.19-stage + ci-operator.openshift.io/variant: opentelemetry-product-ocp-4.20-downstream ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.19-stage-opentelemetry-stage-tests + name: periodic-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.20-downstream-opentelemetry-downstream-tests reporter_config: slack: channel: '#distributed-tracing-qe' @@ -520,8 +520,8 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=opentelemetry-stage-tests - - --variant=opentelemetry-product-ocp-4.19-stage + - --target=opentelemetry-downstream-tests + - --variant=opentelemetry-product-ocp-4.20-downstream command: - ci-operator env: @@ -579,7 +579,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build04 - cron: 30 3 * * 2 + cron: 0 0 30 2 * decorate: true decoration_config: sparse_checkout_files: @@ -592,12 +592,10 @@ periodics: sparse_checkout_files: - tests/e2e-openshift/Dockerfile labels: - ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure-observability - ci-operator.openshift.io/variant: opentelemetry-product-ocp-4.20-downstream + ci-operator.openshift.io/variant: opentelemetry-product-ocp-4.20-stage ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.20-downstream-opentelemetry-downstream-tests + name: periodic-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.20-stage-opentelemetry-stage-tests reporter_config: slack: channel: '#distributed-tracing-qe' @@ -613,12 +611,13 @@ periodics: containers: - args: - --gcs-upload-secret=/secrets/gcs/service-account.json + - --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig - --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=opentelemetry-downstream-tests - - --variant=opentelemetry-product-ocp-4.20-downstream + - --target=opentelemetry-stage-tests + - --variant=opentelemetry-product-ocp-4.20-stage command: - ci-operator env: @@ -645,6 +644,9 @@ periodics: - mountPath: /secrets/gcs name: gcs-credentials readOnly: true + - mountPath: /secrets/hive-hive-credentials + name: hive-hive-credentials + readOnly: true - mountPath: /secrets/manifest-tool name: manifest-tool-local-pusher readOnly: true @@ -665,6 +667,9 @@ periodics: - name: ci-pull-credentials secret: secretName: ci-pull-credentials + - name: hive-hive-credentials + secret: + secretName: hive-hive-credentials - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -675,8 +680,8 @@ periodics: secret: secretName: result-aggregator - agent: kubernetes - cluster: build04 - cron: 0 0 30 2 * + cluster: build08 + cron: 30 3 * * 2 decorate: true decoration_config: sparse_checkout_files: @@ -689,10 +694,12 @@ periodics: sparse_checkout_files: - tests/e2e-openshift/Dockerfile labels: - ci-operator.openshift.io/variant: opentelemetry-product-ocp-4.20-stage + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp-observability + ci-operator.openshift.io/variant: opentelemetry-product-ocp-4.21-downstream ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.20-stage-opentelemetry-stage-tests + name: periodic-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.21-downstream-opentelemetry-downstream-tests reporter_config: slack: channel: '#distributed-tracing-qe' @@ -708,13 +715,12 @@ periodics: containers: - args: - --gcs-upload-secret=/secrets/gcs/service-account.json - - --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig - --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=opentelemetry-stage-tests - - --variant=opentelemetry-product-ocp-4.20-stage + - --target=opentelemetry-downstream-tests + - --variant=opentelemetry-product-ocp-4.21-downstream command: - ci-operator env: @@ -741,9 +747,6 @@ periodics: - mountPath: /secrets/gcs name: gcs-credentials readOnly: true - - mountPath: /secrets/hive-hive-credentials - name: hive-hive-credentials - readOnly: true - mountPath: /secrets/manifest-tool name: manifest-tool-local-pusher readOnly: true @@ -764,9 +767,6 @@ periodics: - name: ci-pull-credentials secret: secretName: ci-pull-credentials - - name: hive-hive-credentials - secret: - secretName: hive-hive-credentials - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -778,7 +778,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build08 - cron: 30 3 * * 2 + cron: 0 0 30 2 * decorate: true decoration_config: sparse_checkout_files: @@ -793,10 +793,10 @@ periodics: labels: ci-operator.openshift.io/cloud: gcp ci-operator.openshift.io/cloud-cluster-profile: gcp-observability - ci-operator.openshift.io/variant: opentelemetry-product-ocp-4.21-downstream + ci-operator.openshift.io/variant: opentelemetry-product-ocp-4.21-stage ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.21-downstream-opentelemetry-downstream-tests + name: periodic-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.21-stage-opentelemetry-stage-tests reporter_config: slack: channel: '#distributed-tracing-qe' @@ -816,8 +816,8 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=opentelemetry-downstream-tests - - --variant=opentelemetry-product-ocp-4.21-downstream + - --target=opentelemetry-stage-tests + - --variant=opentelemetry-product-ocp-4.21-stage command: - ci-operator env: @@ -874,8 +874,8 @@ periodics: secret: secretName: result-aggregator - agent: kubernetes - cluster: build08 - cron: 0 0 30 2 * + cluster: build06 + cron: 30 3 * * 2 decorate: true decoration_config: sparse_checkout_files: @@ -888,12 +888,13 @@ periodics: sparse_checkout_files: - tests/e2e-openshift/Dockerfile labels: - ci-operator.openshift.io/cloud: gcp - ci-operator.openshift.io/cloud-cluster-profile: gcp-observability - ci-operator.openshift.io/variant: opentelemetry-product-ocp-4.21-stage + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-observability + ci-operator.openshift.io/variant: opentelemetry-product-ocp-4.22-downstream ci.openshift.io/generator: prowgen + job-release: "4.22" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.21-stage-opentelemetry-stage-tests + name: periodic-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.22-downstream-opentelemetry-downstream-tests reporter_config: slack: channel: '#distributed-tracing-qe' @@ -913,8 +914,8 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=opentelemetry-stage-tests - - --variant=opentelemetry-product-ocp-4.21-stage + - --target=opentelemetry-downstream-tests + - --variant=opentelemetry-product-ocp-4.22-downstream command: - ci-operator env: @@ -971,8 +972,8 @@ periodics: secret: secretName: result-aggregator - agent: kubernetes - cluster: build06 - cron: 30 3 * * 2 + cluster: build08 + cron: 0 0 30 2 * decorate: true decoration_config: sparse_checkout_files: @@ -985,13 +986,12 @@ periodics: sparse_checkout_files: - tests/e2e-openshift/Dockerfile labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws-observability - ci-operator.openshift.io/variant: opentelemetry-product-ocp-4.22-downstream + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp-observability + ci-operator.openshift.io/variant: opentelemetry-product-ocp-4.22-fips-stage ci.openshift.io/generator: prowgen - job-release: "4.22" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.22-downstream-opentelemetry-downstream-tests + name: periodic-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.22-fips-stage-opentelemetry-stage-tests reporter_config: slack: channel: '#distributed-tracing-qe' @@ -1011,8 +1011,8 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=opentelemetry-downstream-tests - - --variant=opentelemetry-product-ocp-4.22-downstream + - --target=opentelemetry-stage-tests + - --variant=opentelemetry-product-ocp-4.22-fips-stage command: - ci-operator env: diff --git a/ci-operator/jobs/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main-presubmits.yaml b/ci-operator/jobs/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main-presubmits.yaml index 901227a6785e4..5d3808ab7eef3 100644 --- a/ci-operator/jobs/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main-presubmits.yaml @@ -183,18 +183,18 @@ presubmits: - ^main$ - ^main- cluster: build06 - context: ci/prow/opentelemetry-product-ocp-4.17-fips-stage-images + context: ci/prow/opentelemetry-product-ocp-4.17-ibm-p-stage-images decorate: true decoration_config: sparse_checkout_files: - tests/e2e-openshift/Dockerfile labels: - ci-operator.openshift.io/variant: opentelemetry-product-ocp-4.17-fips-stage + ci-operator.openshift.io/variant: opentelemetry-product-ocp-4.17-ibm-p-stage ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.17-fips-stage-images + name: pull-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.17-ibm-p-stage-images path_alias: github.com/open-telemetry/opentelemetry-operator - rerun_command: /test opentelemetry-product-ocp-4.17-fips-stage-images + rerun_command: /test opentelemetry-product-ocp-4.17-ibm-p-stage-images spec: containers: - args: @@ -202,7 +202,7 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --target=[images] - - --variant=opentelemetry-product-ocp-4.17-fips-stage + - --variant=opentelemetry-product-ocp-4.17-ibm-p-stage command: - ci-operator image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest @@ -235,25 +235,25 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )opentelemetry-product-ocp-4.17-fips-stage-images,?($|\s.*) + trigger: (?m)^/test( | .* )opentelemetry-product-ocp-4.17-ibm-p-stage-images,?($|\s.*) - agent: kubernetes always_run: true branches: - ^main$ - ^main- cluster: build06 - context: ci/prow/opentelemetry-product-ocp-4.17-ibm-p-stage-images + context: ci/prow/opentelemetry-product-ocp-4.19-stage-images decorate: true decoration_config: sparse_checkout_files: - tests/e2e-openshift/Dockerfile labels: - ci-operator.openshift.io/variant: opentelemetry-product-ocp-4.17-ibm-p-stage + ci-operator.openshift.io/variant: opentelemetry-product-ocp-4.19-stage ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.17-ibm-p-stage-images + name: pull-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.19-stage-images path_alias: github.com/open-telemetry/opentelemetry-operator - rerun_command: /test opentelemetry-product-ocp-4.17-ibm-p-stage-images + rerun_command: /test opentelemetry-product-ocp-4.19-stage-images spec: containers: - args: @@ -261,7 +261,7 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --target=[images] - - --variant=opentelemetry-product-ocp-4.17-ibm-p-stage + - --variant=opentelemetry-product-ocp-4.19-stage command: - ci-operator image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest @@ -294,25 +294,25 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )opentelemetry-product-ocp-4.17-ibm-p-stage-images,?($|\s.*) + trigger: (?m)^/test( | .* )opentelemetry-product-ocp-4.19-stage-images,?($|\s.*) - agent: kubernetes always_run: true branches: - ^main$ - ^main- cluster: build06 - context: ci/prow/opentelemetry-product-ocp-4.19-stage-images + context: ci/prow/opentelemetry-product-ocp-4.20-downstream-images decorate: true decoration_config: sparse_checkout_files: - tests/e2e-openshift/Dockerfile labels: - ci-operator.openshift.io/variant: opentelemetry-product-ocp-4.19-stage + ci-operator.openshift.io/variant: opentelemetry-product-ocp-4.20-downstream ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.19-stage-images + name: pull-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.20-downstream-images path_alias: github.com/open-telemetry/opentelemetry-operator - rerun_command: /test opentelemetry-product-ocp-4.19-stage-images + rerun_command: /test opentelemetry-product-ocp-4.20-downstream-images spec: containers: - args: @@ -320,7 +320,7 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --target=[images] - - --variant=opentelemetry-product-ocp-4.19-stage + - --variant=opentelemetry-product-ocp-4.20-downstream command: - ci-operator image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest @@ -353,25 +353,25 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )opentelemetry-product-ocp-4.19-stage-images,?($|\s.*) + trigger: (?m)^/test( | .* )opentelemetry-product-ocp-4.20-downstream-images,?($|\s.*) - agent: kubernetes always_run: true branches: - ^main$ - ^main- cluster: build06 - context: ci/prow/opentelemetry-product-ocp-4.20-downstream-images + context: ci/prow/opentelemetry-product-ocp-4.20-stage-images decorate: true decoration_config: sparse_checkout_files: - tests/e2e-openshift/Dockerfile labels: - ci-operator.openshift.io/variant: opentelemetry-product-ocp-4.20-downstream + ci-operator.openshift.io/variant: opentelemetry-product-ocp-4.20-stage ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.20-downstream-images + name: pull-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.20-stage-images path_alias: github.com/open-telemetry/opentelemetry-operator - rerun_command: /test opentelemetry-product-ocp-4.20-downstream-images + rerun_command: /test opentelemetry-product-ocp-4.20-stage-images spec: containers: - args: @@ -379,7 +379,7 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --target=[images] - - --variant=opentelemetry-product-ocp-4.20-downstream + - --variant=opentelemetry-product-ocp-4.20-stage command: - ci-operator image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest @@ -412,25 +412,25 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )opentelemetry-product-ocp-4.20-downstream-images,?($|\s.*) + trigger: (?m)^/test( | .* )opentelemetry-product-ocp-4.20-stage-images,?($|\s.*) - agent: kubernetes always_run: true branches: - ^main$ - ^main- cluster: build06 - context: ci/prow/opentelemetry-product-ocp-4.20-stage-images + context: ci/prow/opentelemetry-product-ocp-4.21-downstream-images decorate: true decoration_config: sparse_checkout_files: - tests/e2e-openshift/Dockerfile labels: - ci-operator.openshift.io/variant: opentelemetry-product-ocp-4.20-stage + ci-operator.openshift.io/variant: opentelemetry-product-ocp-4.21-downstream ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.20-stage-images + name: pull-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.21-downstream-images path_alias: github.com/open-telemetry/opentelemetry-operator - rerun_command: /test opentelemetry-product-ocp-4.20-stage-images + rerun_command: /test opentelemetry-product-ocp-4.21-downstream-images spec: containers: - args: @@ -438,7 +438,7 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --target=[images] - - --variant=opentelemetry-product-ocp-4.20-stage + - --variant=opentelemetry-product-ocp-4.21-downstream command: - ci-operator image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest @@ -471,25 +471,25 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )opentelemetry-product-ocp-4.20-stage-images,?($|\s.*) + trigger: (?m)^/test( | .* )opentelemetry-product-ocp-4.21-downstream-images,?($|\s.*) - agent: kubernetes always_run: true branches: - ^main$ - ^main- cluster: build06 - context: ci/prow/opentelemetry-product-ocp-4.21-downstream-images + context: ci/prow/opentelemetry-product-ocp-4.21-stage-images decorate: true decoration_config: sparse_checkout_files: - tests/e2e-openshift/Dockerfile labels: - ci-operator.openshift.io/variant: opentelemetry-product-ocp-4.21-downstream + ci-operator.openshift.io/variant: opentelemetry-product-ocp-4.21-stage ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.21-downstream-images + name: pull-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.21-stage-images path_alias: github.com/open-telemetry/opentelemetry-operator - rerun_command: /test opentelemetry-product-ocp-4.21-downstream-images + rerun_command: /test opentelemetry-product-ocp-4.21-stage-images spec: containers: - args: @@ -497,7 +497,7 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --target=[images] - - --variant=opentelemetry-product-ocp-4.21-downstream + - --variant=opentelemetry-product-ocp-4.21-stage command: - ci-operator image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest @@ -530,25 +530,26 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )opentelemetry-product-ocp-4.21-downstream-images,?($|\s.*) + trigger: (?m)^/test( | .* )opentelemetry-product-ocp-4.21-stage-images,?($|\s.*) - agent: kubernetes always_run: true branches: - ^main$ - ^main- cluster: build06 - context: ci/prow/opentelemetry-product-ocp-4.21-stage-images + context: ci/prow/opentelemetry-product-ocp-4.22-downstream-images decorate: true decoration_config: sparse_checkout_files: - tests/e2e-openshift/Dockerfile labels: - ci-operator.openshift.io/variant: opentelemetry-product-ocp-4.21-stage + ci-operator.openshift.io/variant: opentelemetry-product-ocp-4.22-downstream ci.openshift.io/generator: prowgen + job-release: "4.22" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.21-stage-images + name: pull-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.22-downstream-images path_alias: github.com/open-telemetry/opentelemetry-operator - rerun_command: /test opentelemetry-product-ocp-4.21-stage-images + rerun_command: /test opentelemetry-product-ocp-4.22-downstream-images spec: containers: - args: @@ -556,7 +557,7 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --target=[images] - - --variant=opentelemetry-product-ocp-4.21-stage + - --variant=opentelemetry-product-ocp-4.22-downstream command: - ci-operator image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest @@ -589,26 +590,25 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )opentelemetry-product-ocp-4.21-stage-images,?($|\s.*) + trigger: (?m)^/test( | .* )opentelemetry-product-ocp-4.22-downstream-images,?($|\s.*) - agent: kubernetes always_run: true branches: - ^main$ - ^main- cluster: build06 - context: ci/prow/opentelemetry-product-ocp-4.22-downstream-images + context: ci/prow/opentelemetry-product-ocp-4.22-fips-stage-images decorate: true decoration_config: sparse_checkout_files: - tests/e2e-openshift/Dockerfile labels: - ci-operator.openshift.io/variant: opentelemetry-product-ocp-4.22-downstream + ci-operator.openshift.io/variant: opentelemetry-product-ocp-4.22-fips-stage ci.openshift.io/generator: prowgen - job-release: "4.22" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.22-downstream-images + name: pull-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.22-fips-stage-images path_alias: github.com/open-telemetry/opentelemetry-operator - rerun_command: /test opentelemetry-product-ocp-4.22-downstream-images + rerun_command: /test opentelemetry-product-ocp-4.22-fips-stage-images spec: containers: - args: @@ -616,7 +616,7 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --target=[images] - - --variant=opentelemetry-product-ocp-4.22-downstream + - --variant=opentelemetry-product-ocp-4.22-fips-stage command: - ci-operator image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest @@ -649,7 +649,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )opentelemetry-product-ocp-4.22-downstream-images,?($|\s.*) + trigger: (?m)^/test( | .* )opentelemetry-product-ocp-4.22-fips-stage-images,?($|\s.*) - agent: kubernetes always_run: true branches: