From 9c58860afe993c27c74b790d7893a64512687426 Mon Sep 17 00:00:00 2001 From: thepetk Date: Thu, 20 Jun 2024 19:43:41 +0100 Subject: [PATCH 1/2] Upgrade registry-operator jobs Signed-off-by: thepetk --- ...evfile-registry-operator-main__v4.15.yaml} | 10 ++++---- ...-registry-operator-release-v0__v4.15.yaml} | 10 ++++---- ...ile-registry-operator-main-presubmits.yaml | 24 +++++++++---------- ...gistry-operator-release-v0-presubmits.yaml | 24 +++++++++---------- 4 files changed, 34 insertions(+), 34 deletions(-) rename ci-operator/config/devfile/registry-operator/{devfile-registry-operator-main__v4.12.yaml => devfile-registry-operator-main__v4.15.yaml} (89%) rename ci-operator/config/devfile/registry-operator/{devfile-registry-operator-release-v0__v4.12.yaml => devfile-registry-operator-release-v0__v4.15.yaml} (89%) diff --git a/ci-operator/config/devfile/registry-operator/devfile-registry-operator-main__v4.12.yaml b/ci-operator/config/devfile/registry-operator/devfile-registry-operator-main__v4.15.yaml similarity index 89% rename from ci-operator/config/devfile/registry-operator/devfile-registry-operator-main__v4.12.yaml rename to ci-operator/config/devfile/registry-operator/devfile-registry-operator-main__v4.15.yaml index 93d05685402c..8b00c7de20c7 100644 --- a/ci-operator/config/devfile/registry-operator/devfile-registry-operator-main__v4.12.yaml +++ b/ci-operator/config/devfile/registry-operator/devfile-registry-operator-main__v4.15.yaml @@ -1,6 +1,6 @@ base_images: cli: - name: "4.12" + name: "4.15" namespace: ocp tag: cli build_root: @@ -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: '*': @@ -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: @@ -58,4 +58,4 @@ zz_generated_metadata: branch: main org: devfile repo: registry-operator - variant: v4.12 + variant: v4.15 diff --git a/ci-operator/config/devfile/registry-operator/devfile-registry-operator-release-v0__v4.12.yaml b/ci-operator/config/devfile/registry-operator/devfile-registry-operator-release-v0__v4.15.yaml similarity index 89% rename from ci-operator/config/devfile/registry-operator/devfile-registry-operator-release-v0__v4.12.yaml rename to ci-operator/config/devfile/registry-operator/devfile-registry-operator-release-v0__v4.15.yaml index 0525da29be9a..945cf1814d63 100644 --- a/ci-operator/config/devfile/registry-operator/devfile-registry-operator-release-v0__v4.12.yaml +++ b/ci-operator/config/devfile/registry-operator/devfile-registry-operator-release-v0__v4.15.yaml @@ -1,6 +1,6 @@ base_images: cli: - name: "4.12" + name: "4.15" namespace: ocp tag: cli build_root: @@ -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: '*': @@ -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: @@ -58,4 +58,4 @@ zz_generated_metadata: branch: release-v0 org: devfile repo: registry-operator - variant: v4.12 + variant: v4.15 diff --git a/ci-operator/jobs/devfile/registry-operator/devfile-registry-operator-main-presubmits.yaml b/ci-operator/jobs/devfile/registry-operator/devfile-registry-operator-main-presubmits.yaml index f6342652dd58..04629e2c695b 100644 --- a/ci-operator/jobs/devfile/registry-operator/devfile-registry-operator-main-presubmits.yaml +++ b/ci-operator/jobs/devfile/registry-operator/devfile-registry-operator-main-presubmits.yaml @@ -6,16 +6,16 @@ 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: @@ -23,7 +23,7 @@ presubmits: - --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 @@ -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: @@ -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 @@ -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.*) diff --git a/ci-operator/jobs/devfile/registry-operator/devfile-registry-operator-release-v0-presubmits.yaml b/ci-operator/jobs/devfile/registry-operator/devfile-registry-operator-release-v0-presubmits.yaml index 0d19565381a7..dd44203875df 100644 --- a/ci-operator/jobs/devfile/registry-operator/devfile-registry-operator-release-v0-presubmits.yaml +++ b/ci-operator/jobs/devfile/registry-operator/devfile-registry-operator-release-v0-presubmits.yaml @@ -6,16 +6,16 @@ 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: @@ -23,7 +23,7 @@ presubmits: - --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 @@ -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: @@ -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 @@ -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.*) From b750c842df9ec196d5003b96bbbffb353a5a4c9c Mon Sep 17 00:00:00 2001 From: thepetk Date: Fri, 21 Jun 2024 13:09:19 +0100 Subject: [PATCH 2/2] Upgrade golang tag to 1.21 Signed-off-by: thepetk --- .../devfile-registry-operator-main__v4.15.yaml | 2 +- .../devfile-registry-operator-release-v0__v4.15.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci-operator/config/devfile/registry-operator/devfile-registry-operator-main__v4.15.yaml b/ci-operator/config/devfile/registry-operator/devfile-registry-operator-main__v4.15.yaml index 8b00c7de20c7..92951a78a34d 100644 --- a/ci-operator/config/devfile/registry-operator/devfile-registry-operator-main__v4.15.yaml +++ b/ci-operator/config/devfile/registry-operator/devfile-registry-operator-main__v4.15.yaml @@ -7,7 +7,7 @@ build_root: image_stream_tag: name: release namespace: openshift - tag: golang-1.19 + tag: golang-1.21 images: - build_args: - name: TARGETARCH diff --git a/ci-operator/config/devfile/registry-operator/devfile-registry-operator-release-v0__v4.15.yaml b/ci-operator/config/devfile/registry-operator/devfile-registry-operator-release-v0__v4.15.yaml index 945cf1814d63..43c6f740aab3 100644 --- a/ci-operator/config/devfile/registry-operator/devfile-registry-operator-release-v0__v4.15.yaml +++ b/ci-operator/config/devfile/registry-operator/devfile-registry-operator-release-v0__v4.15.yaml @@ -7,7 +7,7 @@ build_root: image_stream_tag: name: release namespace: openshift - tag: golang-1.19 + tag: golang-1.21 images: - build_args: - name: TARGETARCH