From 1337a32386614f5d036b2257e4c0bc0fceffbde4 Mon Sep 17 00:00:00 2001 From: Flavius Lacatusu Date: Thu, 18 Mar 2021 13:12:51 +0100 Subject: [PATCH] Fix artifacts name in openshfit ci Signed-off-by: Flavius Lacatusu --- ...ml => eclipse-che-che-operator-7__v6.yaml} | 14 +++++--- ...ml => eclipse-che-che-operator-7__v7.yaml} | 14 +++++--- ...ml => eclipse-che-che-operator-7__v8.yaml} | 14 +++++--- ...eclipse-che-che-operator-7-presubmits.yaml | 36 +++++++++---------- 4 files changed, 48 insertions(+), 30 deletions(-) rename ci-operator/config/eclipse-che/che-operator/{eclipse-che-che-operator-7__v3.yaml => eclipse-che-che-operator-7__v6.yaml} (63%) rename ci-operator/config/eclipse-che/che-operator/{eclipse-che-che-operator-7__v4.yaml => eclipse-che-che-operator-7__v7.yaml} (63%) rename ci-operator/config/eclipse-che/che-operator/{eclipse-che-che-operator-7__v5.yaml => eclipse-che-che-operator-7__v8.yaml} (63%) diff --git a/ci-operator/config/eclipse-che/che-operator/eclipse-che-che-operator-7__v3.yaml b/ci-operator/config/eclipse-che/che-operator/eclipse-che-che-operator-7__v6.yaml similarity index 63% rename from ci-operator/config/eclipse-che/che-operator/eclipse-che-che-operator-7__v3.yaml rename to ci-operator/config/eclipse-che/che-operator/eclipse-che-che-operator-7__v6.yaml index c45e9d766aab..f68d47c762cd 100644 --- a/ci-operator/config/eclipse-che/che-operator/eclipse-che-che-operator-7__v3.yaml +++ b/ci-operator/config/eclipse-che/che-operator/eclipse-che-che-operator-7__v6.yaml @@ -1,6 +1,6 @@ base_images: cli: - name: "4.3" + name: "4.6" namespace: ocp tag: cli cli-jq: @@ -18,7 +18,7 @@ resources: cpu: 100m memory: 200Mi tag_specification: - name: "4.3" + name: "4.6" namespace: ocp tests: - as: che-operator-update @@ -27,7 +27,13 @@ tests: test: - as: test cli: latest - commands: .ci/cico_updates_openshift.sh + commands: | + export GITHUB_TOKEN=$(cat /usr/local/ci-secrets/test-harness-secrets/github-token) + .ci/cico_updates_openshift.sh + credentials: + - mount_path: /usr/local/ci-secrets/test-harness-secrets + name: test-harness-secrets + namespace: test-credentials from: src resources: requests: @@ -37,4 +43,4 @@ zz_generated_metadata: branch: "7" org: eclipse-che repo: che-operator - variant: v3 + variant: v6 diff --git a/ci-operator/config/eclipse-che/che-operator/eclipse-che-che-operator-7__v4.yaml b/ci-operator/config/eclipse-che/che-operator/eclipse-che-che-operator-7__v7.yaml similarity index 63% rename from ci-operator/config/eclipse-che/che-operator/eclipse-che-che-operator-7__v4.yaml rename to ci-operator/config/eclipse-che/che-operator/eclipse-che-che-operator-7__v7.yaml index 514e94e7d693..79d3908de446 100644 --- a/ci-operator/config/eclipse-che/che-operator/eclipse-che-che-operator-7__v4.yaml +++ b/ci-operator/config/eclipse-che/che-operator/eclipse-che-che-operator-7__v7.yaml @@ -1,6 +1,6 @@ base_images: cli: - name: "4.4" + name: "4.7" namespace: ocp tag: cli cli-jq: @@ -18,7 +18,7 @@ resources: cpu: 100m memory: 200Mi tag_specification: - name: "4.4" + name: "4.7" namespace: ocp tests: - as: che-operator-update @@ -27,7 +27,13 @@ tests: test: - as: test cli: latest - commands: .ci/cico_updates_openshift.sh + commands: | + export GITHUB_TOKEN=$(cat /usr/local/ci-secrets/test-harness-secrets/github-token) + .ci/cico_updates_openshift.sh + credentials: + - mount_path: /usr/local/ci-secrets/test-harness-secrets + name: test-harness-secrets + namespace: test-credentials from: src resources: requests: @@ -37,4 +43,4 @@ zz_generated_metadata: branch: "7" org: eclipse-che repo: che-operator - variant: v4 + variant: v7 diff --git a/ci-operator/config/eclipse-che/che-operator/eclipse-che-che-operator-7__v5.yaml b/ci-operator/config/eclipse-che/che-operator/eclipse-che-che-operator-7__v8.yaml similarity index 63% rename from ci-operator/config/eclipse-che/che-operator/eclipse-che-che-operator-7__v5.yaml rename to ci-operator/config/eclipse-che/che-operator/eclipse-che-che-operator-7__v8.yaml index c01762545867..bf7e190d508c 100644 --- a/ci-operator/config/eclipse-che/che-operator/eclipse-che-che-operator-7__v5.yaml +++ b/ci-operator/config/eclipse-che/che-operator/eclipse-che-che-operator-7__v8.yaml @@ -1,6 +1,6 @@ base_images: cli: - name: "4.5" + name: "4.8" namespace: ocp tag: cli cli-jq: @@ -18,7 +18,7 @@ resources: cpu: 100m memory: 200Mi tag_specification: - name: "4.5" + name: "4.8" namespace: ocp tests: - as: che-operator-update @@ -27,7 +27,13 @@ tests: test: - as: test cli: latest - commands: .ci/cico_updates_openshift.sh + commands: | + export GITHUB_TOKEN=$(cat /usr/local/ci-secrets/test-harness-secrets/github-token) + .ci/cico_updates_openshift.sh + credentials: + - mount_path: /usr/local/ci-secrets/test-harness-secrets + name: test-harness-secrets + namespace: test-credentials from: src resources: requests: @@ -37,4 +43,4 @@ zz_generated_metadata: branch: "7" org: eclipse-che repo: che-operator - variant: v5 + variant: v8 diff --git a/ci-operator/jobs/eclipse-che/che-operator/eclipse-che-che-operator-7-presubmits.yaml b/ci-operator/jobs/eclipse-che/che-operator/eclipse-che-che-operator-7-presubmits.yaml index 31ec99b27859..607451faaa20 100644 --- a/ci-operator/jobs/eclipse-che/che-operator/eclipse-che-che-operator-7-presubmits.yaml +++ b/ci-operator/jobs/eclipse-che/che-operator/eclipse-che-che-operator-7-presubmits.yaml @@ -5,16 +5,16 @@ presubmits: branches: - "7" cluster: build01 - context: ci/prow/v3-che-operator-update + context: ci/prow/v6-che-operator-update decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/prowgen-controlled: "true" - ci-operator.openshift.io/variant: v3 + ci-operator.openshift.io/variant: v6 pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-eclipse-che-che-operator-7-v3-che-operator-update - rerun_command: /test v3-che-operator-update + name: pull-ci-eclipse-che-che-operator-7-v6-che-operator-update + rerun_command: /test v6-che-operator-update spec: containers: - args: @@ -24,7 +24,7 @@ presubmits: - --report-credentials-file=/etc/report/credentials - --secret-dir=/usr/local/che-operator-update-cluster-profile - --target=che-operator-update - - --variant=v3 + - --variant=v6 command: - ci-operator image: ci-operator:latest @@ -67,22 +67,22 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )v3-che-operator-update,?($|\s.*) + trigger: (?m)^/test( | .* )v6-che-operator-update,?($|\s.*) - agent: kubernetes always_run: true branches: - "7" cluster: build01 - context: ci/prow/v4-che-operator-update + context: ci/prow/v7-che-operator-update decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/prowgen-controlled: "true" - ci-operator.openshift.io/variant: v4 + ci-operator.openshift.io/variant: v7 pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-eclipse-che-che-operator-7-v4-che-operator-update - rerun_command: /test v4-che-operator-update + name: pull-ci-eclipse-che-che-operator-7-v7-che-operator-update + rerun_command: /test v7-che-operator-update spec: containers: - args: @@ -92,7 +92,7 @@ presubmits: - --report-credentials-file=/etc/report/credentials - --secret-dir=/usr/local/che-operator-update-cluster-profile - --target=che-operator-update - - --variant=v4 + - --variant=v7 command: - ci-operator image: ci-operator:latest @@ -135,22 +135,22 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )v4-che-operator-update,?($|\s.*) + trigger: (?m)^/test( | .* )v7-che-operator-update,?($|\s.*) - agent: kubernetes always_run: true branches: - "7" cluster: build01 - context: ci/prow/v5-che-operator-update + context: ci/prow/v8-che-operator-update decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/prowgen-controlled: "true" - ci-operator.openshift.io/variant: v5 + ci-operator.openshift.io/variant: v8 pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-eclipse-che-che-operator-7-v5-che-operator-update - rerun_command: /test v5-che-operator-update + name: pull-ci-eclipse-che-che-operator-7-v8-che-operator-update + rerun_command: /test v8-che-operator-update spec: containers: - args: @@ -160,7 +160,7 @@ presubmits: - --report-credentials-file=/etc/report/credentials - --secret-dir=/usr/local/che-operator-update-cluster-profile - --target=che-operator-update - - --variant=v5 + - --variant=v8 command: - ci-operator image: ci-operator:latest @@ -203,4 +203,4 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )v5-che-operator-update,?($|\s.*) + trigger: (?m)^/test( | .* )v8-che-operator-update,?($|\s.*)