From f344db9b5b64d60bbbd0caa98c90d3d01a073e59 Mon Sep 17 00:00:00 2001 From: Derek Higgins Date: Mon, 20 Dec 2021 14:50:15 +0000 Subject: [PATCH] Fix cluster profiles for CBO and release jobs Switch over assistet and sno jobs to the correct profile --- .../openshift-cluster-baremetal-operator-master.yaml | 2 +- ...hift-cluster-baremetal-operator-release-4.10.yaml | 2 +- ...hift-cluster-baremetal-operator-release-4.11.yaml | 2 +- ...shift-cluster-baremetal-operator-release-4.7.yaml | 2 +- ...shift-cluster-baremetal-operator-release-4.8.yaml | 2 +- ...shift-cluster-baremetal-operator-release-4.9.yaml | 2 +- .../openshift-release-master__nightly-4.10.yaml | 2 +- .../openshift-release-master__nightly-4.6.yaml | 4 ++-- ...cluster-baremetal-operator-master-presubmits.yaml | 4 ++-- ...r-baremetal-operator-release-4.10-presubmits.yaml | 4 ++-- ...r-baremetal-operator-release-4.11-presubmits.yaml | 4 ++-- ...er-baremetal-operator-release-4.7-presubmits.yaml | 4 ++-- ...er-baremetal-operator-release-4.8-presubmits.yaml | 4 ++-- ...er-baremetal-operator-release-4.9-presubmits.yaml | 4 ++-- .../release/openshift-release-master-periodics.yaml | 12 ++++++------ 15 files changed, 27 insertions(+), 27 deletions(-) diff --git a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-master.yaml b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-master.yaml index 86d455f1c5729..f456c3a11b80f 100644 --- a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-master.yaml @@ -139,7 +139,7 @@ tests: - as: e2e-metal-assisted optional: true steps: - cluster_profile: packet + cluster_profile: packet-assisted workflow: baremetalds-assisted - as: e2e-aws optional: true diff --git a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.10.yaml b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.10.yaml index 54852f654059c..d994ae68fc2f9 100644 --- a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.10.yaml +++ b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.10.yaml @@ -140,7 +140,7 @@ tests: - as: e2e-metal-assisted optional: true steps: - cluster_profile: packet + cluster_profile: packet-assisted workflow: baremetalds-assisted - as: e2e-aws optional: true diff --git a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.11.yaml b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.11.yaml index c8850c3997df4..21078da2c1eff 100644 --- a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.11.yaml +++ b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.11.yaml @@ -139,7 +139,7 @@ tests: - as: e2e-metal-assisted optional: true steps: - cluster_profile: packet + cluster_profile: packet-assisted workflow: baremetalds-assisted - as: e2e-aws optional: true diff --git a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.7.yaml b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.7.yaml index c5ca37e52e875..53f21c2d1e275 100644 --- a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.7.yaml +++ b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.7.yaml @@ -129,7 +129,7 @@ tests: workflow: baremetalds-e2e-virtualmedia - as: e2e-metal-assisted steps: - cluster_profile: packet + cluster_profile: packet-assisted workflow: baremetalds-assisted - as: e2e-aws steps: diff --git a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.8.yaml b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.8.yaml index 6b7b34781f572..a2d218f5713bb 100644 --- a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.8.yaml +++ b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.8.yaml @@ -133,7 +133,7 @@ tests: workflow: baremetalds-e2e-virtualmedia - as: e2e-metal-assisted steps: - cluster_profile: packet + cluster_profile: packet-assisted workflow: baremetalds-assisted - as: e2e-aws steps: diff --git a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.9.yaml b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.9.yaml index 2c1287c6482d8..f38bb9e48f471 100644 --- a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.9.yaml +++ b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.9.yaml @@ -134,7 +134,7 @@ tests: - as: e2e-metal-assisted optional: true steps: - cluster_profile: packet + cluster_profile: packet-assisted workflow: baremetalds-assisted - as: e2e-aws optional: true diff --git a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.10.yaml b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.10.yaml index 1e86ad9cd01d0..e63feb5b0b188 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.10.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.10.yaml @@ -129,7 +129,7 @@ tests: - as: e2e-metal-single-node-live-iso interval: 24h steps: - cluster_profile: packet + cluster_profile: packet-sno workflow: baremetalds-sno - as: e2e-metal-ipi interval: 48h diff --git a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.6.yaml b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.6.yaml index b219ea38871ea..d1e2376835c03 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.6.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.6.yaml @@ -68,12 +68,12 @@ tests: - as: e2e-metal-ipi cron: 0 0 * * 1 steps: - cluster_profile: packet-assisted + cluster_profile: packet workflow: baremetalds-e2e - as: e2e-metal-assisted cron: 0 0 * * 1 steps: - cluster_profile: packet + cluster_profile: packet-assisted dependencies: ASSISTED_AGENT_IMAGE: pipeline:assisted-installer-agent ASSISTED_CONTROLLER_IMAGE: pipeline:assisted-installer-controller diff --git a/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-master-presubmits.yaml index 85796b0ffb20f..649be6a9dc434 100644 --- a/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-master-presubmits.yaml @@ -156,7 +156,7 @@ presubmits: decorate: true labels: ci-operator.openshift.io/cloud: packet - ci-operator.openshift.io/cloud-cluster-profile: packet + ci-operator.openshift.io/cloud-cluster-profile: packet-assisted ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-cluster-baremetal-operator-master-e2e-metal-assisted @@ -211,7 +211,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-packet + secretName: cluster-secrets-packet-assisted - name: pull-secret secret: secretName: registry-pull-credentials diff --git a/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.10-presubmits.yaml b/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.10-presubmits.yaml index ca943da87964c..d628255b63dfc 100644 --- a/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.10-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.10-presubmits.yaml @@ -156,7 +156,7 @@ presubmits: decorate: true labels: ci-operator.openshift.io/cloud: packet - ci-operator.openshift.io/cloud-cluster-profile: packet + ci-operator.openshift.io/cloud-cluster-profile: packet-assisted ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-cluster-baremetal-operator-release-4.10-e2e-metal-assisted @@ -211,7 +211,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-packet + secretName: cluster-secrets-packet-assisted - name: pull-secret secret: secretName: registry-pull-credentials diff --git a/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.11-presubmits.yaml b/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.11-presubmits.yaml index 15a696e44e0e8..10d1311822f41 100644 --- a/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.11-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.11-presubmits.yaml @@ -156,7 +156,7 @@ presubmits: decorate: true labels: ci-operator.openshift.io/cloud: packet - ci-operator.openshift.io/cloud-cluster-profile: packet + ci-operator.openshift.io/cloud-cluster-profile: packet-assisted ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-cluster-baremetal-operator-release-4.11-e2e-metal-assisted @@ -211,7 +211,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-packet + secretName: cluster-secrets-packet-assisted - name: pull-secret secret: secretName: registry-pull-credentials diff --git a/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.7-presubmits.yaml b/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.7-presubmits.yaml index ead24d1700463..ef2ea3879defb 100644 --- a/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.7-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.7-presubmits.yaml @@ -160,7 +160,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: packet - ci-operator.openshift.io/cloud-cluster-profile: packet + ci-operator.openshift.io/cloud-cluster-profile: packet-assisted ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-cluster-baremetal-operator-release-4.7-e2e-metal-assisted @@ -214,7 +214,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-packet + secretName: cluster-secrets-packet-assisted - name: pull-secret secret: secretName: registry-pull-credentials diff --git a/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.8-presubmits.yaml b/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.8-presubmits.yaml index eaef8efd9134e..c7f3652aea5ad 100644 --- a/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.8-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.8-presubmits.yaml @@ -160,7 +160,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: packet - ci-operator.openshift.io/cloud-cluster-profile: packet + ci-operator.openshift.io/cloud-cluster-profile: packet-assisted ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-cluster-baremetal-operator-release-4.8-e2e-metal-assisted @@ -214,7 +214,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-packet + secretName: cluster-secrets-packet-assisted - name: pull-secret secret: secretName: registry-pull-credentials diff --git a/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.9-presubmits.yaml index 9fb538f0ba79b..e3d096bf3b84b 100644 --- a/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.9-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.9-presubmits.yaml @@ -155,7 +155,7 @@ presubmits: decorate: true labels: ci-operator.openshift.io/cloud: packet - ci-operator.openshift.io/cloud-cluster-profile: packet + ci-operator.openshift.io/cloud-cluster-profile: packet-assisted ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-cluster-baremetal-operator-release-4.9-e2e-metal-assisted @@ -210,7 +210,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-packet + secretName: cluster-secrets-packet-assisted - name: pull-secret secret: secretName: registry-pull-credentials diff --git a/ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml b/ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml index 08489f624be8c..a688272766b41 100644 --- a/ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml +++ b/ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml @@ -19140,7 +19140,7 @@ periodics: interval: 24h labels: ci-operator.openshift.io/cloud: packet - ci-operator.openshift.io/cloud-cluster-profile: packet + ci-operator.openshift.io/cloud-cluster-profile: packet-sno ci-operator.openshift.io/variant: nightly-4.10 ci.openshift.io/generator: prowgen ci.openshift.io/no-builds: "true" @@ -19208,7 +19208,7 @@ periodics: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-packet + secretName: cluster-secrets-packet-sno - name: pull-secret secret: secretName: registry-pull-credentials @@ -25927,7 +25927,7 @@ periodics: repo: release labels: ci-operator.openshift.io/cloud: packet - ci-operator.openshift.io/cloud-cluster-profile: packet + ci-operator.openshift.io/cloud-cluster-profile: packet-assisted ci-operator.openshift.io/variant: nightly-4.6 ci.openshift.io/generator: prowgen ci.openshift.io/no-builds: "true" @@ -25994,7 +25994,7 @@ periodics: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-packet + secretName: cluster-secrets-packet-assisted - name: pull-secret secret: secretName: registry-pull-credentials @@ -26013,7 +26013,7 @@ periodics: repo: release labels: ci-operator.openshift.io/cloud: packet - ci-operator.openshift.io/cloud-cluster-profile: packet-assisted + ci-operator.openshift.io/cloud-cluster-profile: packet ci-operator.openshift.io/variant: nightly-4.6 ci.openshift.io/generator: prowgen ci.openshift.io/no-builds: "true" @@ -26070,7 +26070,7 @@ periodics: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-packet-assisted + secretName: cluster-secrets-packet - name: pull-secret secret: secretName: registry-pull-credentials