Merge pull request #16933 from flacatus/che_update

Update openshift version for eclipse che updates tests
openshift · Mar 22, 2021 · b659ac4 · b659ac4
2 parents 4d4a2a9 + 1337a32
commit b659ac4
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 30 deletions.
diff --git a/...rator/eclipse-che-che-operator-7__v3.yaml → ...rator/eclipse-che-che-operator-7__v6.yaml b/...rator/eclipse-che-che-operator-7__v3.yaml → ...rator/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/...rator/eclipse-che-che-operator-7__v4.yaml → ...rator/eclipse-che-che-operator-7__v7.yaml b/...rator/eclipse-che-che-operator-7__v4.yaml → ...rator/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/...rator/eclipse-che-che-operator-7__v5.yaml → ...rator/eclipse-che-che-operator-7__v8.yaml b/...rator/eclipse-che-che-operator-7__v5.yaml → ...rator/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
@@ -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.*)