From 9c99537e943179ae2cdba2388afc6687cabbbccb Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Tue, 13 Sep 2022 12:01:23 +0000 Subject: [PATCH 1/6] registry-replacer --github-token-path /etc/github/oauth --github-endpoint http://ghproxy --config-dir ./ci-operator/config --registry ./ci-operator/step-registry --prune-unused-replacements --prune-ocp-builder-replacements --prune-unused-base-images --ensure-correct-promotion-dockerfile --current-release-minor=12 --ensure-correct-promotion-dockerfile-ignored-repos openshift/origin-aggregated-logging --ensure-correct-promotion-dockerfile-ignored-repos openshift/console --- ...riv-cluster-api-provider-ovirt-master.yaml | 8 ------- ...uster-api-provider-ovirt-release-4.10.yaml | 8 ------- ...uster-api-provider-ovirt-release-4.11.yaml | 8 ------- ...uster-api-provider-ovirt-release-4.12.yaml | 8 ------- ...uster-api-provider-ovirt-release-4.13.yaml | 8 ------- ...luster-api-provider-ovirt-release-4.8.yaml | 4 ---- ...luster-api-provider-ovirt-release-4.9.yaml | 4 ---- ...hift-priv-cluster-nfd-operator-master.yaml | 4 ---- ...riv-cluster-nfd-operator-release-4.10.yaml | 4 ---- ...riv-cluster-nfd-operator-release-4.11.yaml | 4 ---- ...riv-cluster-nfd-operator-release-4.12.yaml | 4 ---- ...riv-cluster-nfd-operator-release-4.13.yaml | 4 ---- ...priv-cluster-nfd-operator-release-4.9.yaml | 4 ---- ...ft-priv-insights-operator-release-4.7.yaml | 4 ---- ...indows-machine-config-operator-master.yaml | 7 ------ ...-machine-config-operator-release-4.12.yaml | 7 ------ ...-machine-config-operator-release-4.13.yaml | 7 ------ .../openshift-console-operator-master.yaml | 8 +++---- ...enshift-console-operator-release-4.12.yaml | 8 +++---- ...enshift-console-operator-release-4.13.yaml | 8 +++---- ...openshift-okd-machine-os-release-4.12.yaml | 12 ---------- ...openshift-okd-machine-os-release-4.13.yaml | 12 ---------- ...e-config-operator-community-4.11__okd.yaml | 7 ++++++ ...-machine-config-operator-release-4.11.yaml | 7 ++++++ ...-machine-config-operator-release-4.12.yaml | 7 ------ ...-machine-config-operator-release-4.13.yaml | 7 ------ .../stackrox-stackrox-release-3.72.yaml | 23 ------------------- 27 files changed, 26 insertions(+), 170 deletions(-) diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-master.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-master.yaml index 553be95e3af58..7bef886bf4585 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-master.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-master.yaml @@ -1,8 +1,4 @@ base_images: - ansible-runner-ovirt: - name: ansible-runner-ovirt - namespace: openshift - tag: latest base: name: 4.12-priv namespace: ocp-private @@ -11,10 +7,6 @@ base_images: name: builder namespace: ocp tag: rhel-8-golang-1.18-openshift-4.12 - ovirt-prfinder: - name: ovirt-prfinder - namespace: openshift - tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.10.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.10.yaml index 3f306348b5818..fa73e705f43de 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.10.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.10.yaml @@ -1,8 +1,4 @@ base_images: - ansible-runner-ovirt: - name: ansible-runner-ovirt - namespace: openshift - tag: latest base: name: 4.10-priv namespace: ocp-private @@ -11,10 +7,6 @@ base_images: name: builder namespace: ocp tag: rhel-8-golang-1.17-openshift-4.10 - ovirt-prfinder: - name: ovirt-prfinder - namespace: openshift - tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.11.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.11.yaml index 06499e9470604..7c6639955d1e3 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.11.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.11.yaml @@ -1,8 +1,4 @@ base_images: - ansible-runner-ovirt: - name: ansible-runner-ovirt - namespace: openshift - tag: latest base: name: 4.11-priv namespace: ocp-private @@ -11,10 +7,6 @@ base_images: name: builder namespace: ocp tag: rhel-8-golang-1.18-openshift-4.11 - ovirt-prfinder: - name: ovirt-prfinder - namespace: openshift - tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.12.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.12.yaml index 3377d549e456d..b3daafd62245c 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.12.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.12.yaml @@ -1,8 +1,4 @@ base_images: - ansible-runner-ovirt: - name: ansible-runner-ovirt - namespace: openshift - tag: latest base: name: 4.12-priv namespace: ocp-private @@ -11,10 +7,6 @@ base_images: name: builder namespace: ocp tag: rhel-8-golang-1.18-openshift-4.12 - ovirt-prfinder: - name: ovirt-prfinder - namespace: openshift - tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.13.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.13.yaml index 385c29e1de01b..3eaa25a6ba43b 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.13.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.13.yaml @@ -1,8 +1,4 @@ base_images: - ansible-runner-ovirt: - name: ansible-runner-ovirt - namespace: openshift - tag: latest base: name: 4.13-priv namespace: ocp-private @@ -11,10 +7,6 @@ base_images: name: builder namespace: ocp tag: rhel-8-golang-1.18-openshift-4.12 - ovirt-prfinder: - name: ovirt-prfinder - namespace: openshift - tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.8.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.8.yaml index 885f55111a399..e8011b2bde324 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.8.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.8.yaml @@ -1,8 +1,4 @@ base_images: - ansible-runner-ovirt: - name: ansible-runner-ovirt - namespace: openshift - tag: latest base: name: 4.8-priv namespace: ocp-private diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.9.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.9.yaml index 82bc192900002..0cb9404c6ef0b 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.9.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.9.yaml @@ -1,8 +1,4 @@ base_images: - ansible-runner-ovirt: - name: ansible-runner-ovirt - namespace: openshift - tag: latest base: name: 4.9-priv namespace: ocp-private diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-master.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-master.yaml index 76ddc6e187813..e7d980df5cccd 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-master.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-master.yaml @@ -3,10 +3,6 @@ base_images: name: 4.12-priv namespace: ocp-private tag: base - ci-artifacts: - name: master - namespace: psap - tag: ci-artifacts ocp_builder_rhel-8-golang-1.18-openshift-4.11: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.10.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.10.yaml index e1a9cf0126a28..666b44beaa745 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.10.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.10.yaml @@ -3,10 +3,6 @@ base_images: name: 4.10-priv namespace: ocp-private tag: base - ci-artifacts: - name: master - namespace: psap - tag: ci-artifacts ocp_builder_rhel-8-golang-1.17-openshift-4.10: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.11.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.11.yaml index 7df1446e3fc1a..9af28b582ce1a 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.11.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.11.yaml @@ -3,10 +3,6 @@ base_images: name: 4.11-priv namespace: ocp-private tag: base - ci-artifacts: - name: master - namespace: psap - tag: ci-artifacts ocp_builder_rhel-8-golang-1.18-openshift-4.11: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.12.yaml index f2c493cceb3a3..f7c5c3fa7b51b 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.12.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.12.yaml @@ -3,10 +3,6 @@ base_images: name: 4.12-priv namespace: ocp-private tag: base - ci-artifacts: - name: master - namespace: psap - tag: ci-artifacts ocp_builder_rhel-8-golang-1.18-openshift-4.11: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.13.yaml index 8686c111f0806..aabef3d02b666 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.13.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.13.yaml @@ -3,10 +3,6 @@ base_images: name: 4.13-priv namespace: ocp-private tag: base - ci-artifacts: - name: master - namespace: psap - tag: ci-artifacts ocp_builder_rhel-8-golang-1.18-openshift-4.11: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.9.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.9.yaml index 691c14480ec4c..054dc5b3d60d0 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.9.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.9.yaml @@ -3,10 +3,6 @@ base_images: name: 4.9-priv namespace: ocp-private tag: base - ci-artifacts: - name: master - namespace: psap - tag: ci-artifacts ocp_builder_rhel-8-golang-1.16-openshift-4.9: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/insights-operator/openshift-priv-insights-operator-release-4.7.yaml b/ci-operator/config/openshift-priv/insights-operator/openshift-priv-insights-operator-release-4.7.yaml index 1b7fdd761532f..3a14a0d935ad4 100644 --- a/ci-operator/config/openshift-priv/insights-operator/openshift-priv-insights-operator-release-4.7.yaml +++ b/ci-operator/config/openshift-priv/insights-operator/openshift-priv-insights-operator-release-4.7.yaml @@ -3,10 +3,6 @@ base_images: name: 4.7-priv namespace: ocp-private tag: base - insights-operator-tests: - name: insights-operator-tests - namespace: ci - tag: latest ocp_builder_rhel-8-golang-1.15-openshift-4.7: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-master.yaml b/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-master.yaml index 2edea758cbb8a..ef573f60451fb 100644 --- a/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-master.yaml +++ b/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-master.yaml @@ -1,8 +1,4 @@ base_images: - ocp_builder_rhel-8-golang-1.17-openshift-4.10: - name: builder - namespace: ocp - tag: rhel-8-golang-1.17-openshift-4.10 openshift_release_golang-1.18: name: release namespace: openshift @@ -15,9 +11,6 @@ canonical_go_repository: github.com/openshift/windows-machine-config-operator images: - dockerfile_path: build/Dockerfile.ci inputs: - ocp_builder_rhel-8-golang-1.17-openshift-4.10: - as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10 openshift_release_golang-1.18: as: - registry.ci.openshift.org/openshift/release:golang-1.18 diff --git a/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.12.yaml index 7f4d60a5247ed..bed27eb36555a 100644 --- a/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.12.yaml +++ b/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.12.yaml @@ -1,8 +1,4 @@ base_images: - ocp_builder_rhel-8-golang-1.17-openshift-4.10: - name: builder - namespace: ocp - tag: rhel-8-golang-1.17-openshift-4.10 openshift_release_golang-1.18: name: release namespace: openshift @@ -15,9 +11,6 @@ canonical_go_repository: github.com/openshift/windows-machine-config-operator images: - dockerfile_path: build/Dockerfile.ci inputs: - ocp_builder_rhel-8-golang-1.17-openshift-4.10: - as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10 openshift_release_golang-1.18: as: - registry.ci.openshift.org/openshift/release:golang-1.18 diff --git a/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.13.yaml index e608cdc562a99..9b4f97dbc3454 100644 --- a/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.13.yaml +++ b/ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.13.yaml @@ -1,8 +1,4 @@ base_images: - ocp_builder_rhel-8-golang-1.17-openshift-4.10: - name: builder - namespace: ocp - tag: rhel-8-golang-1.17-openshift-4.10 openshift_release_golang-1.18: name: release namespace: openshift @@ -15,9 +11,6 @@ canonical_go_repository: github.com/openshift/windows-machine-config-operator images: - dockerfile_path: build/Dockerfile.ci inputs: - ocp_builder_rhel-8-golang-1.17-openshift-4.10: - as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10 openshift_release_golang-1.18: as: - registry.ci.openshift.org/openshift/release:golang-1.18 diff --git a/ci-operator/config/openshift/console-operator/openshift-console-operator-master.yaml b/ci-operator/config/openshift/console-operator/openshift-console-operator-master.yaml index 3c9afeeba89e6..1771e4476b842 100644 --- a/ci-operator/config/openshift/console-operator/openshift-console-operator-master.yaml +++ b/ci-operator/config/openshift/console-operator/openshift-console-operator-master.yaml @@ -3,10 +3,10 @@ base_images: name: "4.12" namespace: ocp tag: base - ocp_builder_rhel-8-golang-1.18-openshift-4.12: + ocp_builder_rhel-8-golang-1.17-openshift-4.10: name: builder namespace: ocp - tag: rhel-8-golang-1.18-openshift-4.12 + tag: rhel-8-golang-1.17-openshift-4.10 binary_build_commands: make build --warn-undefined-variables build_root: from_repository: true @@ -14,9 +14,9 @@ images: - dockerfile_path: Dockerfile.rhel7 from: base inputs: - ocp_builder_rhel-8-golang-1.18-openshift-4.12: + ocp_builder_rhel-8-golang-1.17-openshift-4.10: as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12 + - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10 to: console-operator promotion: name: "4.12" diff --git a/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.12.yaml b/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.12.yaml index 115c72f9b1f31..aa6a017e8bdce 100644 --- a/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.12.yaml +++ b/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.12.yaml @@ -3,10 +3,10 @@ base_images: name: "4.12" namespace: ocp tag: base - ocp_builder_rhel-8-golang-1.18-openshift-4.12: + ocp_builder_rhel-8-golang-1.17-openshift-4.10: name: builder namespace: ocp - tag: rhel-8-golang-1.18-openshift-4.12 + tag: rhel-8-golang-1.17-openshift-4.10 binary_build_commands: make build --warn-undefined-variables build_root: from_repository: true @@ -14,9 +14,9 @@ images: - dockerfile_path: Dockerfile.rhel7 from: base inputs: - ocp_builder_rhel-8-golang-1.18-openshift-4.12: + ocp_builder_rhel-8-golang-1.17-openshift-4.10: as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12 + - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10 to: console-operator promotion: disabled: true diff --git a/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.13.yaml b/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.13.yaml index dad17f7703a0b..f268bf33a03db 100644 --- a/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.13.yaml +++ b/ci-operator/config/openshift/console-operator/openshift-console-operator-release-4.13.yaml @@ -3,10 +3,10 @@ base_images: name: "4.13" namespace: ocp tag: base - ocp_builder_rhel-8-golang-1.18-openshift-4.12: + ocp_builder_rhel-8-golang-1.17-openshift-4.10: name: builder namespace: ocp - tag: rhel-8-golang-1.18-openshift-4.12 + tag: rhel-8-golang-1.17-openshift-4.10 binary_build_commands: make build --warn-undefined-variables build_root: from_repository: true @@ -14,9 +14,9 @@ images: - dockerfile_path: Dockerfile.rhel7 from: base inputs: - ocp_builder_rhel-8-golang-1.18-openshift-4.12: + ocp_builder_rhel-8-golang-1.17-openshift-4.10: as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12 + - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10 to: console-operator promotion: name: "4.13" diff --git a/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.12.yaml b/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.12.yaml index 1049aa92fa7bc..f7e54f749e02d 100644 --- a/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.12.yaml +++ b/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.12.yaml @@ -1,8 +1,3 @@ -base_images: - artifacts: - name: "4.12" - namespace: origin - tag: artifacts build_root: image_stream_tag: name: release @@ -12,16 +7,9 @@ images: - dockerfile_path: Dockerfile.ci to: layering-build - dockerfile_path: Dockerfile.rpms - inputs: - artifacts: - as: - - registry.ci.openshift.org/origin/4.12:artifacts to: okd-rpms - dockerfile_path: Dockerfile.generated inputs: - artifacts: - as: - - registry.ci.openshift.org/origin/4.12:artifacts layering-build: paths: - destination_dir: . diff --git a/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.13.yaml b/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.13.yaml index 70f1539952508..2c27e0a85053a 100644 --- a/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.13.yaml +++ b/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.13.yaml @@ -1,8 +1,3 @@ -base_images: - artifacts: - name: "4.13" - namespace: origin - tag: artifacts build_root: image_stream_tag: name: release @@ -12,16 +7,9 @@ images: - dockerfile_path: Dockerfile.ci to: layering-build - dockerfile_path: Dockerfile.rpms - inputs: - artifacts: - as: - - registry.ci.openshift.org/origin/4.12:artifacts to: okd-rpms - dockerfile_path: Dockerfile.generated inputs: - artifacts: - as: - - registry.ci.openshift.org/origin/4.12:artifacts layering-build: paths: - destination_dir: . diff --git a/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-community-4.11__okd.yaml b/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-community-4.11__okd.yaml index b05c9e432e1d8..191412af859f1 100644 --- a/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-community-4.11__okd.yaml +++ b/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-community-4.11__okd.yaml @@ -1,4 +1,8 @@ base_images: + ocp_builder_rhel-8-golang-1.17-openshift-4.10: + name: builder + namespace: ocp + tag: rhel-8-golang-1.17-openshift-4.10 openshift_release_golang-1.18: name: release namespace: openshift @@ -10,6 +14,9 @@ build_root: images: - dockerfile_path: build/Dockerfile.ci inputs: + ocp_builder_rhel-8-golang-1.17-openshift-4.10: + as: + - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10 openshift_release_golang-1.18: as: - registry.ci.openshift.org/openshift/release:golang-1.18 diff --git a/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.11.yaml b/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.11.yaml index 3b6203644bf07..764205787c18a 100644 --- a/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.11.yaml +++ b/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.11.yaml @@ -1,4 +1,8 @@ base_images: + ocp_builder_rhel-8-golang-1.17-openshift-4.10: + name: builder + namespace: ocp + tag: rhel-8-golang-1.17-openshift-4.10 openshift_release_golang-1.18: name: release namespace: openshift @@ -10,6 +14,9 @@ build_root: images: - dockerfile_path: build/Dockerfile.ci inputs: + ocp_builder_rhel-8-golang-1.17-openshift-4.10: + as: + - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10 openshift_release_golang-1.18: as: - registry.ci.openshift.org/openshift/release:golang-1.18 diff --git a/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.12.yaml b/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.12.yaml index 0f78a9a2d3213..2996ecec50797 100644 --- a/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.12.yaml +++ b/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.12.yaml @@ -1,8 +1,4 @@ base_images: - ocp_builder_rhel-8-golang-1.17-openshift-4.10: - name: builder - namespace: ocp - tag: rhel-8-golang-1.17-openshift-4.10 openshift_release_golang-1.18: name: release namespace: openshift @@ -14,9 +10,6 @@ build_root: images: - dockerfile_path: build/Dockerfile.ci inputs: - ocp_builder_rhel-8-golang-1.17-openshift-4.10: - as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10 openshift_release_golang-1.18: as: - registry.ci.openshift.org/openshift/release:golang-1.18 diff --git a/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.13.yaml b/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.13.yaml index 56e26b9b7afa1..c0aad363e11cd 100644 --- a/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.13.yaml +++ b/ci-operator/config/openshift/windows-machine-config-operator/openshift-windows-machine-config-operator-release-4.13.yaml @@ -1,8 +1,4 @@ base_images: - ocp_builder_rhel-8-golang-1.17-openshift-4.10: - name: builder - namespace: ocp - tag: rhel-8-golang-1.17-openshift-4.10 openshift_release_golang-1.18: name: release namespace: openshift @@ -14,9 +10,6 @@ build_root: images: - dockerfile_path: build/Dockerfile.ci inputs: - ocp_builder_rhel-8-golang-1.17-openshift-4.10: - as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10 openshift_release_golang-1.18: as: - registry.ci.openshift.org/openshift/release:golang-1.18 diff --git a/ci-operator/config/stackrox/stackrox/stackrox-stackrox-release-3.72.yaml b/ci-operator/config/stackrox/stackrox/stackrox-stackrox-release-3.72.yaml index e28662737136f..08bebc8edb46c 100644 --- a/ci-operator/config/stackrox/stackrox/stackrox-stackrox-release-3.72.yaml +++ b/ci-operator/config/stackrox/stackrox/stackrox-stackrox-release-3.72.yaml @@ -1,24 +1,4 @@ base_images: - aro: - name: automation-flavors - namespace: stackrox - tag: aro-0.3.8 - eks: - name: automation-flavors - namespace: stackrox - tag: eks-0.3.1 - golang-1.17.12: - name: golang - namespace: stackrox - tag: 1.17.12 - osd: - name: automation-flavors - namespace: stackrox - tag: osd-0.3.6 - rosa: - name: automation-flavors - namespace: stackrox - tag: rosa-0.3.8 ubi: name: ubi namespace: ocp @@ -89,9 +69,6 @@ images: to: docs - dockerfile_path: operator/build/Dockerfile.gen inputs: - golang-1.17.12: - as: - - golang:1.17.12 operator-artifacts: paths: - destination_dir: . From 1b0d1bbebff831984f12cf02f1ddb7c28995319f Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Tue, 13 Sep 2022 12:01:24 +0000 Subject: [PATCH 2/6] config-brancher --config-dir ./ci-operator/config --current-release 4.12 --future-release 4.12 --future-release 4.13 --confirm --- .../openshift-okd-machine-os-release-4.12.yaml | 12 ++++++++++++ .../openshift-okd-machine-os-release-4.13.yaml | 12 ++++++++++++ .../telemeter/openshift-telemeter-release-4.12.yaml | 4 ++++ .../telemeter/openshift-telemeter-release-4.13.yaml | 4 ++++ 4 files changed, 32 insertions(+) diff --git a/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.12.yaml b/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.12.yaml index f7e54f749e02d..1049aa92fa7bc 100644 --- a/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.12.yaml +++ b/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.12.yaml @@ -1,3 +1,8 @@ +base_images: + artifacts: + name: "4.12" + namespace: origin + tag: artifacts build_root: image_stream_tag: name: release @@ -7,9 +12,16 @@ images: - dockerfile_path: Dockerfile.ci to: layering-build - dockerfile_path: Dockerfile.rpms + inputs: + artifacts: + as: + - registry.ci.openshift.org/origin/4.12:artifacts to: okd-rpms - dockerfile_path: Dockerfile.generated inputs: + artifacts: + as: + - registry.ci.openshift.org/origin/4.12:artifacts layering-build: paths: - destination_dir: . diff --git a/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.13.yaml b/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.13.yaml index 2c27e0a85053a..70f1539952508 100644 --- a/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.13.yaml +++ b/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.13.yaml @@ -1,3 +1,8 @@ +base_images: + artifacts: + name: "4.13" + namespace: origin + tag: artifacts build_root: image_stream_tag: name: release @@ -7,9 +12,16 @@ images: - dockerfile_path: Dockerfile.ci to: layering-build - dockerfile_path: Dockerfile.rpms + inputs: + artifacts: + as: + - registry.ci.openshift.org/origin/4.12:artifacts to: okd-rpms - dockerfile_path: Dockerfile.generated inputs: + artifacts: + as: + - registry.ci.openshift.org/origin/4.12:artifacts layering-build: paths: - destination_dir: . diff --git a/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.12.yaml b/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.12.yaml index 1f68bf6aa2223..2ef9a3f42b7d7 100644 --- a/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.12.yaml +++ b/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.12.yaml @@ -56,10 +56,14 @@ tests: - as: e2e-aws-ovn steps: cluster_profile: aws + env: + TELEMETRY_ENABLED: "true" workflow: openshift-e2e-aws - as: e2e-aws-upgrade steps: cluster_profile: aws + env: + TELEMETRY_ENABLED: "true" workflow: openshift-upgrade-aws - as: benchmark steps: diff --git a/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.13.yaml b/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.13.yaml index d68119c6c1251..66bb676e16486 100644 --- a/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.13.yaml +++ b/ci-operator/config/openshift/telemeter/openshift-telemeter-release-4.13.yaml @@ -55,10 +55,14 @@ tests: - as: e2e-aws-ovn steps: cluster_profile: aws + env: + TELEMETRY_ENABLED: "true" workflow: openshift-e2e-aws - as: e2e-aws-upgrade steps: cluster_profile: aws + env: + TELEMETRY_ENABLED: "true" workflow: openshift-upgrade-aws - as: benchmark steps: From d0162ccf581131c2914f679711106fd1702ddb5f Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Tue, 13 Sep 2022 12:01:26 +0000 Subject: [PATCH 3/6] ci-operator-config-mirror --config-dir ./ci-operator/config --to-org openshift-priv --only-org openshift --whitelist-file ./core-services/openshift-priv/_whitelist.yaml --- .../api/openshift-priv-api-release-4.11.yaml | 3 ++ ...riv-cluster-api-provider-ovirt-master.yaml | 8 +++++ ...uster-api-provider-ovirt-release-4.10.yaml | 8 +++++ ...uster-api-provider-ovirt-release-4.11.yaml | 8 +++++ ...uster-api-provider-ovirt-release-4.12.yaml | 8 +++++ ...uster-api-provider-ovirt-release-4.13.yaml | 8 +++++ ...luster-api-provider-ovirt-release-4.8.yaml | 4 +++ ...luster-api-provider-ovirt-release-4.9.yaml | 4 +++ ...hift-priv-cluster-nfd-operator-master.yaml | 4 +++ ...riv-cluster-nfd-operator-release-4.10.yaml | 4 +++ ...riv-cluster-nfd-operator-release-4.11.yaml | 4 +++ ...riv-cluster-nfd-operator-release-4.12.yaml | 4 +++ ...riv-cluster-nfd-operator-release-4.13.yaml | 4 +++ ...priv-cluster-nfd-operator-release-4.9.yaml | 4 +++ .../openshift-priv-driver-toolkit-master.yaml | 2 +- ...hift-priv-driver-toolkit-release-4.11.yaml | 2 +- ...hift-priv-driver-toolkit-release-4.12.yaml | 2 +- ...hift-priv-driver-toolkit-release-4.13.yaml | 2 +- ...cp-filestore-csi-driver-operator-main.yaml | 4 +++ ...tore-csi-driver-operator-release-4.12.yaml | 4 +++ ...tore-csi-driver-operator-release-4.13.yaml | 4 +++ ...ft-priv-insights-operator-release-4.7.yaml | 4 +++ .../openshift-priv-installer-master.yaml | 32 +++++++++---------- ...openshift-priv-installer-release-4.12.yaml | 32 +++++++++---------- ...openshift-priv-installer-release-4.13.yaml | 32 +++++++++---------- .../openshift-priv-telemeter-master.yaml | 4 +++ ...openshift-priv-telemeter-release-4.12.yaml | 4 +++ ...openshift-priv-telemeter-release-4.13.yaml | 4 +++ 28 files changed, 155 insertions(+), 52 deletions(-) diff --git a/ci-operator/config/openshift-priv/api/openshift-priv-api-release-4.11.yaml b/ci-operator/config/openshift-priv/api/openshift-priv-api-release-4.11.yaml index 2b1181dc8c2f5..595c962cbb8b0 100644 --- a/ci-operator/config/openshift-priv/api/openshift-priv-api-release-4.11.yaml +++ b/ci-operator/config/openshift-priv/api/openshift-priv-api-release-4.11.yaml @@ -46,6 +46,9 @@ tests: commands: | dir=$GOPATH/src/github.com/openshift/client-go git clone https://github.com/openshift/client-go $dir + pushd $dir + git checkout release-4.11 + popd rm -rf $dir/vendor/github.com/openshift/api/* cp -Rf * $dir/vendor/github.com/openshift/api/ rm -rf $dir/vendor/github.com/openshift/api/vendor diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-master.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-master.yaml index 7bef886bf4585..553be95e3af58 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-master.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-master.yaml @@ -1,4 +1,8 @@ base_images: + ansible-runner-ovirt: + name: ansible-runner-ovirt + namespace: openshift + tag: latest base: name: 4.12-priv namespace: ocp-private @@ -7,6 +11,10 @@ base_images: name: builder namespace: ocp tag: rhel-8-golang-1.18-openshift-4.12 + ovirt-prfinder: + name: ovirt-prfinder + namespace: openshift + tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.10.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.10.yaml index fa73e705f43de..3f306348b5818 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.10.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.10.yaml @@ -1,4 +1,8 @@ base_images: + ansible-runner-ovirt: + name: ansible-runner-ovirt + namespace: openshift + tag: latest base: name: 4.10-priv namespace: ocp-private @@ -7,6 +11,10 @@ base_images: name: builder namespace: ocp tag: rhel-8-golang-1.17-openshift-4.10 + ovirt-prfinder: + name: ovirt-prfinder + namespace: openshift + tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.11.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.11.yaml index 7c6639955d1e3..06499e9470604 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.11.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.11.yaml @@ -1,4 +1,8 @@ base_images: + ansible-runner-ovirt: + name: ansible-runner-ovirt + namespace: openshift + tag: latest base: name: 4.11-priv namespace: ocp-private @@ -7,6 +11,10 @@ base_images: name: builder namespace: ocp tag: rhel-8-golang-1.18-openshift-4.11 + ovirt-prfinder: + name: ovirt-prfinder + namespace: openshift + tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.12.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.12.yaml index b3daafd62245c..3377d549e456d 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.12.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.12.yaml @@ -1,4 +1,8 @@ base_images: + ansible-runner-ovirt: + name: ansible-runner-ovirt + namespace: openshift + tag: latest base: name: 4.12-priv namespace: ocp-private @@ -7,6 +11,10 @@ base_images: name: builder namespace: ocp tag: rhel-8-golang-1.18-openshift-4.12 + ovirt-prfinder: + name: ovirt-prfinder + namespace: openshift + tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.13.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.13.yaml index 3eaa25a6ba43b..385c29e1de01b 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.13.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.13.yaml @@ -1,4 +1,8 @@ base_images: + ansible-runner-ovirt: + name: ansible-runner-ovirt + namespace: openshift + tag: latest base: name: 4.13-priv namespace: ocp-private @@ -7,6 +11,10 @@ base_images: name: builder namespace: ocp tag: rhel-8-golang-1.18-openshift-4.12 + ovirt-prfinder: + name: ovirt-prfinder + namespace: openshift + tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.8.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.8.yaml index e8011b2bde324..885f55111a399 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.8.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.8.yaml @@ -1,4 +1,8 @@ base_images: + ansible-runner-ovirt: + name: ansible-runner-ovirt + namespace: openshift + tag: latest base: name: 4.8-priv namespace: ocp-private diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.9.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.9.yaml index 0cb9404c6ef0b..82bc192900002 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.9.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.9.yaml @@ -1,4 +1,8 @@ base_images: + ansible-runner-ovirt: + name: ansible-runner-ovirt + namespace: openshift + tag: latest base: name: 4.9-priv namespace: ocp-private diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-master.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-master.yaml index e7d980df5cccd..76ddc6e187813 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-master.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-master.yaml @@ -3,6 +3,10 @@ base_images: name: 4.12-priv namespace: ocp-private tag: base + ci-artifacts: + name: master + namespace: psap + tag: ci-artifacts ocp_builder_rhel-8-golang-1.18-openshift-4.11: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.10.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.10.yaml index 666b44beaa745..e1a9cf0126a28 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.10.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.10.yaml @@ -3,6 +3,10 @@ base_images: name: 4.10-priv namespace: ocp-private tag: base + ci-artifacts: + name: master + namespace: psap + tag: ci-artifacts ocp_builder_rhel-8-golang-1.17-openshift-4.10: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.11.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.11.yaml index 9af28b582ce1a..7df1446e3fc1a 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.11.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.11.yaml @@ -3,6 +3,10 @@ base_images: name: 4.11-priv namespace: ocp-private tag: base + ci-artifacts: + name: master + namespace: psap + tag: ci-artifacts ocp_builder_rhel-8-golang-1.18-openshift-4.11: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.12.yaml index f7c5c3fa7b51b..f2c493cceb3a3 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.12.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.12.yaml @@ -3,6 +3,10 @@ base_images: name: 4.12-priv namespace: ocp-private tag: base + ci-artifacts: + name: master + namespace: psap + tag: ci-artifacts ocp_builder_rhel-8-golang-1.18-openshift-4.11: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.13.yaml index aabef3d02b666..8686c111f0806 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.13.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.13.yaml @@ -3,6 +3,10 @@ base_images: name: 4.13-priv namespace: ocp-private tag: base + ci-artifacts: + name: master + namespace: psap + tag: ci-artifacts ocp_builder_rhel-8-golang-1.18-openshift-4.11: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.9.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.9.yaml index 054dc5b3d60d0..691c14480ec4c 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.9.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.9.yaml @@ -3,6 +3,10 @@ base_images: name: 4.9-priv namespace: ocp-private tag: base + ci-artifacts: + name: master + namespace: psap + tag: ci-artifacts ocp_builder_rhel-8-golang-1.16-openshift-4.9: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/driver-toolkit/openshift-priv-driver-toolkit-master.yaml b/ci-operator/config/openshift-priv/driver-toolkit/openshift-priv-driver-toolkit-master.yaml index 08d79d23909df..a5bbd542f20b5 100644 --- a/ci-operator/config/openshift-priv/driver-toolkit/openshift-priv-driver-toolkit-master.yaml +++ b/ci-operator/config/openshift-priv/driver-toolkit/openshift-priv-driver-toolkit-master.yaml @@ -32,7 +32,7 @@ releases: candidate: product: ocp stream: nightly - version: "4.10" + version: "4.12" resources: '*': limits: diff --git a/ci-operator/config/openshift-priv/driver-toolkit/openshift-priv-driver-toolkit-release-4.11.yaml b/ci-operator/config/openshift-priv/driver-toolkit/openshift-priv-driver-toolkit-release-4.11.yaml index 93b0c2bc0a61f..d59e8df29a38a 100644 --- a/ci-operator/config/openshift-priv/driver-toolkit/openshift-priv-driver-toolkit-release-4.11.yaml +++ b/ci-operator/config/openshift-priv/driver-toolkit/openshift-priv-driver-toolkit-release-4.11.yaml @@ -32,7 +32,7 @@ releases: candidate: product: ocp stream: nightly - version: "4.10" + version: "4.11" resources: '*': limits: diff --git a/ci-operator/config/openshift-priv/driver-toolkit/openshift-priv-driver-toolkit-release-4.12.yaml b/ci-operator/config/openshift-priv/driver-toolkit/openshift-priv-driver-toolkit-release-4.12.yaml index 9eb2934025a06..08094e222e231 100644 --- a/ci-operator/config/openshift-priv/driver-toolkit/openshift-priv-driver-toolkit-release-4.12.yaml +++ b/ci-operator/config/openshift-priv/driver-toolkit/openshift-priv-driver-toolkit-release-4.12.yaml @@ -33,7 +33,7 @@ releases: candidate: product: ocp stream: nightly - version: "4.10" + version: "4.12" resources: '*': limits: diff --git a/ci-operator/config/openshift-priv/driver-toolkit/openshift-priv-driver-toolkit-release-4.13.yaml b/ci-operator/config/openshift-priv/driver-toolkit/openshift-priv-driver-toolkit-release-4.13.yaml index 038cb6c97024e..ada4daa0d6fed 100644 --- a/ci-operator/config/openshift-priv/driver-toolkit/openshift-priv-driver-toolkit-release-4.13.yaml +++ b/ci-operator/config/openshift-priv/driver-toolkit/openshift-priv-driver-toolkit-release-4.13.yaml @@ -32,7 +32,7 @@ releases: candidate: product: ocp stream: nightly - version: "4.10" + version: "4.12" resources: '*': limits: diff --git a/ci-operator/config/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-main.yaml b/ci-operator/config/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-main.yaml index cafdef01cb644..c3d2e703832e0 100644 --- a/ci-operator/config/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-main.yaml +++ b/ci-operator/config/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-main.yaml @@ -103,6 +103,10 @@ resources: memory: 200Mi test_binary_build_commands: make test tests: +- as: unit + commands: make test-unit + container: + from: src - as: verify commands: make verify container: diff --git a/ci-operator/config/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.12.yaml index 32137ccea23f1..537d23d8da9f4 100644 --- a/ci-operator/config/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.12.yaml +++ b/ci-operator/config/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.12.yaml @@ -104,6 +104,10 @@ resources: memory: 200Mi test_binary_build_commands: make test tests: +- as: unit + commands: make test-unit + container: + from: src - as: verify commands: make verify container: diff --git a/ci-operator/config/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.13.yaml index 19eab9d48e325..f78b7a2a0be10 100644 --- a/ci-operator/config/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.13.yaml +++ b/ci-operator/config/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.13.yaml @@ -103,6 +103,10 @@ resources: memory: 200Mi test_binary_build_commands: make test tests: +- as: unit + commands: make test-unit + container: + from: src - as: verify commands: make verify container: diff --git a/ci-operator/config/openshift-priv/insights-operator/openshift-priv-insights-operator-release-4.7.yaml b/ci-operator/config/openshift-priv/insights-operator/openshift-priv-insights-operator-release-4.7.yaml index 3a14a0d935ad4..1b7fdd761532f 100644 --- a/ci-operator/config/openshift-priv/insights-operator/openshift-priv-insights-operator-release-4.7.yaml +++ b/ci-operator/config/openshift-priv/insights-operator/openshift-priv-insights-operator-release-4.7.yaml @@ -3,6 +3,10 @@ base_images: name: 4.7-priv namespace: ocp-private tag: base + insights-operator-tests: + name: insights-operator-tests + namespace: ci + tag: latest ocp_builder_rhel-8-golang-1.15-openshift-4.7: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-master.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-master.yaml index 97a02f29bad97..13f4b6767af3f 100644 --- a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-master.yaml +++ b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-master.yaml @@ -196,12 +196,12 @@ tests: commands: IS_CONTAINER=TRUE ./hack/verify-codegen.sh container: from: src -- as: e2e-aws +- as: e2e-aws-ovn skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^images/(alibabacloud|azure|azurestack|baremetal|gcp|ibmcloud|libvirt|nutanix|openstack|ovirt|powervs|vsphere)/) steps: cluster_profile: aws workflow: openshift-e2e-aws -- as: e2e-aws-proxy +- as: e2e-aws-ovn-proxy optional: true run_if_changed: aws steps: @@ -212,13 +212,13 @@ tests: steps: cluster_profile: aws workflow: openshift-e2e-aws-upi-proxy -- as: e2e-aws-shared-vpc +- as: e2e-aws-ovn-shared-vpc optional: true run_if_changed: aws steps: cluster_profile: aws workflow: openshift-e2e-aws-sharednetwork -- as: e2e-aws-imdsv2 +- as: e2e-aws-ovn-imdsv2 optional: true run_if_changed: aws steps: @@ -226,7 +226,7 @@ tests: env: AWS_METADATA_SERVICE_AUTH: Required workflow: openshift-e2e-aws -- as: e2e-gcp +- as: e2e-gcp-ovn skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|images|pkg/.*|terraform/providers)/(alibabacloud|aws|azure|azurestack|baremetal|ibmcloud|libvirt|nutanix|openstack|ovirt|powervs|vsphere)/) steps: cluster_profile: gcp @@ -243,24 +243,24 @@ tests: identity\|\[StatefulSetBasic\] should adopt matching orphans and release non-matching pods\|PVC Protection workflow: openshift-e2e-alibabacloud -- as: e2e-gcp-shared-vpc +- as: e2e-gcp-ovn-shared-vpc optional: true run_if_changed: gcp steps: cluster_profile: gcp workflow: openshift-e2e-gcp-sharednetwork -- as: e2e-azure +- as: e2e-azure-ovn skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|images|pkg/.*|terraform/providers)/(alibabacloud|aws|baremetal|gcp|ibmcloud|libvirt|nutanix|openstack|ovirt|powervs|vsphere)/) steps: cluster_profile: azure4 workflow: openshift-e2e-azure -- as: e2e-azure-shared-vpc +- as: e2e-azure-ovn-shared-vpc optional: true run_if_changed: azure steps: cluster_profile: azure4 workflow: openshift-e2e-azure-sharednetwork -- as: e2e-azure-resourcegroup +- as: e2e-azure-ovn-resourcegroup optional: true run_if_changed: azure steps: @@ -271,12 +271,12 @@ tests: steps: cluster_profile: aws workflow: openshift-upgrade-aws-latestinstaller -- as: e2e-aws-upi +- as: e2e-aws-ovn-upi run_if_changed: ^(upi/aws/.*)|^(images/installer/Dockerfile\.upi.*) steps: cluster_profile: aws workflow: openshift-e2e-aws-upi -- as: e2e-gcp-upi +- as: e2e-gcp-ovn-upi run_if_changed: ^(upi/gcp/.*)|^(images/installer/Dockerfile\.upi.*) steps: cluster_profile: gcp @@ -287,7 +287,7 @@ tests: steps: cluster_profile: gcp workflow: openshift-e2e-gcp-upi-xpn -- as: e2e-azure-upi +- as: e2e-azure-ovn-upi run_if_changed: ^(upi/(azure|azurestack)/.*)|^(images/installer/Dockerfile\.upi.*) steps: cluster_profile: azure4 @@ -396,7 +396,7 @@ tests: steps: cluster_profile: openstack-vexxhost workflow: openshift-manifests-openstack -- as: e2e-vsphere +- as: e2e-vsphere-ovn skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|images|pkg/.*|terraform/providers)/(alibabacloud|aws|azure|azurestack|baremetal|gcp|ibmcloud|libvirt|nutanix|openstack|ovirt|powervs)/) steps: cluster_profile: vsphere @@ -433,7 +433,7 @@ tests: steps: cluster_profile: ovirt workflow: openshift-e2e-ovirt-minimal -- as: e2e-aws-single-node +- as: e2e-aws-ovn-single-node optional: true run_if_changed: aws steps: @@ -445,7 +445,7 @@ tests: steps: cluster_profile: packet-sno workflow: baremetalds-sno -- as: e2e-aws-fips +- as: e2e-aws-ovn-fips optional: true run_if_changed: aws steps: @@ -487,7 +487,7 @@ tests: env: TEST_SKIPS: provisioning should provision storage with pvc data source in parallel workflow: openshift-e2e-azurestack-upi -- as: e2e-ibmcloud +- as: e2e-ibmcloud-ovn optional: true skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|images|pkg/.*|terraform/providers)/(alibabacloud|aws|azure|azurestack|baremetal|gcp|libvirt|nutanix|openstack|ovirt|powervs|vsphere)/) steps: diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.12.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.12.yaml index 98ef18fb4fc64..f0896be88b56b 100644 --- a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.12.yaml +++ b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.12.yaml @@ -197,12 +197,12 @@ tests: commands: IS_CONTAINER=TRUE ./hack/verify-codegen.sh container: from: src -- as: e2e-aws +- as: e2e-aws-ovn skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^images/(alibabacloud|azure|azurestack|baremetal|gcp|ibmcloud|libvirt|nutanix|openstack|ovirt|powervs|vsphere)/) steps: cluster_profile: aws workflow: openshift-e2e-aws -- as: e2e-aws-proxy +- as: e2e-aws-ovn-proxy optional: true run_if_changed: aws steps: @@ -213,13 +213,13 @@ tests: steps: cluster_profile: aws workflow: openshift-e2e-aws-upi-proxy -- as: e2e-aws-shared-vpc +- as: e2e-aws-ovn-shared-vpc optional: true run_if_changed: aws steps: cluster_profile: aws workflow: openshift-e2e-aws-sharednetwork -- as: e2e-aws-imdsv2 +- as: e2e-aws-ovn-imdsv2 optional: true run_if_changed: aws steps: @@ -227,7 +227,7 @@ tests: env: AWS_METADATA_SERVICE_AUTH: Required workflow: openshift-e2e-aws -- as: e2e-gcp +- as: e2e-gcp-ovn skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|images|pkg/.*|terraform/providers)/(alibabacloud|aws|azure|azurestack|baremetal|ibmcloud|libvirt|nutanix|openstack|ovirt|powervs|vsphere)/) steps: cluster_profile: gcp @@ -244,24 +244,24 @@ tests: identity\|\[StatefulSetBasic\] should adopt matching orphans and release non-matching pods\|PVC Protection workflow: openshift-e2e-alibabacloud -- as: e2e-gcp-shared-vpc +- as: e2e-gcp-ovn-shared-vpc optional: true run_if_changed: gcp steps: cluster_profile: gcp workflow: openshift-e2e-gcp-sharednetwork -- as: e2e-azure +- as: e2e-azure-ovn skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|images|pkg/.*|terraform/providers)/(alibabacloud|aws|baremetal|gcp|ibmcloud|libvirt|nutanix|openstack|ovirt|powervs|vsphere)/) steps: cluster_profile: azure4 workflow: openshift-e2e-azure -- as: e2e-azure-shared-vpc +- as: e2e-azure-ovn-shared-vpc optional: true run_if_changed: azure steps: cluster_profile: azure4 workflow: openshift-e2e-azure-sharednetwork -- as: e2e-azure-resourcegroup +- as: e2e-azure-ovn-resourcegroup optional: true run_if_changed: azure steps: @@ -272,12 +272,12 @@ tests: steps: cluster_profile: aws workflow: openshift-upgrade-aws-latestinstaller -- as: e2e-aws-upi +- as: e2e-aws-ovn-upi run_if_changed: ^(upi/aws/.*)|^(images/installer/Dockerfile\.upi.*) steps: cluster_profile: aws workflow: openshift-e2e-aws-upi -- as: e2e-gcp-upi +- as: e2e-gcp-ovn-upi run_if_changed: ^(upi/gcp/.*)|^(images/installer/Dockerfile\.upi.*) steps: cluster_profile: gcp @@ -288,7 +288,7 @@ tests: steps: cluster_profile: gcp workflow: openshift-e2e-gcp-upi-xpn -- as: e2e-azure-upi +- as: e2e-azure-ovn-upi run_if_changed: ^(upi/(azure|azurestack)/.*)|^(images/installer/Dockerfile\.upi.*) steps: cluster_profile: azure4 @@ -397,7 +397,7 @@ tests: steps: cluster_profile: openstack-vexxhost workflow: openshift-manifests-openstack -- as: e2e-vsphere +- as: e2e-vsphere-ovn skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|images|pkg/.*|terraform/providers)/(alibabacloud|aws|azure|azurestack|baremetal|gcp|ibmcloud|libvirt|nutanix|openstack|ovirt|powervs)/) steps: cluster_profile: vsphere @@ -434,7 +434,7 @@ tests: steps: cluster_profile: ovirt workflow: openshift-e2e-ovirt-minimal -- as: e2e-aws-single-node +- as: e2e-aws-ovn-single-node optional: true run_if_changed: aws steps: @@ -446,7 +446,7 @@ tests: steps: cluster_profile: packet-sno workflow: baremetalds-sno -- as: e2e-aws-fips +- as: e2e-aws-ovn-fips optional: true run_if_changed: aws steps: @@ -488,7 +488,7 @@ tests: env: TEST_SKIPS: provisioning should provision storage with pvc data source in parallel workflow: openshift-e2e-azurestack-upi -- as: e2e-ibmcloud +- as: e2e-ibmcloud-ovn optional: true skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|images|pkg/.*|terraform/providers)/(alibabacloud|aws|azure|azurestack|baremetal|gcp|libvirt|nutanix|openstack|ovirt|powervs|vsphere)/) steps: diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.13.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.13.yaml index 4cde1c084b6c7..3e7271f5522c1 100644 --- a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.13.yaml +++ b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.13.yaml @@ -196,12 +196,12 @@ tests: commands: IS_CONTAINER=TRUE ./hack/verify-codegen.sh container: from: src -- as: e2e-aws +- as: e2e-aws-ovn skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^images/(alibabacloud|azure|azurestack|baremetal|gcp|ibmcloud|libvirt|nutanix|openstack|ovirt|powervs|vsphere)/) steps: cluster_profile: aws workflow: openshift-e2e-aws -- as: e2e-aws-proxy +- as: e2e-aws-ovn-proxy optional: true run_if_changed: aws steps: @@ -212,13 +212,13 @@ tests: steps: cluster_profile: aws workflow: openshift-e2e-aws-upi-proxy -- as: e2e-aws-shared-vpc +- as: e2e-aws-ovn-shared-vpc optional: true run_if_changed: aws steps: cluster_profile: aws workflow: openshift-e2e-aws-sharednetwork -- as: e2e-aws-imdsv2 +- as: e2e-aws-ovn-imdsv2 optional: true run_if_changed: aws steps: @@ -226,7 +226,7 @@ tests: env: AWS_METADATA_SERVICE_AUTH: Required workflow: openshift-e2e-aws -- as: e2e-gcp +- as: e2e-gcp-ovn skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|images|pkg/.*|terraform/providers)/(alibabacloud|aws|azure|azurestack|baremetal|ibmcloud|libvirt|nutanix|openstack|ovirt|powervs|vsphere)/) steps: cluster_profile: gcp @@ -243,24 +243,24 @@ tests: identity\|\[StatefulSetBasic\] should adopt matching orphans and release non-matching pods\|PVC Protection workflow: openshift-e2e-alibabacloud -- as: e2e-gcp-shared-vpc +- as: e2e-gcp-ovn-shared-vpc optional: true run_if_changed: gcp steps: cluster_profile: gcp workflow: openshift-e2e-gcp-sharednetwork -- as: e2e-azure +- as: e2e-azure-ovn skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|images|pkg/.*|terraform/providers)/(alibabacloud|aws|baremetal|gcp|ibmcloud|libvirt|nutanix|openstack|ovirt|powervs|vsphere)/) steps: cluster_profile: azure4 workflow: openshift-e2e-azure -- as: e2e-azure-shared-vpc +- as: e2e-azure-ovn-shared-vpc optional: true run_if_changed: azure steps: cluster_profile: azure4 workflow: openshift-e2e-azure-sharednetwork -- as: e2e-azure-resourcegroup +- as: e2e-azure-ovn-resourcegroup optional: true run_if_changed: azure steps: @@ -271,12 +271,12 @@ tests: steps: cluster_profile: aws workflow: openshift-upgrade-aws-latestinstaller -- as: e2e-aws-upi +- as: e2e-aws-ovn-upi run_if_changed: ^(upi/aws/.*)|^(images/installer/Dockerfile\.upi.*) steps: cluster_profile: aws workflow: openshift-e2e-aws-upi -- as: e2e-gcp-upi +- as: e2e-gcp-ovn-upi run_if_changed: ^(upi/gcp/.*)|^(images/installer/Dockerfile\.upi.*) steps: cluster_profile: gcp @@ -287,7 +287,7 @@ tests: steps: cluster_profile: gcp workflow: openshift-e2e-gcp-upi-xpn -- as: e2e-azure-upi +- as: e2e-azure-ovn-upi run_if_changed: ^(upi/(azure|azurestack)/.*)|^(images/installer/Dockerfile\.upi.*) steps: cluster_profile: azure4 @@ -396,7 +396,7 @@ tests: steps: cluster_profile: openstack-vexxhost workflow: openshift-manifests-openstack -- as: e2e-vsphere +- as: e2e-vsphere-ovn skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|images|pkg/.*|terraform/providers)/(alibabacloud|aws|azure|azurestack|baremetal|gcp|ibmcloud|libvirt|nutanix|openstack|ovirt|powervs)/) steps: cluster_profile: vsphere @@ -433,7 +433,7 @@ tests: steps: cluster_profile: ovirt workflow: openshift-e2e-ovirt-minimal -- as: e2e-aws-single-node +- as: e2e-aws-ovn-single-node optional: true run_if_changed: aws steps: @@ -445,7 +445,7 @@ tests: steps: cluster_profile: packet-sno workflow: baremetalds-sno -- as: e2e-aws-fips +- as: e2e-aws-ovn-fips optional: true run_if_changed: aws steps: @@ -487,7 +487,7 @@ tests: env: TEST_SKIPS: provisioning should provision storage with pvc data source in parallel workflow: openshift-e2e-azurestack-upi -- as: e2e-ibmcloud +- as: e2e-ibmcloud-ovn optional: true skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|images|pkg/.*|terraform/providers)/(alibabacloud|aws|azure|azurestack|baremetal|gcp|libvirt|nutanix|openstack|ovirt|powervs|vsphere)/) steps: diff --git a/ci-operator/config/openshift-priv/telemeter/openshift-priv-telemeter-master.yaml b/ci-operator/config/openshift-priv/telemeter/openshift-priv-telemeter-master.yaml index 984774fdd834c..a996a771e454d 100644 --- a/ci-operator/config/openshift-priv/telemeter/openshift-priv-telemeter-master.yaml +++ b/ci-operator/config/openshift-priv/telemeter/openshift-priv-telemeter-master.yaml @@ -56,10 +56,14 @@ tests: - as: e2e-aws-ovn steps: cluster_profile: aws + env: + TELEMETRY_ENABLED: "true" workflow: openshift-e2e-aws - as: e2e-aws-upgrade steps: cluster_profile: aws + env: + TELEMETRY_ENABLED: "true" workflow: openshift-upgrade-aws - as: benchmark steps: diff --git a/ci-operator/config/openshift-priv/telemeter/openshift-priv-telemeter-release-4.12.yaml b/ci-operator/config/openshift-priv/telemeter/openshift-priv-telemeter-release-4.12.yaml index 7e04824d6dd61..ec1414959929d 100644 --- a/ci-operator/config/openshift-priv/telemeter/openshift-priv-telemeter-release-4.12.yaml +++ b/ci-operator/config/openshift-priv/telemeter/openshift-priv-telemeter-release-4.12.yaml @@ -57,10 +57,14 @@ tests: - as: e2e-aws-ovn steps: cluster_profile: aws + env: + TELEMETRY_ENABLED: "true" workflow: openshift-e2e-aws - as: e2e-aws-upgrade steps: cluster_profile: aws + env: + TELEMETRY_ENABLED: "true" workflow: openshift-upgrade-aws - as: benchmark steps: diff --git a/ci-operator/config/openshift-priv/telemeter/openshift-priv-telemeter-release-4.13.yaml b/ci-operator/config/openshift-priv/telemeter/openshift-priv-telemeter-release-4.13.yaml index 2234e85fd92a8..3f6aced8bdc4d 100644 --- a/ci-operator/config/openshift-priv/telemeter/openshift-priv-telemeter-release-4.13.yaml +++ b/ci-operator/config/openshift-priv/telemeter/openshift-priv-telemeter-release-4.13.yaml @@ -56,10 +56,14 @@ tests: - as: e2e-aws-ovn steps: cluster_profile: aws + env: + TELEMETRY_ENABLED: "true" workflow: openshift-e2e-aws - as: e2e-aws-upgrade steps: cluster_profile: aws + env: + TELEMETRY_ENABLED: "true" workflow: openshift-upgrade-aws - as: benchmark steps: From a52f6e60ab39ded7a7b9160db8ecda3466941465 Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Tue, 13 Sep 2022 12:01:47 +0000 Subject: [PATCH 4/6] ci-operator-prowgen --from-dir ./ci-operator/config --to-dir ./ci-operator/jobs --- ...e-csi-driver-operator-main-presubmits.yaml | 56 ++++ ...iver-operator-release-4.12-presubmits.yaml | 56 ++++ ...iver-operator-release-4.13-presubmits.yaml | 56 ++++ ...hift-priv-installer-master-presubmits.yaml | 304 +++++++++--------- ...riv-installer-release-4.12-presubmits.yaml | 304 +++++++++--------- ...riv-installer-release-4.13-presubmits.yaml | 304 +++++++++--------- 6 files changed, 600 insertions(+), 480 deletions(-) diff --git a/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-main-presubmits.yaml b/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-main-presubmits.yaml index b8227f8bf0a51..b852f639f90aa 100644 --- a/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-main-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-main-presubmits.yaml @@ -201,6 +201,62 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )operator-e2e,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^main$ + - ^main- + context: ci/prow/unit + decorate: true + decoration_config: + oauth_token_secret: + key: oauth + name: github-credentials-openshift-ci-robot-private-git-cloner + hidden: true + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-priv-gcp-filestore-csi-driver-operator-main-unit + path_alias: github.com/openshift/gcp-filestore-csi-driver-operator + rerun_command: /test unit + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --oauth-token-path=/usr/local/github-credentials/oauth + - --report-credentials-file=/etc/report/credentials + - --target=unit + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /usr/local/github-credentials + name: github-credentials-openshift-ci-robot-private-git-cloner + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )unit,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.12-presubmits.yaml index e0ff58d4e195f..4b813a433204e 100644 --- a/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.12-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.12-presubmits.yaml @@ -201,6 +201,62 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )operator-e2e,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^release-4\.12$ + - ^release-4\.12- + context: ci/prow/unit + decorate: true + decoration_config: + oauth_token_secret: + key: oauth + name: github-credentials-openshift-ci-robot-private-git-cloner + hidden: true + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-priv-gcp-filestore-csi-driver-operator-release-4.12-unit + path_alias: github.com/openshift/gcp-filestore-csi-driver-operator + rerun_command: /test unit + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --oauth-token-path=/usr/local/github-credentials/oauth + - --report-credentials-file=/etc/report/credentials + - --target=unit + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /usr/local/github-credentials + name: github-credentials-openshift-ci-robot-private-git-cloner + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )unit,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.13-presubmits.yaml index 154a2baeccc80..b379695f059c1 100644 --- a/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.13-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.13-presubmits.yaml @@ -201,6 +201,62 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )operator-e2e,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^release-4\.13$ + - ^release-4\.13- + context: ci/prow/unit + decorate: true + decoration_config: + oauth_token_secret: + key: oauth + name: github-credentials-openshift-ci-robot-private-git-cloner + hidden: true + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-priv-gcp-filestore-csi-driver-operator-release-4.13-unit + path_alias: github.com/openshift/gcp-filestore-csi-driver-operator + rerun_command: /test unit + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --oauth-token-path=/usr/local/github-credentials/oauth + - --report-credentials-file=/etc/report/credentials + - --target=unit + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /usr/local/github-credentials + name: github-credentials-openshift-ci-robot-private-git-cloner + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )unit,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-master-presubmits.yaml index 469c1ab510596..e576878d16efc 100644 --- a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-master-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-master-presubmits.yaml @@ -143,12 +143,12 @@ presubmits: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-alibaba,?($|\s.*) - agent: kubernetes - always_run: false + always_run: true branches: - ^master$ - ^master- cluster: build05 - context: ci/prow/e2e-aws + context: ci/prow/e2e-aws-disruptive decorate: true decoration_config: oauth_token_secret: @@ -160,10 +160,10 @@ presubmits: 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-master-e2e-aws + name: pull-ci-openshift-priv-installer-master-e2e-aws-disruptive + optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-aws - skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^images/(alibabacloud|azure|azurestack|baremetal|gcp|ibmcloud|libvirt|nutanix|openstack|ovirt|powervs|vsphere)/) + rerun_command: /test e2e-aws-disruptive spec: containers: - args: @@ -173,8 +173,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-cluster-profile - - --target=e2e-aws + - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile + - --target=e2e-aws-disruptive command: - ci-operator image: ci-operator:latest @@ -190,7 +190,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-cluster-profile + - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -224,14 +224,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*) - agent: kubernetes - always_run: true + always_run: false branches: - ^master$ - ^master- - cluster: build05 - context: ci/prow/e2e-aws-disruptive + context: ci/prow/e2e-aws-ovn decorate: true decoration_config: oauth_token_secret: @@ -243,10 +242,10 @@ presubmits: 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-master-e2e-aws-disruptive - optional: true + name: pull-ci-openshift-priv-installer-master-e2e-aws-ovn path_alias: github.com/openshift/installer - rerun_command: /test e2e-aws-disruptive + rerun_command: /test e2e-aws-ovn + skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^images/(alibabacloud|azure|azurestack|baremetal|gcp|ibmcloud|libvirt|nutanix|openstack|ovirt|powervs|vsphere)/) spec: containers: - args: @@ -256,8 +255,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile - - --target=e2e-aws-disruptive + - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile + - --target=e2e-aws-ovn command: - ci-operator image: ci-operator:latest @@ -273,7 +272,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile + - mountPath: /usr/local/e2e-aws-ovn-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -307,14 +306,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*) - agent: kubernetes always_run: false branches: - ^master$ - ^master- - cluster: build05 - context: ci/prow/e2e-aws-fips + context: ci/prow/e2e-aws-ovn-fips decorate: true decoration_config: oauth_token_secret: @@ -326,10 +324,10 @@ presubmits: 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-master-e2e-aws-fips + name: pull-ci-openshift-priv-installer-master-e2e-aws-ovn-fips optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-aws-fips + rerun_command: /test e2e-aws-ovn-fips run_if_changed: aws spec: containers: @@ -340,8 +338,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-fips-cluster-profile - - --target=e2e-aws-fips + - --secret-dir=/usr/local/e2e-aws-ovn-fips-cluster-profile + - --target=e2e-aws-ovn-fips command: - ci-operator image: ci-operator:latest @@ -357,7 +355,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-fips-cluster-profile + - mountPath: /usr/local/e2e-aws-ovn-fips-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -391,14 +389,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-fips,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-ovn-fips,?($|\s.*) - agent: kubernetes always_run: false branches: - ^master$ - ^master- - cluster: build05 - context: ci/prow/e2e-aws-imdsv2 + context: ci/prow/e2e-aws-ovn-imdsv2 decorate: true decoration_config: oauth_token_secret: @@ -410,10 +407,10 @@ presubmits: 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-master-e2e-aws-imdsv2 + name: pull-ci-openshift-priv-installer-master-e2e-aws-ovn-imdsv2 optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-aws-imdsv2 + rerun_command: /test e2e-aws-ovn-imdsv2 run_if_changed: aws spec: containers: @@ -424,8 +421,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-imdsv2-cluster-profile - - --target=e2e-aws-imdsv2 + - --secret-dir=/usr/local/e2e-aws-ovn-imdsv2-cluster-profile + - --target=e2e-aws-ovn-imdsv2 command: - ci-operator image: ci-operator:latest @@ -441,7 +438,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-imdsv2-cluster-profile + - mountPath: /usr/local/e2e-aws-ovn-imdsv2-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -475,14 +472,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-imdsv2,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-ovn-imdsv2,?($|\s.*) - agent: kubernetes always_run: false branches: - ^master$ - ^master- - cluster: build05 - context: ci/prow/e2e-aws-proxy + context: ci/prow/e2e-aws-ovn-proxy decorate: true decoration_config: oauth_token_secret: @@ -494,10 +490,10 @@ presubmits: 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-master-e2e-aws-proxy + name: pull-ci-openshift-priv-installer-master-e2e-aws-ovn-proxy optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-aws-proxy + rerun_command: /test e2e-aws-ovn-proxy run_if_changed: aws spec: containers: @@ -508,8 +504,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-proxy-cluster-profile - - --target=e2e-aws-proxy + - --secret-dir=/usr/local/e2e-aws-ovn-proxy-cluster-profile + - --target=e2e-aws-ovn-proxy command: - ci-operator image: ci-operator:latest @@ -525,7 +521,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-proxy-cluster-profile + - mountPath: /usr/local/e2e-aws-ovn-proxy-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -559,14 +555,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-proxy,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-ovn-proxy,?($|\s.*) - agent: kubernetes always_run: false branches: - ^master$ - ^master- - cluster: build05 - context: ci/prow/e2e-aws-shared-vpc + context: ci/prow/e2e-aws-ovn-shared-vpc decorate: true decoration_config: oauth_token_secret: @@ -578,10 +573,10 @@ presubmits: 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-master-e2e-aws-shared-vpc + name: pull-ci-openshift-priv-installer-master-e2e-aws-ovn-shared-vpc optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-aws-shared-vpc + rerun_command: /test e2e-aws-ovn-shared-vpc run_if_changed: aws spec: containers: @@ -592,8 +587,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-shared-vpc-cluster-profile - - --target=e2e-aws-shared-vpc + - --secret-dir=/usr/local/e2e-aws-ovn-shared-vpc-cluster-profile + - --target=e2e-aws-ovn-shared-vpc command: - ci-operator image: ci-operator:latest @@ -609,7 +604,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-shared-vpc-cluster-profile + - mountPath: /usr/local/e2e-aws-ovn-shared-vpc-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -643,14 +638,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-shared-vpc,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-ovn-shared-vpc,?($|\s.*) - agent: kubernetes always_run: false branches: - ^master$ - ^master- - cluster: build05 - context: ci/prow/e2e-aws-single-node + context: ci/prow/e2e-aws-ovn-single-node decorate: true decoration_config: oauth_token_secret: @@ -662,10 +656,10 @@ presubmits: 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-master-e2e-aws-single-node + name: pull-ci-openshift-priv-installer-master-e2e-aws-ovn-single-node optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-aws-single-node + rerun_command: /test e2e-aws-ovn-single-node run_if_changed: aws spec: containers: @@ -676,8 +670,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-single-node-cluster-profile - - --target=e2e-aws-single-node + - --secret-dir=/usr/local/e2e-aws-ovn-single-node-cluster-profile + - --target=e2e-aws-ovn-single-node command: - ci-operator image: ci-operator:latest @@ -693,7 +687,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-single-node-cluster-profile + - mountPath: /usr/local/e2e-aws-ovn-single-node-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -727,14 +721,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-single-node,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-ovn-single-node,?($|\s.*) - agent: kubernetes always_run: false branches: - ^master$ - ^master- - cluster: build05 - context: ci/prow/e2e-aws-upgrade + context: ci/prow/e2e-aws-ovn-upi decorate: true decoration_config: oauth_token_secret: @@ -746,11 +739,10 @@ presubmits: 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-master-e2e-aws-upgrade - optional: true + name: pull-ci-openshift-priv-installer-master-e2e-aws-ovn-upi path_alias: github.com/openshift/installer - rerun_command: /test e2e-aws-upgrade - skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|pkg/.*|terraform/providers)/(alibabacloud|azure|baremetal|gcp|ibmcloud|libvirt|nutanix|openstack|ovirt|powervs|vsphere)/) + rerun_command: /test e2e-aws-ovn-upi + run_if_changed: ^(upi/aws/.*)|^(images/installer/Dockerfile\.upi.*) spec: containers: - args: @@ -760,8 +752,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile - - --target=e2e-aws-upgrade + - --secret-dir=/usr/local/e2e-aws-ovn-upi-cluster-profile + - --target=e2e-aws-ovn-upi command: - ci-operator image: ci-operator:latest @@ -777,7 +769,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile + - mountPath: /usr/local/e2e-aws-ovn-upi-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -811,14 +803,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-upgrade,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-ovn-upi,?($|\s.*) - agent: kubernetes always_run: false branches: - ^master$ - ^master- cluster: build05 - context: ci/prow/e2e-aws-upi + context: ci/prow/e2e-aws-upgrade decorate: true decoration_config: oauth_token_secret: @@ -830,10 +822,11 @@ presubmits: 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-master-e2e-aws-upi + name: pull-ci-openshift-priv-installer-master-e2e-aws-upgrade + optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-aws-upi - run_if_changed: ^(upi/aws/.*)|^(images/installer/Dockerfile\.upi.*) + rerun_command: /test e2e-aws-upgrade + skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|pkg/.*|terraform/providers)/(alibabacloud|azure|baremetal|gcp|ibmcloud|libvirt|nutanix|openstack|ovirt|powervs|vsphere)/) spec: containers: - args: @@ -843,8 +836,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-upi-cluster-profile - - --target=e2e-aws-upi + - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile + - --target=e2e-aws-upgrade command: - ci-operator image: ci-operator:latest @@ -860,7 +853,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-upi-cluster-profile + - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -894,7 +887,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-upi,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-upgrade,?($|\s.*) - agent: kubernetes always_run: true branches: @@ -1067,8 +1060,7 @@ presubmits: branches: - ^master$ - ^master- - cluster: build01 - context: ci/prow/e2e-azure + context: ci/prow/e2e-azure-ovn decorate: true decoration_config: oauth_token_secret: @@ -1080,9 +1072,9 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: azure4 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-installer-master-e2e-azure + name: pull-ci-openshift-priv-installer-master-e2e-azure-ovn path_alias: github.com/openshift/installer - rerun_command: /test e2e-azure + rerun_command: /test e2e-azure-ovn skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|images|pkg/.*|terraform/providers)/(alibabacloud|aws|baremetal|gcp|ibmcloud|libvirt|nutanix|openstack|ovirt|powervs|vsphere)/) spec: containers: @@ -1093,8 +1085,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-azure-cluster-profile - - --target=e2e-azure + - --secret-dir=/usr/local/e2e-azure-ovn-cluster-profile + - --target=e2e-azure-ovn command: - ci-operator image: ci-operator:latest @@ -1110,7 +1102,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-azure-cluster-profile + - mountPath: /usr/local/e2e-azure-ovn-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -1144,14 +1136,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-azure-ovn,?($|\s.*) - agent: kubernetes always_run: false branches: - ^master$ - ^master- - cluster: build01 - context: ci/prow/e2e-azure-resourcegroup + context: ci/prow/e2e-azure-ovn-resourcegroup decorate: true decoration_config: oauth_token_secret: @@ -1163,10 +1154,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: azure4 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-installer-master-e2e-azure-resourcegroup + name: pull-ci-openshift-priv-installer-master-e2e-azure-ovn-resourcegroup optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-azure-resourcegroup + rerun_command: /test e2e-azure-ovn-resourcegroup run_if_changed: azure spec: containers: @@ -1177,8 +1168,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-azure-resourcegroup-cluster-profile - - --target=e2e-azure-resourcegroup + - --secret-dir=/usr/local/e2e-azure-ovn-resourcegroup-cluster-profile + - --target=e2e-azure-ovn-resourcegroup command: - ci-operator image: ci-operator:latest @@ -1194,7 +1185,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-azure-resourcegroup-cluster-profile + - mountPath: /usr/local/e2e-azure-ovn-resourcegroup-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -1228,14 +1219,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-azure-resourcegroup,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-azure-ovn-resourcegroup,?($|\s.*) - agent: kubernetes always_run: false branches: - ^master$ - ^master- - cluster: build01 - context: ci/prow/e2e-azure-shared-vpc + context: ci/prow/e2e-azure-ovn-shared-vpc decorate: true decoration_config: oauth_token_secret: @@ -1247,10 +1237,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: azure4 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-installer-master-e2e-azure-shared-vpc + name: pull-ci-openshift-priv-installer-master-e2e-azure-ovn-shared-vpc optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-azure-shared-vpc + rerun_command: /test e2e-azure-ovn-shared-vpc run_if_changed: azure spec: containers: @@ -1261,8 +1251,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-azure-shared-vpc-cluster-profile - - --target=e2e-azure-shared-vpc + - --secret-dir=/usr/local/e2e-azure-ovn-shared-vpc-cluster-profile + - --target=e2e-azure-ovn-shared-vpc command: - ci-operator image: ci-operator:latest @@ -1278,7 +1268,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-azure-shared-vpc-cluster-profile + - mountPath: /usr/local/e2e-azure-ovn-shared-vpc-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -1312,14 +1302,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-azure-shared-vpc,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-azure-ovn-shared-vpc,?($|\s.*) - agent: kubernetes always_run: false branches: - ^master$ - ^master- - cluster: build01 - context: ci/prow/e2e-azure-upi + context: ci/prow/e2e-azure-ovn-upi decorate: true decoration_config: oauth_token_secret: @@ -1331,9 +1320,9 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: azure4 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-installer-master-e2e-azure-upi + name: pull-ci-openshift-priv-installer-master-e2e-azure-ovn-upi path_alias: github.com/openshift/installer - rerun_command: /test e2e-azure-upi + rerun_command: /test e2e-azure-ovn-upi run_if_changed: ^(upi/(azure|azurestack)/.*)|^(images/installer/Dockerfile\.upi.*) spec: containers: @@ -1344,8 +1333,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-azure-upi-cluster-profile - - --target=e2e-azure-upi + - --secret-dir=/usr/local/e2e-azure-ovn-upi-cluster-profile + - --target=e2e-azure-ovn-upi command: - ci-operator image: ci-operator:latest @@ -1361,7 +1350,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-azure-upi-cluster-profile + - mountPath: /usr/local/e2e-azure-ovn-upi-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -1395,7 +1384,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-azure-upi,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-azure-ovn-upi,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -1657,8 +1646,7 @@ presubmits: branches: - ^master$ - ^master- - cluster: build04 - context: ci/prow/e2e-gcp + context: ci/prow/e2e-gcp-ovn decorate: true decoration_config: oauth_token_secret: @@ -1670,9 +1658,9 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: gcp ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-installer-master-e2e-gcp + name: pull-ci-openshift-priv-installer-master-e2e-gcp-ovn path_alias: github.com/openshift/installer - rerun_command: /test e2e-gcp + rerun_command: /test e2e-gcp-ovn skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|images|pkg/.*|terraform/providers)/(alibabacloud|aws|azure|azurestack|baremetal|ibmcloud|libvirt|nutanix|openstack|ovirt|powervs|vsphere)/) spec: containers: @@ -1683,8 +1671,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-gcp-cluster-profile - - --target=e2e-gcp + - --secret-dir=/usr/local/e2e-gcp-ovn-cluster-profile + - --target=e2e-gcp-ovn command: - ci-operator image: ci-operator:latest @@ -1700,7 +1688,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-gcp-cluster-profile + - mountPath: /usr/local/e2e-gcp-ovn-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -1738,14 +1726,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*) - agent: kubernetes always_run: false branches: - ^master$ - ^master- - cluster: build04 - context: ci/prow/e2e-gcp-shared-vpc + context: ci/prow/e2e-gcp-ovn-shared-vpc decorate: true decoration_config: oauth_token_secret: @@ -1757,10 +1744,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: gcp ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-installer-master-e2e-gcp-shared-vpc + name: pull-ci-openshift-priv-installer-master-e2e-gcp-ovn-shared-vpc optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-gcp-shared-vpc + rerun_command: /test e2e-gcp-ovn-shared-vpc run_if_changed: gcp spec: containers: @@ -1771,8 +1758,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-gcp-shared-vpc-cluster-profile - - --target=e2e-gcp-shared-vpc + - --secret-dir=/usr/local/e2e-gcp-ovn-shared-vpc-cluster-profile + - --target=e2e-gcp-ovn-shared-vpc command: - ci-operator image: ci-operator:latest @@ -1788,7 +1775,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-gcp-shared-vpc-cluster-profile + - mountPath: /usr/local/e2e-gcp-ovn-shared-vpc-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -1826,14 +1813,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-gcp-shared-vpc,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp-ovn-shared-vpc,?($|\s.*) - agent: kubernetes - always_run: true + always_run: false branches: - ^master$ - ^master- - cluster: build04 - context: ci/prow/e2e-gcp-upgrade + context: ci/prow/e2e-gcp-ovn-upi decorate: true decoration_config: oauth_token_secret: @@ -1845,10 +1831,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: gcp ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-installer-master-e2e-gcp-upgrade - optional: true + name: pull-ci-openshift-priv-installer-master-e2e-gcp-ovn-upi path_alias: github.com/openshift/installer - rerun_command: /test e2e-gcp-upgrade + rerun_command: /test e2e-gcp-ovn-upi + run_if_changed: ^(upi/gcp/.*)|^(images/installer/Dockerfile\.upi.*) spec: containers: - args: @@ -1858,8 +1844,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-gcp-upgrade-cluster-profile - - --target=e2e-gcp-upgrade + - --secret-dir=/usr/local/e2e-gcp-ovn-upi-cluster-profile + - --target=e2e-gcp-ovn-upi command: - ci-operator image: ci-operator:latest @@ -1875,7 +1861,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile + - mountPath: /usr/local/e2e-gcp-ovn-upi-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -1913,14 +1899,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp-ovn-upi,?($|\s.*) - agent: kubernetes - always_run: false + always_run: true branches: - ^master$ - ^master- cluster: build04 - context: ci/prow/e2e-gcp-upi + context: ci/prow/e2e-gcp-upgrade decorate: true decoration_config: oauth_token_secret: @@ -1932,10 +1918,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: gcp ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-installer-master-e2e-gcp-upi + name: pull-ci-openshift-priv-installer-master-e2e-gcp-upgrade + optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-gcp-upi - run_if_changed: ^(upi/gcp/.*)|^(images/installer/Dockerfile\.upi.*) + rerun_command: /test e2e-gcp-upgrade spec: containers: - args: @@ -1945,8 +1931,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-gcp-upi-cluster-profile - - --target=e2e-gcp-upi + - --secret-dir=/usr/local/e2e-gcp-upgrade-cluster-profile + - --target=e2e-gcp-upgrade command: - ci-operator image: ci-operator:latest @@ -1962,7 +1948,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-gcp-upi-cluster-profile + - mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -2000,7 +1986,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-gcp-upi,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -2094,8 +2080,7 @@ presubmits: branches: - ^master$ - ^master- - cluster: build01 - context: ci/prow/e2e-ibmcloud + context: ci/prow/e2e-ibmcloud-ovn decorate: true decoration_config: oauth_token_secret: @@ -2107,10 +2092,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: ibmcloud ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-installer-master-e2e-ibmcloud + name: pull-ci-openshift-priv-installer-master-e2e-ibmcloud-ovn optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-ibmcloud + rerun_command: /test e2e-ibmcloud-ovn skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|images|pkg/.*|terraform/providers)/(alibabacloud|aws|azure|azurestack|baremetal|gcp|libvirt|nutanix|openstack|ovirt|powervs|vsphere)/) spec: containers: @@ -2121,8 +2106,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-ibmcloud-cluster-profile - - --target=e2e-ibmcloud + - --secret-dir=/usr/local/e2e-ibmcloud-ovn-cluster-profile + - --target=e2e-ibmcloud-ovn command: - ci-operator image: ci-operator:latest @@ -2138,7 +2123,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-ibmcloud-cluster-profile + - mountPath: /usr/local/e2e-ibmcloud-ovn-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -2172,7 +2157,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-ibmcloud,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-ibmcloud-ovn,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -3445,8 +3430,7 @@ presubmits: branches: - ^master$ - ^master- - cluster: vsphere - context: ci/prow/e2e-vsphere + context: ci/prow/e2e-vsphere-ovn decorate: true decoration_config: oauth_token_secret: @@ -3458,9 +3442,9 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: vsphere ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-installer-master-e2e-vsphere + name: pull-ci-openshift-priv-installer-master-e2e-vsphere-ovn path_alias: github.com/openshift/installer - rerun_command: /test e2e-vsphere + rerun_command: /test e2e-vsphere-ovn skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|images|pkg/.*|terraform/providers)/(alibabacloud|aws|azure|azurestack|baremetal|gcp|ibmcloud|libvirt|nutanix|openstack|ovirt|powervs)/) spec: containers: @@ -3471,8 +3455,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-vsphere-cluster-profile - - --target=e2e-vsphere + - --secret-dir=/usr/local/e2e-vsphere-ovn-cluster-profile + - --target=e2e-vsphere-ovn command: - ci-operator image: ci-operator:latest @@ -3488,7 +3472,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-vsphere-cluster-profile + - mountPath: /usr/local/e2e-vsphere-ovn-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -3522,7 +3506,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-vsphere,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-vsphere-ovn,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.12-presubmits.yaml index ca478cff5f686..fcbe444da5e37 100644 --- a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.12-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.12-presubmits.yaml @@ -143,12 +143,12 @@ presubmits: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-alibaba,?($|\s.*) - agent: kubernetes - always_run: false + always_run: true branches: - ^release-4\.12$ - ^release-4\.12- cluster: build05 - context: ci/prow/e2e-aws + context: ci/prow/e2e-aws-disruptive decorate: true decoration_config: oauth_token_secret: @@ -160,10 +160,10 @@ presubmits: 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.12-e2e-aws + name: pull-ci-openshift-priv-installer-release-4.12-e2e-aws-disruptive + optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-aws - skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^images/(alibabacloud|azure|azurestack|baremetal|gcp|ibmcloud|libvirt|nutanix|openstack|ovirt|powervs|vsphere)/) + rerun_command: /test e2e-aws-disruptive spec: containers: - args: @@ -173,8 +173,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-cluster-profile - - --target=e2e-aws + - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile + - --target=e2e-aws-disruptive command: - ci-operator image: ci-operator:latest @@ -190,7 +190,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-cluster-profile + - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -224,14 +224,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*) - agent: kubernetes - always_run: true + always_run: false branches: - ^release-4\.12$ - ^release-4\.12- - cluster: build05 - context: ci/prow/e2e-aws-disruptive + context: ci/prow/e2e-aws-ovn decorate: true decoration_config: oauth_token_secret: @@ -243,10 +242,10 @@ presubmits: 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.12-e2e-aws-disruptive - optional: true + name: pull-ci-openshift-priv-installer-release-4.12-e2e-aws-ovn path_alias: github.com/openshift/installer - rerun_command: /test e2e-aws-disruptive + rerun_command: /test e2e-aws-ovn + skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^images/(alibabacloud|azure|azurestack|baremetal|gcp|ibmcloud|libvirt|nutanix|openstack|ovirt|powervs|vsphere)/) spec: containers: - args: @@ -256,8 +255,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile - - --target=e2e-aws-disruptive + - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile + - --target=e2e-aws-ovn command: - ci-operator image: ci-operator:latest @@ -273,7 +272,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile + - mountPath: /usr/local/e2e-aws-ovn-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -307,14 +306,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.12$ - ^release-4\.12- - cluster: build05 - context: ci/prow/e2e-aws-fips + context: ci/prow/e2e-aws-ovn-fips decorate: true decoration_config: oauth_token_secret: @@ -326,10 +324,10 @@ presubmits: 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.12-e2e-aws-fips + name: pull-ci-openshift-priv-installer-release-4.12-e2e-aws-ovn-fips optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-aws-fips + rerun_command: /test e2e-aws-ovn-fips run_if_changed: aws spec: containers: @@ -340,8 +338,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-fips-cluster-profile - - --target=e2e-aws-fips + - --secret-dir=/usr/local/e2e-aws-ovn-fips-cluster-profile + - --target=e2e-aws-ovn-fips command: - ci-operator image: ci-operator:latest @@ -357,7 +355,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-fips-cluster-profile + - mountPath: /usr/local/e2e-aws-ovn-fips-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -391,14 +389,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-fips,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-ovn-fips,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.12$ - ^release-4\.12- - cluster: build05 - context: ci/prow/e2e-aws-imdsv2 + context: ci/prow/e2e-aws-ovn-imdsv2 decorate: true decoration_config: oauth_token_secret: @@ -410,10 +407,10 @@ presubmits: 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.12-e2e-aws-imdsv2 + name: pull-ci-openshift-priv-installer-release-4.12-e2e-aws-ovn-imdsv2 optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-aws-imdsv2 + rerun_command: /test e2e-aws-ovn-imdsv2 run_if_changed: aws spec: containers: @@ -424,8 +421,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-imdsv2-cluster-profile - - --target=e2e-aws-imdsv2 + - --secret-dir=/usr/local/e2e-aws-ovn-imdsv2-cluster-profile + - --target=e2e-aws-ovn-imdsv2 command: - ci-operator image: ci-operator:latest @@ -441,7 +438,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-imdsv2-cluster-profile + - mountPath: /usr/local/e2e-aws-ovn-imdsv2-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -475,14 +472,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-imdsv2,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-ovn-imdsv2,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.12$ - ^release-4\.12- - cluster: build05 - context: ci/prow/e2e-aws-proxy + context: ci/prow/e2e-aws-ovn-proxy decorate: true decoration_config: oauth_token_secret: @@ -494,10 +490,10 @@ presubmits: 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.12-e2e-aws-proxy + name: pull-ci-openshift-priv-installer-release-4.12-e2e-aws-ovn-proxy optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-aws-proxy + rerun_command: /test e2e-aws-ovn-proxy run_if_changed: aws spec: containers: @@ -508,8 +504,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-proxy-cluster-profile - - --target=e2e-aws-proxy + - --secret-dir=/usr/local/e2e-aws-ovn-proxy-cluster-profile + - --target=e2e-aws-ovn-proxy command: - ci-operator image: ci-operator:latest @@ -525,7 +521,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-proxy-cluster-profile + - mountPath: /usr/local/e2e-aws-ovn-proxy-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -559,14 +555,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-proxy,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-ovn-proxy,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.12$ - ^release-4\.12- - cluster: build05 - context: ci/prow/e2e-aws-shared-vpc + context: ci/prow/e2e-aws-ovn-shared-vpc decorate: true decoration_config: oauth_token_secret: @@ -578,10 +573,10 @@ presubmits: 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.12-e2e-aws-shared-vpc + name: pull-ci-openshift-priv-installer-release-4.12-e2e-aws-ovn-shared-vpc optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-aws-shared-vpc + rerun_command: /test e2e-aws-ovn-shared-vpc run_if_changed: aws spec: containers: @@ -592,8 +587,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-shared-vpc-cluster-profile - - --target=e2e-aws-shared-vpc + - --secret-dir=/usr/local/e2e-aws-ovn-shared-vpc-cluster-profile + - --target=e2e-aws-ovn-shared-vpc command: - ci-operator image: ci-operator:latest @@ -609,7 +604,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-shared-vpc-cluster-profile + - mountPath: /usr/local/e2e-aws-ovn-shared-vpc-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -643,14 +638,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-shared-vpc,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-ovn-shared-vpc,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.12$ - ^release-4\.12- - cluster: build05 - context: ci/prow/e2e-aws-single-node + context: ci/prow/e2e-aws-ovn-single-node decorate: true decoration_config: oauth_token_secret: @@ -662,10 +656,10 @@ presubmits: 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.12-e2e-aws-single-node + name: pull-ci-openshift-priv-installer-release-4.12-e2e-aws-ovn-single-node optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-aws-single-node + rerun_command: /test e2e-aws-ovn-single-node run_if_changed: aws spec: containers: @@ -676,8 +670,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-single-node-cluster-profile - - --target=e2e-aws-single-node + - --secret-dir=/usr/local/e2e-aws-ovn-single-node-cluster-profile + - --target=e2e-aws-ovn-single-node command: - ci-operator image: ci-operator:latest @@ -693,7 +687,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-single-node-cluster-profile + - mountPath: /usr/local/e2e-aws-ovn-single-node-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -727,14 +721,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-single-node,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-ovn-single-node,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.12$ - ^release-4\.12- - cluster: build05 - context: ci/prow/e2e-aws-upgrade + context: ci/prow/e2e-aws-ovn-upi decorate: true decoration_config: oauth_token_secret: @@ -746,11 +739,10 @@ presubmits: 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.12-e2e-aws-upgrade - optional: true + name: pull-ci-openshift-priv-installer-release-4.12-e2e-aws-ovn-upi path_alias: github.com/openshift/installer - rerun_command: /test e2e-aws-upgrade - skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|pkg/.*|terraform/providers)/(alibabacloud|azure|baremetal|gcp|ibmcloud|libvirt|nutanix|openstack|ovirt|powervs|vsphere)/) + rerun_command: /test e2e-aws-ovn-upi + run_if_changed: ^(upi/aws/.*)|^(images/installer/Dockerfile\.upi.*) spec: containers: - args: @@ -760,8 +752,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile - - --target=e2e-aws-upgrade + - --secret-dir=/usr/local/e2e-aws-ovn-upi-cluster-profile + - --target=e2e-aws-ovn-upi command: - ci-operator image: ci-operator:latest @@ -777,7 +769,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile + - mountPath: /usr/local/e2e-aws-ovn-upi-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -811,14 +803,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-upgrade,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-ovn-upi,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.12$ - ^release-4\.12- cluster: build05 - context: ci/prow/e2e-aws-upi + context: ci/prow/e2e-aws-upgrade decorate: true decoration_config: oauth_token_secret: @@ -830,10 +822,11 @@ presubmits: 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.12-e2e-aws-upi + name: pull-ci-openshift-priv-installer-release-4.12-e2e-aws-upgrade + optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-aws-upi - run_if_changed: ^(upi/aws/.*)|^(images/installer/Dockerfile\.upi.*) + rerun_command: /test e2e-aws-upgrade + skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|pkg/.*|terraform/providers)/(alibabacloud|azure|baremetal|gcp|ibmcloud|libvirt|nutanix|openstack|ovirt|powervs|vsphere)/) spec: containers: - args: @@ -843,8 +836,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-upi-cluster-profile - - --target=e2e-aws-upi + - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile + - --target=e2e-aws-upgrade command: - ci-operator image: ci-operator:latest @@ -860,7 +853,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-upi-cluster-profile + - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -894,7 +887,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-upi,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-upgrade,?($|\s.*) - agent: kubernetes always_run: true branches: @@ -1067,8 +1060,7 @@ presubmits: branches: - ^release-4\.12$ - ^release-4\.12- - cluster: build01 - context: ci/prow/e2e-azure + context: ci/prow/e2e-azure-ovn decorate: true decoration_config: oauth_token_secret: @@ -1080,9 +1072,9 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: azure4 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-installer-release-4.12-e2e-azure + name: pull-ci-openshift-priv-installer-release-4.12-e2e-azure-ovn path_alias: github.com/openshift/installer - rerun_command: /test e2e-azure + rerun_command: /test e2e-azure-ovn skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|images|pkg/.*|terraform/providers)/(alibabacloud|aws|baremetal|gcp|ibmcloud|libvirt|nutanix|openstack|ovirt|powervs|vsphere)/) spec: containers: @@ -1093,8 +1085,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-azure-cluster-profile - - --target=e2e-azure + - --secret-dir=/usr/local/e2e-azure-ovn-cluster-profile + - --target=e2e-azure-ovn command: - ci-operator image: ci-operator:latest @@ -1110,7 +1102,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-azure-cluster-profile + - mountPath: /usr/local/e2e-azure-ovn-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -1144,14 +1136,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-azure-ovn,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.12$ - ^release-4\.12- - cluster: build01 - context: ci/prow/e2e-azure-resourcegroup + context: ci/prow/e2e-azure-ovn-resourcegroup decorate: true decoration_config: oauth_token_secret: @@ -1163,10 +1154,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: azure4 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-installer-release-4.12-e2e-azure-resourcegroup + name: pull-ci-openshift-priv-installer-release-4.12-e2e-azure-ovn-resourcegroup optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-azure-resourcegroup + rerun_command: /test e2e-azure-ovn-resourcegroup run_if_changed: azure spec: containers: @@ -1177,8 +1168,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-azure-resourcegroup-cluster-profile - - --target=e2e-azure-resourcegroup + - --secret-dir=/usr/local/e2e-azure-ovn-resourcegroup-cluster-profile + - --target=e2e-azure-ovn-resourcegroup command: - ci-operator image: ci-operator:latest @@ -1194,7 +1185,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-azure-resourcegroup-cluster-profile + - mountPath: /usr/local/e2e-azure-ovn-resourcegroup-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -1228,14 +1219,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-azure-resourcegroup,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-azure-ovn-resourcegroup,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.12$ - ^release-4\.12- - cluster: build01 - context: ci/prow/e2e-azure-shared-vpc + context: ci/prow/e2e-azure-ovn-shared-vpc decorate: true decoration_config: oauth_token_secret: @@ -1247,10 +1237,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: azure4 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-installer-release-4.12-e2e-azure-shared-vpc + name: pull-ci-openshift-priv-installer-release-4.12-e2e-azure-ovn-shared-vpc optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-azure-shared-vpc + rerun_command: /test e2e-azure-ovn-shared-vpc run_if_changed: azure spec: containers: @@ -1261,8 +1251,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-azure-shared-vpc-cluster-profile - - --target=e2e-azure-shared-vpc + - --secret-dir=/usr/local/e2e-azure-ovn-shared-vpc-cluster-profile + - --target=e2e-azure-ovn-shared-vpc command: - ci-operator image: ci-operator:latest @@ -1278,7 +1268,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-azure-shared-vpc-cluster-profile + - mountPath: /usr/local/e2e-azure-ovn-shared-vpc-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -1312,14 +1302,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-azure-shared-vpc,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-azure-ovn-shared-vpc,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.12$ - ^release-4\.12- - cluster: build01 - context: ci/prow/e2e-azure-upi + context: ci/prow/e2e-azure-ovn-upi decorate: true decoration_config: oauth_token_secret: @@ -1331,9 +1320,9 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: azure4 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-installer-release-4.12-e2e-azure-upi + name: pull-ci-openshift-priv-installer-release-4.12-e2e-azure-ovn-upi path_alias: github.com/openshift/installer - rerun_command: /test e2e-azure-upi + rerun_command: /test e2e-azure-ovn-upi run_if_changed: ^(upi/(azure|azurestack)/.*)|^(images/installer/Dockerfile\.upi.*) spec: containers: @@ -1344,8 +1333,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-azure-upi-cluster-profile - - --target=e2e-azure-upi + - --secret-dir=/usr/local/e2e-azure-ovn-upi-cluster-profile + - --target=e2e-azure-ovn-upi command: - ci-operator image: ci-operator:latest @@ -1361,7 +1350,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-azure-upi-cluster-profile + - mountPath: /usr/local/e2e-azure-ovn-upi-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -1395,7 +1384,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-azure-upi,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-azure-ovn-upi,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -1657,8 +1646,7 @@ presubmits: branches: - ^release-4\.12$ - ^release-4\.12- - cluster: build04 - context: ci/prow/e2e-gcp + context: ci/prow/e2e-gcp-ovn decorate: true decoration_config: oauth_token_secret: @@ -1670,9 +1658,9 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: gcp ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-installer-release-4.12-e2e-gcp + name: pull-ci-openshift-priv-installer-release-4.12-e2e-gcp-ovn path_alias: github.com/openshift/installer - rerun_command: /test e2e-gcp + rerun_command: /test e2e-gcp-ovn skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|images|pkg/.*|terraform/providers)/(alibabacloud|aws|azure|azurestack|baremetal|ibmcloud|libvirt|nutanix|openstack|ovirt|powervs|vsphere)/) spec: containers: @@ -1683,8 +1671,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-gcp-cluster-profile - - --target=e2e-gcp + - --secret-dir=/usr/local/e2e-gcp-ovn-cluster-profile + - --target=e2e-gcp-ovn command: - ci-operator image: ci-operator:latest @@ -1700,7 +1688,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-gcp-cluster-profile + - mountPath: /usr/local/e2e-gcp-ovn-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -1738,14 +1726,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.12$ - ^release-4\.12- - cluster: build04 - context: ci/prow/e2e-gcp-shared-vpc + context: ci/prow/e2e-gcp-ovn-shared-vpc decorate: true decoration_config: oauth_token_secret: @@ -1757,10 +1744,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: gcp ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-installer-release-4.12-e2e-gcp-shared-vpc + name: pull-ci-openshift-priv-installer-release-4.12-e2e-gcp-ovn-shared-vpc optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-gcp-shared-vpc + rerun_command: /test e2e-gcp-ovn-shared-vpc run_if_changed: gcp spec: containers: @@ -1771,8 +1758,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-gcp-shared-vpc-cluster-profile - - --target=e2e-gcp-shared-vpc + - --secret-dir=/usr/local/e2e-gcp-ovn-shared-vpc-cluster-profile + - --target=e2e-gcp-ovn-shared-vpc command: - ci-operator image: ci-operator:latest @@ -1788,7 +1775,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-gcp-shared-vpc-cluster-profile + - mountPath: /usr/local/e2e-gcp-ovn-shared-vpc-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -1826,14 +1813,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-gcp-shared-vpc,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp-ovn-shared-vpc,?($|\s.*) - agent: kubernetes - always_run: true + always_run: false branches: - ^release-4\.12$ - ^release-4\.12- - cluster: build04 - context: ci/prow/e2e-gcp-upgrade + context: ci/prow/e2e-gcp-ovn-upi decorate: true decoration_config: oauth_token_secret: @@ -1845,10 +1831,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: gcp ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-installer-release-4.12-e2e-gcp-upgrade - optional: true + name: pull-ci-openshift-priv-installer-release-4.12-e2e-gcp-ovn-upi path_alias: github.com/openshift/installer - rerun_command: /test e2e-gcp-upgrade + rerun_command: /test e2e-gcp-ovn-upi + run_if_changed: ^(upi/gcp/.*)|^(images/installer/Dockerfile\.upi.*) spec: containers: - args: @@ -1858,8 +1844,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-gcp-upgrade-cluster-profile - - --target=e2e-gcp-upgrade + - --secret-dir=/usr/local/e2e-gcp-ovn-upi-cluster-profile + - --target=e2e-gcp-ovn-upi command: - ci-operator image: ci-operator:latest @@ -1875,7 +1861,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile + - mountPath: /usr/local/e2e-gcp-ovn-upi-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -1913,14 +1899,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp-ovn-upi,?($|\s.*) - agent: kubernetes - always_run: false + always_run: true branches: - ^release-4\.12$ - ^release-4\.12- cluster: build04 - context: ci/prow/e2e-gcp-upi + context: ci/prow/e2e-gcp-upgrade decorate: true decoration_config: oauth_token_secret: @@ -1932,10 +1918,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: gcp ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-installer-release-4.12-e2e-gcp-upi + name: pull-ci-openshift-priv-installer-release-4.12-e2e-gcp-upgrade + optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-gcp-upi - run_if_changed: ^(upi/gcp/.*)|^(images/installer/Dockerfile\.upi.*) + rerun_command: /test e2e-gcp-upgrade spec: containers: - args: @@ -1945,8 +1931,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-gcp-upi-cluster-profile - - --target=e2e-gcp-upi + - --secret-dir=/usr/local/e2e-gcp-upgrade-cluster-profile + - --target=e2e-gcp-upgrade command: - ci-operator image: ci-operator:latest @@ -1962,7 +1948,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-gcp-upi-cluster-profile + - mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -2000,7 +1986,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-gcp-upi,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -2094,8 +2080,7 @@ presubmits: branches: - ^release-4\.12$ - ^release-4\.12- - cluster: build01 - context: ci/prow/e2e-ibmcloud + context: ci/prow/e2e-ibmcloud-ovn decorate: true decoration_config: oauth_token_secret: @@ -2107,10 +2092,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: ibmcloud ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-installer-release-4.12-e2e-ibmcloud + name: pull-ci-openshift-priv-installer-release-4.12-e2e-ibmcloud-ovn optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-ibmcloud + rerun_command: /test e2e-ibmcloud-ovn skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|images|pkg/.*|terraform/providers)/(alibabacloud|aws|azure|azurestack|baremetal|gcp|libvirt|nutanix|openstack|ovirt|powervs|vsphere)/) spec: containers: @@ -2121,8 +2106,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-ibmcloud-cluster-profile - - --target=e2e-ibmcloud + - --secret-dir=/usr/local/e2e-ibmcloud-ovn-cluster-profile + - --target=e2e-ibmcloud-ovn command: - ci-operator image: ci-operator:latest @@ -2138,7 +2123,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-ibmcloud-cluster-profile + - mountPath: /usr/local/e2e-ibmcloud-ovn-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -2172,7 +2157,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-ibmcloud,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-ibmcloud-ovn,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -3445,8 +3430,7 @@ presubmits: branches: - ^release-4\.12$ - ^release-4\.12- - cluster: vsphere - context: ci/prow/e2e-vsphere + context: ci/prow/e2e-vsphere-ovn decorate: true decoration_config: oauth_token_secret: @@ -3458,9 +3442,9 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: vsphere ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-installer-release-4.12-e2e-vsphere + name: pull-ci-openshift-priv-installer-release-4.12-e2e-vsphere-ovn path_alias: github.com/openshift/installer - rerun_command: /test e2e-vsphere + rerun_command: /test e2e-vsphere-ovn skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|images|pkg/.*|terraform/providers)/(alibabacloud|aws|azure|azurestack|baremetal|gcp|ibmcloud|libvirt|nutanix|openstack|ovirt|powervs)/) spec: containers: @@ -3471,8 +3455,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-vsphere-cluster-profile - - --target=e2e-vsphere + - --secret-dir=/usr/local/e2e-vsphere-ovn-cluster-profile + - --target=e2e-vsphere-ovn command: - ci-operator image: ci-operator:latest @@ -3488,7 +3472,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-vsphere-cluster-profile + - mountPath: /usr/local/e2e-vsphere-ovn-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -3522,7 +3506,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-vsphere,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-vsphere-ovn,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.13-presubmits.yaml index 0dea6d8b1ab82..b04754dd4cce9 100644 --- a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.13-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.13-presubmits.yaml @@ -143,12 +143,12 @@ presubmits: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-alibaba,?($|\s.*) - agent: kubernetes - always_run: false + always_run: true branches: - ^release-4\.13$ - ^release-4\.13- cluster: build05 - context: ci/prow/e2e-aws + context: ci/prow/e2e-aws-disruptive decorate: true decoration_config: oauth_token_secret: @@ -160,10 +160,10 @@ presubmits: 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.13-e2e-aws + name: pull-ci-openshift-priv-installer-release-4.13-e2e-aws-disruptive + optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-aws - skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^images/(alibabacloud|azure|azurestack|baremetal|gcp|ibmcloud|libvirt|nutanix|openstack|ovirt|powervs|vsphere)/) + rerun_command: /test e2e-aws-disruptive spec: containers: - args: @@ -173,8 +173,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-cluster-profile - - --target=e2e-aws + - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile + - --target=e2e-aws-disruptive command: - ci-operator image: ci-operator:latest @@ -190,7 +190,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-cluster-profile + - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -224,14 +224,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*) - agent: kubernetes - always_run: true + always_run: false branches: - ^release-4\.13$ - ^release-4\.13- - cluster: build05 - context: ci/prow/e2e-aws-disruptive + context: ci/prow/e2e-aws-ovn decorate: true decoration_config: oauth_token_secret: @@ -243,10 +242,10 @@ presubmits: 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.13-e2e-aws-disruptive - optional: true + name: pull-ci-openshift-priv-installer-release-4.13-e2e-aws-ovn path_alias: github.com/openshift/installer - rerun_command: /test e2e-aws-disruptive + rerun_command: /test e2e-aws-ovn + skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^images/(alibabacloud|azure|azurestack|baremetal|gcp|ibmcloud|libvirt|nutanix|openstack|ovirt|powervs|vsphere)/) spec: containers: - args: @@ -256,8 +255,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile - - --target=e2e-aws-disruptive + - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile + - --target=e2e-aws-ovn command: - ci-operator image: ci-operator:latest @@ -273,7 +272,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile + - mountPath: /usr/local/e2e-aws-ovn-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -307,14 +306,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.13$ - ^release-4\.13- - cluster: build05 - context: ci/prow/e2e-aws-fips + context: ci/prow/e2e-aws-ovn-fips decorate: true decoration_config: oauth_token_secret: @@ -326,10 +324,10 @@ presubmits: 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.13-e2e-aws-fips + name: pull-ci-openshift-priv-installer-release-4.13-e2e-aws-ovn-fips optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-aws-fips + rerun_command: /test e2e-aws-ovn-fips run_if_changed: aws spec: containers: @@ -340,8 +338,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-fips-cluster-profile - - --target=e2e-aws-fips + - --secret-dir=/usr/local/e2e-aws-ovn-fips-cluster-profile + - --target=e2e-aws-ovn-fips command: - ci-operator image: ci-operator:latest @@ -357,7 +355,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-fips-cluster-profile + - mountPath: /usr/local/e2e-aws-ovn-fips-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -391,14 +389,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-fips,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-ovn-fips,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.13$ - ^release-4\.13- - cluster: build05 - context: ci/prow/e2e-aws-imdsv2 + context: ci/prow/e2e-aws-ovn-imdsv2 decorate: true decoration_config: oauth_token_secret: @@ -410,10 +407,10 @@ presubmits: 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.13-e2e-aws-imdsv2 + name: pull-ci-openshift-priv-installer-release-4.13-e2e-aws-ovn-imdsv2 optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-aws-imdsv2 + rerun_command: /test e2e-aws-ovn-imdsv2 run_if_changed: aws spec: containers: @@ -424,8 +421,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-imdsv2-cluster-profile - - --target=e2e-aws-imdsv2 + - --secret-dir=/usr/local/e2e-aws-ovn-imdsv2-cluster-profile + - --target=e2e-aws-ovn-imdsv2 command: - ci-operator image: ci-operator:latest @@ -441,7 +438,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-imdsv2-cluster-profile + - mountPath: /usr/local/e2e-aws-ovn-imdsv2-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -475,14 +472,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-imdsv2,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-ovn-imdsv2,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.13$ - ^release-4\.13- - cluster: build05 - context: ci/prow/e2e-aws-proxy + context: ci/prow/e2e-aws-ovn-proxy decorate: true decoration_config: oauth_token_secret: @@ -494,10 +490,10 @@ presubmits: 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.13-e2e-aws-proxy + name: pull-ci-openshift-priv-installer-release-4.13-e2e-aws-ovn-proxy optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-aws-proxy + rerun_command: /test e2e-aws-ovn-proxy run_if_changed: aws spec: containers: @@ -508,8 +504,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-proxy-cluster-profile - - --target=e2e-aws-proxy + - --secret-dir=/usr/local/e2e-aws-ovn-proxy-cluster-profile + - --target=e2e-aws-ovn-proxy command: - ci-operator image: ci-operator:latest @@ -525,7 +521,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-proxy-cluster-profile + - mountPath: /usr/local/e2e-aws-ovn-proxy-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -559,14 +555,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-proxy,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-ovn-proxy,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.13$ - ^release-4\.13- - cluster: build05 - context: ci/prow/e2e-aws-shared-vpc + context: ci/prow/e2e-aws-ovn-shared-vpc decorate: true decoration_config: oauth_token_secret: @@ -578,10 +573,10 @@ presubmits: 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.13-e2e-aws-shared-vpc + name: pull-ci-openshift-priv-installer-release-4.13-e2e-aws-ovn-shared-vpc optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-aws-shared-vpc + rerun_command: /test e2e-aws-ovn-shared-vpc run_if_changed: aws spec: containers: @@ -592,8 +587,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-shared-vpc-cluster-profile - - --target=e2e-aws-shared-vpc + - --secret-dir=/usr/local/e2e-aws-ovn-shared-vpc-cluster-profile + - --target=e2e-aws-ovn-shared-vpc command: - ci-operator image: ci-operator:latest @@ -609,7 +604,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-shared-vpc-cluster-profile + - mountPath: /usr/local/e2e-aws-ovn-shared-vpc-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -643,14 +638,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-shared-vpc,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-ovn-shared-vpc,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.13$ - ^release-4\.13- - cluster: build05 - context: ci/prow/e2e-aws-single-node + context: ci/prow/e2e-aws-ovn-single-node decorate: true decoration_config: oauth_token_secret: @@ -662,10 +656,10 @@ presubmits: 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.13-e2e-aws-single-node + name: pull-ci-openshift-priv-installer-release-4.13-e2e-aws-ovn-single-node optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-aws-single-node + rerun_command: /test e2e-aws-ovn-single-node run_if_changed: aws spec: containers: @@ -676,8 +670,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-single-node-cluster-profile - - --target=e2e-aws-single-node + - --secret-dir=/usr/local/e2e-aws-ovn-single-node-cluster-profile + - --target=e2e-aws-ovn-single-node command: - ci-operator image: ci-operator:latest @@ -693,7 +687,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-single-node-cluster-profile + - mountPath: /usr/local/e2e-aws-ovn-single-node-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -727,14 +721,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-single-node,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-ovn-single-node,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.13$ - ^release-4\.13- - cluster: build05 - context: ci/prow/e2e-aws-upgrade + context: ci/prow/e2e-aws-ovn-upi decorate: true decoration_config: oauth_token_secret: @@ -746,11 +739,10 @@ presubmits: 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.13-e2e-aws-upgrade - optional: true + name: pull-ci-openshift-priv-installer-release-4.13-e2e-aws-ovn-upi path_alias: github.com/openshift/installer - rerun_command: /test e2e-aws-upgrade - skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|pkg/.*|terraform/providers)/(alibabacloud|azure|baremetal|gcp|ibmcloud|libvirt|nutanix|openstack|ovirt|powervs|vsphere)/) + rerun_command: /test e2e-aws-ovn-upi + run_if_changed: ^(upi/aws/.*)|^(images/installer/Dockerfile\.upi.*) spec: containers: - args: @@ -760,8 +752,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile - - --target=e2e-aws-upgrade + - --secret-dir=/usr/local/e2e-aws-ovn-upi-cluster-profile + - --target=e2e-aws-ovn-upi command: - ci-operator image: ci-operator:latest @@ -777,7 +769,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile + - mountPath: /usr/local/e2e-aws-ovn-upi-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -811,14 +803,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-upgrade,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-ovn-upi,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.13$ - ^release-4\.13- cluster: build05 - context: ci/prow/e2e-aws-upi + context: ci/prow/e2e-aws-upgrade decorate: true decoration_config: oauth_token_secret: @@ -830,10 +822,11 @@ presubmits: 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.13-e2e-aws-upi + name: pull-ci-openshift-priv-installer-release-4.13-e2e-aws-upgrade + optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-aws-upi - run_if_changed: ^(upi/aws/.*)|^(images/installer/Dockerfile\.upi.*) + rerun_command: /test e2e-aws-upgrade + skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|pkg/.*|terraform/providers)/(alibabacloud|azure|baremetal|gcp|ibmcloud|libvirt|nutanix|openstack|ovirt|powervs|vsphere)/) spec: containers: - args: @@ -843,8 +836,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-upi-cluster-profile - - --target=e2e-aws-upi + - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile + - --target=e2e-aws-upgrade command: - ci-operator image: ci-operator:latest @@ -860,7 +853,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-upi-cluster-profile + - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -894,7 +887,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-upi,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-upgrade,?($|\s.*) - agent: kubernetes always_run: true branches: @@ -1067,8 +1060,7 @@ presubmits: branches: - ^release-4\.13$ - ^release-4\.13- - cluster: build01 - context: ci/prow/e2e-azure + context: ci/prow/e2e-azure-ovn decorate: true decoration_config: oauth_token_secret: @@ -1080,9 +1072,9 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: azure4 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-installer-release-4.13-e2e-azure + name: pull-ci-openshift-priv-installer-release-4.13-e2e-azure-ovn path_alias: github.com/openshift/installer - rerun_command: /test e2e-azure + rerun_command: /test e2e-azure-ovn skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|images|pkg/.*|terraform/providers)/(alibabacloud|aws|baremetal|gcp|ibmcloud|libvirt|nutanix|openstack|ovirt|powervs|vsphere)/) spec: containers: @@ -1093,8 +1085,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-azure-cluster-profile - - --target=e2e-azure + - --secret-dir=/usr/local/e2e-azure-ovn-cluster-profile + - --target=e2e-azure-ovn command: - ci-operator image: ci-operator:latest @@ -1110,7 +1102,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-azure-cluster-profile + - mountPath: /usr/local/e2e-azure-ovn-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -1144,14 +1136,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-azure-ovn,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.13$ - ^release-4\.13- - cluster: build01 - context: ci/prow/e2e-azure-resourcegroup + context: ci/prow/e2e-azure-ovn-resourcegroup decorate: true decoration_config: oauth_token_secret: @@ -1163,10 +1154,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: azure4 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-installer-release-4.13-e2e-azure-resourcegroup + name: pull-ci-openshift-priv-installer-release-4.13-e2e-azure-ovn-resourcegroup optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-azure-resourcegroup + rerun_command: /test e2e-azure-ovn-resourcegroup run_if_changed: azure spec: containers: @@ -1177,8 +1168,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-azure-resourcegroup-cluster-profile - - --target=e2e-azure-resourcegroup + - --secret-dir=/usr/local/e2e-azure-ovn-resourcegroup-cluster-profile + - --target=e2e-azure-ovn-resourcegroup command: - ci-operator image: ci-operator:latest @@ -1194,7 +1185,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-azure-resourcegroup-cluster-profile + - mountPath: /usr/local/e2e-azure-ovn-resourcegroup-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -1228,14 +1219,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-azure-resourcegroup,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-azure-ovn-resourcegroup,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.13$ - ^release-4\.13- - cluster: build01 - context: ci/prow/e2e-azure-shared-vpc + context: ci/prow/e2e-azure-ovn-shared-vpc decorate: true decoration_config: oauth_token_secret: @@ -1247,10 +1237,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: azure4 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-installer-release-4.13-e2e-azure-shared-vpc + name: pull-ci-openshift-priv-installer-release-4.13-e2e-azure-ovn-shared-vpc optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-azure-shared-vpc + rerun_command: /test e2e-azure-ovn-shared-vpc run_if_changed: azure spec: containers: @@ -1261,8 +1251,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-azure-shared-vpc-cluster-profile - - --target=e2e-azure-shared-vpc + - --secret-dir=/usr/local/e2e-azure-ovn-shared-vpc-cluster-profile + - --target=e2e-azure-ovn-shared-vpc command: - ci-operator image: ci-operator:latest @@ -1278,7 +1268,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-azure-shared-vpc-cluster-profile + - mountPath: /usr/local/e2e-azure-ovn-shared-vpc-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -1312,14 +1302,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-azure-shared-vpc,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-azure-ovn-shared-vpc,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.13$ - ^release-4\.13- - cluster: build01 - context: ci/prow/e2e-azure-upi + context: ci/prow/e2e-azure-ovn-upi decorate: true decoration_config: oauth_token_secret: @@ -1331,9 +1320,9 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: azure4 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-installer-release-4.13-e2e-azure-upi + name: pull-ci-openshift-priv-installer-release-4.13-e2e-azure-ovn-upi path_alias: github.com/openshift/installer - rerun_command: /test e2e-azure-upi + rerun_command: /test e2e-azure-ovn-upi run_if_changed: ^(upi/(azure|azurestack)/.*)|^(images/installer/Dockerfile\.upi.*) spec: containers: @@ -1344,8 +1333,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-azure-upi-cluster-profile - - --target=e2e-azure-upi + - --secret-dir=/usr/local/e2e-azure-ovn-upi-cluster-profile + - --target=e2e-azure-ovn-upi command: - ci-operator image: ci-operator:latest @@ -1361,7 +1350,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-azure-upi-cluster-profile + - mountPath: /usr/local/e2e-azure-ovn-upi-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -1395,7 +1384,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-azure-upi,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-azure-ovn-upi,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -1657,8 +1646,7 @@ presubmits: branches: - ^release-4\.13$ - ^release-4\.13- - cluster: build04 - context: ci/prow/e2e-gcp + context: ci/prow/e2e-gcp-ovn decorate: true decoration_config: oauth_token_secret: @@ -1670,9 +1658,9 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: gcp ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-installer-release-4.13-e2e-gcp + name: pull-ci-openshift-priv-installer-release-4.13-e2e-gcp-ovn path_alias: github.com/openshift/installer - rerun_command: /test e2e-gcp + rerun_command: /test e2e-gcp-ovn skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|images|pkg/.*|terraform/providers)/(alibabacloud|aws|azure|azurestack|baremetal|ibmcloud|libvirt|nutanix|openstack|ovirt|powervs|vsphere)/) spec: containers: @@ -1683,8 +1671,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-gcp-cluster-profile - - --target=e2e-gcp + - --secret-dir=/usr/local/e2e-gcp-ovn-cluster-profile + - --target=e2e-gcp-ovn command: - ci-operator image: ci-operator:latest @@ -1700,7 +1688,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-gcp-cluster-profile + - mountPath: /usr/local/e2e-gcp-ovn-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -1738,14 +1726,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp-ovn,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.13$ - ^release-4\.13- - cluster: build04 - context: ci/prow/e2e-gcp-shared-vpc + context: ci/prow/e2e-gcp-ovn-shared-vpc decorate: true decoration_config: oauth_token_secret: @@ -1757,10 +1744,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: gcp ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-installer-release-4.13-e2e-gcp-shared-vpc + name: pull-ci-openshift-priv-installer-release-4.13-e2e-gcp-ovn-shared-vpc optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-gcp-shared-vpc + rerun_command: /test e2e-gcp-ovn-shared-vpc run_if_changed: gcp spec: containers: @@ -1771,8 +1758,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-gcp-shared-vpc-cluster-profile - - --target=e2e-gcp-shared-vpc + - --secret-dir=/usr/local/e2e-gcp-ovn-shared-vpc-cluster-profile + - --target=e2e-gcp-ovn-shared-vpc command: - ci-operator image: ci-operator:latest @@ -1788,7 +1775,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-gcp-shared-vpc-cluster-profile + - mountPath: /usr/local/e2e-gcp-ovn-shared-vpc-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -1826,14 +1813,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-gcp-shared-vpc,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp-ovn-shared-vpc,?($|\s.*) - agent: kubernetes - always_run: true + always_run: false branches: - ^release-4\.13$ - ^release-4\.13- - cluster: build04 - context: ci/prow/e2e-gcp-upgrade + context: ci/prow/e2e-gcp-ovn-upi decorate: true decoration_config: oauth_token_secret: @@ -1845,10 +1831,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: gcp ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-installer-release-4.13-e2e-gcp-upgrade - optional: true + name: pull-ci-openshift-priv-installer-release-4.13-e2e-gcp-ovn-upi path_alias: github.com/openshift/installer - rerun_command: /test e2e-gcp-upgrade + rerun_command: /test e2e-gcp-ovn-upi + run_if_changed: ^(upi/gcp/.*)|^(images/installer/Dockerfile\.upi.*) spec: containers: - args: @@ -1858,8 +1844,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-gcp-upgrade-cluster-profile - - --target=e2e-gcp-upgrade + - --secret-dir=/usr/local/e2e-gcp-ovn-upi-cluster-profile + - --target=e2e-gcp-ovn-upi command: - ci-operator image: ci-operator:latest @@ -1875,7 +1861,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile + - mountPath: /usr/local/e2e-gcp-ovn-upi-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -1913,14 +1899,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp-ovn-upi,?($|\s.*) - agent: kubernetes - always_run: false + always_run: true branches: - ^release-4\.13$ - ^release-4\.13- cluster: build04 - context: ci/prow/e2e-gcp-upi + context: ci/prow/e2e-gcp-upgrade decorate: true decoration_config: oauth_token_secret: @@ -1932,10 +1918,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: gcp ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-installer-release-4.13-e2e-gcp-upi + name: pull-ci-openshift-priv-installer-release-4.13-e2e-gcp-upgrade + optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-gcp-upi - run_if_changed: ^(upi/gcp/.*)|^(images/installer/Dockerfile\.upi.*) + rerun_command: /test e2e-gcp-upgrade spec: containers: - args: @@ -1945,8 +1931,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-gcp-upi-cluster-profile - - --target=e2e-gcp-upi + - --secret-dir=/usr/local/e2e-gcp-upgrade-cluster-profile + - --target=e2e-gcp-upgrade command: - ci-operator image: ci-operator:latest @@ -1962,7 +1948,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-gcp-upi-cluster-profile + - mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -2000,7 +1986,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-gcp-upi,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -2094,8 +2080,7 @@ presubmits: branches: - ^release-4\.13$ - ^release-4\.13- - cluster: build01 - context: ci/prow/e2e-ibmcloud + context: ci/prow/e2e-ibmcloud-ovn decorate: true decoration_config: oauth_token_secret: @@ -2107,10 +2092,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: ibmcloud ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-installer-release-4.13-e2e-ibmcloud + name: pull-ci-openshift-priv-installer-release-4.13-e2e-ibmcloud-ovn optional: true path_alias: github.com/openshift/installer - rerun_command: /test e2e-ibmcloud + rerun_command: /test e2e-ibmcloud-ovn skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|images|pkg/.*|terraform/providers)/(alibabacloud|aws|azure|azurestack|baremetal|gcp|libvirt|nutanix|openstack|ovirt|powervs|vsphere)/) spec: containers: @@ -2121,8 +2106,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-ibmcloud-cluster-profile - - --target=e2e-ibmcloud + - --secret-dir=/usr/local/e2e-ibmcloud-ovn-cluster-profile + - --target=e2e-ibmcloud-ovn command: - ci-operator image: ci-operator:latest @@ -2138,7 +2123,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-ibmcloud-cluster-profile + - mountPath: /usr/local/e2e-ibmcloud-ovn-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -2172,7 +2157,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-ibmcloud,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-ibmcloud-ovn,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -3445,8 +3430,7 @@ presubmits: branches: - ^release-4\.13$ - ^release-4\.13- - cluster: vsphere - context: ci/prow/e2e-vsphere + context: ci/prow/e2e-vsphere-ovn decorate: true decoration_config: oauth_token_secret: @@ -3458,9 +3442,9 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: vsphere ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-installer-release-4.13-e2e-vsphere + name: pull-ci-openshift-priv-installer-release-4.13-e2e-vsphere-ovn path_alias: github.com/openshift/installer - rerun_command: /test e2e-vsphere + rerun_command: /test e2e-vsphere-ovn skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|images|pkg/.*|terraform/providers)/(alibabacloud|aws|azure|azurestack|baremetal|gcp|ibmcloud|libvirt|nutanix|openstack|ovirt|powervs)/) spec: containers: @@ -3471,8 +3455,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-vsphere-cluster-profile - - --target=e2e-vsphere + - --secret-dir=/usr/local/e2e-vsphere-ovn-cluster-profile + - --target=e2e-vsphere-ovn command: - ci-operator image: ci-operator:latest @@ -3488,7 +3472,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-vsphere-cluster-profile + - mountPath: /usr/local/e2e-vsphere-ovn-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -3522,7 +3506,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-vsphere,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-vsphere-ovn,?($|\s.*) - agent: kubernetes always_run: false branches: From 81f1c62da6ff5ab82f307590067d14b95a696048 Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Tue, 13 Sep 2022 12:02:17 +0000 Subject: [PATCH 5/6] sanitize-prow-jobs --prow-jobs-dir ./ci-operator/jobs --config-path ./core-services/sanitize-prow-jobs/_config.yaml --- ...tore-csi-driver-operator-main-presubmits.yaml | 1 + ...-driver-operator-release-4.12-presubmits.yaml | 1 + ...-driver-operator-release-4.13-presubmits.yaml | 1 + ...enshift-priv-installer-master-presubmits.yaml | 16 ++++++++++++++++ ...t-priv-installer-release-4.12-presubmits.yaml | 16 ++++++++++++++++ ...t-priv-installer-release-4.13-presubmits.yaml | 16 ++++++++++++++++ 6 files changed, 51 insertions(+) diff --git a/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-main-presubmits.yaml b/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-main-presubmits.yaml index b852f639f90aa..031920064d528 100644 --- a/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-main-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-main-presubmits.yaml @@ -206,6 +206,7 @@ presubmits: branches: - ^main$ - ^main- + cluster: build01 context: ci/prow/unit decorate: true decoration_config: diff --git a/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.12-presubmits.yaml index 4b813a433204e..c7086999bb1b3 100644 --- a/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.12-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.12-presubmits.yaml @@ -206,6 +206,7 @@ presubmits: branches: - ^release-4\.12$ - ^release-4\.12- + cluster: build01 context: ci/prow/unit decorate: true decoration_config: diff --git a/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.13-presubmits.yaml index b379695f059c1..62191eca4ca72 100644 --- a/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.13-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/gcp-filestore-csi-driver-operator/openshift-priv-gcp-filestore-csi-driver-operator-release-4.13-presubmits.yaml @@ -206,6 +206,7 @@ presubmits: branches: - ^release-4\.13$ - ^release-4\.13- + cluster: build01 context: ci/prow/unit decorate: true decoration_config: diff --git a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-master-presubmits.yaml index e576878d16efc..18ca7321f0174 100644 --- a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-master-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-master-presubmits.yaml @@ -230,6 +230,7 @@ presubmits: branches: - ^master$ - ^master- + cluster: build05 context: ci/prow/e2e-aws-ovn decorate: true decoration_config: @@ -312,6 +313,7 @@ presubmits: branches: - ^master$ - ^master- + cluster: build05 context: ci/prow/e2e-aws-ovn-fips decorate: true decoration_config: @@ -395,6 +397,7 @@ presubmits: branches: - ^master$ - ^master- + cluster: build05 context: ci/prow/e2e-aws-ovn-imdsv2 decorate: true decoration_config: @@ -478,6 +481,7 @@ presubmits: branches: - ^master$ - ^master- + cluster: build05 context: ci/prow/e2e-aws-ovn-proxy decorate: true decoration_config: @@ -561,6 +565,7 @@ presubmits: branches: - ^master$ - ^master- + cluster: build05 context: ci/prow/e2e-aws-ovn-shared-vpc decorate: true decoration_config: @@ -644,6 +649,7 @@ presubmits: branches: - ^master$ - ^master- + cluster: build05 context: ci/prow/e2e-aws-ovn-single-node decorate: true decoration_config: @@ -727,6 +733,7 @@ presubmits: branches: - ^master$ - ^master- + cluster: build05 context: ci/prow/e2e-aws-ovn-upi decorate: true decoration_config: @@ -1060,6 +1067,7 @@ presubmits: branches: - ^master$ - ^master- + cluster: build01 context: ci/prow/e2e-azure-ovn decorate: true decoration_config: @@ -1142,6 +1150,7 @@ presubmits: branches: - ^master$ - ^master- + cluster: build01 context: ci/prow/e2e-azure-ovn-resourcegroup decorate: true decoration_config: @@ -1225,6 +1234,7 @@ presubmits: branches: - ^master$ - ^master- + cluster: build01 context: ci/prow/e2e-azure-ovn-shared-vpc decorate: true decoration_config: @@ -1308,6 +1318,7 @@ presubmits: branches: - ^master$ - ^master- + cluster: build01 context: ci/prow/e2e-azure-ovn-upi decorate: true decoration_config: @@ -1646,6 +1657,7 @@ presubmits: branches: - ^master$ - ^master- + cluster: build04 context: ci/prow/e2e-gcp-ovn decorate: true decoration_config: @@ -1732,6 +1744,7 @@ presubmits: branches: - ^master$ - ^master- + cluster: build04 context: ci/prow/e2e-gcp-ovn-shared-vpc decorate: true decoration_config: @@ -1819,6 +1832,7 @@ presubmits: branches: - ^master$ - ^master- + cluster: build04 context: ci/prow/e2e-gcp-ovn-upi decorate: true decoration_config: @@ -2080,6 +2094,7 @@ presubmits: branches: - ^master$ - ^master- + cluster: build01 context: ci/prow/e2e-ibmcloud-ovn decorate: true decoration_config: @@ -3430,6 +3445,7 @@ presubmits: branches: - ^master$ - ^master- + cluster: vsphere context: ci/prow/e2e-vsphere-ovn decorate: true decoration_config: diff --git a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.12-presubmits.yaml index fcbe444da5e37..95a6f6605e021 100644 --- a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.12-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.12-presubmits.yaml @@ -230,6 +230,7 @@ presubmits: branches: - ^release-4\.12$ - ^release-4\.12- + cluster: build05 context: ci/prow/e2e-aws-ovn decorate: true decoration_config: @@ -312,6 +313,7 @@ presubmits: branches: - ^release-4\.12$ - ^release-4\.12- + cluster: build05 context: ci/prow/e2e-aws-ovn-fips decorate: true decoration_config: @@ -395,6 +397,7 @@ presubmits: branches: - ^release-4\.12$ - ^release-4\.12- + cluster: build05 context: ci/prow/e2e-aws-ovn-imdsv2 decorate: true decoration_config: @@ -478,6 +481,7 @@ presubmits: branches: - ^release-4\.12$ - ^release-4\.12- + cluster: build05 context: ci/prow/e2e-aws-ovn-proxy decorate: true decoration_config: @@ -561,6 +565,7 @@ presubmits: branches: - ^release-4\.12$ - ^release-4\.12- + cluster: build05 context: ci/prow/e2e-aws-ovn-shared-vpc decorate: true decoration_config: @@ -644,6 +649,7 @@ presubmits: branches: - ^release-4\.12$ - ^release-4\.12- + cluster: build05 context: ci/prow/e2e-aws-ovn-single-node decorate: true decoration_config: @@ -727,6 +733,7 @@ presubmits: branches: - ^release-4\.12$ - ^release-4\.12- + cluster: build05 context: ci/prow/e2e-aws-ovn-upi decorate: true decoration_config: @@ -1060,6 +1067,7 @@ presubmits: branches: - ^release-4\.12$ - ^release-4\.12- + cluster: build01 context: ci/prow/e2e-azure-ovn decorate: true decoration_config: @@ -1142,6 +1150,7 @@ presubmits: branches: - ^release-4\.12$ - ^release-4\.12- + cluster: build01 context: ci/prow/e2e-azure-ovn-resourcegroup decorate: true decoration_config: @@ -1225,6 +1234,7 @@ presubmits: branches: - ^release-4\.12$ - ^release-4\.12- + cluster: build01 context: ci/prow/e2e-azure-ovn-shared-vpc decorate: true decoration_config: @@ -1308,6 +1318,7 @@ presubmits: branches: - ^release-4\.12$ - ^release-4\.12- + cluster: build01 context: ci/prow/e2e-azure-ovn-upi decorate: true decoration_config: @@ -1646,6 +1657,7 @@ presubmits: branches: - ^release-4\.12$ - ^release-4\.12- + cluster: build04 context: ci/prow/e2e-gcp-ovn decorate: true decoration_config: @@ -1732,6 +1744,7 @@ presubmits: branches: - ^release-4\.12$ - ^release-4\.12- + cluster: build04 context: ci/prow/e2e-gcp-ovn-shared-vpc decorate: true decoration_config: @@ -1819,6 +1832,7 @@ presubmits: branches: - ^release-4\.12$ - ^release-4\.12- + cluster: build04 context: ci/prow/e2e-gcp-ovn-upi decorate: true decoration_config: @@ -2080,6 +2094,7 @@ presubmits: branches: - ^release-4\.12$ - ^release-4\.12- + cluster: build01 context: ci/prow/e2e-ibmcloud-ovn decorate: true decoration_config: @@ -3430,6 +3445,7 @@ presubmits: branches: - ^release-4\.12$ - ^release-4\.12- + cluster: vsphere context: ci/prow/e2e-vsphere-ovn decorate: true decoration_config: diff --git a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.13-presubmits.yaml index b04754dd4cce9..319207a56c879 100644 --- a/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.13-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/installer/openshift-priv-installer-release-4.13-presubmits.yaml @@ -230,6 +230,7 @@ presubmits: branches: - ^release-4\.13$ - ^release-4\.13- + cluster: build05 context: ci/prow/e2e-aws-ovn decorate: true decoration_config: @@ -312,6 +313,7 @@ presubmits: branches: - ^release-4\.13$ - ^release-4\.13- + cluster: build05 context: ci/prow/e2e-aws-ovn-fips decorate: true decoration_config: @@ -395,6 +397,7 @@ presubmits: branches: - ^release-4\.13$ - ^release-4\.13- + cluster: build05 context: ci/prow/e2e-aws-ovn-imdsv2 decorate: true decoration_config: @@ -478,6 +481,7 @@ presubmits: branches: - ^release-4\.13$ - ^release-4\.13- + cluster: build05 context: ci/prow/e2e-aws-ovn-proxy decorate: true decoration_config: @@ -561,6 +565,7 @@ presubmits: branches: - ^release-4\.13$ - ^release-4\.13- + cluster: build05 context: ci/prow/e2e-aws-ovn-shared-vpc decorate: true decoration_config: @@ -644,6 +649,7 @@ presubmits: branches: - ^release-4\.13$ - ^release-4\.13- + cluster: build05 context: ci/prow/e2e-aws-ovn-single-node decorate: true decoration_config: @@ -727,6 +733,7 @@ presubmits: branches: - ^release-4\.13$ - ^release-4\.13- + cluster: build05 context: ci/prow/e2e-aws-ovn-upi decorate: true decoration_config: @@ -1060,6 +1067,7 @@ presubmits: branches: - ^release-4\.13$ - ^release-4\.13- + cluster: build01 context: ci/prow/e2e-azure-ovn decorate: true decoration_config: @@ -1142,6 +1150,7 @@ presubmits: branches: - ^release-4\.13$ - ^release-4\.13- + cluster: build01 context: ci/prow/e2e-azure-ovn-resourcegroup decorate: true decoration_config: @@ -1225,6 +1234,7 @@ presubmits: branches: - ^release-4\.13$ - ^release-4\.13- + cluster: build01 context: ci/prow/e2e-azure-ovn-shared-vpc decorate: true decoration_config: @@ -1308,6 +1318,7 @@ presubmits: branches: - ^release-4\.13$ - ^release-4\.13- + cluster: build01 context: ci/prow/e2e-azure-ovn-upi decorate: true decoration_config: @@ -1646,6 +1657,7 @@ presubmits: branches: - ^release-4\.13$ - ^release-4\.13- + cluster: build04 context: ci/prow/e2e-gcp-ovn decorate: true decoration_config: @@ -1732,6 +1744,7 @@ presubmits: branches: - ^release-4\.13$ - ^release-4\.13- + cluster: build04 context: ci/prow/e2e-gcp-ovn-shared-vpc decorate: true decoration_config: @@ -1819,6 +1832,7 @@ presubmits: branches: - ^release-4\.13$ - ^release-4\.13- + cluster: build04 context: ci/prow/e2e-gcp-ovn-upi decorate: true decoration_config: @@ -2080,6 +2094,7 @@ presubmits: branches: - ^release-4\.13$ - ^release-4\.13- + cluster: build01 context: ci/prow/e2e-ibmcloud-ovn decorate: true decoration_config: @@ -3430,6 +3445,7 @@ presubmits: branches: - ^release-4\.13$ - ^release-4\.13- + cluster: vsphere context: ci/prow/e2e-vsphere-ovn decorate: true decoration_config: From 4b71ac5987bd978a2bf347d76cc6de3a20661635 Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Tue, 13 Sep 2022 12:02:32 +0000 Subject: [PATCH 6/6] clusterimageset-updater --pools ./clusters/hive/pools --imagesets ./clusters/hive/pools --- .../openstack-k8s-operators-4-10-vexxhost-sno_clusterpool.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/clusters/hive/pools/openstack-k8s-operators/openstack-k8s-operators-4-10-vexxhost-sno_clusterpool.yaml b/clusters/hive/pools/openstack-k8s-operators/openstack-k8s-operators-4-10-vexxhost-sno_clusterpool.yaml index 6e290d9f04cdc..57d7fc3c2f685 100644 --- a/clusters/hive/pools/openstack-k8s-operators/openstack-k8s-operators-4-10-vexxhost-sno_clusterpool.yaml +++ b/clusters/hive/pools/openstack-k8s-operators/openstack-k8s-operators-4-10-vexxhost-sno_clusterpool.yaml @@ -20,8 +20,6 @@ spec: installAttemptsLimit: 1 installConfigSecretTemplateRef: name: install-config-sno - inventory: - - name: openstack-k8s-operators-cdc-vexx-01 maxConcurrent: 1 maxSize: 1 platform: