Merge pull request openshift#17731 from prietyc123/DisablePSIJobsOnOd…

…oPrs

Disable psi jobs on odo pr

ci-operator/config/openshift/odo/openshift-odo-master__psi.yaml

@@ -8,23 +8,6 @@ resources:
       cpu: 800m
       memory: 6Gi
 tests:
-- as: openshift-integration-e2e
-  steps:
-    test:
-    - as: openshift-integration-e2e-steps
-      commands: sh scripts/openshiftci-e2e-4x-psi-tests.sh
-      credentials:
-      - mount_path: /usr/local/ci-secrets/odo-rabbitmq
-        name: odo-rabbitmq
-        namespace: test-credentials
-      env:
-      - default: /usr/local/ci-secrets/odo-rabbitmq/amqpuri
-        name: ODO_RABBITMQ_AMQP_URL
-      from: src
-      resources:
-        requests:
-          cpu: "2"
-          memory: 6Gi
 - as: kubernetes-integration-e2e
   steps:
     test:
@@ -42,23 +25,6 @@ tests:
         requests:
           cpu: "2"
           memory: 6Gi
-- as: minishift-integration-e2e
-  steps:
-    test:
-    - as: minishift-integration-e2e-steps
-      commands: scripts/minici-presubmit-all-tests.sh minishift
-      credentials:
-      - mount_path: /usr/local/ci-secrets/odo-rabbitmq
-        name: odo-rabbitmq
-        namespace: test-credentials
-      env:
-      - default: /usr/local/ci-secrets/odo-rabbitmq/amqpuri
-        name: ODO_RABBITMQ_AMQP_URL
-      from: src
-      resources:
-        requests:
-          cpu: "2"
-          memory: 6Gi
 zz_generated_metadata:
   branch: master
   org: openshift

ci-operator/jobs/openshift/odo/openshift-odo-master-presubmits.yaml

@@ -52,110 +52,6 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )psi-kubernetes-integration-e2e,?($|\s.*)
-  - agent: kubernetes
-    always_run: false
-    branches:
-    - master
-    cluster: build02
-    context: ci/prow/psi-minishift-integration-e2e
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci-operator.openshift.io/prowgen-controlled: "true"
-      ci-operator.openshift.io/variant: psi
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-odo-master-psi-minishift-integration-e2e
-    optional: true
-    rerun_command: /test psi-minishift-integration-e2e
-    run_if_changed: ^(?:[^d]+|d(?:$|[^o]|o(?:$|[^c]|c(?:$|[^s]))))*$
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --report-credentials-file=/etc/report/credentials
-        - --target=minishift-integration-e2e
-        - --variant=psi
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - 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: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )psi-minishift-integration-e2e,?($|\s.*)
-  - agent: kubernetes
-    always_run: false
-    branches:
-    - master
-    cluster: build02
-    context: ci/prow/psi-openshift-integration-e2e
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci-operator.openshift.io/prowgen-controlled: "true"
-      ci-operator.openshift.io/variant: psi
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-odo-master-psi-openshift-integration-e2e
-    optional: true
-    rerun_command: /test psi-openshift-integration-e2e
-    run_if_changed: ^(?:[^d]+|d(?:$|[^o]|o(?:$|[^c]|c(?:$|[^s]))))*$
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --report-credentials-file=/etc/report/credentials
-        - --target=openshift-integration-e2e
-        - --variant=psi
-        command:
-        - ci-operator
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - 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: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )psi-openshift-integration-e2e,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches: