Fix OPP variant naming to comply with CR conventions #85817
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -143,7 +143,7 @@ tests: | |||||||
| - ref: interop-opp-odf-health | ||||||||
| - ref: interop-tests-opp-quay-smoke | ||||||||
| - ref: interop-opp-skip-ratio-gate | ||||||||
| - as: cr--full-stack--vsphere | ||||||||
| capabilities: | ||||||||
| - intranet | ||||||||
| cluster: vsphere02 | ||||||||
|
|
@@ -203,7 +203,7 @@ tests: | |||||||
| - ref: acm-opp-app | ||||||||
| - ref: interop-opp-skip-ratio-gate | ||||||||
| workflow: acm-ipi-vsphere | ||||||||
| - as: full-stack--fips--aws | ||||||||
| capabilities: | ||||||||
| - intranet | ||||||||
| cluster: build05 | ||||||||
|
|
@@ -226,7 +226,6 @@ tests: | |||||||
| COMPUTE_NODE_REPLICAS: "6" | ||||||||
| COMPUTE_NODE_TYPE: m6a.2xlarge | ||||||||
| CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge | ||||||||
| FIPS_ENABLED: "true" | ||||||||
|
Contributor
There was a problem hiding this comment. The deleted FIPS config (
Suggested change
AI-generated. Review for accuracy. |
||||||||
| FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/refs/heads/main/firewatch-base-configs/opp/lp-interop-aws.json | ||||||||
| FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["5.0-lp","opp-aws-lp","opp-lp","fips"]' | ||||||||
|
|
@@ -270,7 +269,6 @@ tests: | |||||||
| - ref: acm-opp-app | ||||||||
| - ref: interop-opp-odf-health | ||||||||
| - ref: interop-tests-opp-quay-smoke | ||||||||
|
Contributor
There was a problem hiding this comment. The deleted FIPS config had
Suggested change
AI-generated. Review for accuracy. |
||||||||
|
Contributor
There was a problem hiding this comment. The For removal: The FIPS entry isn't wired into the data-router pipeline, so keeping it lean is reasonable. The gate output isn't consumed by anything downstream in the FIPS job. Against removal: The step is harmless and gives visibility into test-skip rates under FIPS mode. The non-FIPS entries keep it, so removing it creates an asymmetry. Not a blocker — but @amiskin94 could you confirm this was intentional and not an accidental deletion during the config restructuring? AI-generated. Review for accuracy.
Contributor
There was a problem hiding this comment. Thanks for confirming the intent. One nuance for the record: on the post-#86008 base, AI-generated. Review for accuracy. |
||||||||
| zz_generated_metadata: | ||||||||
| branch: master | ||||||||
| org: RedHatQE | ||||||||
|
|
||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2302,17 +2302,6 @@ periodics: | |
| job-release: "4.22" | ||
| pj-rehearse.openshift.io/can-be-rehearsed: "true" | ||
| name: periodic-ci-RedHatQE-interop-testing-master-ocp-4.22-lpMainline-lp-interop--acm-virt--eus-upgrade-from-4.20-cr--n2-upgrade--cpou--aws | ||
| spec: | ||
| containers: | ||
| - args: | ||
|
|
@@ -2857,8 +2846,8 @@ periodics: | |
| secret: | ||
| secretName: result-aggregator | ||
| - agent: kubernetes | ||
| cluster: vsphere02 | ||
| cron: 0 3,15 * * * | ||
| decorate: true | ||
| decoration_config: | ||
| skip_cloning: true | ||
|
|
@@ -2868,14 +2857,14 @@ periodics: | |
| repo: interop-testing | ||
| labels: | ||
| capability/intranet: intranet | ||
| ci-operator.openshift.io/cloud: vsphere | ||
| ci-operator.openshift.io/cloud-cluster-profile: vsphere-elastic | ||
| ci-operator.openshift.io/cluster: vsphere02 | ||
| ci-operator.openshift.io/variant: ocp-5.0-lpMainline-lp-interop--opp | ||
| ci.openshift.io/generator: prowgen | ||
| job-release: "5.0" | ||
| pj-rehearse.openshift.io/can-be-rehearsed: "true" | ||
| name: periodic-ci-RedHatQE-interop-testing-master-ocp-5.0-lpMainline-lp-interop--opp-cr--full-stack--vsphere | ||
| reporter_config: | ||
| slack: | ||
| channel: '#opp-discussion' | ||
|
|
@@ -2899,7 +2888,7 @@ periodics: | |
| - --lease-server-credentials-file=/etc/boskos/credentials | ||
| - --report-credentials-file=/etc/report/credentials | ||
| - --secret-dir=/secrets/ci-pull-credentials | ||
| - --target=cr--full-stack--vsphere | ||
| - --variant=ocp-5.0-lpMainline-lp-interop--opp | ||
| command: | ||
| - ci-operator | ||
|
|
@@ -2972,8 +2961,8 @@ periodics: | |
| secret: | ||
| secretName: result-aggregator | ||
| - agent: kubernetes | ||
| cluster: build05 | ||
| cron: 0 5,17 * * * | ||
| decorate: true | ||
| decoration_config: | ||
| skip_cloning: true | ||
|
|
@@ -2983,14 +2972,14 @@ periodics: | |
| repo: interop-testing | ||
| labels: | ||
| capability/intranet: intranet | ||
| ci-operator.openshift.io/cloud: aws | ||
| ci-operator.openshift.io/cloud-cluster-profile: aws-cspi-qe | ||
| ci-operator.openshift.io/cluster: build05 | ||
| ci-operator.openshift.io/variant: ocp-5.0-lpMainline-lp-interop--opp | ||
| ci.openshift.io/generator: prowgen | ||
| job-release: "5.0" | ||
| pj-rehearse.openshift.io/can-be-rehearsed: "true" | ||
| name: periodic-ci-RedHatQE-interop-testing-master-ocp-5.0-lpMainline-lp-interop--opp-full-stack--fips--aws | ||
| reporter_config: | ||
| slack: | ||
| channel: '#opp-discussion' | ||
|
|
@@ -3014,7 +3003,7 @@ periodics: | |
| - --lease-server-credentials-file=/etc/boskos/credentials | ||
| - --report-credentials-file=/etc/report/credentials | ||
| - --secret-dir=/secrets/ci-pull-credentials | ||
| - --target=full-stack--fips--aws | ||
| - --variant=ocp-5.0-lpMainline-lp-interop--opp | ||
| command: | ||
| - ci-operator | ||
|
|
@@ -3202,8 +3191,8 @@ periodics: | |
| secret: | ||
| secretName: result-aggregator | ||
| - agent: kubernetes | ||
| cluster: vsphere02 | ||
| cron: 0 3,15 * * * | ||
| decorate: true | ||
| decoration_config: | ||
| skip_cloning: true | ||
|
|
@@ -3213,14 +3202,14 @@ periodics: | |
| repo: interop-testing | ||
| labels: | ||
| capability/intranet: intranet | ||
| ci-operator.openshift.io/cloud: vsphere | ||
| ci-operator.openshift.io/cloud-cluster-profile: vsphere-elastic | ||
| ci-operator.openshift.io/cluster: vsphere02 | ||
| ci-operator.openshift.io/variant: ocp-5.1-lpMainline-lp-interop--opp | ||
| ci.openshift.io/generator: prowgen | ||
| job-release: "5.1" | ||
| pj-rehearse.openshift.io/can-be-rehearsed: "true" | ||
| name: periodic-ci-RedHatQE-interop-testing-master-ocp-5.1-lpMainline-lp-interop--opp-cr--full-stack--vsphere | ||
| reporter_config: | ||
| slack: | ||
| channel: '#opp-discussion' | ||
|
|
@@ -3244,7 +3233,7 @@ periodics: | |
| - --lease-server-credentials-file=/etc/boskos/credentials | ||
| - --report-credentials-file=/etc/report/credentials | ||
| - --secret-dir=/secrets/ci-pull-credentials | ||
| - --target=cr--full-stack--vsphere | ||
| - --variant=ocp-5.1-lpMainline-lp-interop--opp | ||
| command: | ||
| - ci-operator | ||
|
|
@@ -3317,8 +3306,8 @@ periodics: | |
| secret: | ||
| secretName: result-aggregator | ||
| - agent: kubernetes | ||
| cluster: build05 | ||
| cron: 30 5,17 * * * | ||
| decorate: true | ||
| decoration_config: | ||
| skip_cloning: true | ||
|
|
@@ -3328,14 +3317,14 @@ periodics: | |
| repo: interop-testing | ||
| labels: | ||
| capability/intranet: intranet | ||
| ci-operator.openshift.io/cloud: aws | ||
| ci-operator.openshift.io/cloud-cluster-profile: aws-cspi-qe | ||
| ci-operator.openshift.io/cluster: build05 | ||
| ci-operator.openshift.io/variant: ocp-5.1-lpMainline-lp-interop--opp | ||
| ci.openshift.io/generator: prowgen | ||
| job-release: "5.1" | ||
| pj-rehearse.openshift.io/can-be-rehearsed: "true" | ||
| name: periodic-ci-RedHatQE-interop-testing-master-ocp-5.1-lpMainline-lp-interop--opp-full-stack--fips--aws | ||
| reporter_config: | ||
| slack: | ||
| channel: '#opp-discussion' | ||
|
|
@@ -3359,7 +3348,7 @@ periodics: | |
| - --lease-server-credentials-file=/etc/boskos/credentials | ||
| - --report-credentials-file=/etc/report/credentials | ||
| - --secret-dir=/secrets/ci-pull-credentials | ||
| - --target=full-stack--fips--aws | ||
| - --variant=ocp-5.1-lpMainline-lp-interop--opp | ||
| command: | ||
| - ci-operator | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
✅ Correct removal — dead config.
DR__RP__CR_COMP_NAMEis consumed exclusively by thempiit-data-router-reporterstep, which reads it as the ReportPortal launch name and ComponentReadiness attribute (hard-fails if empty). The FIPS entry (cr--full-stack--fips--aws) does not havempiit-data-router-reporterin its post steps, so this env var had no consumer here.It was carried over during the PR #86008 merge (which consolidated the standalone FIPS config files into the main configs) without noticing that the FIPS job never included the reporter step. Removing it is a correct cleanup.
AI-generated. Review for accuracy.