Merge pull request openshift#15684 from kpouget/presubmit-hooks

Test OperatorHub & Master on Presubmit hooks

Author: openshift-merge-robot

ci-operator/config/openshift-psap/ci-artifacts/openshift-psap-ci-artifacts-master.yaml

@@ -28,7 +28,7 @@ tests:
   steps:
     cluster_profile: aws
     test:
-    - as: nightly
+    - as: presubmit-operatorhub
       cli: latest
       commands: run gpu-ci
       credentials:
@@ -40,6 +40,30 @@ tests:
         requests:
           cpu: 2000m
           memory: 2Gi
+    - as: presubmit-operatorhub-cleanup
+      cli: latest
+      commands: run gpu-ci-undeploy
+      credentials:
+      - mount_path: /var/run/psap-entitlement-secret
+        name: psap-entitlement-secret
+        namespace: test-credentials
+      from: ci-artifacts
+      resources:
+        requests:
+          cpu: 2000m
+          memory: 2Gi
+    - as: presubmit-master
+      cli: latest
+      commands: run gpu-commit-ci
+      credentials:
+      - mount_path: /var/run/psap-entitlement-secret
+        name: psap-entitlement-secret
+        namespace: test-credentials
+      from: ci-artifacts
+      resources:
+        requests:
+          cpu: 2000m
+          memory: 2Gi
     workflow: ipi-aws
 zz_generated_metadata:
   branch: master

ci-operator/config/openshift-psap/ci-artifacts/openshift-psap-ci-artifacts-release-next.yaml

@@ -42,24 +42,6 @@ tests:
           cpu: 2000m
           memory: 2Gi
     workflow: ipi-aws
-- artifact_dir: /tmp/artifacts
-  as: gpu-operator-e2e-presubmit
-  steps:
-    cluster_profile: aws
-    test:
-    - as: nightly
-      cli: latest
-      commands: run gpu-commit-ci
-      credentials:
-      - mount_path: /var/run/psap-entitlement-secret
-        name: psap-entitlement-secret
-        namespace: test-credentials
-      from: ci-artifacts
-      resources:
-        requests:
-          cpu: 2000m
-          memory: 2Gi
-    workflow: ipi-aws
 zz_generated_metadata:
   branch: release-next
   org: openshift-psap

ci-operator/jobs/openshift-psap/ci-artifacts/openshift-psap-ci-artifacts-release-next-presubmits.yaml

@@ -1,72 +1,5 @@
 presubmits:
   openshift-psap/ci-artifacts:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - release-next
-    cluster: build01
-    context: ci/prow/gpu-operator-e2e-presubmit
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci-operator.openshift.io/prowgen-controlled: "true"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-psap-ci-artifacts-release-next-gpu-operator-e2e-presubmit
-    rerun_command: /test gpu-operator-e2e-presubmit
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --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/gpu-operator-e2e-presubmit-cluster-profile
-        - --target=gpu-operator-e2e-presubmit
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
-        - mountPath: /usr/local/gpu-operator-e2e-presubmit-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: password
-            path: password
-          secretName: boskos-credentials
-      - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-aws
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )gpu-operator-e2e-presubmit,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches: