Add Eclipse Che support in OCP 4.5 4.6 4.7 version

Signed-off-by: Flavius Lacatusu <flacatus@redhat.com>
openshift · Nov 19, 2020 · 3c7b658 · 3c7b658
1 parent 25fb512
commit 3c7b658
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 60 deletions.
diff --git a/...-operator/eclipse-che-operator-7__v3.yaml → ...-operator/eclipse-che-operator-7__v6.yaml b/...-operator/eclipse-che-operator-7__v3.yaml → ...-operator/eclipse-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
@@ -37,4 +37,4 @@ zz_generated_metadata:
   branch: "7"
   org: eclipse
   repo: che-operator
-  variant: v3
+  variant: v6
diff --git a/...-operator/eclipse-che-operator-7__v4.yaml → ...-operator/eclipse-che-operator-7__v7.yaml b/...-operator/eclipse-che-operator-7__v4.yaml → ...-operator/eclipse-che-operator-7__v7.yaml
@@ -1,6 +1,6 @@
 base_images:
   cli:
-    name: "4.4"
+    name: "4.6"
     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
@@ -37,4 +37,4 @@ zz_generated_metadata:
   branch: "7"
   org: eclipse
   repo: che-operator
-  variant: v4
+  variant: v7
diff --git a/...ator/eclipse-che-operator-master__v3.yaml → ...ator/eclipse-che-operator-master__v6.yaml b/...ator/eclipse-che-operator-master__v3.yaml → ...ator/eclipse-che-operator-master__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
@@ -37,4 +37,4 @@ zz_generated_metadata:
   branch: master
   org: eclipse
   repo: che-operator
-  variant: v3
+  variant: v6
diff --git a/...ator/eclipse-che-operator-master__v4.yaml → ...ator/eclipse-che-operator-master__v7.yaml b/...ator/eclipse-che-operator-master__v4.yaml → ...ator/eclipse-che-operator-master__v7.yaml
@@ -1,6 +1,6 @@
 base_images:
   cli:
-    name: "4.4"
+    name: "4.6"
     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
@@ -37,4 +37,4 @@ zz_generated_metadata:
   branch: master
   org: eclipse
   repo: che-operator
-  variant: v4
+  variant: v7
diff --git a/ci-operator/jobs/eclipse/che-operator/eclipse-che-operator-7-presubmits.yaml b/ci-operator/jobs/eclipse/che-operator/eclipse-che-operator-7-presubmits.yaml
@@ -5,16 +5,16 @@ presubmits:
     branches:
     - "7"
     cluster: build01
-    context: ci/prow/v3-che-operator-update
+    context: ci/prow/v5-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: v5
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-eclipse-che-operator-7-v3-che-operator-update
-    rerun_command: /test v3-che-operator-update
+    name: pull-ci-eclipse-che-operator-7-v5-che-operator-update
+    rerun_command: /test v5-che-operator-update
     spec:
       containers:
       - args:
@@ -24,7 +24,7 @@ presubmits:
         - --report-username=ci
         - --secret-dir=/usr/local/che-operator-update-cluster-profile
         - --target=che-operator-update
-        - --variant=v3
+        - --variant=v5
         command:
         - ci-operator
         image: ci-operator:latest
@@ -64,22 +64,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )v3-che-operator-update,?($|\s.*)
+    trigger: (?m)^/test( | .* )v5-che-operator-update,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - "7"
     cluster: build01
-    context: ci/prow/v4-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: v4
+      ci-operator.openshift.io/variant: v6
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-eclipse-che-operator-7-v4-che-operator-update
-    rerun_command: /test v4-che-operator-update
+    name: pull-ci-eclipse-che-operator-7-v6-che-operator-update
+    rerun_command: /test v6-che-operator-update
     spec:
       containers:
       - args:
@@ -89,7 +89,7 @@ presubmits:
         - --report-username=ci
         - --secret-dir=/usr/local/che-operator-update-cluster-profile
         - --target=che-operator-update
-        - --variant=v4
+        - --variant=v6
         command:
         - ci-operator
         image: ci-operator:latest
@@ -129,22 +129,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )v4-che-operator-update,?($|\s.*)
+    trigger: (?m)^/test( | .* )v6-che-operator-update,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - "7"
     cluster: build01
-    context: ci/prow/v5-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: v5
+      ci-operator.openshift.io/variant: v7
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-eclipse-che-operator-7-v5-che-operator-update
-    rerun_command: /test v5-che-operator-update
+    name: pull-ci-eclipse-che-operator-7-v7-che-operator-update
+    rerun_command: /test v7-che-operator-update
     spec:
       containers:
       - args:
@@ -154,7 +154,7 @@ presubmits:
         - --report-username=ci
         - --secret-dir=/usr/local/che-operator-update-cluster-profile
         - --target=che-operator-update
-        - --variant=v5
+        - --variant=v7
         command:
         - ci-operator
         image: ci-operator:latest
@@ -194,4 +194,4 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )v5-che-operator-update,?($|\s.*)
+    trigger: (?m)^/test( | .* )v7-che-operator-update,?($|\s.*)
diff --git a/ci-operator/jobs/eclipse/che-operator/eclipse-che-operator-master-presubmits.yaml b/ci-operator/jobs/eclipse/che-operator/eclipse-che-operator-master-presubmits.yaml
@@ -5,26 +5,26 @@ presubmits:
     branches:
     - master
     cluster: build01
-    context: ci/prow/v3-che-operator-update
+    context: ci/prow/v5-che-operator-olm-latest-changes-tests
     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: v5
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-eclipse-che-operator-master-v3-che-operator-update
-    rerun_command: /test v3-che-operator-update
+    name: pull-ci-eclipse-che-operator-master-v5-che-operator-olm-latest-changes-tests
+    rerun_command: /test v5-che-operator-olm-latest-changes-tests
     spec:
       containers:
       - args:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --lease-server-password-file=/etc/boskos/password
         - --report-password-file=/etc/report/password.txt
         - --report-username=ci
-        - --secret-dir=/usr/local/che-operator-update-cluster-profile
-        - --target=che-operator-update
-        - --variant=v3
+        - --secret-dir=/usr/local/che-operator-olm-latest-changes-tests-cluster-profile
+        - --target=che-operator-olm-latest-changes-tests
+        - --variant=v5
         command:
         - ci-operator
         image: ci-operator:latest
@@ -37,7 +37,7 @@ presubmits:
         - mountPath: /etc/boskos
           name: boskos
           readOnly: true
-        - mountPath: /usr/local/che-operator-update-cluster-profile
+        - mountPath: /usr/local/che-operator-olm-latest-changes-tests-cluster-profile
           name: cluster-profile
         - mountPath: /etc/pull-secret
           name: pull-secret
@@ -64,22 +64,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )v3-che-operator-update,?($|\s.*)
+    trigger: (?m)^/test( | .* )v5-che-operator-olm-latest-changes-tests,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - master
     cluster: build01
-    context: ci/prow/v4-che-operator-update
+    context: ci/prow/v5-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: v5
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-eclipse-che-operator-master-v4-che-operator-update
-    rerun_command: /test v4-che-operator-update
+    name: pull-ci-eclipse-che-operator-master-v5-che-operator-update
+    rerun_command: /test v5-che-operator-update
     spec:
       containers:
       - args:
@@ -89,7 +89,7 @@ presubmits:
         - --report-username=ci
         - --secret-dir=/usr/local/che-operator-update-cluster-profile
         - --target=che-operator-update
-        - --variant=v4
+        - --variant=v5
         command:
         - ci-operator
         image: ci-operator:latest
@@ -129,32 +129,32 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )v4-che-operator-update,?($|\s.*)
+    trigger: (?m)^/test( | .* )v5-che-operator-update,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - master
     cluster: build01
-    context: ci/prow/v5-che-operator-olm-latest-changes-tests
+    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: v5
+      ci-operator.openshift.io/variant: v6
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-eclipse-che-operator-master-v5-che-operator-olm-latest-changes-tests
-    rerun_command: /test v5-che-operator-olm-latest-changes-tests
+    name: pull-ci-eclipse-che-operator-master-v6-che-operator-update
+    rerun_command: /test v6-che-operator-update
     spec:
       containers:
       - args:
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --lease-server-password-file=/etc/boskos/password
         - --report-password-file=/etc/report/password.txt
         - --report-username=ci
-        - --secret-dir=/usr/local/che-operator-olm-latest-changes-tests-cluster-profile
-        - --target=che-operator-olm-latest-changes-tests
-        - --variant=v5
+        - --secret-dir=/usr/local/che-operator-update-cluster-profile
+        - --target=che-operator-update
+        - --variant=v6
         command:
         - ci-operator
         image: ci-operator:latest
@@ -167,7 +167,7 @@ presubmits:
         - mountPath: /etc/boskos
           name: boskos
           readOnly: true
-        - mountPath: /usr/local/che-operator-olm-latest-changes-tests-cluster-profile
+        - mountPath: /usr/local/che-operator-update-cluster-profile
           name: cluster-profile
         - mountPath: /etc/pull-secret
           name: pull-secret
@@ -194,22 +194,22 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )v5-che-operator-olm-latest-changes-tests,?($|\s.*)
+    trigger: (?m)^/test( | .* )v6-che-operator-update,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
     - master
     cluster: build01
-    context: ci/prow/v5-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: v5
+      ci-operator.openshift.io/variant: v7
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-eclipse-che-operator-master-v5-che-operator-update
-    rerun_command: /test v5-che-operator-update
+    name: pull-ci-eclipse-che-operator-master-v7-che-operator-update
+    rerun_command: /test v7-che-operator-update
     spec:
       containers:
       - args:
@@ -219,7 +219,7 @@ presubmits:
         - --report-username=ci
         - --secret-dir=/usr/local/che-operator-update-cluster-profile
         - --target=che-operator-update
-        - --variant=v5
+        - --variant=v7
         command:
         - ci-operator
         image: ci-operator:latest
@@ -259,4 +259,4 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )v5-che-operator-update,?($|\s.*)
+    trigger: (?m)^/test( | .* )v7-che-operator-update,?($|\s.*)