Fix v8 all namespace job. Remove unsupported v7 all namespace job.

Signed-off-by: Oleksandr Andriienko <oandriie@redhat.com>
openshift · Oct 19, 2021 · 79f0991 · 79f0991
1 parent 8768d82
commit 79f0991
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 114 deletions.
diff --git a/ci-operator/config/eclipse-che/che-operator/eclipse-che-che-operator-main__v7.yaml b/ci-operator/config/eclipse-che/che-operator/eclipse-che-che-operator-main__v7.yaml
@@ -8,8 +8,6 @@ operator:
   bundles:
   - context_dir: bundle/next/eclipse-che-preview-openshift
     dockerfile_path: bundle.Dockerfile
-  - context_dir: bundle/next-all-namespaces/eclipse-che-preview-openshift
-    dockerfile_path: bundle.Dockerfile
 releases:
   initial:
     integration:
@@ -35,7 +33,7 @@ tests:
       OO_CHANNEL: next
       OO_INSTALL_NAMESPACE: eclipse-che
       OO_PACKAGE: eclipse-che-preview-openshift
-      OO_TARGET_NAMESPACES: ''
+      OO_TARGET_NAMESPACES: '!install'
     test:
     - as: multi-host-nightly-deployment
       cli: latest
@@ -152,34 +150,6 @@ tests:
           cpu: 100m
           memory: 200Mi
     workflow: optional-operators-ci-gcp
-- as: e2e-all-namespaces-deployment
-  steps:
-    cluster_profile: gcp
-    env:
-      OO_CHANNEL: next-all-namespaces
-      OO_INSTALL_NAMESPACE: openshift-operators
-      OO_PACKAGE: eclipse-che-preview-openshift
-      OO_TARGET_NAMESPACES: '!install'
-    test:
-    - as: single-host-next-deployment
-      cli: latest
-      commands: |
-        echo -e "[INFO] Test script content"
-        oc get po -n openshift-operators
-      dependencies:
-      - env: CI_CHE_OPERATOR_IMAGE
-        name: che-operator-image
-      env:
-      - name: OO_CHANNEL
-      - name: OO_INSTALL_NAMESPACE
-      - name: OO_PACKAGE
-      - name: OO_TARGET_NAMESPACES
-      from: src
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-    workflow: optional-operators-ci-gcp
 zz_generated_metadata:
   branch: main
   org: eclipse-che

diff --git a/ci-operator/config/eclipse-che/che-operator/eclipse-che-che-operator-main__v8.yaml b/ci-operator/config/eclipse-che/che-operator/eclipse-che-che-operator-main__v8.yaml
@@ -123,9 +123,9 @@ tests:
     cluster_profile: gcp
     env:
       OO_CHANNEL: next-all-namespaces
-      OO_INSTALL_NAMESPACE: openshift-operators
+      OO_INSTALL_NAMESPACE: eclipse-che
       OO_PACKAGE: eclipse-che-preview-openshift
-      OO_TARGET_NAMESPACES: '!install'
+      OO_TARGET_NAMESPACES: '!all'
     test:
     - as: single-host-deployment
       cli: latest

diff --git a/ci-operator/jobs/eclipse-che/che-operator/eclipse-che-che-operator-main-presubmits.yaml b/ci-operator/jobs/eclipse-che/che-operator/eclipse-che-che-operator-main-presubmits.yaml
@@ -134,85 +134,7 @@ presubmits:
     branches:
     - ^main$
     - ^main-
-    cluster: build01
-    context: ci/prow/v7-e2e-all-namespaces-deployment
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci-operator.openshift.io/variant: v7
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-eclipse-che-che-operator-main-v7-e2e-all-namespaces-deployment
-    rerun_command: /test v7-e2e-all-namespaces-deployment
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --lease-server-credentials-file=/etc/boskos/credentials
-        - --report-credentials-file=/etc/report/credentials
-        - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-all-namespaces-deployment-cluster-profile
-        - --target=e2e-all-namespaces-deployment
-        - --variant=v7
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
-        - mountPath: /secrets/ci-pull-credentials
-          name: ci-pull-credentials
-          readOnly: true
-        - mountPath: /usr/local/e2e-all-namespaces-deployment-cluster-profile
-          name: cluster-profile
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: boskos
-        secret:
-          items:
-          - key: credentials
-            path: credentials
-          secretName: boskos-credentials
-      - name: ci-pull-credentials
-        secret:
-          secretName: ci-pull-credentials
-      - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-gcp
-          - configMap:
-              name: cluster-profile-gcp
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )v7-e2e-all-namespaces-deployment,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^main$
-    - ^main-
-    cluster: build01
+    cluster: build02
     context: ci/prow/v7-images
     decorate: true
     decoration_config:
@@ -624,7 +546,7 @@ presubmits:
     branches:
     - ^main$
     - ^main-
-    cluster: build01
+    cluster: build02
     context: ci/prow/v8-e2e-all-namespaces-deployment
     decorate: true
     decoration_config:
@@ -702,7 +624,7 @@ presubmits:
     branches:
     - ^main$
     - ^main-
-    cluster: build01
+    cluster: build02
     context: ci/prow/v8-images
     decorate: true
     decoration_config: