From f9899e137ce6b4e8c5653e04a6504a2b91c0f7e2 Mon Sep 17 00:00:00 2001 From: Michal Pryc Date: Wed, 12 Jun 2024 20:31:35 +0200 Subject: [PATCH 1/2] Rework of CI files for oadp 1.3, 1.4 and master The rework includes: - Small src fix for use of OCP 4.12 and 4.14 on Branch 1.0 - Removal of branch 1.1 and 1.2 of oadp-operator - Addition of OCP 4.15 on branch 1.3 - Move branch 1.4 to OCP 4.14, 4.15 and 4.16 - Move branch master to OCP 4.14, 4.15 and 4.16 - Removal of src from builder where needed - Addition of virt jobs to relevant branches - Removal of gcp jobs - Removal of azure jobs Signed-off-by: Michal Pryc --- .../openshift-oadp-operator-master.yaml | 1 - .../openshift-oadp-operator-master__4.14.yaml | 100 --- ...openshift-oadp-operator-master__4.15.yaml} | 90 +-- ...openshift-oadp-operator-master__4.16.yaml} | 92 +-- .../openshift-oadp-operator-oadp-1.0.yaml | 1 - .../openshift-oadp-operator-oadp-1.3.yaml | 1 - ...penshift-oadp-operator-oadp-1.3__4.12.yaml | 104 +-- ...penshift-oadp-operator-oadp-1.3__4.13.yaml | 104 +-- ...penshift-oadp-operator-oadp-1.3__4.14.yaml | 102 --- ...penshift-oadp-operator-oadp-1.3__4.15.yaml | 85 +++ .../openshift-oadp-operator-oadp-1.4.yaml | 1 - ...penshift-oadp-operator-oadp-1.4__4.13.yaml | 185 ----- ...penshift-oadp-operator-oadp-1.4__4.14.yaml | 84 +-- ...enshift-oadp-operator-oadp-1.4__4.15.yaml} | 88 +-- ...nshift-oadp-operator-master-periodics.yaml | 512 +------------- ...shift-oadp-operator-master-presubmits.yaml | 514 +++----------- ...hift-oadp-operator-oadp-1.3-periodics.yaml | 432 +----------- ...ift-oadp-operator-oadp-1.3-presubmits.yaml | 469 +++---------- ...hift-oadp-operator-oadp-1.4-periodics.yaml | 584 +--------------- ...ift-oadp-operator-oadp-1.4-presubmits.yaml | 653 ++---------------- 20 files changed, 370 insertions(+), 3832 deletions(-) rename ci-operator/config/openshift/oadp-operator/{openshift-oadp-operator-master__4.12.yaml => openshift-oadp-operator-master__4.15.yaml} (54%) rename ci-operator/config/openshift/oadp-operator/{openshift-oadp-operator-master__4.13.yaml => openshift-oadp-operator-master__4.16.yaml} (54%) create mode 100644 ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.15.yaml delete mode 100644 ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4__4.13.yaml rename ci-operator/config/openshift/oadp-operator/{openshift-oadp-operator-oadp-1.4__4.12.yaml => openshift-oadp-operator-oadp-1.4__4.15.yaml} (54%) diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master.yaml index 3783a488cbc36..f79efe049e6eb 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master.yaml @@ -5,7 +5,6 @@ build_root: tag: ubi9-v1.22.2 images: - dockerfile_path: Dockerfile - from: src to: oadp-operator promotion: to: diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master__4.14.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master__4.14.yaml index d18a4837a1e8e..e7458ba50131f 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master__4.14.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master__4.14.yaml @@ -53,56 +53,6 @@ tests: cpu: 1000m memory: 512Mi workflow: optional-operators-ci-aws -- always_run: false - as: e2e-test-azure - steps: - cluster_profile: azure4 - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-azure -- always_run: false - as: e2e-test-gcp - steps: - cluster_profile: gcp - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-gcp - as: e2e-test-aws-periodic cron: 0 4 * * * steps: @@ -128,56 +78,6 @@ tests: cpu: 1000m memory: 512Mi workflow: optional-operators-ci-aws -- as: e2e-test-gcp-periodic - cron: 0 4 * * * - steps: - cluster_profile: gcp - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-gcp -- as: e2e-test-azure-periodic - cron: 0 4 * * * - steps: - cluster_profile: azure4 - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-azure - always_run: false as: e2e-test-kubevirt-aws run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+ diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master__4.12.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master__4.15.yaml similarity index 54% rename from ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master__4.12.yaml rename to ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master__4.15.yaml index 5920d468f7b68..77960046c6429 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master__4.12.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master__4.15.yaml @@ -18,7 +18,7 @@ releases: latest: release: channel: fast - version: "4.12" + version: "4.15" resources: '*': limits: @@ -53,56 +53,6 @@ tests: cpu: 1000m memory: 512Mi workflow: optional-operators-ci-aws -- always_run: false - as: e2e-test-azure - steps: - cluster_profile: azure4 - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-azure -- always_run: false - as: e2e-test-gcp - steps: - cluster_profile: gcp - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-gcp - as: e2e-test-aws-periodic cron: 0 4 * * * steps: @@ -128,35 +78,11 @@ tests: cpu: 1000m memory: 512Mi workflow: optional-operators-ci-aws -- as: e2e-test-gcp-periodic - cron: 0 4 * * * - steps: - cluster_profile: gcp-3 - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-gcp -- as: e2e-test-azure-periodic - cron: 0 4 * * * +- always_run: false + as: e2e-test-kubevirt-aws + run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+ steps: - cluster_profile: azure4 + cluster_profile: aws dependencies: OO_INDEX: ci-index env: @@ -167,7 +93,7 @@ tests: test: - as: e2e cli: latest - commands: make test-e2e + commands: make TEST_VIRT=true test-e2e credentials: - mount_path: /var/run/oadp-credentials name: oadp-credentials @@ -177,9 +103,9 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-azure + workflow: optional-operators-ci-aws zz_generated_metadata: branch: master org: openshift repo: oadp-operator - variant: "4.12" + variant: "4.15" diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master__4.13.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master__4.16.yaml similarity index 54% rename from ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master__4.13.yaml rename to ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master__4.16.yaml index 8f4419cef25ca..4dd5250df2469 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master__4.13.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master__4.16.yaml @@ -18,7 +18,7 @@ releases: latest: release: channel: fast - version: "4.13" + version: "4.16" resources: '*': limits: @@ -53,58 +53,8 @@ tests: cpu: 1000m memory: 512Mi workflow: optional-operators-ci-aws -- always_run: false - as: e2e-test-azure - steps: - cluster_profile: azure4 - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-azure -- always_run: false - as: e2e-test-gcp - steps: - cluster_profile: gcp - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-gcp - as: e2e-test-aws-periodic - cron: 53 22 * * 0 + cron: 0 4 * * * steps: cluster_profile: aws dependencies: @@ -128,35 +78,11 @@ tests: cpu: 1000m memory: 512Mi workflow: optional-operators-ci-aws -- as: e2e-test-gcp-periodic - cron: 41 22 * * 6 - steps: - cluster_profile: gcp - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-gcp -- as: e2e-test-azure-periodic - cron: 15 17 * * 6 +- always_run: false + as: e2e-test-kubevirt-aws + run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+ steps: - cluster_profile: azure4 + cluster_profile: aws dependencies: OO_INDEX: ci-index env: @@ -167,7 +93,7 @@ tests: test: - as: e2e cli: latest - commands: make test-e2e + commands: make TEST_VIRT=true test-e2e credentials: - mount_path: /var/run/oadp-credentials name: oadp-credentials @@ -177,9 +103,9 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-azure + workflow: optional-operators-ci-aws zz_generated_metadata: branch: master org: openshift repo: oadp-operator - variant: "4.13" + variant: "4.16" diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0.yaml index 7da2f32f0eca8..8c28869b54c51 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0.yaml @@ -5,7 +5,6 @@ build_root: tag: rhel-8-golang-1.21-openshift-4.16 images: - dockerfile_path: Dockerfile - from: src to: oadp-operator-1.0 promotion: to: diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3.yaml index 702cfb698214a..adbe67d499fc1 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3.yaml @@ -5,7 +5,6 @@ build_root: tag: rhel-8-golang-1.20-openshift-4.14 images: - dockerfile_path: Dockerfile - from: src to: oadp-operator-1.3 promotion: to: diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.12.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.12.yaml index 22f312c06ee3d..f8e569c1f4b4c 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.12.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.12.yaml @@ -2,13 +2,11 @@ build_root: image_stream_tag: name: builder namespace: ocp - tag: rhel-8-golang-1.20-openshift-4.14 + tag: rhel-8-golang-1.19-openshift-4.12 images: - dockerfile_path: Dockerfile - from: src to: oadp-operator-1.3 - dockerfile_path: build/ci-Dockerfile - from: src to: test-oadp-operator-1.3 operator: bundles: @@ -55,56 +53,6 @@ tests: cpu: 1000m memory: 512Mi workflow: optional-operators-ci-aws -- always_run: false - as: e2e-test-azure - steps: - cluster_profile: azure4 - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable-1.3 - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator-1.3 - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-azure -- always_run: false - as: e2e-test-gcp - steps: - cluster_profile: gcp - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable-1.3 - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator-1.3 - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-gcp - as: e2e-test-aws-periodic cron: 0 4 * * * steps: @@ -130,56 +78,6 @@ tests: cpu: 1000m memory: 512Mi workflow: optional-operators-ci-aws -- as: e2e-test-gcp-periodic - cron: 0 4 * * * - steps: - cluster_profile: gcp - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable-1.3 - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator-1.3 - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-gcp -- as: e2e-test-azure-periodic - cron: 0 4 * * * - steps: - cluster_profile: azure4 - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable-1.3 - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator-1.3 - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-azure zz_generated_metadata: branch: oadp-1.3 org: openshift diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.13.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.13.yaml index a15f49f8059ec..791c334f4d4f0 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.13.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.13.yaml @@ -2,13 +2,11 @@ build_root: image_stream_tag: name: builder namespace: ocp - tag: rhel-8-golang-1.20-openshift-4.14 + tag: rhel-8-golang-1.19-openshift-4.13 images: - dockerfile_path: Dockerfile - from: src to: oadp-operator-1.3 - dockerfile_path: build/ci-Dockerfile - from: src to: test-oadp-operator-1.3 operator: bundles: @@ -55,56 +53,6 @@ tests: cpu: 1000m memory: 512Mi workflow: optional-operators-ci-aws -- always_run: false - as: e2e-test-azure - steps: - cluster_profile: azure4 - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable-1.3 - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator-1.3 - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-azure -- always_run: false - as: e2e-test-gcp - steps: - cluster_profile: gcp - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable-1.3 - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator-1.3 - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-gcp - as: e2e-test-aws-periodic cron: 7 15 * * 0 steps: @@ -130,56 +78,6 @@ tests: cpu: 1000m memory: 512Mi workflow: optional-operators-ci-aws -- as: e2e-test-gcp-periodic - cron: 25 15 * * 0 - steps: - cluster_profile: gcp - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable-1.3 - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator-1.3 - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-gcp -- as: e2e-test-azure-periodic - cron: 43 17 * * 6 - steps: - cluster_profile: azure4 - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable-1.3 - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator-1.3 - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-azure zz_generated_metadata: branch: oadp-1.3 org: openshift diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.14.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.14.yaml index 97e5457acca6a..29fa3ccbfbb05 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.14.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.14.yaml @@ -5,10 +5,8 @@ build_root: tag: rhel-8-golang-1.20-openshift-4.14 images: - dockerfile_path: Dockerfile - from: src to: oadp-operator-1.3 - dockerfile_path: build/ci-Dockerfile - from: src to: test-oadp-operator-1.3 operator: bundles: @@ -55,56 +53,6 @@ tests: cpu: 1000m memory: 512Mi workflow: optional-operators-ci-aws -- always_run: false - as: e2e-test-azure - steps: - cluster_profile: azure4 - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable-1.3 - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator-1.3 - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-azure -- always_run: false - as: e2e-test-gcp - steps: - cluster_profile: gcp - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable-1.3 - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator-1.3 - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-gcp - as: e2e-test-aws-periodic cron: 0 4 * * * steps: @@ -130,56 +78,6 @@ tests: cpu: 1000m memory: 512Mi workflow: optional-operators-ci-aws -- as: e2e-test-gcp-periodic - cron: 0 4 * * * - steps: - cluster_profile: gcp - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable-1.3 - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator-1.3 - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-gcp -- as: e2e-test-azure-periodic - cron: 0 4 * * * - steps: - cluster_profile: azure4 - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable-1.3 - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator-1.3 - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-azure zz_generated_metadata: branch: oadp-1.3 org: openshift diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.15.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.15.yaml new file mode 100644 index 0000000000000..9add4fea2c8c8 --- /dev/null +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.15.yaml @@ -0,0 +1,85 @@ +build_root: + image_stream_tag: + name: builder + namespace: ocp + tag: rhel-8-golang-1.20-openshift-4.15 +images: +- dockerfile_path: Dockerfile + to: oadp-operator-1.3 +- dockerfile_path: build/ci-Dockerfile + to: test-oadp-operator-1.3 +operator: + bundles: + - dockerfile_path: build/Dockerfile.bundle + substitutions: + - pullspec: quay.io/konveyor/oadp-operator:oadp-1.3 + with: oadp-operator-1.3 +releases: + latest: + release: + channel: fast + version: "4.15" +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 1000m + memory: 512Mi +tests: +- always_run: false + as: e2e-test-aws + run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+ + steps: + cluster_profile: aws + dependencies: + OO_INDEX: ci-index + env: + OO_CHANNEL: stable-1.3 + OO_INSTALL_NAMESPACE: openshift-adp + OO_PACKAGE: oadp-operator + OO_TARGET_NAMESPACES: '!install' + test: + - as: e2e + cli: latest + commands: make test-e2e + credentials: + - mount_path: /var/run/oadp-credentials + name: oadp-credentials + namespace: test-credentials + from: test-oadp-operator-1.3 + resources: + requests: + cpu: 1000m + memory: 512Mi + workflow: optional-operators-ci-aws +- as: e2e-test-aws-periodic + cron: 0 4 * * * + steps: + cluster_profile: aws + dependencies: + OO_INDEX: ci-index + env: + OO_CHANNEL: stable-1.3 + OO_INSTALL_NAMESPACE: openshift-adp + OO_PACKAGE: oadp-operator + OO_TARGET_NAMESPACES: '!install' + test: + - as: e2e + cli: latest + commands: make test-e2e + credentials: + - mount_path: /var/run/oadp-credentials + name: oadp-credentials + namespace: test-credentials + from: test-oadp-operator-1.3 + resources: + requests: + cpu: 1000m + memory: 512Mi + workflow: optional-operators-ci-aws +zz_generated_metadata: + branch: oadp-1.3 + org: openshift + repo: oadp-operator + variant: "4.15" diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4.yaml index 646379a6e0b5e..e84560d2dcecc 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4.yaml @@ -5,7 +5,6 @@ build_root: tag: ubi9-v1.22.2 images: - dockerfile_path: Dockerfile - from: src to: oadp-operator-1.4 promotion: to: diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4__4.13.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4__4.13.yaml deleted file mode 100644 index 1eba402f9d2ae..0000000000000 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4__4.13.yaml +++ /dev/null @@ -1,185 +0,0 @@ -build_root: - image_stream_tag: - name: builder - namespace: konveyor - tag: ubi9-v1.22.2 -images: -- dockerfile_path: Dockerfile - to: oadp-operator-1.4 -- dockerfile_path: build/ci-Dockerfile - to: test-oadp-operator-1.4 -operator: - bundles: - - dockerfile_path: build/Dockerfile.bundle - substitutions: - - pullspec: quay.io/konveyor/oadp-operator:oadp-1.4 - with: oadp-operator-1.4 -releases: - latest: - release: - channel: fast - version: "4.13" -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 1000m - memory: 512Mi -tests: -- always_run: false - as: e2e-test-aws - run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+ - steps: - cluster_profile: aws - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable-1.4 - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator-1.4 - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-aws -- always_run: false - as: e2e-test-azure - steps: - cluster_profile: azure4 - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable-1.4 - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator-1.4 - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-azure -- always_run: false - as: e2e-test-gcp - steps: - cluster_profile: gcp - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable-1.4 - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator-1.4 - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-gcp -- as: e2e-test-aws-periodic - cron: 7 15 * * 0 - steps: - cluster_profile: aws - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable-1.4 - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator-1.4 - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-aws -- as: e2e-test-gcp-periodic - cron: 25 15 * * 0 - steps: - cluster_profile: gcp - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable-1.4 - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator-1.4 - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-gcp -- as: e2e-test-azure-periodic - cron: 43 17 * * 6 - steps: - cluster_profile: azure4 - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable-1.4 - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator-1.4 - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-azure -zz_generated_metadata: - branch: oadp-1.4 - org: openshift - repo: oadp-operator - variant: "4.13" diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4__4.14.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4__4.14.yaml index ad58b867d62d7..903857cd55a5a 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4__4.14.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4__4.14.yaml @@ -54,34 +54,10 @@ tests: memory: 512Mi workflow: optional-operators-ci-aws - always_run: false - as: e2e-test-azure - steps: - cluster_profile: azure4 - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable-1.4 - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator-1.4 - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-azure -- always_run: false - as: e2e-test-gcp + as: e2e-test-kubevirt-aws + run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+ steps: - cluster_profile: gcp + cluster_profile: aws dependencies: OO_INDEX: ci-index env: @@ -92,7 +68,7 @@ tests: test: - as: e2e cli: latest - commands: make test-e2e + commands: make TEST_VIRT=true test-e2e credentials: - mount_path: /var/run/oadp-credentials name: oadp-credentials @@ -102,7 +78,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-gcp + workflow: optional-operators-ci-aws - as: e2e-test-aws-periodic cron: 0 4 * * * steps: @@ -128,56 +104,6 @@ tests: cpu: 1000m memory: 512Mi workflow: optional-operators-ci-aws -- as: e2e-test-gcp-periodic - cron: 0 4 * * * - steps: - cluster_profile: gcp - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable-1.4 - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator-1.4 - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-gcp -- as: e2e-test-azure-periodic - cron: 0 4 * * * - steps: - cluster_profile: azure4 - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable-1.4 - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator-1.4 - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-azure zz_generated_metadata: branch: oadp-1.4 org: openshift diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4__4.12.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4__4.15.yaml similarity index 54% rename from ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4__4.12.yaml rename to ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4__4.15.yaml index 556c78cfa1fff..b60271d9da4b5 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4__4.12.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4__4.15.yaml @@ -18,7 +18,7 @@ releases: latest: release: channel: fast - version: "4.12" + version: "4.15" resources: '*': limits: @@ -54,34 +54,10 @@ tests: memory: 512Mi workflow: optional-operators-ci-aws - always_run: false - as: e2e-test-azure - steps: - cluster_profile: azure4 - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable-1.4 - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator-1.4 - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-azure -- always_run: false - as: e2e-test-gcp + as: e2e-test-kubevirt-aws + run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+ steps: - cluster_profile: gcp + cluster_profile: aws dependencies: OO_INDEX: ci-index env: @@ -92,7 +68,7 @@ tests: test: - as: e2e cli: latest - commands: make test-e2e + commands: make TEST_VIRT=true test-e2e credentials: - mount_path: /var/run/oadp-credentials name: oadp-credentials @@ -102,7 +78,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-gcp + workflow: optional-operators-ci-aws - as: e2e-test-aws-periodic cron: 0 4 * * * steps: @@ -128,58 +104,8 @@ tests: cpu: 1000m memory: 512Mi workflow: optional-operators-ci-aws -- as: e2e-test-gcp-periodic - cron: 0 4 * * * - steps: - cluster_profile: gcp - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable-1.4 - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator-1.4 - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-gcp -- as: e2e-test-azure-periodic - cron: 0 4 * * * - steps: - cluster_profile: azure4 - dependencies: - OO_INDEX: ci-index - env: - OO_CHANNEL: stable-1.4 - OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator-1.4 - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-azure zz_generated_metadata: branch: oadp-1.4 org: openshift repo: oadp-operator - variant: "4.12" + variant: "4.15" diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-periodics.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-periodics.yaml index 1ebb82ab45221..ac5db4e7855e4 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-periodics.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-periodics.yaml @@ -12,10 +12,10 @@ periodics: labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: aws - ci-operator.openshift.io/variant: "4.12" + ci-operator.openshift.io/variant: "4.14" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-oadp-operator-master-4.12-e2e-test-aws-periodic + name: periodic-ci-openshift-oadp-operator-master-4.14-e2e-test-aws-periodic spec: containers: - args: @@ -26,7 +26,7 @@ periodics: - --secret-dir=/secrets/ci-pull-credentials - --secret-dir=/usr/local/e2e-test-aws-periodic-cluster-profile - --target=e2e-test-aws-periodic - - --variant=4.12 + - --variant=4.14 command: - ci-operator image: ci-operator:latest @@ -79,173 +79,9 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator -- agent: kubernetes - cluster: build04 - cron: 0 4 * * * - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: master - org: openshift - repo: oadp-operator - labels: - ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure4 - ci-operator.openshift.io/variant: "4.12" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-oadp-operator-master-4.12-e2e-test-azure-periodic - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-azure-periodic-cluster-profile - - --target=e2e-test-azure-periodic - - --variant=4.12 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-test-azure-periodic-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - secret: - secretName: cluster-secrets-azure4 - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator -- agent: kubernetes - cluster: build04 - cron: 0 4 * * * - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: master - org: openshift - repo: oadp-operator - labels: - ci-operator.openshift.io/cloud: gcp - ci-operator.openshift.io/cloud-cluster-profile: gcp-3 - ci-operator.openshift.io/variant: "4.12" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-oadp-operator-master-4.12-e2e-test-gcp-periodic - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-gcp-periodic-cluster-profile - - --target=e2e-test-gcp-periodic - - --variant=4.12 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-test-gcp-periodic-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-gcp-3 - - configMap: - name: cluster-profile-gcp-3 - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - agent: kubernetes cluster: build05 - cron: 53 22 * * 0 + cron: 0 4 * * * decorate: true decoration_config: skip_cloning: true @@ -256,10 +92,10 @@ periodics: labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: aws - ci-operator.openshift.io/variant: "4.13" + ci-operator.openshift.io/variant: "4.15" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-oadp-operator-master-4.13-e2e-test-aws-periodic + name: periodic-ci-openshift-oadp-operator-master-4.15-e2e-test-aws-periodic spec: containers: - args: @@ -270,7 +106,7 @@ periodics: - --secret-dir=/secrets/ci-pull-credentials - --secret-dir=/usr/local/e2e-test-aws-periodic-cluster-profile - --target=e2e-test-aws-periodic - - --variant=4.13 + - --variant=4.15 command: - ci-operator image: ci-operator:latest @@ -323,170 +159,6 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator -- agent: kubernetes - cluster: build04 - cron: 15 17 * * 6 - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: master - org: openshift - repo: oadp-operator - labels: - ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure4 - ci-operator.openshift.io/variant: "4.13" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-oadp-operator-master-4.13-e2e-test-azure-periodic - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-azure-periodic-cluster-profile - - --target=e2e-test-azure-periodic - - --variant=4.13 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-test-azure-periodic-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - secret: - secretName: cluster-secrets-azure4 - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator -- agent: kubernetes - cluster: build04 - cron: 41 22 * * 6 - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: master - org: openshift - repo: oadp-operator - labels: - ci-operator.openshift.io/cloud: gcp - ci-operator.openshift.io/cloud-cluster-profile: gcp - ci-operator.openshift.io/variant: "4.13" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-oadp-operator-master-4.13-e2e-test-gcp-periodic - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-gcp-periodic-cluster-profile - - --target=e2e-test-gcp-periodic - - --variant=4.13 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-test-gcp-periodic-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - agent: kubernetes cluster: build05 cron: 0 4 * * * @@ -500,10 +172,10 @@ periodics: labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: aws - ci-operator.openshift.io/variant: "4.14" + ci-operator.openshift.io/variant: "4.16" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-oadp-operator-master-4.14-e2e-test-aws-periodic + name: periodic-ci-openshift-oadp-operator-master-4.16-e2e-test-aws-periodic spec: containers: - args: @@ -514,7 +186,7 @@ periodics: - --secret-dir=/secrets/ci-pull-credentials - --secret-dir=/usr/local/e2e-test-aws-periodic-cluster-profile - --target=e2e-test-aws-periodic - - --variant=4.14 + - --variant=4.16 command: - ci-operator image: ci-operator:latest @@ -567,170 +239,6 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator -- agent: kubernetes - cluster: build04 - cron: 0 4 * * * - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: master - org: openshift - repo: oadp-operator - labels: - ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure4 - ci-operator.openshift.io/variant: "4.14" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-oadp-operator-master-4.14-e2e-test-azure-periodic - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-azure-periodic-cluster-profile - - --target=e2e-test-azure-periodic - - --variant=4.14 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-test-azure-periodic-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - secret: - secretName: cluster-secrets-azure4 - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator -- agent: kubernetes - cluster: build04 - cron: 0 4 * * * - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: master - org: openshift - repo: oadp-operator - labels: - ci-operator.openshift.io/cloud: gcp - ci-operator.openshift.io/cloud-cluster-profile: gcp - ci-operator.openshift.io/variant: "4.14" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-oadp-operator-master-4.14-e2e-test-gcp-periodic - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-gcp-periodic-cluster-profile - - --target=e2e-test-gcp-periodic - - --variant=4.14 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-test-gcp-periodic-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - agent: kubernetes cluster: build04 cron: 0 4 * * * diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-presubmits.yaml index 51e1e6319f4c2..a8dc8bdc61eda 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-presubmits.yaml @@ -6,16 +6,16 @@ presubmits: - ^master$ - ^master- cluster: build04 - context: ci/prow/4.12-ci-index + context: ci/prow/4.14-ci-index decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/variant: "4.12" + ci-operator.openshift.io/variant: "4.14" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-master-4.12-ci-index - rerun_command: /test 4.12-ci-index + name: pull-ci-openshift-oadp-operator-master-4.14-ci-index + rerun_command: /test 4.14-ci-index spec: containers: - args: @@ -23,7 +23,7 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --target=ci-index - - --variant=4.12 + - --variant=4.14 command: - ci-operator image: ci-operator:latest @@ -56,25 +56,25 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.12-ci-index,?($|\s.*) + trigger: (?m)^/test( | .* )4.14-ci-index,?($|\s.*) - agent: kubernetes always_run: false branches: - ^master$ - ^master- cluster: build03 - context: ci/prow/4.12-e2e-test-aws + context: ci/prow/4.14-e2e-test-aws decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: aws - ci-operator.openshift.io/variant: "4.12" + ci-operator.openshift.io/variant: "4.14" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-master-4.12-e2e-test-aws - rerun_command: /test 4.12-e2e-test-aws + name: pull-ci-openshift-oadp-operator-master-4.14-e2e-test-aws + rerun_command: /test 4.14-e2e-test-aws run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+ spec: containers: @@ -86,7 +86,7 @@ presubmits: - --secret-dir=/secrets/ci-pull-credentials - --secret-dir=/usr/local/e2e-test-aws-cluster-profile - --target=e2e-test-aws - - --variant=4.12 + - --variant=4.14 command: - ci-operator image: ci-operator:latest @@ -139,25 +139,26 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.12-e2e-test-aws,?($|\s.*) + trigger: (?m)^/test( | .* )4.14-e2e-test-aws,?($|\s.*) - agent: kubernetes always_run: false branches: - ^master$ - ^master- - cluster: build04 - context: ci/prow/4.12-e2e-test-azure + cluster: build03 + context: ci/prow/4.14-e2e-test-kubevirt-aws decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure4 - ci-operator.openshift.io/variant: "4.12" + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/variant: "4.14" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-master-4.12-e2e-test-azure - rerun_command: /test 4.12-e2e-test-azure + name: pull-ci-openshift-oadp-operator-master-4.14-e2e-test-kubevirt-aws + rerun_command: /test 4.14-e2e-test-kubevirt-aws + run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+ spec: containers: - args: @@ -166,9 +167,9 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-azure-cluster-profile - - --target=e2e-test-azure - - --variant=4.12 + - --secret-dir=/usr/local/e2e-test-kubevirt-aws-cluster-profile + - --target=e2e-test-kubevirt-aws + - --variant=4.14 command: - ci-operator image: ci-operator:latest @@ -184,7 +185,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-test-azure-cluster-profile + - mountPath: /usr/local/e2e-test-kubevirt-aws-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -211,93 +212,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-azure4 - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )(4.12-e2e-test-azure|remaining-required),?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^master$ - - ^master- - cluster: build02 - context: ci/prow/4.12-e2e-test-gcp - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/cloud: gcp - ci-operator.openshift.io/cloud-cluster-profile: gcp - ci-operator.openshift.io/variant: "4.12" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-master-4.12-e2e-test-gcp - rerun_command: /test 4.12-e2e-test-gcp - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-gcp-cluster-profile - - --target=e2e-test-gcp - - --variant=4.12 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-test-gcp-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp + secretName: cluster-secrets-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -307,23 +222,23 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )(4.12-e2e-test-gcp|remaining-required),?($|\s.*) + trigger: (?m)^/test( | .* )4.14-e2e-test-kubevirt-aws,?($|\s.*) - agent: kubernetes always_run: true branches: - ^master$ - ^master- cluster: build04 - context: ci/prow/4.12-images + context: ci/prow/4.14-images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/variant: "4.12" + ci-operator.openshift.io/variant: "4.14" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-master-4.12-images - rerun_command: /test 4.12-images + name: pull-ci-openshift-oadp-operator-master-4.14-images + rerun_command: /test 4.14-images spec: containers: - args: @@ -331,7 +246,7 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --target=[images] - - --variant=4.12 + - --variant=4.14 command: - ci-operator image: ci-operator:latest @@ -364,23 +279,23 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.12-images,?($|\s.*) + trigger: (?m)^/test( | .* )4.14-images,?($|\s.*) - agent: kubernetes always_run: true branches: - ^master$ - ^master- cluster: build04 - context: ci/prow/4.13-ci-index + context: ci/prow/4.15-ci-index decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/variant: "4.13" + ci-operator.openshift.io/variant: "4.15" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-master-4.13-ci-index - rerun_command: /test 4.13-ci-index + name: pull-ci-openshift-oadp-operator-master-4.15-ci-index + rerun_command: /test 4.15-ci-index spec: containers: - args: @@ -388,7 +303,7 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --target=ci-index - - --variant=4.13 + - --variant=4.15 command: - ci-operator image: ci-operator:latest @@ -421,25 +336,25 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.13-ci-index,?($|\s.*) + trigger: (?m)^/test( | .* )4.15-ci-index,?($|\s.*) - agent: kubernetes always_run: false branches: - ^master$ - ^master- cluster: build03 - context: ci/prow/4.13-e2e-test-aws + context: ci/prow/4.15-e2e-test-aws decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: aws - ci-operator.openshift.io/variant: "4.13" + ci-operator.openshift.io/variant: "4.15" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-master-4.13-e2e-test-aws - rerun_command: /test 4.13-e2e-test-aws + name: pull-ci-openshift-oadp-operator-master-4.15-e2e-test-aws + rerun_command: /test 4.15-e2e-test-aws run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+ spec: containers: @@ -451,7 +366,7 @@ presubmits: - --secret-dir=/secrets/ci-pull-credentials - --secret-dir=/usr/local/e2e-test-aws-cluster-profile - --target=e2e-test-aws - - --variant=4.13 + - --variant=4.15 command: - ci-operator image: ci-operator:latest @@ -504,25 +419,26 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.13-e2e-test-aws,?($|\s.*) + trigger: (?m)^/test( | .* )4.15-e2e-test-aws,?($|\s.*) - agent: kubernetes always_run: false branches: - ^master$ - ^master- - cluster: build04 - context: ci/prow/4.13-e2e-test-azure + cluster: build03 + context: ci/prow/4.15-e2e-test-kubevirt-aws decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure4 - ci-operator.openshift.io/variant: "4.13" + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/variant: "4.15" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-master-4.13-e2e-test-azure - rerun_command: /test 4.13-e2e-test-azure + name: pull-ci-openshift-oadp-operator-master-4.15-e2e-test-kubevirt-aws + rerun_command: /test 4.15-e2e-test-kubevirt-aws + run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+ spec: containers: - args: @@ -531,9 +447,9 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-azure-cluster-profile - - --target=e2e-test-azure - - --variant=4.13 + - --secret-dir=/usr/local/e2e-test-kubevirt-aws-cluster-profile + - --target=e2e-test-kubevirt-aws + - --variant=4.15 command: - ci-operator image: ci-operator:latest @@ -549,7 +465,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-test-azure-cluster-profile + - mountPath: /usr/local/e2e-test-kubevirt-aws-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -576,93 +492,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-azure4 - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )(4.13-e2e-test-azure|remaining-required),?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^master$ - - ^master- - cluster: build02 - context: ci/prow/4.13-e2e-test-gcp - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/cloud: gcp - ci-operator.openshift.io/cloud-cluster-profile: gcp - ci-operator.openshift.io/variant: "4.13" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-master-4.13-e2e-test-gcp - rerun_command: /test 4.13-e2e-test-gcp - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-gcp-cluster-profile - - --target=e2e-test-gcp - - --variant=4.13 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-test-gcp-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp + secretName: cluster-secrets-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -672,23 +502,23 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )(4.13-e2e-test-gcp|remaining-required),?($|\s.*) + trigger: (?m)^/test( | .* )4.15-e2e-test-kubevirt-aws,?($|\s.*) - agent: kubernetes always_run: true branches: - ^master$ - ^master- cluster: build04 - context: ci/prow/4.13-images + context: ci/prow/4.15-images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/variant: "4.13" + ci-operator.openshift.io/variant: "4.15" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-master-4.13-images - rerun_command: /test 4.13-images + name: pull-ci-openshift-oadp-operator-master-4.15-images + rerun_command: /test 4.15-images spec: containers: - args: @@ -696,7 +526,7 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --target=[images] - - --variant=4.13 + - --variant=4.15 command: - ci-operator image: ci-operator:latest @@ -729,23 +559,23 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.13-images,?($|\s.*) + trigger: (?m)^/test( | .* )4.15-images,?($|\s.*) - agent: kubernetes always_run: true branches: - ^master$ - ^master- cluster: build04 - context: ci/prow/4.14-ci-index + context: ci/prow/4.16-ci-index decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/variant: "4.14" + ci-operator.openshift.io/variant: "4.16" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-master-4.14-ci-index - rerun_command: /test 4.14-ci-index + name: pull-ci-openshift-oadp-operator-master-4.16-ci-index + rerun_command: /test 4.16-ci-index spec: containers: - args: @@ -753,7 +583,7 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --target=ci-index - - --variant=4.14 + - --variant=4.16 command: - ci-operator image: ci-operator:latest @@ -786,25 +616,25 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.14-ci-index,?($|\s.*) + trigger: (?m)^/test( | .* )4.16-ci-index,?($|\s.*) - agent: kubernetes always_run: false branches: - ^master$ - ^master- cluster: build03 - context: ci/prow/4.14-e2e-test-aws + context: ci/prow/4.16-e2e-test-aws decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: aws - ci-operator.openshift.io/variant: "4.14" + ci-operator.openshift.io/variant: "4.16" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-master-4.14-e2e-test-aws - rerun_command: /test 4.14-e2e-test-aws + name: pull-ci-openshift-oadp-operator-master-4.16-e2e-test-aws + rerun_command: /test 4.16-e2e-test-aws run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+ spec: containers: @@ -816,7 +646,7 @@ presubmits: - --secret-dir=/secrets/ci-pull-credentials - --secret-dir=/usr/local/e2e-test-aws-cluster-profile - --target=e2e-test-aws - - --variant=4.14 + - --variant=4.16 command: - ci-operator image: ci-operator:latest @@ -869,193 +699,25 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.14-e2e-test-aws,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^master$ - - ^master- - cluster: build04 - context: ci/prow/4.14-e2e-test-azure - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure4 - ci-operator.openshift.io/variant: "4.14" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-master-4.14-e2e-test-azure - rerun_command: /test 4.14-e2e-test-azure - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-azure-cluster-profile - - --target=e2e-test-azure - - --variant=4.14 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-test-azure-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - secret: - secretName: cluster-secrets-azure4 - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )(4.14-e2e-test-azure|remaining-required),?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^master$ - - ^master- - cluster: build02 - context: ci/prow/4.14-e2e-test-gcp - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/cloud: gcp - ci-operator.openshift.io/cloud-cluster-profile: gcp - ci-operator.openshift.io/variant: "4.14" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-master-4.14-e2e-test-gcp - rerun_command: /test 4.14-e2e-test-gcp - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-gcp-cluster-profile - - --target=e2e-test-gcp - - --variant=4.14 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-test-gcp-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )(4.14-e2e-test-gcp|remaining-required),?($|\s.*) + trigger: (?m)^/test( | .* )4.16-e2e-test-aws,?($|\s.*) - agent: kubernetes always_run: false branches: - ^master$ - ^master- cluster: build03 - context: ci/prow/4.14-e2e-test-kubevirt-aws + context: ci/prow/4.16-e2e-test-kubevirt-aws decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: aws - ci-operator.openshift.io/variant: "4.14" + ci-operator.openshift.io/variant: "4.16" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-master-4.14-e2e-test-kubevirt-aws - rerun_command: /test 4.14-e2e-test-kubevirt-aws + name: pull-ci-openshift-oadp-operator-master-4.16-e2e-test-kubevirt-aws + rerun_command: /test 4.16-e2e-test-kubevirt-aws run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+ spec: containers: @@ -1067,7 +729,7 @@ presubmits: - --secret-dir=/secrets/ci-pull-credentials - --secret-dir=/usr/local/e2e-test-kubevirt-aws-cluster-profile - --target=e2e-test-kubevirt-aws - - --variant=4.14 + - --variant=4.16 command: - ci-operator image: ci-operator:latest @@ -1120,23 +782,23 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.14-e2e-test-kubevirt-aws,?($|\s.*) + trigger: (?m)^/test( | .* )4.16-e2e-test-kubevirt-aws,?($|\s.*) - agent: kubernetes always_run: true branches: - ^master$ - ^master- cluster: build04 - context: ci/prow/4.14-images + context: ci/prow/4.16-images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/variant: "4.14" + ci-operator.openshift.io/variant: "4.16" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-master-4.14-images - rerun_command: /test 4.14-images + name: pull-ci-openshift-oadp-operator-master-4.16-images + rerun_command: /test 4.16-images spec: containers: - args: @@ -1144,7 +806,7 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --target=[images] - - --variant=4.14 + - --variant=4.16 command: - ci-operator image: ci-operator:latest @@ -1177,7 +839,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.14-images,?($|\s.*) + trigger: (?m)^/test( | .* )4.16-images,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3-periodics.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3-periodics.yaml index 13f13f1a492fd..045ad4279a3b4 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3-periodics.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3-periodics.yaml @@ -79,170 +79,6 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator -- agent: kubernetes - cluster: build04 - cron: 0 4 * * * - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: oadp-1.3 - org: openshift - repo: oadp-operator - labels: - ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure4 - ci-operator.openshift.io/variant: "4.12" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-oadp-operator-oadp-1.3-4.12-e2e-test-azure-periodic - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-azure-periodic-cluster-profile - - --target=e2e-test-azure-periodic - - --variant=4.12 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-test-azure-periodic-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - secret: - secretName: cluster-secrets-azure4 - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator -- agent: kubernetes - cluster: build04 - cron: 0 4 * * * - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: oadp-1.3 - org: openshift - repo: oadp-operator - labels: - ci-operator.openshift.io/cloud: gcp - ci-operator.openshift.io/cloud-cluster-profile: gcp - ci-operator.openshift.io/variant: "4.12" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-oadp-operator-oadp-1.3-4.12-e2e-test-gcp-periodic - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-gcp-periodic-cluster-profile - - --target=e2e-test-gcp-periodic - - --variant=4.12 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-test-gcp-periodic-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - agent: kubernetes cluster: build05 cron: 7 15 * * 0 @@ -323,170 +159,6 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator -- agent: kubernetes - cluster: build04 - cron: 43 17 * * 6 - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: oadp-1.3 - org: openshift - repo: oadp-operator - labels: - ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure4 - ci-operator.openshift.io/variant: "4.13" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-oadp-operator-oadp-1.3-4.13-e2e-test-azure-periodic - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-azure-periodic-cluster-profile - - --target=e2e-test-azure-periodic - - --variant=4.13 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-test-azure-periodic-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - secret: - secretName: cluster-secrets-azure4 - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator -- agent: kubernetes - cluster: build04 - cron: 25 15 * * 0 - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: oadp-1.3 - org: openshift - repo: oadp-operator - labels: - ci-operator.openshift.io/cloud: gcp - ci-operator.openshift.io/cloud-cluster-profile: gcp - ci-operator.openshift.io/variant: "4.13" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-oadp-operator-oadp-1.3-4.13-e2e-test-gcp-periodic - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-gcp-periodic-cluster-profile - - --target=e2e-test-gcp-periodic - - --variant=4.13 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-test-gcp-periodic-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - agent: kubernetes cluster: build05 cron: 0 4 * * * @@ -568,7 +240,7 @@ periodics: secret: secretName: result-aggregator - agent: kubernetes - cluster: build04 + cluster: build05 cron: 0 4 * * * decorate: true decoration_config: @@ -578,12 +250,12 @@ periodics: org: openshift repo: oadp-operator labels: - ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure4 - ci-operator.openshift.io/variant: "4.14" + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/variant: "4.15" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-oadp-operator-oadp-1.3-4.14-e2e-test-azure-periodic + name: periodic-ci-openshift-oadp-operator-oadp-1.3-4.15-e2e-test-aws-periodic spec: containers: - args: @@ -592,9 +264,9 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-azure-periodic-cluster-profile - - --target=e2e-test-azure-periodic - - --variant=4.14 + - --secret-dir=/usr/local/e2e-test-aws-periodic-cluster-profile + - --target=e2e-test-aws-periodic + - --variant=4.15 command: - ci-operator image: ci-operator:latest @@ -610,7 +282,7 @@ periodics: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-test-azure-periodic-cluster-profile + - mountPath: /usr/local/e2e-test-aws-periodic-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -637,91 +309,7 @@ periodics: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-azure4 - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator -- agent: kubernetes - cluster: build04 - cron: 0 4 * * * - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: oadp-1.3 - org: openshift - repo: oadp-operator - labels: - ci-operator.openshift.io/cloud: gcp - ci-operator.openshift.io/cloud-cluster-profile: gcp - ci-operator.openshift.io/variant: "4.14" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-oadp-operator-oadp-1.3-4.14-e2e-test-gcp-periodic - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-gcp-periodic-cluster-profile - - --target=e2e-test-gcp-periodic - - --variant=4.14 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-test-gcp-periodic-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp + secretName: cluster-secrets-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3-presubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3-presubmits.yaml index 887c186fd5563..7a54053a222e8 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3-presubmits.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3-presubmits.yaml @@ -140,174 +140,6 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )4.12-e2e-test-aws,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^oadp-1\.3$ - - ^oadp-1\.3- - cluster: build04 - context: ci/prow/4.12-e2e-test-azure - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure4 - ci-operator.openshift.io/variant: "4.12" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.3-4.12-e2e-test-azure - rerun_command: /test 4.12-e2e-test-azure - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-azure-cluster-profile - - --target=e2e-test-azure - - --variant=4.12 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-test-azure-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - secret: - secretName: cluster-secrets-azure4 - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )(4.12-e2e-test-azure|remaining-required),?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^oadp-1\.3$ - - ^oadp-1\.3- - cluster: build02 - context: ci/prow/4.12-e2e-test-gcp - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/cloud: gcp - ci-operator.openshift.io/cloud-cluster-profile: gcp - ci-operator.openshift.io/variant: "4.12" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.3-4.12-e2e-test-gcp - rerun_command: /test 4.12-e2e-test-gcp - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-gcp-cluster-profile - - --target=e2e-test-gcp - - --variant=4.12 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-test-gcp-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )(4.12-e2e-test-gcp|remaining-required),?($|\s.*) - agent: kubernetes always_run: true branches: @@ -505,174 +337,6 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )4.13-e2e-test-aws,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^oadp-1\.3$ - - ^oadp-1\.3- - cluster: build04 - context: ci/prow/4.13-e2e-test-azure - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure4 - ci-operator.openshift.io/variant: "4.13" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.3-4.13-e2e-test-azure - rerun_command: /test 4.13-e2e-test-azure - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-azure-cluster-profile - - --target=e2e-test-azure - - --variant=4.13 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-test-azure-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - secret: - secretName: cluster-secrets-azure4 - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )(4.13-e2e-test-azure|remaining-required),?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^oadp-1\.3$ - - ^oadp-1\.3- - cluster: build02 - context: ci/prow/4.13-e2e-test-gcp - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/cloud: gcp - ci-operator.openshift.io/cloud-cluster-profile: gcp - ci-operator.openshift.io/variant: "4.13" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.3-4.13-e2e-test-gcp - rerun_command: /test 4.13-e2e-test-gcp - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-gcp-cluster-profile - - --target=e2e-test-gcp - - --variant=4.13 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-test-gcp-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )(4.13-e2e-test-gcp|remaining-required),?($|\s.*) - agent: kubernetes always_run: true branches: @@ -871,33 +535,28 @@ presubmits: secretName: result-aggregator trigger: (?m)^/test( | .* )4.14-e2e-test-aws,?($|\s.*) - agent: kubernetes - always_run: false + always_run: true branches: - ^oadp-1\.3$ - ^oadp-1\.3- cluster: build04 - context: ci/prow/4.14-e2e-test-azure + context: ci/prow/4.14-images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure4 ci-operator.openshift.io/variant: "4.14" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.3-4.14-e2e-test-azure - rerun_command: /test 4.14-e2e-test-azure + name: pull-ci-openshift-oadp-operator-oadp-1.3-4.14-images + rerun_command: /test 4.14-images spec: containers: - args: - --gcs-upload-secret=/secrets/gcs/service-account.json - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-azure-cluster-profile - - --target=e2e-test-azure + - --target=[images] - --variant=4.14 command: - ci-operator @@ -908,14 +567,6 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-test-azure-cluster-profile - name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials readOnly: true @@ -930,18 +581,63 @@ presubmits: readOnly: true serviceAccountName: ci-operator volumes: - - name: boskos + - name: manifest-tool-local-pusher secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials + secretName: manifest-tool-local-pusher + - name: pull-secret secret: - secretName: ci-pull-credentials - - name: cluster-profile + secretName: registry-pull-credentials + - name: result-aggregator secret: - secretName: cluster-secrets-azure4 + secretName: result-aggregator + trigger: (?m)^/test( | .* )4.14-images,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^oadp-1\.3$ + - ^oadp-1\.3- + cluster: build04 + context: ci/prow/4.15-ci-index + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/variant: "4.15" + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-oadp-operator-oadp-1.3-4.15-ci-index + rerun_command: /test 4.15-ci-index + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --report-credentials-file=/etc/report/credentials + - --target=ci-index + - --variant=4.15 + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -951,25 +647,26 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )(4.14-e2e-test-azure|remaining-required),?($|\s.*) + trigger: (?m)^/test( | .* )4.15-ci-index,?($|\s.*) - agent: kubernetes always_run: false branches: - ^oadp-1\.3$ - ^oadp-1\.3- - cluster: build02 - context: ci/prow/4.14-e2e-test-gcp + cluster: build03 + context: ci/prow/4.15-e2e-test-aws decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cloud: gcp - ci-operator.openshift.io/cloud-cluster-profile: gcp - ci-operator.openshift.io/variant: "4.14" + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/variant: "4.15" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.3-4.14-e2e-test-gcp - rerun_command: /test 4.14-e2e-test-gcp + name: pull-ci-openshift-oadp-operator-oadp-1.3-4.15-e2e-test-aws + rerun_command: /test 4.15-e2e-test-aws + run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+ spec: containers: - args: @@ -978,9 +675,9 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-gcp-cluster-profile - - --target=e2e-test-gcp - - --variant=4.14 + - --secret-dir=/usr/local/e2e-test-aws-cluster-profile + - --target=e2e-test-aws + - --variant=4.15 command: - ci-operator image: ci-operator:latest @@ -996,7 +693,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-test-gcp-cluster-profile + - mountPath: /usr/local/e2e-test-aws-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -1022,12 +719,8 @@ presubmits: secret: secretName: ci-pull-credentials - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp + secret: + secretName: cluster-secrets-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -1037,23 +730,23 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )(4.14-e2e-test-gcp|remaining-required),?($|\s.*) + trigger: (?m)^/test( | .* )4.15-e2e-test-aws,?($|\s.*) - agent: kubernetes always_run: true branches: - ^oadp-1\.3$ - ^oadp-1\.3- cluster: build04 - context: ci/prow/4.14-images + context: ci/prow/4.15-images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/variant: "4.14" + ci-operator.openshift.io/variant: "4.15" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.3-4.14-images - rerun_command: /test 4.14-images + name: pull-ci-openshift-oadp-operator-oadp-1.3-4.15-images + rerun_command: /test 4.15-images spec: containers: - args: @@ -1061,7 +754,7 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --target=[images] - - --variant=4.14 + - --variant=4.15 command: - ci-operator image: ci-operator:latest @@ -1094,7 +787,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.14-images,?($|\s.*) + trigger: (?m)^/test( | .* )4.15-images,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-periodics.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-periodics.yaml index 435b56841f39d..f3064200ef863 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-periodics.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-periodics.yaml @@ -12,10 +12,10 @@ periodics: labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: aws - ci-operator.openshift.io/variant: "4.12" + ci-operator.openshift.io/variant: "4.14" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-oadp-operator-oadp-1.4-4.12-e2e-test-aws-periodic + name: periodic-ci-openshift-oadp-operator-oadp-1.4-4.14-e2e-test-aws-periodic spec: containers: - args: @@ -26,7 +26,7 @@ periodics: - --secret-dir=/secrets/ci-pull-credentials - --secret-dir=/usr/local/e2e-test-aws-periodic-cluster-profile - --target=e2e-test-aws-periodic - - --variant=4.12 + - --variant=4.14 command: - ci-operator image: ci-operator:latest @@ -79,414 +79,6 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator -- agent: kubernetes - cluster: build04 - cron: 0 4 * * * - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: oadp-1.4 - org: openshift - repo: oadp-operator - labels: - ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure4 - ci-operator.openshift.io/variant: "4.12" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-oadp-operator-oadp-1.4-4.12-e2e-test-azure-periodic - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-azure-periodic-cluster-profile - - --target=e2e-test-azure-periodic - - --variant=4.12 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-test-azure-periodic-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - secret: - secretName: cluster-secrets-azure4 - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator -- agent: kubernetes - cluster: build04 - cron: 0 4 * * * - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: oadp-1.4 - org: openshift - repo: oadp-operator - labels: - ci-operator.openshift.io/cloud: gcp - ci-operator.openshift.io/cloud-cluster-profile: gcp - ci-operator.openshift.io/variant: "4.12" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-oadp-operator-oadp-1.4-4.12-e2e-test-gcp-periodic - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-gcp-periodic-cluster-profile - - --target=e2e-test-gcp-periodic - - --variant=4.12 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-test-gcp-periodic-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator -- agent: kubernetes - cluster: build05 - cron: 7 15 * * 0 - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: oadp-1.4 - org: openshift - repo: oadp-operator - labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws - ci-operator.openshift.io/variant: "4.13" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-oadp-operator-oadp-1.4-4.13-e2e-test-aws-periodic - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-aws-periodic-cluster-profile - - --target=e2e-test-aws-periodic - - --variant=4.13 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-test-aws-periodic-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - secret: - secretName: cluster-secrets-aws - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator -- agent: kubernetes - cluster: build04 - cron: 43 17 * * 6 - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: oadp-1.4 - org: openshift - repo: oadp-operator - labels: - ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure4 - ci-operator.openshift.io/variant: "4.13" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-oadp-operator-oadp-1.4-4.13-e2e-test-azure-periodic - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-azure-periodic-cluster-profile - - --target=e2e-test-azure-periodic - - --variant=4.13 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-test-azure-periodic-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - secret: - secretName: cluster-secrets-azure4 - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator -- agent: kubernetes - cluster: build04 - cron: 25 15 * * 0 - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: oadp-1.4 - org: openshift - repo: oadp-operator - labels: - ci-operator.openshift.io/cloud: gcp - ci-operator.openshift.io/cloud-cluster-profile: gcp - ci-operator.openshift.io/variant: "4.13" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-oadp-operator-oadp-1.4-4.13-e2e-test-gcp-periodic - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-gcp-periodic-cluster-profile - - --target=e2e-test-gcp-periodic - - --variant=4.13 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-test-gcp-periodic-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - agent: kubernetes cluster: build05 cron: 0 4 * * * @@ -500,10 +92,10 @@ periodics: labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: aws - ci-operator.openshift.io/variant: "4.14" + ci-operator.openshift.io/variant: "4.15" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-oadp-operator-oadp-1.4-4.14-e2e-test-aws-periodic + name: periodic-ci-openshift-oadp-operator-oadp-1.4-4.15-e2e-test-aws-periodic spec: containers: - args: @@ -514,7 +106,7 @@ periodics: - --secret-dir=/secrets/ci-pull-credentials - --secret-dir=/usr/local/e2e-test-aws-periodic-cluster-profile - --target=e2e-test-aws-periodic - - --variant=4.14 + - --variant=4.15 command: - ci-operator image: ci-operator:latest @@ -567,170 +159,6 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator -- agent: kubernetes - cluster: build04 - cron: 0 4 * * * - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: oadp-1.4 - org: openshift - repo: oadp-operator - labels: - ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure4 - ci-operator.openshift.io/variant: "4.14" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-oadp-operator-oadp-1.4-4.14-e2e-test-azure-periodic - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-azure-periodic-cluster-profile - - --target=e2e-test-azure-periodic - - --variant=4.14 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-test-azure-periodic-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - secret: - secretName: cluster-secrets-azure4 - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator -- agent: kubernetes - cluster: build04 - cron: 0 4 * * * - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: oadp-1.4 - org: openshift - repo: oadp-operator - labels: - ci-operator.openshift.io/cloud: gcp - ci-operator.openshift.io/cloud-cluster-profile: gcp - ci-operator.openshift.io/variant: "4.14" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-oadp-operator-oadp-1.4-4.14-e2e-test-gcp-periodic - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-gcp-periodic-cluster-profile - - --target=e2e-test-gcp-periodic - - --variant=4.14 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-test-gcp-periodic-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - agent: kubernetes cluster: build05 cron: 0 4 * * * diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-presubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-presubmits.yaml index 822f478980311..407a4fe1926c7 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-presubmits.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-presubmits.yaml @@ -6,16 +6,16 @@ presubmits: - ^oadp-1\.4$ - ^oadp-1\.4- cluster: build04 - context: ci/prow/4.12-ci-index + context: ci/prow/4.14-ci-index decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/variant: "4.12" + ci-operator.openshift.io/variant: "4.14" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.4-4.12-ci-index - rerun_command: /test 4.12-ci-index + name: pull-ci-openshift-oadp-operator-oadp-1.4-4.14-ci-index + rerun_command: /test 4.14-ci-index spec: containers: - args: @@ -23,7 +23,7 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --target=ci-index - - --variant=4.12 + - --variant=4.14 command: - ci-operator image: ci-operator:latest @@ -56,25 +56,25 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.12-ci-index,?($|\s.*) + trigger: (?m)^/test( | .* )4.14-ci-index,?($|\s.*) - agent: kubernetes always_run: false branches: - ^oadp-1\.4$ - ^oadp-1\.4- cluster: build03 - context: ci/prow/4.12-e2e-test-aws + context: ci/prow/4.14-e2e-test-aws decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: aws - ci-operator.openshift.io/variant: "4.12" + ci-operator.openshift.io/variant: "4.14" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.4-4.12-e2e-test-aws - rerun_command: /test 4.12-e2e-test-aws + name: pull-ci-openshift-oadp-operator-oadp-1.4-4.14-e2e-test-aws + rerun_command: /test 4.14-e2e-test-aws run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+ spec: containers: @@ -86,7 +86,7 @@ presubmits: - --secret-dir=/secrets/ci-pull-credentials - --secret-dir=/usr/local/e2e-test-aws-cluster-profile - --target=e2e-test-aws - - --variant=4.12 + - --variant=4.14 command: - ci-operator image: ci-operator:latest @@ -139,307 +139,25 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.12-e2e-test-aws,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^oadp-1\.4$ - - ^oadp-1\.4- - cluster: build04 - context: ci/prow/4.12-e2e-test-azure - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure4 - ci-operator.openshift.io/variant: "4.12" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.4-4.12-e2e-test-azure - rerun_command: /test 4.12-e2e-test-azure - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-azure-cluster-profile - - --target=e2e-test-azure - - --variant=4.12 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-test-azure-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - secret: - secretName: cluster-secrets-azure4 - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )(4.12-e2e-test-azure|remaining-required),?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^oadp-1\.4$ - - ^oadp-1\.4- - cluster: build02 - context: ci/prow/4.12-e2e-test-gcp - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/cloud: gcp - ci-operator.openshift.io/cloud-cluster-profile: gcp - ci-operator.openshift.io/variant: "4.12" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.4-4.12-e2e-test-gcp - rerun_command: /test 4.12-e2e-test-gcp - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-gcp-cluster-profile - - --target=e2e-test-gcp - - --variant=4.12 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-test-gcp-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )(4.12-e2e-test-gcp|remaining-required),?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^oadp-1\.4$ - - ^oadp-1\.4- - cluster: build04 - context: ci/prow/4.12-images - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/variant: "4.12" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.4-4.12-images - rerun_command: /test 4.12-images - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --target=[images] - - --variant=4.12 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )4.12-images,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^oadp-1\.4$ - - ^oadp-1\.4- - cluster: build04 - context: ci/prow/4.13-ci-index - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/variant: "4.13" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.4-4.13-ci-index - rerun_command: /test 4.13-ci-index - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --target=ci-index - - --variant=4.13 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )4.13-ci-index,?($|\s.*) + trigger: (?m)^/test( | .* )4.14-e2e-test-aws,?($|\s.*) - agent: kubernetes always_run: false branches: - ^oadp-1\.4$ - ^oadp-1\.4- cluster: build03 - context: ci/prow/4.13-e2e-test-aws + context: ci/prow/4.14-e2e-test-kubevirt-aws decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: aws - ci-operator.openshift.io/variant: "4.13" + ci-operator.openshift.io/variant: "4.14" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.4-4.13-e2e-test-aws - rerun_command: /test 4.13-e2e-test-aws + name: pull-ci-openshift-oadp-operator-oadp-1.4-4.14-e2e-test-kubevirt-aws + rerun_command: /test 4.14-e2e-test-kubevirt-aws run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+ spec: containers: @@ -449,9 +167,9 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-aws-cluster-profile - - --target=e2e-test-aws - - --variant=4.13 + - --secret-dir=/usr/local/e2e-test-kubevirt-aws-cluster-profile + - --target=e2e-test-kubevirt-aws + - --variant=4.14 command: - ci-operator image: ci-operator:latest @@ -467,7 +185,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-test-aws-cluster-profile + - mountPath: /usr/local/e2e-test-kubevirt-aws-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -504,191 +222,23 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.13-e2e-test-aws,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^oadp-1\.4$ - - ^oadp-1\.4- - cluster: build04 - context: ci/prow/4.13-e2e-test-azure - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure4 - ci-operator.openshift.io/variant: "4.13" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.4-4.13-e2e-test-azure - rerun_command: /test 4.13-e2e-test-azure - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-azure-cluster-profile - - --target=e2e-test-azure - - --variant=4.13 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-test-azure-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - secret: - secretName: cluster-secrets-azure4 - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )(4.13-e2e-test-azure|remaining-required),?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^oadp-1\.4$ - - ^oadp-1\.4- - cluster: build02 - context: ci/prow/4.13-e2e-test-gcp - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/cloud: gcp - ci-operator.openshift.io/cloud-cluster-profile: gcp - ci-operator.openshift.io/variant: "4.13" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.4-4.13-e2e-test-gcp - rerun_command: /test 4.13-e2e-test-gcp - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-gcp-cluster-profile - - --target=e2e-test-gcp - - --variant=4.13 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-test-gcp-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )(4.13-e2e-test-gcp|remaining-required),?($|\s.*) + trigger: (?m)^/test( | .* )4.14-e2e-test-kubevirt-aws,?($|\s.*) - agent: kubernetes always_run: true branches: - ^oadp-1\.4$ - ^oadp-1\.4- cluster: build04 - context: ci/prow/4.13-images + context: ci/prow/4.14-images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/variant: "4.13" + ci-operator.openshift.io/variant: "4.14" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.4-4.13-images - rerun_command: /test 4.13-images + name: pull-ci-openshift-oadp-operator-oadp-1.4-4.14-images + rerun_command: /test 4.14-images spec: containers: - args: @@ -696,7 +246,7 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --target=[images] - - --variant=4.13 + - --variant=4.14 command: - ci-operator image: ci-operator:latest @@ -729,23 +279,23 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.13-images,?($|\s.*) + trigger: (?m)^/test( | .* )4.14-images,?($|\s.*) - agent: kubernetes always_run: true branches: - ^oadp-1\.4$ - ^oadp-1\.4- cluster: build04 - context: ci/prow/4.14-ci-index + context: ci/prow/4.15-ci-index decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/variant: "4.14" + ci-operator.openshift.io/variant: "4.15" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.4-4.14-ci-index - rerun_command: /test 4.14-ci-index + name: pull-ci-openshift-oadp-operator-oadp-1.4-4.15-ci-index + rerun_command: /test 4.15-ci-index spec: containers: - args: @@ -753,7 +303,7 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --target=ci-index - - --variant=4.14 + - --variant=4.15 command: - ci-operator image: ci-operator:latest @@ -786,25 +336,25 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.14-ci-index,?($|\s.*) + trigger: (?m)^/test( | .* )4.15-ci-index,?($|\s.*) - agent: kubernetes always_run: false branches: - ^oadp-1\.4$ - ^oadp-1\.4- cluster: build03 - context: ci/prow/4.14-e2e-test-aws + context: ci/prow/4.15-e2e-test-aws decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: aws - ci-operator.openshift.io/variant: "4.14" + ci-operator.openshift.io/variant: "4.15" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.4-4.14-e2e-test-aws - rerun_command: /test 4.14-e2e-test-aws + name: pull-ci-openshift-oadp-operator-oadp-1.4-4.15-e2e-test-aws + rerun_command: /test 4.15-e2e-test-aws run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+ spec: containers: @@ -816,7 +366,7 @@ presubmits: - --secret-dir=/secrets/ci-pull-credentials - --secret-dir=/usr/local/e2e-test-aws-cluster-profile - --target=e2e-test-aws - - --variant=4.14 + - --variant=4.15 command: - ci-operator image: ci-operator:latest @@ -869,25 +419,26 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.14-e2e-test-aws,?($|\s.*) + trigger: (?m)^/test( | .* )4.15-e2e-test-aws,?($|\s.*) - agent: kubernetes always_run: false branches: - ^oadp-1\.4$ - ^oadp-1\.4- - cluster: build04 - context: ci/prow/4.14-e2e-test-azure + cluster: build03 + context: ci/prow/4.15-e2e-test-kubevirt-aws decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure4 - ci-operator.openshift.io/variant: "4.14" + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/variant: "4.15" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.4-4.14-e2e-test-azure - rerun_command: /test 4.14-e2e-test-azure + name: pull-ci-openshift-oadp-operator-oadp-1.4-4.15-e2e-test-kubevirt-aws + rerun_command: /test 4.15-e2e-test-kubevirt-aws + run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+ spec: containers: - args: @@ -896,9 +447,9 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-azure-cluster-profile - - --target=e2e-test-azure - - --variant=4.14 + - --secret-dir=/usr/local/e2e-test-kubevirt-aws-cluster-profile + - --target=e2e-test-kubevirt-aws + - --variant=4.15 command: - ci-operator image: ci-operator:latest @@ -914,7 +465,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-test-azure-cluster-profile + - mountPath: /usr/local/e2e-test-kubevirt-aws-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -941,93 +492,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-azure4 - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )(4.14-e2e-test-azure|remaining-required),?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^oadp-1\.4$ - - ^oadp-1\.4- - cluster: build02 - context: ci/prow/4.14-e2e-test-gcp - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/cloud: gcp - ci-operator.openshift.io/cloud-cluster-profile: gcp - ci-operator.openshift.io/variant: "4.14" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.4-4.14-e2e-test-gcp - rerun_command: /test 4.14-e2e-test-gcp - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-test-gcp-cluster-profile - - --target=e2e-test-gcp - - --variant=4.14 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-test-gcp-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp + secretName: cluster-secrets-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -1037,23 +502,23 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )(4.14-e2e-test-gcp|remaining-required),?($|\s.*) + trigger: (?m)^/test( | .* )4.15-e2e-test-kubevirt-aws,?($|\s.*) - agent: kubernetes always_run: true branches: - ^oadp-1\.4$ - ^oadp-1\.4- cluster: build04 - context: ci/prow/4.14-images + context: ci/prow/4.15-images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/variant: "4.14" + ci-operator.openshift.io/variant: "4.15" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.4-4.14-images - rerun_command: /test 4.14-images + name: pull-ci-openshift-oadp-operator-oadp-1.4-4.15-images + rerun_command: /test 4.15-images spec: containers: - args: @@ -1061,7 +526,7 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --target=[images] - - --variant=4.14 + - --variant=4.15 command: - ci-operator image: ci-operator:latest @@ -1094,7 +559,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.14-images,?($|\s.*) + trigger: (?m)^/test( | .* )4.15-images,?($|\s.*) - agent: kubernetes always_run: true branches: From 668199b0c51378c9c1351e66fcdbd6d20a4e1524 Mon Sep 17 00:00:00 2001 From: Michal Pryc Date: Fri, 14 Jun 2024 13:48:49 +0200 Subject: [PATCH 2/2] Fix for oadp-operator master branch - proper 4.16 release stream Fixes issue with the 4.16 jobs for master branch that had improper stream used. Signed-off-by: Michal Pryc --- .../oadp-operator/openshift-oadp-operator-master__4.16.yaml | 5 +++-- .../openshift-oadp-operator-master-periodics.yaml | 1 + .../openshift-oadp-operator-master-presubmits.yaml | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master__4.16.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master__4.16.yaml index 4dd5250df2469..b0627b20dd35c 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master__4.16.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master__4.16.yaml @@ -16,8 +16,9 @@ operator: with: oadp-operator releases: latest: - release: - channel: fast + candidate: + product: ocp + stream: nightly version: "4.16" resources: '*': diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-periodics.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-periodics.yaml index ac5db4e7855e4..f1f12689f3a03 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-periodics.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-periodics.yaml @@ -174,6 +174,7 @@ periodics: ci-operator.openshift.io/cloud-cluster-profile: aws ci-operator.openshift.io/variant: "4.16" ci.openshift.io/generator: prowgen + job-release: "4.16" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: periodic-ci-openshift-oadp-operator-master-4.16-e2e-test-aws-periodic spec: diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-presubmits.yaml index a8dc8bdc61eda..8648f3adcd388 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-presubmits.yaml @@ -573,6 +573,7 @@ presubmits: labels: ci-operator.openshift.io/variant: "4.16" ci.openshift.io/generator: prowgen + job-release: "4.16" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-oadp-operator-master-4.16-ci-index rerun_command: /test 4.16-ci-index @@ -632,6 +633,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: aws ci-operator.openshift.io/variant: "4.16" ci.openshift.io/generator: prowgen + job-release: "4.16" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-oadp-operator-master-4.16-e2e-test-aws rerun_command: /test 4.16-e2e-test-aws @@ -715,6 +717,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: aws ci-operator.openshift.io/variant: "4.16" ci.openshift.io/generator: prowgen + job-release: "4.16" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-oadp-operator-master-4.16-e2e-test-kubevirt-aws rerun_command: /test 4.16-e2e-test-kubevirt-aws @@ -796,6 +799,7 @@ presubmits: labels: ci-operator.openshift.io/variant: "4.16" ci.openshift.io/generator: prowgen + job-release: "4.16" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-oadp-operator-master-4.16-images rerun_command: /test 4.16-images