ci-operator/config/openshift/cluster-version-operator: Separate A->B and B->A jobs

ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-master.yaml

@@ -79,14 +79,16 @@ tests:
           cpu: 100m
           memory: 200Mi
     workflow: openshift-e2e-azure
-- as: e2e-agnostic-upgrade
+- as: e2e-agnostic-upgrade-into-change
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: azure4
-    env:
-      TEST_TYPE: upgrade
-      TEST_UPGRADE_OPTIONS: abort-at=100
     workflow: openshift-upgrade-azure
+- as: e2e-agnostic-upgrade-out-of-change
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+  steps:
+    cluster_profile: gcp
+    workflow: openshift-upgrade-gcp-latestinstaller
 zz_generated_metadata:
   branch: master
   org: openshift

ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-master-presubmits.yaml

@@ -152,15 +152,15 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build02
-    context: ci/prow/e2e-agnostic-upgrade
+    context: ci/prow/e2e-agnostic-upgrade-into-change
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: azure4
       ci-operator.openshift.io/cloud-cluster-profile: azure4
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-version-operator-master-e2e-agnostic-upgrade
-    rerun_command: /test e2e-agnostic-upgrade
+    name: pull-ci-openshift-cluster-version-operator-master-e2e-agnostic-upgrade-into-change
+    rerun_command: /test e2e-agnostic-upgrade-into-change
     skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
     spec:
       containers:
@@ -170,8 +170,8 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --secret-dir=/usr/local/e2e-agnostic-upgrade-cluster-profile
-        - --target=e2e-agnostic-upgrade
+        - --secret-dir=/usr/local/e2e-agnostic-upgrade-into-change-cluster-profile
+        - --target=e2e-agnostic-upgrade-into-change
         command:
         - ci-operator
         image: ci-operator:latest
@@ -187,7 +187,7 @@ presubmits:
         - mountPath: /secrets/ci-pull-credentials
           name: ci-pull-credentials
           readOnly: true
-        - mountPath: /usr/local/e2e-agnostic-upgrade-cluster-profile
+        - mountPath: /usr/local/e2e-agnostic-upgrade-into-change-cluster-profile
           name: cluster-profile
         - mountPath: /secrets/gcs
           name: gcs-credentials
@@ -218,7 +218,84 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-agnostic-upgrade,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-agnostic-upgrade-into-change,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - ^master$
+    - ^master-
+    cluster: build02
+    context: ci/prow/e2e-agnostic-upgrade-out-of-change
+    decorate: true
+    labels:
+      ci-operator.openshift.io/cloud: gcp
+      ci-operator.openshift.io/cloud-cluster-profile: gcp
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-cluster-version-operator-master-e2e-agnostic-upgrade-out-of-change
+    rerun_command: /test e2e-agnostic-upgrade-out-of-change
+    skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+    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-agnostic-upgrade-out-of-change-cluster-profile
+        - --target=e2e-agnostic-upgrade-out-of-change
+        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-agnostic-upgrade-out-of-change-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( | .* )e2e-agnostic-upgrade-out-of-change,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches: