Skip to content

Commit eb9cfdf

Browse files
IshwarKanseIshwarKanse
authored
Test RHOSDT 3.5 Tempo release (#62209)
1 parent 7f0596a commit eb9cfdf

11 files changed

+222
-155
lines changed

‎ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.12-stage.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,10 @@ tests:
3939
{"name": "kiali-ossm", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-operators", "target_namespaces": ""},
4040
{"name": "serverless-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-serverless", "target_namespaces": "", "operator_group": "openshift-serverless"}
4141
]
42-
OTEL_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:870308
42+
OTEL_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:927218
4343
SKIP_TESTS: tests/e2e-openshift/monitoring tests/e2e-openshift/red-metrics tests/e2e-openshift-ossm/*
44-
TEMPO_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:875494
44+
tests/e2e-openshift-object-stores/*
45+
TEMPO_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:928201
4546
test:
4647
- ref: distributed-tracing-install-otel-konflux-catalogsource
4748
- ref: distributed-tracing-install-tempo-konflux-catalogsource

‎ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.14-arm-stage.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ tests:
5555
{"name": "kiali-ossm", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-operators", "target_namespaces": ""},
5656
{"name": "serverless-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-serverless", "target_namespaces": "", "operator_group": "openshift-serverless"}
5757
]
58-
OTEL_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:870302
58+
OTEL_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:927220
5959
SKIP_TESTS: tests/e2e/generate tests/e2e-openshift/monolithic-multitenancy-static
60-
tests/e2e-openshift-serverless/*
61-
TEMPO_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:875475
60+
tests/e2e-openshift-serverless/* tests/e2e-openshift-object-stores/*
61+
TEMPO_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:928292
6262
test:
6363
- ref: idp-htpasswd
6464
- ref: distributed-tracing-install-otel-konflux-catalogsource

‎ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.14-stage.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,9 @@ tests:
4646
{"name": "kiali-ossm", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-operators", "target_namespaces": ""},
4747
{"name": "serverless-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-serverless", "target_namespaces": "", "operator_group": "openshift-serverless"}
4848
]
49-
OTEL_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:870302
50-
TEMPO_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:875475
49+
OTEL_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:927220
50+
SKIP_TESTS: tests/e2e-openshift-object-stores/*
51+
TEMPO_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:928292
5152
test:
5253
- ref: distributed-tracing-install-otel-konflux-catalogsource
5354
- ref: distributed-tracing-install-tempo-konflux-catalogsource

‎ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.15-ibm-z-stage.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ tests:
3737
{"name": "kiali-ossm", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-operators", "target_namespaces": ""},
3838
{"name": "serverless-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-serverless", "target_namespaces": "", "operator_group": "openshift-serverless"}
3939
]
40-
OTEL_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:870305
40+
OTEL_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:927219
4141
SKIP_TESTS: tests/e2e/generate tests/e2e/gateway tests/e2e-openshift/monolithic-multitenancy-static
42-
tests/e2e-openshift-ossm/*
43-
TEMPO_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:875516
42+
tests/e2e-openshift-ossm/* tests/e2e-openshift-object-stores/*
43+
TEMPO_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:928197
4444
test:
4545
- ref: distributed-tracing-install-otel-konflux-catalogsource
4646
- ref: distributed-tracing-install-tempo-konflux-catalogsource

‎ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.15-stage.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,9 @@ tests:
4646
{"name": "kiali-ossm", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-operators", "target_namespaces": ""},
4747
{"name": "serverless-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-serverless", "target_namespaces": "", "operator_group": "openshift-serverless"}
4848
]
49-
OTEL_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:870305
50-
TEMPO_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:875516
49+
OTEL_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:927219
50+
SKIP_TESTS: tests/e2e-openshift-object-stores/*
51+
TEMPO_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:928197
5152
test:
5253
- ref: distributed-tracing-install-otel-konflux-catalogsource
5354
- ref: distributed-tracing-install-tempo-konflux-catalogsource

‎ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.16-ibm-p-stage.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ tests:
3737
{"name": "kiali-ossm", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-operators", "target_namespaces": ""},
3838
{"name": "serverless-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-serverless", "target_namespaces": "", "operator_group": "openshift-serverless"}
3939
]
40-
OTEL_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:877599
40+
OTEL_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:927216
4141
SKIP_TESTS: tests/e2e/generate tests/e2e/gateway tests/e2e-openshift/monolithic-multitenancy-static
42-
tests/e2e-openshift-ossm/*
43-
TEMPO_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:875477
42+
tests/e2e-openshift-ossm/* tests/e2e-openshift-object-stores/*
43+
TEMPO_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:928202
4444
test:
4545
- ref: distributed-tracing-install-otel-konflux-catalogsource
4646
- ref: distributed-tracing-install-tempo-konflux-catalogsource

‎ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.16-stage.yaml‎

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -39,31 +39,9 @@ tests:
3939
{"name": "kiali-ossm", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-operators", "target_namespaces": ""},
4040
{"name": "serverless-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-serverless", "target_namespaces": "", "operator_group": "openshift-serverless"}
4141
]
42-
OTEL_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:870304
43-
TEMPO_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:875477
44-
test:
45-
- ref: distributed-tracing-install-otel-konflux-catalogsource
46-
- ref: distributed-tracing-install-tempo-konflux-catalogsource
47-
- ref: install-operators
48-
- ref: distributed-tracing-tests-tempo-downstream
49-
workflow: cucushift-installer-rehearse-aws-ipi
50-
- always_run: false
51-
as: tempo-stage-tests-fips
52-
steps:
53-
cluster_profile: aws-qe
54-
env:
55-
BASE_DOMAIN: qe.devcluster.openshift.com
56-
FIPS_ENABLED: "true"
57-
OPERATORS: |
58-
[
59-
{"name": "tempo-product", "source": "tempo-catalogsource", "channel": "stable", "install_namespace": "openshift-tempo-operator","target_namespaces": "", "operator_group": "openshift-tempo-operator"},
60-
{"name": "opentelemetry-product", "source": "otel-catalogsource", "channel": "stable", "install_namespace": "openshift-opentelemetry-operator", "target_namespaces": "", "operator_group": "openshift-opentelemetry-operator"},
61-
{"name": "servicemeshoperator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-operators", "target_namespaces": ""},
62-
{"name": "kiali-ossm", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-operators", "target_namespaces": ""},
63-
{"name": "serverless-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-serverless", "target_namespaces": "", "operator_group": "openshift-serverless"}
64-
]
65-
OTEL_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:870304
66-
TEMPO_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:875477
42+
OTEL_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:927216
43+
SKIP_TESTS: tests/e2e-openshift-object-stores/*
44+
TEMPO_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:928202
6745
test:
6846
- ref: distributed-tracing-install-otel-konflux-catalogsource
6947
- ref: distributed-tracing-install-tempo-konflux-catalogsource

‎ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.17-stage.yaml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@ tests:
3939
{"name": "kiali-ossm", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-operators", "target_namespaces": ""},
4040
{"name": "serverless-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-serverless", "target_namespaces": "", "operator_group": "openshift-serverless"}
4141
]
42-
OTEL_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:870306
43-
TEMPO_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:875485
42+
OTEL_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:927215
43+
SKIP_TESTS: tests/e2e-openshift-object-stores/*
44+
TEMPO_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:928251
4445
test:
4546
- ref: distributed-tracing-install-otel-konflux-catalogsource
4647
- ref: distributed-tracing-install-tempo-konflux-catalogsource
@@ -62,8 +63,9 @@ tests:
6263
{"name": "kiali-ossm", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-operators", "target_namespaces": ""},
6364
{"name": "serverless-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-serverless", "target_namespaces": "", "operator_group": "openshift-serverless"}
6465
]
65-
OTEL_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:870306
66-
TEMPO_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:875485
66+
OTEL_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:927215
67+
SKIP_TESTS: tests/e2e-openshift-object-stores/*
68+
TEMPO_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:928251
6769
test:
6870
- ref: distributed-tracing-install-otel-konflux-catalogsource
6971
- ref: distributed-tracing-install-tempo-konflux-catalogsource

‎ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.18-stage.yaml‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
base_images:
2+
cli:
3+
name: "4.18"
4+
namespace: ocp
5+
tag: cli
6+
build_root:
7+
image_stream_tag:
8+
name: release
9+
namespace: openshift
10+
tag: rhel-8-release-golang-1.22-openshift-4.17
11+
canonical_go_repository: github.com/grafana/tempo-operator
12+
images:
13+
- context_dir: .
14+
dockerfile_path: tests/Dockerfile
15+
to: tempo-tests-runner
16+
releases:
17+
latest:
18+
candidate:
19+
product: ocp
20+
stream: nightly
21+
version: "4.18"
22+
resources:
23+
'*':
24+
requests:
25+
cpu: 100m
26+
memory: 200Mi
27+
tests:
28+
- always_run: false
29+
as: tempo-stage-tests
30+
steps:
31+
cluster_profile: aws-qe
32+
env:
33+
BASE_DOMAIN: qe.devcluster.openshift.com
34+
OPERATORS: |
35+
[
36+
{"name": "tempo-product", "source": "tempo-catalogsource", "channel": "stable", "install_namespace": "openshift-tempo-operator","target_namespaces": "", "operator_group": "openshift-tempo-operator"},
37+
{"name": "opentelemetry-product", "source": "otel-catalogsource", "channel": "stable", "install_namespace": "openshift-opentelemetry-operator", "target_namespaces": "", "operator_group": "openshift-opentelemetry-operator"},
38+
{"name": "servicemeshoperator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-operators", "target_namespaces": ""},
39+
{"name": "kiali-ossm", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-operators", "target_namespaces": ""},
40+
{"name": "serverless-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-serverless", "target_namespaces": "", "operator_group": "openshift-serverless"}
41+
]
42+
OTEL_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:927217
43+
SKIP_TESTS: tests/e2e-openshift-ossm/*
44+
TEMPO_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:928198
45+
test:
46+
- ref: distributed-tracing-install-otel-konflux-catalogsource
47+
- ref: distributed-tracing-install-tempo-konflux-catalogsource
48+
- ref: install-operators
49+
- ref: distributed-tracing-tests-tempo-downstream
50+
workflow: cucushift-installer-rehearse-aws-ipi-shared-vpc-phz-sts
51+
zz_generated_metadata:
52+
branch: main
53+
org: openshift
54+
repo: grafana-tempo-operator
55+
variant: tempo-product-ocp-4.18-stage

0 commit comments

Comments
 (0)