diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-main.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-main.yaml index a274db3990c87..a0ee1aa83bbc8 100644 --- a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-main.yaml +++ b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-main.yaml @@ -1516,7 +1516,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: AWS_PUBLIC_IPV4_POOL_ID: ipv4pool-ec2-0768267342e327ea9 leases: @@ -1527,7 +1527,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool-disabled optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: AWS_PUBLIC_IPV4_POOL_ID: none workflow: openshift-e2e-aws diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.16__altinfra.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.16__altinfra.yaml index ed49c26c8303d..6d3bf4294ad77 100644 --- a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.16__altinfra.yaml +++ b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.16__altinfra.yaml @@ -126,7 +126,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws env: FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.17__altinfra.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.17__altinfra.yaml index 872baa355fc40..adfa25836e9b8 100644 --- a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.17__altinfra.yaml +++ b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.17__altinfra.yaml @@ -120,7 +120,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-3 env: FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.18.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.18.yaml index 61116ba6a0bf3..113056da0c0c0 100644 --- a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.18.yaml +++ b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.18.yaml @@ -1023,7 +1023,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws env: AWS_PUBLIC_IPV4_POOL_ID: ipv4pool-ec2-0768267342e327ea9 leases: @@ -1034,7 +1034,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool-disabled optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws env: AWS_PUBLIC_IPV4_POOL_ID: none workflow: openshift-e2e-aws diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.19.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.19.yaml index 3884e890c66ee..48b67f13aee13 100644 --- a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.19.yaml +++ b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.19.yaml @@ -1188,7 +1188,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: AWS_PUBLIC_IPV4_POOL_ID: ipv4pool-ec2-0768267342e327ea9 leases: @@ -1199,7 +1199,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool-disabled optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: AWS_PUBLIC_IPV4_POOL_ID: none workflow: openshift-e2e-aws diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.20.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.20.yaml index 1571a735a1ad8..93782a7ad2e2f 100644 --- a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.20.yaml +++ b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.20.yaml @@ -1270,7 +1270,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-3 env: AWS_PUBLIC_IPV4_POOL_ID: ipv4pool-ec2-0768267342e327ea9 leases: @@ -1281,7 +1281,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool-disabled optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-3 env: AWS_PUBLIC_IPV4_POOL_ID: none workflow: openshift-e2e-aws diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.21.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.21.yaml index 553fe21fceeba..20eefc2d5cbe2 100644 --- a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.21.yaml +++ b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.21.yaml @@ -1328,7 +1328,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: AWS_PUBLIC_IPV4_POOL_ID: ipv4pool-ec2-0768267342e327ea9 leases: @@ -1339,7 +1339,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool-disabled optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: AWS_PUBLIC_IPV4_POOL_ID: none workflow: openshift-e2e-aws diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.22.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.22.yaml index f121cfc868fd5..f033170924194 100644 --- a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.22.yaml +++ b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.22.yaml @@ -1471,7 +1471,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: AWS_PUBLIC_IPV4_POOL_ID: ipv4pool-ec2-0768267342e327ea9 leases: @@ -1482,7 +1482,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool-disabled optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: AWS_PUBLIC_IPV4_POOL_ID: none workflow: openshift-e2e-aws diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.23.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.23.yaml index 7ffc327fac71c..3efdb08d7e2a2 100644 --- a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.23.yaml +++ b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.23.yaml @@ -1516,7 +1516,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: AWS_PUBLIC_IPV4_POOL_ID: ipv4pool-ec2-0768267342e327ea9 leases: @@ -1527,7 +1527,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool-disabled optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: AWS_PUBLIC_IPV4_POOL_ID: none workflow: openshift-e2e-aws diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-5.0.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-5.0.yaml index 770db53cce474..8637294bce8c5 100644 --- a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-5.0.yaml +++ b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-5.0.yaml @@ -1517,7 +1517,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: AWS_PUBLIC_IPV4_POOL_ID: ipv4pool-ec2-0768267342e327ea9 leases: @@ -1528,7 +1528,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool-disabled optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: AWS_PUBLIC_IPV4_POOL_ID: none workflow: openshift-e2e-aws diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-5.1.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-5.1.yaml index ab457ffa95959..14f54536f4cfd 100644 --- a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-5.1.yaml +++ b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-5.1.yaml @@ -1516,7 +1516,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: AWS_PUBLIC_IPV4_POOL_ID: ipv4pool-ec2-0768267342e327ea9 leases: @@ -1527,7 +1527,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool-disabled optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: AWS_PUBLIC_IPV4_POOL_ID: none workflow: openshift-e2e-aws diff --git a/ci-operator/config/openshift/installer/openshift-installer-main.yaml b/ci-operator/config/openshift/installer/openshift-installer-main.yaml index d48fc2fb59c43..147ebe961d50d 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-main.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-main.yaml @@ -1527,7 +1527,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: AWS_PUBLIC_IPV4_POOL_ID: ipv4pool-ec2-0768267342e327ea9 leases: @@ -1538,7 +1538,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool-disabled optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: AWS_PUBLIC_IPV4_POOL_ID: none workflow: openshift-e2e-aws diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.16__altinfra.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.16__altinfra.yaml index d38425b235501..ac2dd60fb47e6 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-release-4.16__altinfra.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.16__altinfra.yaml @@ -123,7 +123,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws env: FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.17__altinfra.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.17__altinfra.yaml index 22dae979a8131..59d7762b163be 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-release-4.17__altinfra.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.17__altinfra.yaml @@ -117,7 +117,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-3 env: FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.18.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.18.yaml index c237d0b43e750..89c16b1011c7b 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-release-4.18.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.18.yaml @@ -1034,7 +1034,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws env: AWS_PUBLIC_IPV4_POOL_ID: ipv4pool-ec2-0768267342e327ea9 leases: @@ -1045,7 +1045,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool-disabled optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws env: AWS_PUBLIC_IPV4_POOL_ID: none workflow: openshift-e2e-aws diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.19.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.19.yaml index 9a5b98f829670..41e32554186bf 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-release-4.19.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.19.yaml @@ -1199,7 +1199,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: AWS_PUBLIC_IPV4_POOL_ID: ipv4pool-ec2-0768267342e327ea9 leases: @@ -1210,7 +1210,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool-disabled optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: AWS_PUBLIC_IPV4_POOL_ID: none workflow: openshift-e2e-aws diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.20.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.20.yaml index dff4d5ae88bf4..064b4a175fe83 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-release-4.20.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.20.yaml @@ -1281,7 +1281,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-3 env: AWS_PUBLIC_IPV4_POOL_ID: ipv4pool-ec2-0768267342e327ea9 leases: @@ -1292,7 +1292,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool-disabled optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-3 env: AWS_PUBLIC_IPV4_POOL_ID: none workflow: openshift-e2e-aws diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.21.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.21.yaml index 8a28182abad58..bff0baf584552 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-release-4.21.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.21.yaml @@ -1339,7 +1339,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: AWS_PUBLIC_IPV4_POOL_ID: ipv4pool-ec2-0768267342e327ea9 leases: @@ -1350,7 +1350,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool-disabled optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: AWS_PUBLIC_IPV4_POOL_ID: none workflow: openshift-e2e-aws diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.22.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.22.yaml index 3558126eb0282..0f41633ce6ce0 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-release-4.22.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.22.yaml @@ -1482,7 +1482,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: AWS_PUBLIC_IPV4_POOL_ID: ipv4pool-ec2-0768267342e327ea9 leases: @@ -1493,7 +1493,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool-disabled optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: AWS_PUBLIC_IPV4_POOL_ID: none workflow: openshift-e2e-aws diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.23.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.23.yaml index 896fcc24f6d2e..1484125b3b9a7 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-release-4.23.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.23.yaml @@ -1527,7 +1527,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: AWS_PUBLIC_IPV4_POOL_ID: ipv4pool-ec2-0768267342e327ea9 leases: @@ -1538,7 +1538,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool-disabled optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: AWS_PUBLIC_IPV4_POOL_ID: none workflow: openshift-e2e-aws diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-5.0.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-5.0.yaml index e37adc3cbaa41..29a44d2a869f4 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-release-5.0.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-release-5.0.yaml @@ -1528,7 +1528,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: AWS_PUBLIC_IPV4_POOL_ID: ipv4pool-ec2-0768267342e327ea9 leases: @@ -1539,7 +1539,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool-disabled optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: AWS_PUBLIC_IPV4_POOL_ID: none workflow: openshift-e2e-aws diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-5.1.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-5.1.yaml index 596f3088f8930..07c2a0363b158 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-release-5.1.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-release-5.1.yaml @@ -1527,7 +1527,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: AWS_PUBLIC_IPV4_POOL_ID: ipv4pool-ec2-0768267342e327ea9 leases: @@ -1538,7 +1538,7 @@ tests: as: e2e-aws-ovn-public-ipv4-pool-disabled optional: true steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: AWS_PUBLIC_IPV4_POOL_ID: none workflow: openshift-e2e-aws diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16__multi-nightly-4.16-upgrade-from-stable-4.16.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16__multi-nightly-4.16-upgrade-from-stable-4.16.yaml index 4d5dbf2442449..cb4de34cf254d 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16__multi-nightly-4.16-upgrade-from-stable-4.16.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16__multi-nightly-4.16-upgrade-from-stable-4.16.yaml @@ -156,7 +156,7 @@ tests: - as: aws-ipi-public-ipv4-pool-arm-f60 cron: 57 2 16 8 * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws env: BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com COMPUTE_NODE_TYPE: m6g.xlarge diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16__multi-nightly.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16__multi-nightly.yaml index 6520e96ff1924..45da28fce55ae 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16__multi-nightly.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16__multi-nightly.yaml @@ -571,7 +571,7 @@ tests: - as: aws-ipi-public-ipv4-pool-arm-f14 cron: 55 16 20 9 * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-3 env: BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com COMPUTE_NODE_TYPE: m6g.xlarge @@ -586,7 +586,7 @@ tests: - as: aws-ipi-public-ipv4-pool-amd-f28-destructive cron: 46 11 22 8 * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com leases: diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.17__multi-nightly-4.17-upgrade-from-stable-4.16.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.17__multi-nightly-4.17-upgrade-from-stable-4.16.yaml index aadb29763d80e..dd9253391ed03 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.17__multi-nightly-4.17-upgrade-from-stable-4.16.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.17__multi-nightly-4.17-upgrade-from-stable-4.16.yaml @@ -231,7 +231,7 @@ tests: - as: aws-ipi-public-ipv4-pool-arm-f28 cron: 36 16 3 * * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com COMPUTE_NODE_TYPE: m6g.xlarge diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.17__multi-nightly-4.17-upgrade-from-stable-4.17.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.17__multi-nightly-4.17-upgrade-from-stable-4.17.yaml index 0b40affc91c98..b10fac3cf2392 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.17__multi-nightly-4.17-upgrade-from-stable-4.17.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.17__multi-nightly-4.17-upgrade-from-stable-4.17.yaml @@ -239,7 +239,7 @@ tests: - as: aws-ipi-public-ipv4-pool-arm-f60 cron: 28 6 27 11 * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com COMPUTE_NODE_TYPE: m6g.xlarge diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.17__multi-nightly.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.17__multi-nightly.yaml index 44ac60364e6d2..ef6d9a39a152f 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.17__multi-nightly.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.17__multi-nightly.yaml @@ -478,7 +478,7 @@ tests: - as: aws-ipi-public-ipv4-pool-amd-f28-destructive cron: 17 10 28 12 * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-3 env: BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com leases: @@ -490,7 +490,7 @@ tests: - as: aws-ipi-public-ipv4-pool-arm-f14 cron: 11 13 8 3 * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws env: BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com COMPUTE_NODE_TYPE: m6g.xlarge diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.18__multi-nightly-4.18-upgrade-from-stable-4.17.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.18__multi-nightly-4.18-upgrade-from-stable-4.17.yaml index f113653a20c65..e130c15e80515 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.18__multi-nightly-4.18-upgrade-from-stable-4.17.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.18__multi-nightly-4.18-upgrade-from-stable-4.17.yaml @@ -211,7 +211,7 @@ tests: - as: aws-ipi-public-ipv4-pool-arm-f28 cron: 46 11 25 * * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-3 env: BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com COMPUTE_NODE_TYPE: m6g.xlarge diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.18__multi-nightly-4.18-upgrade-from-stable-4.18.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.18__multi-nightly-4.18-upgrade-from-stable-4.18.yaml index a1a8aca057b6f..9c2da7010db32 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.18__multi-nightly-4.18-upgrade-from-stable-4.18.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.18__multi-nightly-4.18-upgrade-from-stable-4.18.yaml @@ -221,7 +221,7 @@ tests: - as: aws-ipi-public-ipv4-pool-mini-perm-arm-f60 cron: 20 23 26 12 * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws env: AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes" BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.18__multi-nightly.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.18__multi-nightly.yaml index 36430d9a19315..2f5b16fcec279 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.18__multi-nightly.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.18__multi-nightly.yaml @@ -635,7 +635,7 @@ tests: - as: aws-ipi-public-ipv4-pool-byo-subnet-amd-f28-destructive cron: 27 5 23 1 * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws env: BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com leases: @@ -647,7 +647,7 @@ tests: - as: aws-ipi-public-ipv4-pool-byo-subnet-mini-perm-arm-f14 cron: 43 13 15 12 * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws env: AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes" BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com @@ -663,7 +663,7 @@ tests: - as: aws-ipi-public-ipv4-pool-mini-perm-amd-f28-destructive cron: 37 5 23 9 * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-3 env: AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes" BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com @@ -676,7 +676,7 @@ tests: - as: aws-ipi-public-ipv4-pool-mini-perm-arm-f14 cron: 54 12 13 9 * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-3 env: AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes" BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.19__multi-nightly-4.19-upgrade-from-stable-4.18.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.19__multi-nightly-4.19-upgrade-from-stable-4.18.yaml index 055c3fe6bd3a0..fe05f38df9acd 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.19__multi-nightly-4.19-upgrade-from-stable-4.18.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.19__multi-nightly-4.19-upgrade-from-stable-4.18.yaml @@ -223,7 +223,7 @@ tests: - as: aws-ipi-public-ipv4-pool-arm-f28 cron: 26 7 25 * * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com COMPUTE_NODE_TYPE: m6g.xlarge diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.19__multi-nightly-4.19-upgrade-from-stable-4.19.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.19__multi-nightly-4.19-upgrade-from-stable-4.19.yaml index 33fa75e706fd1..ed1754bfeff40 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.19__multi-nightly-4.19-upgrade-from-stable-4.19.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.19__multi-nightly-4.19-upgrade-from-stable-4.19.yaml @@ -299,7 +299,7 @@ tests: - as: aws-ipi-public-ipv4-pool-mini-perm-arm-f60 cron: 10 17 4 2,4,6,8,10,12 * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws env: AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes" BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.19__multi-nightly.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.19__multi-nightly.yaml index 3954c0d1a9a2d..e3ce3ec459480 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.19__multi-nightly.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.19__multi-nightly.yaml @@ -845,7 +845,7 @@ tests: - as: aws-ipi-public-ipv4-pool-byo-subnet-amd-f28-destructive cron: 17 20 27 * * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws env: BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com leases: @@ -857,7 +857,7 @@ tests: - as: aws-ipi-public-ipv4-pool-byo-subnet-mini-perm-arm-f14 cron: 31 18 1,17 * * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws env: AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes" BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com @@ -873,7 +873,7 @@ tests: - as: aws-ipi-public-ipv4-pool-mini-perm-amd-f28-destructive cron: 17 11 13 * * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws env: AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes" BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com @@ -886,7 +886,7 @@ tests: - as: aws-ipi-public-ipv4-pool-mini-perm-arm-f14 cron: 3 23 11,27 * * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes" BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.20__multi-nightly-4.20-upgrade-from-stable-4.19.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.20__multi-nightly-4.20-upgrade-from-stable-4.19.yaml index 82151f00e6637..68765e1705634 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.20__multi-nightly-4.20-upgrade-from-stable-4.19.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.20__multi-nightly-4.20-upgrade-from-stable-4.19.yaml @@ -226,7 +226,7 @@ tests: - as: aws-ipi-public-ipv4-pool-arm-f28 cron: 44 17 21 * * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com COMPUTE_NODE_TYPE: m6g.xlarge diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.20__multi-nightly-4.20-upgrade-from-stable-4.20.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.20__multi-nightly-4.20-upgrade-from-stable-4.20.yaml index 2df0649b4e2a4..7dc0049c5df1d 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.20__multi-nightly-4.20-upgrade-from-stable-4.20.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.20__multi-nightly-4.20-upgrade-from-stable-4.20.yaml @@ -299,7 +299,7 @@ tests: - as: aws-ipi-public-ipv4-pool-mini-perm-arm-f60 cron: 12 20 15 1,3,5,7,9,11 * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws env: AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes" BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.20__multi-nightly.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.20__multi-nightly.yaml index 06cfc8f0e0ef9..cd468f667ad9e 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.20__multi-nightly.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.20__multi-nightly.yaml @@ -789,7 +789,7 @@ tests: - as: aws-ipi-public-ipv4-pool-byo-subnet-amd-f28-destructive cron: 6 13 5 * * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws env: BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com leases: @@ -801,7 +801,7 @@ tests: - as: aws-ipi-public-ipv4-pool-byo-subnet-mini-perm-arm-f14 cron: 55 21 12,26 * * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws env: AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes" BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com @@ -817,7 +817,7 @@ tests: - as: aws-ipi-public-ipv4-pool-mini-perm-amd-f28-destructive cron: 24 2 6 * * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws env: AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes" BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com @@ -830,7 +830,7 @@ tests: - as: aws-ipi-public-ipv4-pool-mini-perm-arm-f14 cron: 19 10 6,20 * * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes" BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.21__multi-nightly-4.21-upgrade-from-stable-4.20.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.21__multi-nightly-4.21-upgrade-from-stable-4.20.yaml index e1545448cceff..89a673f97cd4f 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.21__multi-nightly-4.21-upgrade-from-stable-4.20.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.21__multi-nightly-4.21-upgrade-from-stable-4.20.yaml @@ -226,7 +226,7 @@ tests: - as: aws-ipi-public-ipv4-pool-arm-f28 cron: 13 22 29 * * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com COMPUTE_NODE_TYPE: m6g.xlarge diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.21__multi-nightly-4.21-upgrade-from-stable-4.21.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.21__multi-nightly-4.21-upgrade-from-stable-4.21.yaml index 41ae5fee15a95..d3ea88fb3b1b1 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.21__multi-nightly-4.21-upgrade-from-stable-4.21.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.21__multi-nightly-4.21-upgrade-from-stable-4.21.yaml @@ -299,7 +299,7 @@ tests: - as: aws-ipi-public-ipv4-pool-mini-perm-arm-f60 cron: 45 1 5 1,3,5,7,9,11 * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws env: AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes" BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.21__multi-nightly.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.21__multi-nightly.yaml index 74a5e69162cee..66c0590d8117e 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.21__multi-nightly.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.21__multi-nightly.yaml @@ -940,7 +940,7 @@ tests: - as: aws-ipi-public-ipv4-pool-byo-subnet-amd-f28-destructive cron: 37 17 19 * * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws env: BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com leases: @@ -952,7 +952,7 @@ tests: - as: aws-ipi-public-ipv4-pool-byo-subnet-mini-perm-arm-f14 cron: 42 22 5,21 * * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws env: AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes" BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com @@ -968,7 +968,7 @@ tests: - as: aws-ipi-public-ipv4-pool-mini-perm-amd-f28-destructive cron: 18 10 19 * * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws env: AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes" BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com @@ -981,7 +981,7 @@ tests: - as: aws-ipi-public-ipv4-pool-mini-perm-arm-f14 cron: 52 7 11,27 * * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes" BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.22__multi-nightly-4.22-upgrade-from-stable-4.21.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.22__multi-nightly-4.22-upgrade-from-stable-4.21.yaml index eb76defafa20e..e9672698d9df8 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.22__multi-nightly-4.22-upgrade-from-stable-4.21.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.22__multi-nightly-4.22-upgrade-from-stable-4.21.yaml @@ -227,7 +227,7 @@ tests: - as: aws-ipi-public-ipv4-pool-arm-f28 cron: 54 2 14 * * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com COMPUTE_NODE_TYPE: m6g.xlarge diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.22__multi-nightly-4.22-upgrade-from-stable-4.22.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.22__multi-nightly-4.22-upgrade-from-stable-4.22.yaml index aa7e0d6ba8b18..2b4f38211f44d 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.22__multi-nightly-4.22-upgrade-from-stable-4.22.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.22__multi-nightly-4.22-upgrade-from-stable-4.22.yaml @@ -303,7 +303,7 @@ tests: - as: aws-ipi-public-ipv4-pool-mini-perm-arm-f60 cron: 9 1 2 2,4,6,8,10,12 * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws env: AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes" BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.22__multi-nightly.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.22__multi-nightly.yaml index c873916d4a247..406985a1aaedd 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.22__multi-nightly.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.22__multi-nightly.yaml @@ -1076,7 +1076,7 @@ tests: - as: aws-ipi-public-ipv4-pool-byo-subnet-amd-f28-destructive cron: 13 13 4 * * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws env: BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com leases: @@ -1088,7 +1088,7 @@ tests: - as: aws-ipi-public-ipv4-pool-byo-subnet-mini-perm-arm-f14 cron: 33 8 4,18 * * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws env: AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes" BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com @@ -1104,7 +1104,7 @@ tests: - as: aws-ipi-public-ipv4-pool-mini-perm-amd-f28-destructive cron: 6 22 30 * * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws env: AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes" BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com @@ -1117,7 +1117,7 @@ tests: - as: aws-ipi-public-ipv4-pool-mini-perm-arm-f14 cron: 57 17 12,26 * * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes" BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-5.0__multi-nightly.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-5.0__multi-nightly.yaml index b32089aefa6d4..96fe1a8634740 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-5.0__multi-nightly.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-5.0__multi-nightly.yaml @@ -929,7 +929,7 @@ tests: - as: aws-ipi-public-ipv4-pool-byo-subnet-amd-f28-destructive cron: 13 13 4 * * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws env: BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com leases: @@ -941,7 +941,7 @@ tests: - as: aws-ipi-public-ipv4-pool-byo-subnet-mini-perm-arm-f14 cron: 33 8 4,18 * * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws env: AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes" BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com @@ -957,7 +957,7 @@ tests: - as: aws-ipi-public-ipv4-pool-mini-perm-amd-f28-destructive cron: 6 22 30 * * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws env: AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes" BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com @@ -970,7 +970,7 @@ tests: - as: aws-ipi-public-ipv4-pool-mini-perm-arm-f14 cron: 57 17 12,26 * * steps: - cluster_profile: openshift-org-aws + cluster_profile: aws-2 env: AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes" BASE_DOMAIN: origin-ci-int-aws.dev.rhcloud.com diff --git a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-main-presubmits.yaml b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-main-presubmits.yaml index b3491c56856bc..d82925ec710e1 100644 --- a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-main-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-main-presubmits.yaml @@ -3556,7 +3556,7 @@ presubmits: hidden: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-priv-installer-main-e2e-aws-ovn-public-ipv4-pool @@ -3654,7 +3654,7 @@ presubmits: hidden: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-priv-installer-main-e2e-aws-ovn-public-ipv4-pool-disabled diff --git a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.16-presubmits.yaml b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.16-presubmits.yaml index 9aa80f57fee54..0fe006b4dd640 100644 --- a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.16-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.16-presubmits.yaml @@ -675,7 +675,7 @@ presubmits: hidden: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws ci-operator.openshift.io/variant: altinfra ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" diff --git a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.17-presubmits.yaml b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.17-presubmits.yaml index cb24917bb34e1..6efd5d9927f63 100644 --- a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.17-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.17-presubmits.yaml @@ -595,7 +595,7 @@ presubmits: hidden: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-3 ci-operator.openshift.io/variant: altinfra ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" diff --git a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.18-presubmits.yaml b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.18-presubmits.yaml index c010ed9e90685..f8ba6fbcc8d34 100644 --- a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.18-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.18-presubmits.yaml @@ -5199,7 +5199,7 @@ presubmits: hidden: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-priv-installer-release-4.18-e2e-aws-ovn-public-ipv4-pool @@ -5297,7 +5297,7 @@ presubmits: hidden: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-priv-installer-release-4.18-e2e-aws-ovn-public-ipv4-pool-disabled diff --git a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.19-presubmits.yaml b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.19-presubmits.yaml index 1ae24edd13b05..4f1270d1a0abb 100644 --- a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.19-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.19-presubmits.yaml @@ -2450,7 +2450,7 @@ presubmits: hidden: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-priv-installer-release-4.19-e2e-aws-ovn-public-ipv4-pool @@ -2548,7 +2548,7 @@ presubmits: hidden: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-priv-installer-release-4.19-e2e-aws-ovn-public-ipv4-pool-disabled diff --git a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.20-presubmits.yaml b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.20-presubmits.yaml index 6f69c49a1e489..d8a6e8367a870 100644 --- a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.20-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.20-presubmits.yaml @@ -2568,7 +2568,7 @@ presubmits: hidden: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-3 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-priv-installer-release-4.20-e2e-aws-ovn-public-ipv4-pool @@ -2666,7 +2666,7 @@ presubmits: hidden: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-3 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-priv-installer-release-4.20-e2e-aws-ovn-public-ipv4-pool-disabled diff --git a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.21-presubmits.yaml b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.21-presubmits.yaml index e73cf50185d99..a6c48eaf87af7 100644 --- a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.21-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.21-presubmits.yaml @@ -2568,7 +2568,7 @@ presubmits: hidden: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-priv-installer-release-4.21-e2e-aws-ovn-public-ipv4-pool @@ -2666,7 +2666,7 @@ presubmits: hidden: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-priv-installer-release-4.21-e2e-aws-ovn-public-ipv4-pool-disabled diff --git a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.22-presubmits.yaml b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.22-presubmits.yaml index 20a4436a4658a..ecd7481322eda 100644 --- a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.22-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.22-presubmits.yaml @@ -3256,7 +3256,7 @@ presubmits: hidden: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-priv-installer-release-4.22-e2e-aws-ovn-public-ipv4-pool @@ -3354,7 +3354,7 @@ presubmits: hidden: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-priv-installer-release-4.22-e2e-aws-ovn-public-ipv4-pool-disabled diff --git a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.23-presubmits.yaml b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.23-presubmits.yaml index d120beca798e1..dcadb82c70c9e 100644 --- a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.23-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.23-presubmits.yaml @@ -3556,7 +3556,7 @@ presubmits: hidden: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-priv-installer-release-4.23-e2e-aws-ovn-public-ipv4-pool @@ -3654,7 +3654,7 @@ presubmits: hidden: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-priv-installer-release-4.23-e2e-aws-ovn-public-ipv4-pool-disabled diff --git a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-5.0-presubmits.yaml b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-5.0-presubmits.yaml index c995d67d757f9..9e23ccc4bb75a 100644 --- a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-5.0-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-5.0-presubmits.yaml @@ -3556,7 +3556,7 @@ presubmits: hidden: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-priv-installer-release-5.0-e2e-aws-ovn-public-ipv4-pool @@ -3654,7 +3654,7 @@ presubmits: hidden: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-priv-installer-release-5.0-e2e-aws-ovn-public-ipv4-pool-disabled diff --git a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-5.1-presubmits.yaml b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-5.1-presubmits.yaml index df7d2778e42c8..c8724c3177a7c 100644 --- a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-5.1-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-5.1-presubmits.yaml @@ -3556,7 +3556,7 @@ presubmits: hidden: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-priv-installer-release-5.1-e2e-aws-ovn-public-ipv4-pool @@ -3654,7 +3654,7 @@ presubmits: hidden: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-priv-installer-release-5.1-e2e-aws-ovn-public-ipv4-pool-disabled diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-main-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-main-presubmits.yaml index a4165436d540c..8877745b240f8 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-main-presubmits.yaml @@ -3229,7 +3229,7 @@ presubmits: - images/openstack/Dockerfile.ci labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-installer-main-e2e-aws-ovn-public-ipv4-pool @@ -3318,7 +3318,7 @@ presubmits: - images/openstack/Dockerfile.ci labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-installer-main-e2e-aws-ovn-public-ipv4-pool-disabled diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.16-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.16-presubmits.yaml index eefe0768fe8a0..d6ac5641b0cc3 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.16-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.16-presubmits.yaml @@ -608,7 +608,7 @@ presubmits: - images/installer-altinfra/Dockerfile.ci labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws ci-operator.openshift.io/variant: altinfra ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.17-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.17-presubmits.yaml index 96fb0554596ac..b3e4f932ac38c 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.17-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.17-presubmits.yaml @@ -537,7 +537,7 @@ presubmits: - images/installer-altinfra/Dockerfile.ci labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-3 ci-operator.openshift.io/variant: altinfra ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.18-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.18-presubmits.yaml index 1aaacc547032c..00a91d1896ae0 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.18-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.18-presubmits.yaml @@ -4711,7 +4711,7 @@ presubmits: - images/openstack/Dockerfile.ci labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-installer-release-4.18-e2e-aws-ovn-public-ipv4-pool @@ -4800,7 +4800,7 @@ presubmits: - images/openstack/Dockerfile.ci labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-installer-release-4.18-e2e-aws-ovn-public-ipv4-pool-disabled diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.19-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.19-presubmits.yaml index b07b9c9ed9782..2d582ea5882c2 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.19-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.19-presubmits.yaml @@ -2222,7 +2222,7 @@ presubmits: - images/openstack/Dockerfile.ci labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-installer-release-4.19-e2e-aws-ovn-public-ipv4-pool @@ -2311,7 +2311,7 @@ presubmits: - images/openstack/Dockerfile.ci labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-installer-release-4.19-e2e-aws-ovn-public-ipv4-pool-disabled diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.20-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.20-presubmits.yaml index a9f6e8ae1aba7..59d121c5ea608 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.20-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.20-presubmits.yaml @@ -2331,7 +2331,7 @@ presubmits: - images/openstack/Dockerfile.ci labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-3 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-installer-release-4.20-e2e-aws-ovn-public-ipv4-pool @@ -2420,7 +2420,7 @@ presubmits: - images/openstack/Dockerfile.ci labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-3 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-installer-release-4.20-e2e-aws-ovn-public-ipv4-pool-disabled diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.21-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.21-presubmits.yaml index f7cacbe6e9349..9b044f0433ad3 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.21-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.21-presubmits.yaml @@ -2331,7 +2331,7 @@ presubmits: - images/openstack/Dockerfile.ci labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-installer-release-4.21-e2e-aws-ovn-public-ipv4-pool @@ -2420,7 +2420,7 @@ presubmits: - images/openstack/Dockerfile.ci labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-installer-release-4.21-e2e-aws-ovn-public-ipv4-pool-disabled diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.22-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.22-presubmits.yaml index 5cde2e24d9251..62eba03e63769 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.22-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.22-presubmits.yaml @@ -2956,7 +2956,7 @@ presubmits: - images/openstack/Dockerfile.ci labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-installer-release-4.22-e2e-aws-ovn-public-ipv4-pool @@ -3045,7 +3045,7 @@ presubmits: - images/openstack/Dockerfile.ci labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-installer-release-4.22-e2e-aws-ovn-public-ipv4-pool-disabled diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.23-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.23-presubmits.yaml index 3e6eebb9708e3..0d4462d2e2954 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.23-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.23-presubmits.yaml @@ -3229,7 +3229,7 @@ presubmits: - images/openstack/Dockerfile.ci labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-installer-release-4.23-e2e-aws-ovn-public-ipv4-pool @@ -3318,7 +3318,7 @@ presubmits: - images/openstack/Dockerfile.ci labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-installer-release-4.23-e2e-aws-ovn-public-ipv4-pool-disabled diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-release-5.0-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-release-5.0-presubmits.yaml index 19529b479fb5b..ce98b354d9c5f 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-release-5.0-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-release-5.0-presubmits.yaml @@ -3228,7 +3228,7 @@ presubmits: - images/openstack/Dockerfile.ci labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-installer-release-5.0-e2e-aws-ovn-public-ipv4-pool @@ -3317,7 +3317,7 @@ presubmits: - images/openstack/Dockerfile.ci labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-installer-release-5.0-e2e-aws-ovn-public-ipv4-pool-disabled diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-release-5.1-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-release-5.1-presubmits.yaml index c983f80a695cf..86701ad1ee370 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-release-5.1-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-release-5.1-presubmits.yaml @@ -3229,7 +3229,7 @@ presubmits: - images/openstack/Dockerfile.ci labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-installer-release-5.1-e2e-aws-ovn-public-ipv4-pool @@ -3318,7 +3318,7 @@ presubmits: - images/openstack/Dockerfile.ci labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-installer-release-5.1-e2e-aws-ovn-public-ipv4-pool-disabled diff --git a/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16-periodics.yaml b/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16-periodics.yaml index ca726c5efc50f..b27509f1c7115 100644 --- a/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16-periodics.yaml +++ b/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16-periodics.yaml @@ -47235,7 +47235,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws ci-operator.openshift.io/variant: multi-nightly-4.16-upgrade-from-stable-4.16 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" @@ -51059,7 +51059,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci-operator.openshift.io/variant: multi-nightly ci.openshift.io/generator: prowgen job-release: "4.16" @@ -51149,7 +51149,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-3 ci-operator.openshift.io/variant: multi-nightly ci.openshift.io/generator: prowgen job-release: "4.16" diff --git a/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.17-periodics.yaml b/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.17-periodics.yaml index d175eefce41d6..9f24a69b516cc 100644 --- a/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.17-periodics.yaml +++ b/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.17-periodics.yaml @@ -51709,7 +51709,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci-operator.openshift.io/variant: multi-nightly-4.17-upgrade-from-stable-4.16 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" @@ -56790,7 +56790,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci-operator.openshift.io/variant: multi-nightly-4.17-upgrade-from-stable-4.17 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" @@ -63263,7 +63263,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-3 ci-operator.openshift.io/variant: multi-nightly ci.openshift.io/generator: prowgen job-release: "4.17" @@ -63353,7 +63353,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws ci-operator.openshift.io/variant: multi-nightly ci.openshift.io/generator: prowgen job-release: "4.17" diff --git a/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.18-periodics.yaml b/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.18-periodics.yaml index 196bd8f6ecc8c..e23fc9aab925f 100644 --- a/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.18-periodics.yaml +++ b/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.18-periodics.yaml @@ -58185,7 +58185,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-3 ci-operator.openshift.io/variant: multi-nightly-4.18-upgrade-from-stable-4.17 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" @@ -63266,7 +63266,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws ci-operator.openshift.io/variant: multi-nightly-4.18-upgrade-from-stable-4.18 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" @@ -70875,7 +70875,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws ci-operator.openshift.io/variant: multi-nightly ci.openshift.io/generator: prowgen job-release: "4.18" @@ -70965,7 +70965,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws ci-operator.openshift.io/variant: multi-nightly ci.openshift.io/generator: prowgen job-release: "4.18" @@ -71055,7 +71055,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-3 ci-operator.openshift.io/variant: multi-nightly ci.openshift.io/generator: prowgen job-release: "4.18" @@ -71145,7 +71145,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-3 ci-operator.openshift.io/variant: multi-nightly ci.openshift.io/generator: prowgen job-release: "4.18" diff --git a/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.19-periodics.yaml b/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.19-periodics.yaml index a344a8e3fd249..1055bbe01e0c4 100644 --- a/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.19-periodics.yaml +++ b/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.19-periodics.yaml @@ -61700,7 +61700,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci-operator.openshift.io/variant: multi-nightly-4.19-upgrade-from-stable-4.18 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" @@ -67316,7 +67316,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws ci-operator.openshift.io/variant: multi-nightly-4.19-upgrade-from-stable-4.19 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" @@ -75420,7 +75420,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws ci-operator.openshift.io/variant: multi-nightly ci.openshift.io/generator: prowgen job-release: "4.19" @@ -75510,7 +75510,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws ci-operator.openshift.io/variant: multi-nightly ci.openshift.io/generator: prowgen job-release: "4.19" @@ -75600,7 +75600,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws ci-operator.openshift.io/variant: multi-nightly ci.openshift.io/generator: prowgen job-release: "4.19" @@ -75690,7 +75690,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci-operator.openshift.io/variant: multi-nightly ci.openshift.io/generator: prowgen job-release: "4.19" diff --git a/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.20-periodics.yaml b/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.20-periodics.yaml index 6414de909536c..d8b5b6c6ed306 100644 --- a/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.20-periodics.yaml +++ b/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.20-periodics.yaml @@ -64092,7 +64092,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci-operator.openshift.io/variant: multi-nightly-4.20-upgrade-from-stable-4.19 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" @@ -69708,7 +69708,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws ci-operator.openshift.io/variant: multi-nightly-4.20-upgrade-from-stable-4.20 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" @@ -77452,7 +77452,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws ci-operator.openshift.io/variant: multi-nightly ci.openshift.io/generator: prowgen job-release: "4.20" @@ -77542,7 +77542,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws ci-operator.openshift.io/variant: multi-nightly ci.openshift.io/generator: prowgen job-release: "4.20" @@ -77632,7 +77632,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws ci-operator.openshift.io/variant: multi-nightly ci.openshift.io/generator: prowgen job-release: "4.20" @@ -77722,7 +77722,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci-operator.openshift.io/variant: multi-nightly ci.openshift.io/generator: prowgen job-release: "4.20" diff --git a/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.21-periodics.yaml b/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.21-periodics.yaml index 00a8edf540a67..69fb4f6fab93e 100644 --- a/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.21-periodics.yaml +++ b/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.21-periodics.yaml @@ -70195,7 +70195,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci-operator.openshift.io/variant: multi-nightly-4.21-upgrade-from-stable-4.20 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" @@ -75811,7 +75811,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws ci-operator.openshift.io/variant: multi-nightly-4.21-upgrade-from-stable-4.21 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" @@ -84366,7 +84366,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws ci-operator.openshift.io/variant: multi-nightly ci.openshift.io/generator: prowgen job-release: "4.21" @@ -84456,7 +84456,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws ci-operator.openshift.io/variant: multi-nightly ci.openshift.io/generator: prowgen job-release: "4.21" @@ -84546,7 +84546,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws ci-operator.openshift.io/variant: multi-nightly ci.openshift.io/generator: prowgen job-release: "4.21" @@ -84636,7 +84636,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci-operator.openshift.io/variant: multi-nightly ci.openshift.io/generator: prowgen job-release: "4.21" diff --git a/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.22-periodics.yaml b/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.22-periodics.yaml index 97e3fbde5746d..cd432b807a216 100644 --- a/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.22-periodics.yaml +++ b/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.22-periodics.yaml @@ -75099,7 +75099,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci-operator.openshift.io/variant: multi-nightly-4.22-upgrade-from-stable-4.21 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" @@ -80715,7 +80715,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws ci-operator.openshift.io/variant: multi-nightly-4.22-upgrade-from-stable-4.22 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" @@ -90800,7 +90800,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws ci-operator.openshift.io/variant: multi-nightly ci.openshift.io/generator: prowgen job-release: "4.22" @@ -90890,7 +90890,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws ci-operator.openshift.io/variant: multi-nightly ci.openshift.io/generator: prowgen job-release: "4.22" @@ -90980,7 +90980,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws ci-operator.openshift.io/variant: multi-nightly ci.openshift.io/generator: prowgen job-release: "4.22" @@ -91070,7 +91070,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci-operator.openshift.io/variant: multi-nightly ci.openshift.io/generator: prowgen job-release: "4.22" diff --git a/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-5.0-periodics.yaml b/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-5.0-periodics.yaml index 198a2302e40bf..fdb7c152d3a13 100644 --- a/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-5.0-periodics.yaml +++ b/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-5.0-periodics.yaml @@ -42055,7 +42055,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws ci-operator.openshift.io/variant: multi-nightly ci.openshift.io/generator: prowgen job-release: "5.0" @@ -42145,7 +42145,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws ci-operator.openshift.io/variant: multi-nightly ci.openshift.io/generator: prowgen job-release: "5.0" @@ -42235,7 +42235,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws ci-operator.openshift.io/variant: multi-nightly ci.openshift.io/generator: prowgen job-release: "5.0" @@ -42325,7 +42325,7 @@ periodics: repo: openshift-tests-private labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci-operator.openshift.io/variant: multi-nightly ci.openshift.io/generator: prowgen job-release: "5.0" diff --git a/core-services/prow/02_config/generate-boskos.py b/core-services/prow/02_config/generate-boskos.py index e6887d9e9d90e..380c8b52d7ad4 100755 --- a/core-services/prow/02_config/generate-boskos.py +++ b/core-services/prow/02_config/generate-boskos.py @@ -813,6 +813,48 @@ }, } +CLUSTER_PROFILE_SETS_IGNORE = { + # Do not dump the following cps. Useful when a new profile is about to be introduced + # and it is not fully defined yet. + 'profiles': [], + + # Do not enforce any Cluster Profile Set usage policy on these tests. The schema of + # this stanza is defined as follow: + # + # 'tests_allowlist': { + # '${ORGANIZATION_REGEXP}/${REPOSITORY_REGEXP}' : { + # '${BRANCH_REGEXP}': { + # '${VARIANT_REGEXP}': [ + # '${TEST_REGEXP}' + # ] + # } + # } + # } + 'tests_allowlist': { + 'openshift(-priv)?/openshift-tests-private': { + '.+': { + '.*': [ + '.*-public-ipv4-pool.*' + ] + } + }, + 'openshift(-priv)?/installer': { + '.+': { + '.*': [ + '.*-public-ipv4-pool.*' + ] + } + }, + 'openshift/release': { + '.+': { + '.*': [ + '.*-public-ipv4-pool.*' + ] + } + } + }, +} + def cluster_profile_set_resources(clusterProfileSets): def profile_set_resource(profileSet, profileSetData): cps_resource = { @@ -885,13 +927,18 @@ def generate_config(): yaml.dump(config, f, default_flow_style=False) def print_cluster_profile_set_details(): - # Do not dump the following cps. Useful when a new profile is about to be introduced - # and it is not fully defined yet. - ignore_list = [] - cps = {} + ignored_cps = CLUSTER_PROFILE_SETS_IGNORE['profiles'] + cps = { + 'cluster_profile_sets': {}, + 'tests_allowlist': {}, + } + for cps_name, cps_data in CLUSTER_PROFILE_SETS_CONFIG.items(): - if not cps_name in ignore_list: - cps[cps_name] = list(cps_data.keys()) + if not cps_name in ignored_cps: + cps['cluster_profile_sets'][cps_name] = list(cps_data.keys()) + + cps['tests_allowlist'] = CLUSTER_PROFILE_SETS_IGNORE['tests_allowlist'] + print(json.dumps(cps, indent=2)) if args.print_cps: