Skip to content

Debug and fix cluster profile and infra issues for upstream jobs #80642

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Jun 18, 2026
Merged

Debug and fix cluster profile and infra issues for upstream jobs #80642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...mpo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.14-arm-stage.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: ""
Expand Down
8 changes: 4 additions & 4 deletions ...o-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.16-ibm-z-stage.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: ""
Expand Down
8 changes: 4 additions & 4 deletions ...o-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.17-ibm-p-stage.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: ""
Expand Down
2 changes: 2 additions & 0 deletions ...po-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.19-downstream.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand Down
15 changes: 8 additions & 7 deletions ...rafana-tempo-operator/openshift-grafana-tempo-operator-main__upstream-ocp-4.12-amd64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"},
Expand All @@ -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
Expand All @@ -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
Expand Down
20 changes: 13 additions & 7 deletions ...rafana-tempo-operator/openshift-grafana-tempo-operator-main__upstream-ocp-4.21-amd64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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"},
Expand All @@ -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
Expand All @@ -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
Expand Down
24 changes: 6 additions & 18 deletions ...rafana-tempo-operator/openshift-grafana-tempo-operator-main__upstream-ocp-4.22-amd64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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"},
Expand All @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions ...open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.14-arm-stage.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: ""
Expand Down
8 changes: 4 additions & 4 deletions ...en-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.16-ibm-z-stage.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: ""
Expand Down
8 changes: 4 additions & 4 deletions ...en-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.17-ibm-p-stage.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: ""
Expand Down
2 changes: 2 additions & 0 deletions ...pen-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.19-downstream.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand Down
2 changes: 2 additions & 0 deletions ...ift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.19-stage.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
18 changes: 9 additions & 9 deletions ...erator/openshift-open-telemetry-opentelemetry-operator-main__upstream-ocp-4.12-amd64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -105,28 +105,28 @@ 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"},
{"name": "amq-streams", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-operators", "target_namespaces": ""}
]
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
Expand All @@ -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
Expand Down
Loading