From 6a784b0dcc7eb042d8b02042aaa5c83adbdd07b0 Mon Sep 17 00:00:00 2001 From: Joseph Kim Date: Fri, 11 Oct 2024 09:58:14 -0400 Subject: [PATCH] Upgrade OCP levels for CI tests (#57623) * Upgrade OCP levels for CI tests * add reporter_config for slack alerts for 4.15 * override changes made by make jobs * replace by the generated job --- .../janus-idp-backstage-showcase-1.2.x.yaml | 2 +- .../janus-idp-backstage-showcase-main.yaml | 10 +++++----- ...us-idp-backstage-showcase-release-1.3.yaml | 2 +- ...idp-backstage-showcase-main-periodics.yaml | 20 +++++++++---------- ...ckstage-showcase-helm-aks-nightly-ref.yaml | 10 +++++----- ...us-idp-backstage-showcase-nightly-ref.yaml | 10 +++++----- ...tage-showcase-release-1.3-nightly-ref.yaml | 10 +++++----- 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/ci-operator/config/janus-idp/backstage-showcase/janus-idp-backstage-showcase-1.2.x.yaml b/ci-operator/config/janus-idp/backstage-showcase/janus-idp-backstage-showcase-1.2.x.yaml index c7e848b645dfb..d145884d4bf46 100644 --- a/ci-operator/config/janus-idp/backstage-showcase/janus-idp-backstage-showcase-1.2.x.yaml +++ b/ci-operator/config/janus-idp/backstage-showcase/janus-idp-backstage-showcase-1.2.x.yaml @@ -1,7 +1,7 @@ build_root: project_image: dockerfile_literal: | - FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 + FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.16 RUN yum -y install make wget gcc git httpd-tools images: - context_dir: .ibm/images diff --git a/ci-operator/config/janus-idp/backstage-showcase/janus-idp-backstage-showcase-main.yaml b/ci-operator/config/janus-idp/backstage-showcase/janus-idp-backstage-showcase-main.yaml index 7035b2b104bd6..c91886421d238 100644 --- a/ci-operator/config/janus-idp/backstage-showcase/janus-idp-backstage-showcase-main.yaml +++ b/ci-operator/config/janus-idp/backstage-showcase/janus-idp-backstage-showcase-main.yaml @@ -1,7 +1,7 @@ build_root: project_image: dockerfile_literal: | - FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 + FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.16 RUN yum -y install make wget gcc git httpd-tools images: - context_dir: .ibm/images @@ -35,18 +35,18 @@ tests: steps: test: - ref: janus-idp-backstage-showcase-nightly -- as: e2e-tests-nightly-ocp-v4-14 +- as: e2e-tests-nightly-ocp-v4-15 cron: 0 2 * * * steps: env: - OC_CLIENT_VERSION: stable-4.14 + OC_CLIENT_VERSION: stable-4.15 test: - ref: janus-idp-backstage-showcase-nightly -- as: e2e-tests-nightly-ocp-v4-13 +- as: e2e-tests-nightly-ocp-v4-14 cron: 0 3 * * * steps: env: - OC_CLIENT_VERSION: stable-4.13 + OC_CLIENT_VERSION: stable-4.14 test: - ref: janus-idp-backstage-showcase-nightly - as: e2e-tests-nightly-aks diff --git a/ci-operator/config/janus-idp/backstage-showcase/janus-idp-backstage-showcase-release-1.3.yaml b/ci-operator/config/janus-idp/backstage-showcase/janus-idp-backstage-showcase-release-1.3.yaml index a29f01ec83aad..223ef864a5482 100644 --- a/ci-operator/config/janus-idp/backstage-showcase/janus-idp-backstage-showcase-release-1.3.yaml +++ b/ci-operator/config/janus-idp/backstage-showcase/janus-idp-backstage-showcase-release-1.3.yaml @@ -1,7 +1,7 @@ build_root: project_image: dockerfile_literal: | - FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 + FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.16 RUN yum -y install make wget gcc git httpd-tools images: - context_dir: .ibm/images diff --git a/ci-operator/jobs/janus-idp/backstage-showcase/janus-idp-backstage-showcase-main-periodics.yaml b/ci-operator/jobs/janus-idp/backstage-showcase/janus-idp-backstage-showcase-main-periodics.yaml index 99ac335d5f702..6967010e7abe2 100644 --- a/ci-operator/jobs/janus-idp/backstage-showcase/janus-idp-backstage-showcase-main-periodics.yaml +++ b/ci-operator/jobs/janus-idp/backstage-showcase/janus-idp-backstage-showcase-main-periodics.yaml @@ -158,7 +158,7 @@ periodics: labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-janus-idp-backstage-showcase-main-e2e-tests-nightly-ocp-v4-13 + name: periodic-ci-janus-idp-backstage-showcase-main-e2e-tests-nightly-ocp-v4-14 reporter_config: slack: channel: '#rhdh-e2e-test-alerts' @@ -168,9 +168,9 @@ periodics: - error report_template: '{{if eq .Status.State "success"}} :done-circle-check: {{else}} :failed: {{end}} Job *`{{.Spec.Job}}`* ended with *{{.Status.State}}*. Open - Report: - | - | + | + | | <{{.Status.URL}}|View logs>' spec: containers: @@ -179,7 +179,7 @@ periodics: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-tests-nightly-ocp-v4-13 + - --target=e2e-tests-nightly-ocp-v4-14 command: - ci-operator image: ci-operator:latest @@ -231,7 +231,7 @@ periodics: labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-janus-idp-backstage-showcase-main-e2e-tests-nightly-ocp-v4-14 + name: periodic-ci-janus-idp-backstage-showcase-main-e2e-tests-nightly-ocp-v4-15 reporter_config: slack: channel: '#rhdh-e2e-test-alerts' @@ -241,9 +241,9 @@ periodics: - error report_template: '{{if eq .Status.State "success"}} :done-circle-check: {{else}} :failed: {{end}} Job *`{{.Spec.Job}}`* ended with *{{.Status.State}}*. Open - Report: - | - | + | + | | <{{.Status.URL}}|View logs>' spec: containers: @@ -252,7 +252,7 @@ periodics: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-tests-nightly-ocp-v4-14 + - --target=e2e-tests-nightly-ocp-v4-15 command: - ci-operator image: ci-operator:latest diff --git a/ci-operator/step-registry/janus-idp/backstage-showcase/helm-aks-nightly/janus-idp-backstage-showcase-helm-aks-nightly-ref.yaml b/ci-operator/step-registry/janus-idp/backstage-showcase/helm-aks-nightly/janus-idp-backstage-showcase-helm-aks-nightly-ref.yaml index b6dc98642a1e0..d4de583e809e1 100644 --- a/ci-operator/step-registry/janus-idp/backstage-showcase/helm-aks-nightly/janus-idp-backstage-showcase-helm-aks-nightly-ref.yaml +++ b/ci-operator/step-registry/janus-idp/backstage-showcase/helm-aks-nightly/janus-idp-backstage-showcase-helm-aks-nightly-ref.yaml @@ -3,12 +3,12 @@ ref: cli: latest commands: "janus-idp-backstage-showcase-helm-aks-nightly-commands.sh" credentials: - - mount_path: /tmp/secrets - name: rhdh - namespace: test-credentials + - mount_path: /tmp/secrets + name: rhdh + namespace: test-credentials env: - - name: OC_CLIENT_VERSION - default: stable-4.14 + - name: OC_CLIENT_VERSION + default: stable-4.16 from: showcase-e2e-runner resources: limits: diff --git a/ci-operator/step-registry/janus-idp/backstage-showcase/nightly/janus-idp-backstage-showcase-nightly-ref.yaml b/ci-operator/step-registry/janus-idp/backstage-showcase/nightly/janus-idp-backstage-showcase-nightly-ref.yaml index 2b8c35ee8965e..42eaf8bbed862 100644 --- a/ci-operator/step-registry/janus-idp/backstage-showcase/nightly/janus-idp-backstage-showcase-nightly-ref.yaml +++ b/ci-operator/step-registry/janus-idp/backstage-showcase/nightly/janus-idp-backstage-showcase-nightly-ref.yaml @@ -3,12 +3,12 @@ ref: cli: latest commands: "janus-idp-backstage-showcase-nightly-commands.sh" credentials: - - mount_path: /tmp/secrets - name: rhdh - namespace: test-credentials + - mount_path: /tmp/secrets + name: rhdh + namespace: test-credentials env: - - name: OC_CLIENT_VERSION - default: stable-4.14 + - name: OC_CLIENT_VERSION + default: stable-4.16 from: showcase-e2e-runner resources: limits: diff --git a/ci-operator/step-registry/janus-idp/backstage-showcase/release-1.3/nightly/janus-idp-backstage-showcase-release-1.3-nightly-ref.yaml b/ci-operator/step-registry/janus-idp/backstage-showcase/release-1.3/nightly/janus-idp-backstage-showcase-release-1.3-nightly-ref.yaml index 0f4e225a9e14d..dc2e4d2855830 100644 --- a/ci-operator/step-registry/janus-idp/backstage-showcase/release-1.3/nightly/janus-idp-backstage-showcase-release-1.3-nightly-ref.yaml +++ b/ci-operator/step-registry/janus-idp/backstage-showcase/release-1.3/nightly/janus-idp-backstage-showcase-release-1.3-nightly-ref.yaml @@ -3,12 +3,12 @@ ref: cli: latest commands: "janus-idp-backstage-showcase-release-1.3-nightly-commands.sh" credentials: - - mount_path: /tmp/secrets - name: rhdh - namespace: test-credentials + - mount_path: /tmp/secrets + name: rhdh + namespace: test-credentials env: - - name: OC_CLIENT_VERSION - default: stable-4.14 + - name: OC_CLIENT_VERSION + default: stable-4.16 from: showcase-e2e-runner resources: limits: