MGMT-19624: move 4.13 tests to optional (EOL)

openshift · Jan 19, 2025 · 8706c01 · 8706c01
1 parent 5dd8439
commit 8706c01
Show file tree

Hide file tree

Showing 5 changed files with 80 additions and 74 deletions.
diff --git a/...r/config/openshift/assisted-service/openshift-assisted-service-cloud_hotfix_releases.yaml b/...r/config/openshift/assisted-service/openshift-assisted-service-cloud_hotfix_releases.yaml
@@ -176,8 +176,9 @@ tests:
         SERVICE_BASE_REF=cloud_hotfix_releases
         OPENSHIFT_VERSION=4.12
     workflow: assisted-baremetal
-- always_run: true
+- always_run: false
   as: e2e-metal-assisted-4-13
+  optional: true
   steps:
     cluster_profile: packet-assisted
     dependencies:

diff --git a/ci-operator/config/openshift/assisted-test-infra/openshift-assisted-test-infra-master.yaml b/ci-operator/config/openshift/assisted-test-infra/openshift-assisted-test-infra-master.yaml
@@ -196,8 +196,9 @@ tests:
         OPENSHIFT_VERSION=4.12
       TEST_TYPE: none
     workflow: assisted-baremetal
-- as: e2e-metal-assisted-4-13-periodic
-  cron: 30 03 * * 2
+- always_run: false
+  as: e2e-metal-assisted-4-13-periodic
+  optional: true
   steps:
     cluster_profile: packet-assisted
     dependencies:

diff --git a/...enshift/assisted-service/openshift-assisted-service-cloud_hotfix_releases-presubmits.yaml b/...enshift/assisted-service/openshift-assisted-service-cloud_hotfix_releases-presubmits.yaml
@@ -88,6 +88,7 @@ presubmits:
       job-release: "4.18"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-assisted-service-cloud_hotfix_releases-e2e-metal-assisted-4-13
+    optional: true
     rerun_command: /test e2e-metal-assisted-4-13
     spec:
       containers:

diff --git a/...or/jobs/openshift/assisted-test-infra/openshift-assisted-test-infra-master-periodics.yaml b/...or/jobs/openshift/assisted-test-infra/openshift-assisted-test-infra-master-periodics.yaml
@@ -70,77 +70,6 @@ periodics:
     - name: result-aggregator
       secret:
         secretName: result-aggregator
-- agent: kubernetes
-  cluster: build05
-  cron: 30 03 * * 2
-  decorate: true
-  extra_refs:
-  - base_ref: master
-    org: openshift
-    repo: assisted-test-infra
-  labels:
-    ci-operator.openshift.io/cloud: packet-edge
-    ci-operator.openshift.io/cloud-cluster-profile: packet-assisted
-    ci.openshift.io/generator: prowgen
-    job-release: "4.18"
-    pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-assisted-test-infra-master-e2e-metal-assisted-4-13-periodic
-  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
-      - --target=e2e-metal-assisted-4-13-periodic
-      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: /secrets/gcs
-        name: gcs-credentials
-        readOnly: true
-      - mountPath: /secrets/manifest-tool
-        name: manifest-tool-local-pusher
-        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: manifest-tool-local-pusher
-      secret:
-        secretName: manifest-tool-local-pusher
-    - name: pull-secret
-      secret:
-        secretName: registry-pull-credentials
-    - name: result-aggregator
-      secret:
-        secretName: result-aggregator
 - agent: kubernetes
   cluster: build05
   cron: 30 04 * * 2

diff --git a/...r/jobs/openshift/assisted-test-infra/openshift-assisted-test-infra-master-presubmits.yaml b/...r/jobs/openshift/assisted-test-infra/openshift-assisted-test-infra-master-presubmits.yaml
@@ -148,6 +148,80 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-assisted-4-13,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - ^master$
+    - ^master-
+    cluster: build01
+    context: ci/prow/e2e-metal-assisted-4-13-periodic
+    decorate: true
+    labels:
+      ci-operator.openshift.io/cloud: packet-edge
+      ci-operator.openshift.io/cloud-cluster-profile: packet-assisted
+      ci.openshift.io/generator: prowgen
+      job-release: "4.18"
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-assisted-test-infra-master-e2e-metal-assisted-4-13-periodic
+    optional: true
+    rerun_command: /test e2e-metal-assisted-4-13-periodic
+    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
+        - --target=e2e-metal-assisted-4-13-periodic
+        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: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /secrets/manifest-tool
+          name: manifest-tool-local-pusher
+          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: manifest-tool-local-pusher
+        secret:
+          secretName: manifest-tool-local-pusher
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-metal-assisted-4-13-periodic,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches: