Skip to content

Commit

Permalink
add 4.16 upgrade job, update others to use version selector (#50980)
Browse files Browse the repository at this point in the history
  • Loading branch information
mgahagan73 authored May 10, 2024
1 parent 86499da commit ec286bd
Show file tree
Hide file tree
Showing 17 changed files with 289 additions and 446 deletions.
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
base_images:
ansible:
name: "4.12"
namespace: ocp
tag: ansible
cli:
name: "4.12"
namespace: ocp
tag: cli
dev-scripts:
name: test
namespace: ocp-kni
tag: dev-scripts
tests-private:
name: tests-private
namespace: ci
Expand All @@ -31,22 +23,13 @@ base_images:
name: "4.12"
namespace: ocp
tag: tools
upi-installer:
name: "4.11"
namespace: ocp
tag: upi-installer
releases:
intermediate411:
release:
architecture: amd64
channel: fast
version: "4.11"
latest:
candidate:
architecture: amd64
product: ocp
stream: nightly
version: "4.10"
version: "4.12"
target:
candidate:
architecture: amd64
Expand All @@ -64,23 +47,10 @@ tests:
steps:
cluster_profile: azure-qe
test:
- as: set-upgrade-releases
commands: echo "${RELEASE_IMAGE_INTERMEDIATE411},${RELEASE_IMAGE_TARGET}" >
${SHARED_DIR}/upgrade-edge
dependencies:
- env: RELEASE_IMAGE_INTERMEDIATE411
name: release:intermediate411
- env: RELEASE_IMAGE_TARGET
name: release:target
from: cli
resources:
requests:
cpu: 100m
memory: 200Mi
- chain: openshift-upgrade-qe-test
workflow: cucushift-installer-rehearse-azure-aro
zz_generated_metadata:
branch: release-4.12
org: openshift
repo: openshift-tests-private
variant: amd64-nightly-4.12-upgrade-from-aro
variant: amd64-nightly-4.12-upgrade-from-aro-4.12
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
base_images:
cli:
name: "4.13"
namespace: ocp
tag: cli
tests-private-postupg:
name: tests-private
namespace: ci
tag: "4.13"
tests-private-preupg:
name: tests-private
namespace: ci
tag: "4.13"
tools:
name: "4.13"
namespace: ocp
tag: tools
releases:
latest:
candidate:
architecture: amd64
product: ocp
stream: nightly
version: "4.13"
target:
candidate:
architecture: amd64
product: ocp
stream: nightly
version: "4.13"
resources:
'*':
requests:
cpu: 100m
memory: 200Mi
tests:
- as: aro-f30
cron: 6 16 2 * *
steps:
cluster_profile: azure-qe
env:
ARO_CLUSTER_VERSION: 4.13.23
test:
- chain: openshift-upgrade-qe-test
workflow: cucushift-installer-rehearse-azure-aro
zz_generated_metadata:
branch: release-4.13
org: openshift
repo: openshift-tests-private
variant: amd64-nightly-4.13-upgrade-from-aro-4.13

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
base_images:
cli:
name: "4.14"
namespace: ocp
tag: cli
tests-private-postupg:
name: tests-private
namespace: ci
tag: "4.14"
tests-private-preupg:
name: tests-private
namespace: ci
tag: "4.14"
tools:
name: "4.14"
namespace: ocp
tag: tools
releases:
latest:
candidate:
architecture: amd64
product: ocp
stream: nightly
version: "4.14"
target:
candidate:
architecture: amd64
product: ocp
stream: nightly
version: "4.14"
resources:
'*':
requests:
cpu: 100m
memory: 200Mi
tests:
- as: aro-f30
cron: 28 7 4 * *
steps:
cluster_profile: azure-qe
env:
ARO_CLUSTER_VERSION: 4.14.16
test:
- chain: openshift-upgrade-qe-test
workflow: cucushift-installer-rehearse-azure-aro
zz_generated_metadata:
branch: release-4.14
org: openshift
repo: openshift-tests-private
variant: amd64-nightly-4.14-upgrade-from-aro-4.14

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
base_images:
cli:
name: "4.14"
namespace: ocp
tag: cli
tests-private-postupg:
name: tests-private
namespace: ci
tag: "4.15"
tests-private-preupg:
name: tests-private
namespace: ci
tag: "4.14"
tools:
name: "4.14"
namespace: ocp
tag: tools
releases:
latest:
candidate:
architecture: amd64
product: ocp
stream: nightly
version: "4.14"
target:
candidate:
architecture: amd64
product: ocp
stream: nightly
version: "4.15"
resources:
'*':
requests:
cpu: 100m
memory: 200Mi
tests:
- as: aro-f30
cron: 11 19 22 * *
steps:
cluster_profile: azure-qe
env:
ARO_CLUSTER_VERSION: 4.14.16
test:
- chain: openshift-upgrade-qe-test
workflow: cucushift-installer-rehearse-azure-aro
zz_generated_metadata:
branch: release-4.15
org: openshift
repo: openshift-tests-private
variant: amd64-nightly-4.15-upgrade-from-aro-4.14
Loading

0 comments on commit ec286bd

Please sign in to comment.