From 8ce4e2d04de3079fd639d1122dff721088ee52f3 Mon Sep 17 00:00:00 2001 From: Ishwar Kanse Date: Wed, 17 Jun 2026 10:12:58 +0530 Subject: [PATCH] Debug and fix cluster profile and infra issues for upstream jobs --- ...ain__tempo-product-ocp-4.14-arm-stage.yaml | 8 +- ...n__tempo-product-ocp-4.16-ibm-z-stage.yaml | 8 +- ...n__tempo-product-ocp-4.17-ibm-p-stage.yaml | 8 +- ...in__tempo-product-ocp-4.19-downstream.yaml | 2 + ...perator-main__upstream-ocp-4.12-amd64.yaml | 15 +-- ...perator-main__upstream-ocp-4.21-amd64.yaml | 20 ++-- ...perator-main__upstream-ocp-4.22-amd64.yaml | 24 ++--- ...ntelemetry-product-ocp-4.14-arm-stage.yaml | 8 +- ...elemetry-product-ocp-4.16-ibm-z-stage.yaml | 8 +- ...elemetry-product-ocp-4.17-ibm-p-stage.yaml | 8 +- ...telemetry-product-ocp-4.19-downstream.yaml | 2 + ..._opentelemetry-product-ocp-4.19-stage.yaml | 2 + ...perator-main__upstream-ocp-4.12-amd64.yaml | 18 ++-- ...perator-main__upstream-ocp-4.21-amd64.yaml | 21 ++-- ...perator-main__upstream-ocp-4.22-amd64.yaml | 15 +-- ...rafana-tempo-operator-main-presubmits.yaml | 98 ++--------------- ...pentelemetry-operator-main-presubmits.yaml | 102 +----------------- 17 files changed, 94 insertions(+), 273 deletions(-) diff --git a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.14-arm-stage.yaml b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.14-arm-stage.yaml index e49b3025d9f58..ec4458bfa83db 100644 --- a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.14-arm-stage.yaml +++ b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.14-arm-stage.yaml @@ -4,9 +4,9 @@ base_images: namespace: ocp tag: cli operator-sdk: - name: "4.19" - namespace: origin - tag: operator-sdk + name: cli-operator-sdk + namespace: ocp + tag: v1.39.2 build_root: image_stream_tag: name: builder @@ -87,7 +87,7 @@ tests: oc create -f https://raw.githubusercontent.com/openshift/distributed-tracing-qe/refs/heads/main/resources/tempo-icsp.yaml oc create namespace openshift-tempo-operator oc label namespace openshift-tempo-operator openshift.io/cluster-monitoring="true" - operator-sdk run bundle --timeout=10m --security-context-config restricted -n openshift-tempo-operator "$MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE" + cd /tmp && operator-sdk run bundle --timeout=10m --security-context-config restricted -n openshift-tempo-operator "$MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE" oc wait --for condition=Available -n openshift-tempo-operator deployment tempo-operator-controller env: - default: "" diff --git a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.16-ibm-z-stage.yaml b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.16-ibm-z-stage.yaml index 146c8c4719225..625b266b8f0b8 100644 --- a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.16-ibm-z-stage.yaml +++ b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.16-ibm-z-stage.yaml @@ -4,9 +4,9 @@ base_images: namespace: ocp tag: cli operator-sdk: - name: "4.19" - namespace: origin - tag: operator-sdk + name: cli-operator-sdk + namespace: ocp + tag: v1.39.2 build_root: image_stream_tag: name: builder @@ -72,7 +72,7 @@ tests: oc create -f https://raw.githubusercontent.com/openshift/distributed-tracing-qe/refs/heads/main/resources/tempo-icsp.yaml oc create namespace openshift-tempo-operator oc label namespace openshift-tempo-operator openshift.io/cluster-monitoring="true" - operator-sdk run bundle --timeout=10m --security-context-config restricted -n openshift-tempo-operator "$MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE" + cd /tmp && operator-sdk run bundle --timeout=10m --security-context-config restricted -n openshift-tempo-operator "$MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE" oc wait --for condition=Available -n openshift-tempo-operator deployment tempo-operator-controller env: - default: "" diff --git a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.17-ibm-p-stage.yaml b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.17-ibm-p-stage.yaml index db77c5b66371d..75c11e71d79e7 100644 --- a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.17-ibm-p-stage.yaml +++ b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.17-ibm-p-stage.yaml @@ -4,9 +4,9 @@ base_images: namespace: ocp tag: cli operator-sdk: - name: "4.19" - namespace: origin - tag: operator-sdk + name: cli-operator-sdk + namespace: ocp + tag: v1.39.2 build_root: image_stream_tag: name: builder @@ -74,7 +74,7 @@ tests: oc create -f https://raw.githubusercontent.com/openshift/distributed-tracing-qe/refs/heads/main/resources/tempo-icsp.yaml oc create namespace openshift-tempo-operator oc label namespace openshift-tempo-operator openshift.io/cluster-monitoring="true" - operator-sdk run bundle --timeout=10m --security-context-config restricted -n openshift-tempo-operator "$MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE" + cd /tmp && operator-sdk run bundle --timeout=10m --security-context-config restricted -n openshift-tempo-operator "$MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE" oc wait --for condition=Available -n openshift-tempo-operator deployment tempo-operator-controller env: - default: "" diff --git a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.19-downstream.yaml b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.19-downstream.yaml index 8ddf944c79a32..772ded3667106 100644 --- a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.19-downstream.yaml +++ b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.19-downstream.yaml @@ -46,6 +46,8 @@ tests: cluster_profile: azure-observability env: BASE_DOMAIN: observability.azure.devcluster.openshift.com + COMPUTE_NODE_TYPE: Standard_D4s_v3 + CONTROL_PLANE_INSTANCE_TYPE: Standard_D8s_v3 OPERATORS: | [ {"name": "tempo-product", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-tempo-operator","target_namespace": "", "operator_group": "openshift-tempo-operator"}, diff --git a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__upstream-ocp-4.12-amd64.yaml b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__upstream-ocp-4.12-amd64.yaml index 2da10b9f87d49..408e05e6800a9 100644 --- a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__upstream-ocp-4.12-amd64.yaml +++ b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__upstream-ocp-4.12-amd64.yaml @@ -4,9 +4,9 @@ base_images: namespace: ocp tag: cli operator-sdk: - name: "4.12" - namespace: origin - tag: operator-sdk + name: cli-operator-sdk + namespace: ocp + tag: v1.39.2 upi-installer: name: "4.12" namespace: ocp @@ -47,9 +47,10 @@ resources: tests: - as: tempo-upstream-tests steps: - cluster_profile: gcp-observability + cluster_profile: aws-observability env: AGENT_SKILL_URL: https://raw.githubusercontent.com/openshift/distributed-tracing-qe/main/plugins/qe-agent/skills/SKILL.md + BASE_DOMAIN: devobscluster.devcluster.openshift.com OPERATORS: | [ {"name": "opentelemetry-product", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-opentelemetry-operator", "target_namespaces": "", "operator_group": "openshift-opentelemetry-operator"}, @@ -60,13 +61,13 @@ tests: SKIP_TESTS: tests/e2e-openshift-object-stores/* post: - ref: openshift-observability-qe-agent - - chain: cucushift-installer-rehearse-gcp-ipi-deprovision + - chain: cucushift-installer-rehearse-aws-ipi-deprovision test: - as: install cli: latest commands: | oc create namespace openshift-tempo-operator - operator-sdk run bundle --timeout=10m --security-context-config restricted -n openshift-tempo-operator "$OO_BUNDLE" + cd /tmp && operator-sdk run bundle --timeout=10m --security-context-config restricted -n openshift-tempo-operator "$OO_BUNDLE" oc wait --for condition=Available -n openshift-tempo-operator deployment tempo-operator-controller dependencies: - env: OO_BUNDLE @@ -78,7 +79,7 @@ tests: memory: 400Mi - ref: install-operators - ref: distributed-tracing-tests-tempo-upstream - workflow: cucushift-installer-rehearse-gcp-ipi + workflow: cucushift-installer-rehearse-aws-ipi zz_generated_metadata: branch: main org: openshift diff --git a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__upstream-ocp-4.21-amd64.yaml b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__upstream-ocp-4.21-amd64.yaml index b141d50212b19..fc897aa5dece9 100644 --- a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__upstream-ocp-4.21-amd64.yaml +++ b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__upstream-ocp-4.21-amd64.yaml @@ -4,9 +4,13 @@ base_images: namespace: ocp tag: cli operator-sdk: + name: cli-operator-sdk + namespace: ocp + tag: v1.39.2 + upi-installer: name: "4.21" - namespace: origin - tag: operator-sdk + namespace: ocp + tag: upi-installer binary_build_commands: make build build_root: image_stream_tag: @@ -44,9 +48,12 @@ resources: tests: - as: tempo-upstream-tests steps: - cluster_profile: gcp-observability + cluster_profile: azure-observability env: AGENT_SKILL_URL: https://raw.githubusercontent.com/openshift/distributed-tracing-qe/main/plugins/qe-agent/skills/SKILL.md + BASE_DOMAIN: observability.azure.devcluster.openshift.com + COMPUTE_NODE_TYPE: Standard_D4s_v3 + CONTROL_PLANE_INSTANCE_TYPE: Standard_D8s_v3 OPERATORS: | [ {"name": "opentelemetry-product", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-opentelemetry-operator", "target_namespaces": "", "operator_group": "openshift-opentelemetry-operator"}, @@ -59,13 +66,13 @@ tests: SKIP_TESTS: tests/e2e-openshift-object-stores/* post: - ref: openshift-observability-qe-agent - - chain: cucushift-installer-rehearse-gcp-ipi-deprovision + - chain: cucushift-installer-rehearse-azure-ipi-deprovision test: - as: install cli: latest commands: | oc create namespace openshift-tempo-operator - operator-sdk run bundle --timeout=10m --security-context-config restricted -n openshift-tempo-operator "$OO_BUNDLE" + cd /tmp && operator-sdk run bundle --timeout=10m --security-context-config restricted -n openshift-tempo-operator "$OO_BUNDLE" oc wait --for condition=Available -n openshift-tempo-operator deployment tempo-operator-controller dependencies: - env: OO_BUNDLE @@ -77,8 +84,7 @@ tests: memory: 400Mi - ref: install-operators - ref: distributed-tracing-tests-tempo-upstream - - ref: distributed-tracing-tests-tracing-ui-integration - workflow: cucushift-installer-rehearse-gcp-ipi + workflow: cucushift-installer-rehearse-azure-ipi zz_generated_metadata: branch: main org: openshift diff --git a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__upstream-ocp-4.22-amd64.yaml b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__upstream-ocp-4.22-amd64.yaml index 2b9c5fc5f8649..1136f51355f1c 100644 --- a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__upstream-ocp-4.22-amd64.yaml +++ b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__upstream-ocp-4.22-amd64.yaml @@ -4,13 +4,9 @@ base_images: namespace: ocp tag: cli operator-sdk: - name: "4.19" - namespace: origin - tag: operator-sdk - upi-installer: - name: "4.12" + name: cli-operator-sdk namespace: ocp - tag: upi-installer + tag: v1.39.2 binary_build_commands: make build build_root: image_stream_tag: @@ -46,18 +42,11 @@ resources: cpu: 100m memory: 200Mi tests: -- always_run: false - as: security-sast-tempo - steps: - env: - PROJECT_NAME: tempo-operator - workflow: openshift-ci-security - as: tempo-upstream-tests steps: - cluster_profile: azure-observability + cluster_profile: gcp-observability env: AGENT_SKILL_URL: https://raw.githubusercontent.com/openshift/distributed-tracing-qe/main/plugins/qe-agent/skills/SKILL.md - BASE_DOMAIN: observability.azure.devcluster.openshift.com OPERATORS: | [ {"name": "opentelemetry-product", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-opentelemetry-operator", "target_namespaces": "", "operator_group": "openshift-opentelemetry-operator"}, @@ -70,13 +59,13 @@ tests: SKIP_TESTS: tests/e2e-openshift-object-stores/* post: - ref: openshift-observability-qe-agent - - chain: cucushift-installer-rehearse-azure-ipi-deprovision + - chain: cucushift-installer-rehearse-gcp-ipi-deprovision test: - as: install cli: latest commands: | oc create namespace openshift-tempo-operator - operator-sdk run bundle --timeout=10m --security-context-config restricted -n openshift-tempo-operator "$OO_BUNDLE" + cd /tmp && operator-sdk run bundle --timeout=10m --security-context-config restricted -n openshift-tempo-operator "$OO_BUNDLE" oc wait --for condition=Available -n openshift-tempo-operator deployment tempo-operator-controller dependencies: - env: OO_BUNDLE @@ -88,8 +77,7 @@ tests: memory: 400Mi - ref: install-operators - ref: distributed-tracing-tests-tempo-upstream - - ref: distributed-tracing-tests-tracing-ui-integration - workflow: cucushift-installer-rehearse-azure-ipi + workflow: cucushift-installer-rehearse-gcp-ipi zz_generated_metadata: branch: main org: openshift diff --git a/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.14-arm-stage.yaml b/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.14-arm-stage.yaml index a43356c424722..77677a18eba5b 100644 --- a/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.14-arm-stage.yaml +++ b/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.14-arm-stage.yaml @@ -4,9 +4,9 @@ base_images: namespace: ocp tag: cli operator-sdk: - name: "4.19" - namespace: origin - tag: operator-sdk + name: cli-operator-sdk + namespace: ocp + tag: v1.39.2 build_root: image_stream_tag: name: builder @@ -89,7 +89,7 @@ tests: oc create -f https://raw.githubusercontent.com/openshift/distributed-tracing-qe/refs/heads/main/resources/otel-icsp.yaml oc create namespace opentelemetry-operator-system oc label namespace opentelemetry-operator-system openshift.io/cluster-monitoring="true" - operator-sdk run bundle --timeout=5m --security-context-config restricted -n opentelemetry-operator-system "$MULTISTAGE_PARAM_OVERRIDE_OTEL_INDEX_IMAGE" + cd /tmp && operator-sdk run bundle --timeout=5m --security-context-config restricted -n opentelemetry-operator-system "$MULTISTAGE_PARAM_OVERRIDE_OTEL_INDEX_IMAGE" oc wait --for condition=Available -n opentelemetry-operator-system deployment opentelemetry-operator-controller-manager env: - default: "" diff --git a/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.16-ibm-z-stage.yaml b/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.16-ibm-z-stage.yaml index 90f118c07440b..d6e160c44f183 100644 --- a/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.16-ibm-z-stage.yaml +++ b/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.16-ibm-z-stage.yaml @@ -4,9 +4,9 @@ base_images: namespace: ocp tag: cli operator-sdk: - name: "4.19" - namespace: origin - tag: operator-sdk + name: cli-operator-sdk + namespace: ocp + tag: v1.39.2 build_root: image_stream_tag: name: builder @@ -76,7 +76,7 @@ tests: oc create -f https://raw.githubusercontent.com/openshift/distributed-tracing-qe/refs/heads/main/resources/otel-icsp.yaml oc create namespace opentelemetry-operator-system oc label namespace opentelemetry-operator-system openshift.io/cluster-monitoring="true" - operator-sdk run bundle --timeout=5m --security-context-config restricted -n opentelemetry-operator-system "$MULTISTAGE_PARAM_OVERRIDE_OTEL_INDEX_IMAGE" + cd /tmp && operator-sdk run bundle --timeout=5m --security-context-config restricted -n opentelemetry-operator-system "$MULTISTAGE_PARAM_OVERRIDE_OTEL_INDEX_IMAGE" oc wait --for condition=Available -n opentelemetry-operator-system deployment opentelemetry-operator-controller-manager env: - default: "" diff --git a/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.17-ibm-p-stage.yaml b/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.17-ibm-p-stage.yaml index 1226ea9fb4ff5..904fa2b804ce6 100644 --- a/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.17-ibm-p-stage.yaml +++ b/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.17-ibm-p-stage.yaml @@ -4,9 +4,9 @@ base_images: namespace: ocp tag: cli operator-sdk: - name: "4.19" - namespace: origin - tag: operator-sdk + name: cli-operator-sdk + namespace: ocp + tag: v1.39.2 build_root: image_stream_tag: name: builder @@ -73,7 +73,7 @@ tests: oc create -f https://raw.githubusercontent.com/openshift/distributed-tracing-qe/refs/heads/main/resources/otel-icsp.yaml oc create namespace opentelemetry-operator-system oc label namespace opentelemetry-operator-system openshift.io/cluster-monitoring="true" - operator-sdk run bundle --timeout=5m --security-context-config restricted -n opentelemetry-operator-system "$MULTISTAGE_PARAM_OVERRIDE_OTEL_INDEX_IMAGE" + cd /tmp && operator-sdk run bundle --timeout=5m --security-context-config restricted -n opentelemetry-operator-system "$MULTISTAGE_PARAM_OVERRIDE_OTEL_INDEX_IMAGE" oc wait --for condition=Available -n opentelemetry-operator-system deployment opentelemetry-operator-controller-manager env: - default: "" diff --git a/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.19-downstream.yaml b/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.19-downstream.yaml index 4469b3651d980..185debd6b5959 100644 --- a/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.19-downstream.yaml +++ b/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.19-downstream.yaml @@ -45,6 +45,8 @@ tests: cluster_profile: azure-observability env: BASE_DOMAIN: observability.azure.devcluster.openshift.com + COMPUTE_NODE_TYPE: Standard_D4s_v3 + CONTROL_PLANE_INSTANCE_TYPE: Standard_D8s_v3 OPERATORS: | [ {"name": "tempo-product", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-tempo-operator", "target_namespaces": "", "operator_group": "openshift-tempo-operator"}, diff --git a/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.19-stage.yaml b/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.19-stage.yaml index 1a9694b1b24d5..9d140ed76828a 100644 --- a/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.19-stage.yaml +++ b/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.19-stage.yaml @@ -46,6 +46,8 @@ tests: env: AGENT_SKILL_URL: https://raw.githubusercontent.com/openshift/distributed-tracing-qe/main/plugins/qe-agent/skills/SKILL.md BASE_DOMAIN: observability.azure.devcluster.openshift.com + COMPUTE_NODE_TYPE: Standard_D4s_v3 + CONTROL_PLANE_INSTANCE_TYPE: Standard_D8s_v3 MULTISTAGE_PARAM_OVERRIDE_OTEL_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:1155559 MULTISTAGE_PARAM_OVERRIDE_OTEL_TESTS_BRANCH: rhosdt-3.10 OPERATORS: | diff --git a/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__upstream-ocp-4.12-amd64.yaml b/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__upstream-ocp-4.12-amd64.yaml index 530dbe05ef1ad..7fc1ba7779d27 100644 --- a/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__upstream-ocp-4.12-amd64.yaml +++ b/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__upstream-ocp-4.12-amd64.yaml @@ -4,9 +4,9 @@ base_images: namespace: ocp tag: cli operator-sdk: - name: "4.12" - namespace: origin - tag: operator-sdk + name: cli-operator-sdk + namespace: ocp + tag: v1.39.2 upi-installer: name: "4.12" namespace: ocp @@ -105,10 +105,10 @@ resources: tests: - as: opentelemetry-upstream-tests steps: - cluster_profile: gcp-observability + cluster_profile: aws-observability env: AGENT_SKILL_URL: https://raw.githubusercontent.com/openshift/distributed-tracing-qe/main/plugins/qe-agent/skills/SKILL.md - BASE_DOMAIN: observability.azure.devcluster.openshift.com + BASE_DOMAIN: devobscluster.devcluster.openshift.com OPERATORS: | [ {"name": "tempo-product", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-tempo-operator", "target_namespaces": "", "operator_group": "openshift-tempo-operator"}, @@ -116,17 +116,17 @@ tests: ] SKIP_TESTS: tests/e2e/smoke-ip-families tests/e2e-openshift/export-to-cluster-logging-lokistack tests/e2e-otel/*aws* tests/e2e-openshift/kafka tests/e2e-otel/google* tests/e2e-targetallocator/targetallocator-prometheuscr - tests/e2e-instrumentation/instrumentation-go + tests/e2e-instrumentation/instrumentation-go tests/e2e/httpRoute post: - ref: openshift-observability-qe-agent - - chain: cucushift-installer-rehearse-gcp-ipi-deprovision + - chain: cucushift-installer-rehearse-aws-ipi-deprovision test: - as: install cli: latest commands: | oc create namespace opentelemetry-operator-system oc label namespace opentelemetry-operator-system openshift.io/cluster-monitoring="true" - operator-sdk run bundle --timeout=5m --security-context-config restricted -n opentelemetry-operator-system "$OO_BUNDLE" + cd /tmp && operator-sdk run bundle --timeout=5m --security-context-config restricted -n opentelemetry-operator-system "$OO_BUNDLE" oc wait --for condition=Available -n opentelemetry-operator-system deployment opentelemetry-operator-controller-manager dependencies: - env: OO_BUNDLE @@ -138,7 +138,7 @@ tests: memory: 400Mi - ref: install-operators - ref: distributed-tracing-tests-opentelemetry-upstream - workflow: cucushift-installer-rehearse-gcp-ipi + workflow: cucushift-installer-rehearse-aws-ipi zz_generated_metadata: branch: main org: openshift diff --git a/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__upstream-ocp-4.21-amd64.yaml b/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__upstream-ocp-4.21-amd64.yaml index 438de27c0ae5b..ec38f9f54be2a 100644 --- a/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__upstream-ocp-4.21-amd64.yaml +++ b/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__upstream-ocp-4.21-amd64.yaml @@ -4,9 +4,13 @@ base_images: namespace: ocp tag: cli operator-sdk: - name: "4.19" - namespace: origin - tag: operator-sdk + name: cli-operator-sdk + namespace: ocp + tag: v1.39.2 + upi-installer: + name: "4.21" + namespace: ocp + tag: upi-installer binary_build_commands: unset GOFLAGS && make manager && make targetallocator && make operator-opamp-bridge build_root: @@ -102,9 +106,12 @@ resources: tests: - as: opentelemetry-upstream-tests steps: - cluster_profile: gcp-observability + cluster_profile: azure-observability env: AGENT_SKILL_URL: https://raw.githubusercontent.com/openshift/distributed-tracing-qe/main/plugins/qe-agent/skills/SKILL.md + BASE_DOMAIN: observability.azure.devcluster.openshift.com + COMPUTE_NODE_TYPE: Standard_D4s_v3 + CONTROL_PLANE_INSTANCE_TYPE: Standard_D8s_v3 OPERATORS: | [ {"name": "tempo-product", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-tempo-operator", "target_namespaces": "", "operator_group": "openshift-tempo-operator"}, @@ -117,14 +124,14 @@ tests: tests/e2e-instrumentation/instrumentation-go post: - ref: openshift-observability-qe-agent - - chain: cucushift-installer-rehearse-gcp-ipi-deprovision + - chain: cucushift-installer-rehearse-azure-ipi-deprovision test: - as: install cli: latest commands: | oc create namespace opentelemetry-operator-system oc label namespace opentelemetry-operator-system openshift.io/cluster-monitoring="true" - operator-sdk run bundle --timeout=5m --security-context-config restricted -n opentelemetry-operator-system "$OO_BUNDLE" + cd /tmp && operator-sdk run bundle --timeout=5m --security-context-config restricted -n opentelemetry-operator-system "$OO_BUNDLE" oc wait --for condition=Available -n opentelemetry-operator-system deployment opentelemetry-operator-controller-manager dependencies: - env: OO_BUNDLE @@ -136,7 +143,7 @@ tests: memory: 400Mi - ref: install-operators - ref: distributed-tracing-tests-opentelemetry-upstream - workflow: cucushift-installer-rehearse-gcp-ipi + workflow: cucushift-installer-rehearse-azure-ipi zz_generated_metadata: branch: main org: openshift diff --git a/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__upstream-ocp-4.22-amd64.yaml b/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__upstream-ocp-4.22-amd64.yaml index 890c876aac775..0ba2f1f660baa 100644 --- a/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__upstream-ocp-4.22-amd64.yaml +++ b/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__upstream-ocp-4.22-amd64.yaml @@ -4,9 +4,9 @@ base_images: namespace: ocp tag: cli operator-sdk: - name: "4.19" - namespace: origin - tag: operator-sdk + name: cli-operator-sdk + namespace: ocp + tag: v1.39.2 binary_build_commands: unset GOFLAGS && make manager && make targetallocator && make operator-opamp-bridge build_root: @@ -100,13 +100,6 @@ resources: cpu: 100m memory: 200Mi tests: -- always_run: false - as: security-sast-otel - steps: - env: - PROJECT_NAME: opentelemetry-operator - SNYK_PRE_EXECUTION_HOOK_CMD: go mod vendor && go mod tidy - workflow: openshift-ci-security - as: opentelemetry-upstream-tests steps: cluster_profile: gcp-observability @@ -129,7 +122,7 @@ tests: commands: | oc create namespace opentelemetry-operator-system oc label namespace opentelemetry-operator-system openshift.io/cluster-monitoring="true" - operator-sdk run bundle --timeout=5m --security-context-config restricted -n opentelemetry-operator-system "$OO_BUNDLE" + cd /tmp && operator-sdk run bundle --timeout=5m --security-context-config restricted -n opentelemetry-operator-system "$OO_BUNDLE" oc wait --for condition=Available -n opentelemetry-operator-system deployment opentelemetry-operator-controller-manager dependencies: - env: OO_BUNDLE diff --git a/ci-operator/jobs/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main-presubmits.yaml b/ci-operator/jobs/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main-presubmits.yaml index 8c97249e93fe3..7e77723065546 100644 --- a/ci-operator/jobs/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main-presubmits.yaml @@ -785,8 +785,8 @@ presubmits: - Dockerfile - tests/Dockerfile labels: - ci-operator.openshift.io/cloud: gcp - ci-operator.openshift.io/cloud-cluster-profile: gcp-observability + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-observability ci-operator.openshift.io/variant: upstream-ocp-4.12-amd64 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" @@ -994,8 +994,8 @@ presubmits: - Dockerfile - tests/Dockerfile labels: - ci-operator.openshift.io/cloud: gcp - ci-operator.openshift.io/cloud-cluster-profile: gcp-observability + ci-operator.openshift.io/cloud: azure4 + ci-operator.openshift.io/cloud-cluster-profile: azure-observability ci-operator.openshift.io/variant: upstream-ocp-4.21-amd64 ci.openshift.io/generator: prowgen job-release: "4.21" @@ -1191,92 +1191,6 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )upstream-ocp-4.22-amd64-images,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^main$ - - ^main- - cluster: build13 - context: ci/prow/upstream-ocp-4.22-amd64-security-sast-tempo - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - - tests/Dockerfile - labels: - ci-operator.openshift.io/variant: upstream-ocp-4.22-amd64 - ci.openshift.io/generator: prowgen - job-release: "4.22" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-grafana-tempo-operator-main-upstream-ocp-4.22-amd64-security-sast-tempo - path_alias: github.com/grafana/tempo-operator - rerun_command: /test upstream-ocp-4.22-amd64-security-sast-tempo - 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=security-sast-tempo - - --variant=upstream-ocp-4.22-amd64 - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - 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( | .* )(upstream-ocp-4.22-amd64-security-sast-tempo|remaining-required),?($|\s.*) - agent: kubernetes always_run: true branches: @@ -1290,8 +1204,8 @@ presubmits: - Dockerfile - tests/Dockerfile labels: - ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure-observability + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp-observability ci-operator.openshift.io/variant: upstream-ocp-4.22-amd64 ci.openshift.io/generator: prowgen job-release: "4.22" 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 296ad1ecce6c2..b14e37a1a8752 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 @@ -806,8 +806,8 @@ presubmits: - tests/e2e-openshift/Dockerfile - tests/test-e2e-apps/bridge-server/Dockerfile labels: - ci-operator.openshift.io/cloud: gcp - ci-operator.openshift.io/cloud-cluster-profile: gcp-observability + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-observability ci-operator.openshift.io/variant: upstream-ocp-4.12-amd64 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" @@ -1039,8 +1039,8 @@ presubmits: - tests/e2e-openshift/Dockerfile - tests/test-e2e-apps/bridge-server/Dockerfile labels: - ci-operator.openshift.io/cloud: gcp - ci-operator.openshift.io/cloud-cluster-profile: gcp-observability + ci-operator.openshift.io/cloud: azure4 + ci-operator.openshift.io/cloud-cluster-profile: azure-observability ci-operator.openshift.io/variant: upstream-ocp-4.21-amd64 ci.openshift.io/generator: prowgen job-release: "4.21" @@ -1348,97 +1348,3 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )upstream-ocp-4.22-amd64-opentelemetry-upstream-tests,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^main$ - - ^main- - cluster: build06 - context: ci/prow/upstream-ocp-4.22-amd64-security-sast-otel - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - - autoinstrumentation/apache-httpd/Dockerfile - - autoinstrumentation/dotnet/Dockerfile - - autoinstrumentation/java/Dockerfile - - autoinstrumentation/nodejs/Dockerfile - - autoinstrumentation/python/Dockerfile - - cmd/operator-opamp-bridge/Dockerfile - - cmd/otel-allocator/Dockerfile - - tests/e2e-openshift/Dockerfile - - tests/test-e2e-apps/bridge-server/Dockerfile - labels: - ci-operator.openshift.io/variant: upstream-ocp-4.22-amd64 - 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-upstream-ocp-4.22-amd64-security-sast-otel - path_alias: github.com/open-telemetry/opentelemetry-operator - rerun_command: /test upstream-ocp-4.22-amd64-security-sast-otel - 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=security-sast-otel - - --variant=upstream-ocp-4.22-amd64 - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - 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( | .* )(upstream-ocp-4.22-amd64-security-sast-otel|remaining-required),?($|\s.*)