Skip to content

Commit

Permalink
chore: upgrade registry-operator tests to ocp 4.15 (openshift#53498)
Browse files Browse the repository at this point in the history
* Upgrade registry-operator jobs

Signed-off-by: thepetk <[email protected]>

* Upgrade golang tag to 1.21

Signed-off-by: thepetk <[email protected]>

---------

Signed-off-by: thepetk <[email protected]>
  • Loading branch information
thepetk authored and Joe Talerico committed Jul 15, 2024
1 parent cd346c3 commit 65f98f0
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 36 deletions.
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
base_images:
cli:
name: "4.12"
name: "4.15"
namespace: ocp
tag: cli
build_root:
image_stream_tag:
name: release
namespace: openshift
tag: golang-1.19
tag: golang-1.21
images:
- build_args:
- name: TARGETARCH
Expand All @@ -17,12 +17,12 @@ images:
releases:
initial:
integration:
name: "4.12"
name: "4.15"
namespace: ocp
latest:
integration:
include_built_images: true
name: "4.12"
name: "4.15"
namespace: ocp
resources:
'*':
Expand All @@ -42,7 +42,7 @@ tests:
commands: |
export PATH=$PATH:/tmp/bin
mkdir /tmp/bin
curl -L --fail https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/candidate-4.12/openshift-client-linux.tar.gz | tar xvzf - -C /tmp/bin/ oc
curl -L --fail https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/candidate-4.15/openshift-client-linux.tar.gz | tar xvzf - -C /tmp/bin/ oc
chmod ug+x /tmp/bin/oc
.ci/openshift_integration.sh
dependencies:
Expand All @@ -58,4 +58,4 @@ zz_generated_metadata:
branch: main
org: devfile
repo: registry-operator
variant: v4.12
variant: v4.15
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
base_images:
cli:
name: "4.12"
name: "4.15"
namespace: ocp
tag: cli
build_root:
image_stream_tag:
name: release
namespace: openshift
tag: golang-1.19
tag: golang-1.21
images:
- build_args:
- name: TARGETARCH
Expand All @@ -17,12 +17,12 @@ images:
releases:
initial:
integration:
name: "4.12"
name: "4.15"
namespace: ocp
latest:
integration:
include_built_images: true
name: "4.12"
name: "4.15"
namespace: ocp
resources:
'*':
Expand All @@ -42,7 +42,7 @@ tests:
commands: |
export PATH=$PATH:/tmp/bin
mkdir /tmp/bin
curl -L --fail https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/candidate-4.12/openshift-client-linux.tar.gz | tar xvzf - -C /tmp/bin/ oc
curl -L --fail https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/candidate-4.15/openshift-client-linux.tar.gz | tar xvzf - -C /tmp/bin/ oc
chmod ug+x /tmp/bin/oc
.ci/openshift_integration.sh
dependencies:
Expand All @@ -58,4 +58,4 @@ zz_generated_metadata:
branch: release-v0
org: devfile
repo: registry-operator
variant: v4.12
variant: v4.15
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,24 @@ presubmits:
- ^main$
- ^main-
cluster: build05
context: ci/prow/v4.12-images
context: ci/prow/v4.15-images
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/variant: v4.12
ci-operator.openshift.io/variant: v4.15
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-devfile-registry-operator-main-v4.12-images
rerun_command: /test v4.12-images
name: pull-ci-devfile-registry-operator-main-v4.15-images
rerun_command: /test v4.15-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=v4.12
- --variant=v4.15
command:
- ci-operator
image: ci-operator:latest
Expand Down Expand Up @@ -56,25 +56,25 @@ presubmits:
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )v4.12-images,?($|\s.*)
trigger: (?m)^/test( | .* )v4.15-images,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
- ^main$
- ^main-
cluster: build03
context: ci/prow/v4.12-registry-operator-integration-test
context: ci/prow/v4.15-registry-operator-integration-test
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/cloud: aws
ci-operator.openshift.io/cloud-cluster-profile: aws-devfile
ci-operator.openshift.io/variant: v4.12
ci-operator.openshift.io/variant: v4.15
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-devfile-registry-operator-main-v4.12-registry-operator-integration-test
rerun_command: /test v4.12-registry-operator-integration-test
name: pull-ci-devfile-registry-operator-main-v4.15-registry-operator-integration-test
rerun_command: /test v4.15-registry-operator-integration-test
spec:
containers:
- args:
Expand All @@ -85,7 +85,7 @@ presubmits:
- --secret-dir=/secrets/ci-pull-credentials
- --secret-dir=/usr/local/registry-operator-integration-test-cluster-profile
- --target=registry-operator-integration-test
- --variant=v4.12
- --variant=v4.15
command:
- ci-operator
image: ci-operator:latest
Expand Down Expand Up @@ -138,4 +138,4 @@ presubmits:
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )v4.12-registry-operator-integration-test,?($|\s.*)
trigger: (?m)^/test( | .* )v4.15-registry-operator-integration-test,?($|\s.*)
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,24 @@ presubmits:
- ^release-v0$
- ^release-v0-
cluster: build05
context: ci/prow/v4.12-images
context: ci/prow/v4.15-images
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/variant: v4.12
ci-operator.openshift.io/variant: v4.15
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-devfile-registry-operator-release-v0-v4.12-images
rerun_command: /test v4.12-images
name: pull-ci-devfile-registry-operator-release-v0-v4.15-images
rerun_command: /test v4.15-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=v4.12
- --variant=v4.15
command:
- ci-operator
image: ci-operator:latest
Expand Down Expand Up @@ -56,25 +56,25 @@ presubmits:
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )v4.12-images,?($|\s.*)
trigger: (?m)^/test( | .* )v4.15-images,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
- ^release-v0$
- ^release-v0-
cluster: build03
context: ci/prow/v4.12-registry-operator-integration-test
context: ci/prow/v4.15-registry-operator-integration-test
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/cloud: aws
ci-operator.openshift.io/cloud-cluster-profile: aws-devfile
ci-operator.openshift.io/variant: v4.12
ci-operator.openshift.io/variant: v4.15
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-devfile-registry-operator-release-v0-v4.12-registry-operator-integration-test
rerun_command: /test v4.12-registry-operator-integration-test
name: pull-ci-devfile-registry-operator-release-v0-v4.15-registry-operator-integration-test
rerun_command: /test v4.15-registry-operator-integration-test
spec:
containers:
- args:
Expand All @@ -85,7 +85,7 @@ presubmits:
- --secret-dir=/secrets/ci-pull-credentials
- --secret-dir=/usr/local/registry-operator-integration-test-cluster-profile
- --target=registry-operator-integration-test
- --variant=v4.12
- --variant=v4.15
command:
- ci-operator
image: ci-operator:latest
Expand Down Expand Up @@ -138,4 +138,4 @@ presubmits:
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )v4.12-registry-operator-integration-test,?($|\s.*)
trigger: (?m)^/test( | .* )v4.15-registry-operator-integration-test,?($|\s.*)

0 comments on commit 65f98f0

Please sign in to comment.