NO-ISSUE: fixing osc resources (#59897)

openshift · Dec 15, 2024 · 81db806 · 81db806
1 parent 7286d27
commit 81db806
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 42 deletions.
diff --git a/ci-operator/config/openshift/assisted-service/openshift-assisted-service-master__edge.yaml b/ci-operator/config/openshift/assisted-service/openshift-assisted-service-master__edge.yaml
@@ -1143,38 +1143,38 @@ tests:
         OPENSHIFT_VERSION=4.16
     workflow: assisted-baremetal
 - always_run: false
-  as: e2e-metal-assisted-osc-sno-4-17
+  as: e2e-metal-assisted-osc-sno-4-18
   optional: true
   steps:
     cluster_profile: packet-assisted
     dependencies:
-      OPENSHIFT_TESTS_IMAGE: tests-4.17
+      OPENSHIFT_TESTS_IMAGE: tests-4.18
     env:
       ASSISTED_CONFIG: |
         OLM_OPERATORS=osc
         NUM_MASTERS=1
         NUM_WORKERS=0
-        MASTER_MEMORY=20480
-        MASTER_CPU=12
-        OPENSHIFT_VERSION=4.17
+        MASTER_MEMORY=18432
+        MASTER_CPU=10
+        OPENSHIFT_VERSION=4.18
     workflow: assisted-baremetal
 - always_run: false
-  as: e2e-metal-assisted-osc-4-17
+  as: e2e-metal-assisted-osc-4-18
   optional: true
   steps:
     cluster_profile: packet-assisted
     dependencies:
-      OPENSHIFT_TESTS_IMAGE: tests-4.17
+      OPENSHIFT_TESTS_IMAGE: tests-4.18
     env:
       ASSISTED_CONFIG: |
         OLM_OPERATORS=osc
         NUM_MASTERS=3
         NUM_WORKERS=2
-        MASTER_MEMORY=10240
-        MASTER_CPU=6
+        MASTER_MEMORY=18432
+        MASTER_CPU=5
         WORKER_MEMORY=10240
-        WORKER_CPU=6
-        OPENSHIFT_VERSION=4.17
+        WORKER_CPU=3
+        OPENSHIFT_VERSION=4.18
     workflow: assisted-baremetal
 - as: e2e-metal-assisted-day2-4-18
   optional: true

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
@@ -384,38 +384,38 @@ tests:
         OPENSHIFT_VERSION=4.18
     workflow: assisted-baremetal
 - always_run: false
-  as: e2e-metal-assisted-osc-4-17
+  as: e2e-metal-assisted-osc-4-18
   optional: true
   steps:
     cluster_profile: packet-assisted
     dependencies:
-      OPENSHIFT_TESTS_IMAGE: tests-4.17
+      OPENSHIFT_TESTS_IMAGE: tests-4.18
     env:
       ASSISTED_CONFIG: |
         OLM_OPERATORS=osc
         NUM_MASTERS=3
         NUM_WORKERS=2
-        MASTER_MEMORY=10240
-        MASTER_CPU=6
+        MASTER_MEMORY=18432
+        MASTER_CPU=5
         WORKER_MEMORY=10240
-        WORKER_CPU=6
-        OPENSHIFT_VERSION=4.17
+        WORKER_CPU=3
+        OPENSHIFT_VERSION=4.18
     workflow: assisted-baremetal
 - always_run: false
-  as: e2e-metal-assisted-osc-sno-4-17
+  as: e2e-metal-assisted-osc-sno-4-18
   optional: true
   steps:
     cluster_profile: packet-assisted
     dependencies:
-      OPENSHIFT_TESTS_IMAGE: tests-4.17
+      OPENSHIFT_TESTS_IMAGE: tests-4.18
     env:
       ASSISTED_CONFIG: |
         OLM_OPERATORS=osc
         NUM_MASTERS=1
         NUM_WORKERS=0
-        MASTER_MEMORY=20480
-        MASTER_CPU=12
-        OPENSHIFT_VERSION=4.17
+        MASTER_MEMORY=18432
+        MASTER_CPU=10
+        OPENSHIFT_VERSION=4.18
     workflow: assisted-baremetal
 - always_run: false
   as: e2e-metal-assisted-metallb-4-18

diff --git a/...perator/jobs/openshift/assisted-service/openshift-assisted-service-master-presubmits.yaml b/...perator/jobs/openshift/assisted-service/openshift-assisted-service-master-presubmits.yaml
@@ -4388,7 +4388,7 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build01
-    context: ci/prow/edge-e2e-metal-assisted-osc-4-17
+    context: ci/prow/edge-e2e-metal-assisted-osc-4-18
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: packet-edge
@@ -4397,9 +4397,9 @@ presubmits:
       ci.openshift.io/generator: prowgen
       job-release: "4.18"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-assisted-service-master-edge-e2e-metal-assisted-osc-4-17
+    name: pull-ci-openshift-assisted-service-master-edge-e2e-metal-assisted-osc-4-18
     optional: true
-    rerun_command: /test edge-e2e-metal-assisted-osc-4-17
+    rerun_command: /test edge-e2e-metal-assisted-osc-4-18
     spec:
       containers:
       - args:
@@ -4408,7 +4408,7 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --target=e2e-metal-assisted-osc-4-17
+        - --target=e2e-metal-assisted-osc-4-18
         - --variant=edge
         command:
         - ci-operator
@@ -4457,14 +4457,14 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )edge-e2e-metal-assisted-osc-4-17,?($|\s.*)
+    trigger: (?m)^/test( | .* )edge-e2e-metal-assisted-osc-4-18,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^master$
     - ^master-
     cluster: build01
-    context: ci/prow/edge-e2e-metal-assisted-osc-sno-4-17
+    context: ci/prow/edge-e2e-metal-assisted-osc-sno-4-18
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: packet-edge
@@ -4473,9 +4473,9 @@ presubmits:
       ci.openshift.io/generator: prowgen
       job-release: "4.18"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-assisted-service-master-edge-e2e-metal-assisted-osc-sno-4-17
+    name: pull-ci-openshift-assisted-service-master-edge-e2e-metal-assisted-osc-sno-4-18
     optional: true
-    rerun_command: /test edge-e2e-metal-assisted-osc-sno-4-17
+    rerun_command: /test edge-e2e-metal-assisted-osc-sno-4-18
     spec:
       containers:
       - args:
@@ -4484,7 +4484,7 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --target=e2e-metal-assisted-osc-sno-4-17
+        - --target=e2e-metal-assisted-osc-sno-4-18
         - --variant=edge
         command:
         - ci-operator
@@ -4533,7 +4533,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )edge-e2e-metal-assisted-osc-sno-4-17,?($|\s.*)
+    trigger: (?m)^/test( | .* )edge-e2e-metal-assisted-osc-sno-4-18,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:

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
@@ -2454,17 +2454,17 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build01
-    context: ci/prow/e2e-metal-assisted-osc-4-17
+    context: ci/prow/e2e-metal-assisted-osc-4-18
     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-osc-4-17
+    name: pull-ci-openshift-assisted-test-infra-master-e2e-metal-assisted-osc-4-18
     optional: true
-    rerun_command: /test e2e-metal-assisted-osc-4-17
+    rerun_command: /test e2e-metal-assisted-osc-4-18
     spec:
       containers:
       - args:
@@ -2473,7 +2473,7 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --target=e2e-metal-assisted-osc-4-17
+        - --target=e2e-metal-assisted-osc-4-18
         command:
         - ci-operator
         image: ci-operator:latest
@@ -2521,24 +2521,24 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-assisted-osc-4-17,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-assisted-osc-4-18,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
     - ^master$
     - ^master-
     cluster: build01
-    context: ci/prow/e2e-metal-assisted-osc-sno-4-17
+    context: ci/prow/e2e-metal-assisted-osc-sno-4-18
     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-osc-sno-4-17
+    name: pull-ci-openshift-assisted-test-infra-master-e2e-metal-assisted-osc-sno-4-18
     optional: true
-    rerun_command: /test e2e-metal-assisted-osc-sno-4-17
+    rerun_command: /test e2e-metal-assisted-osc-sno-4-18
     spec:
       containers:
       - args:
@@ -2547,7 +2547,7 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --target=e2e-metal-assisted-osc-sno-4-17
+        - --target=e2e-metal-assisted-osc-sno-4-18
         command:
         - ci-operator
         image: ci-operator:latest
@@ -2595,7 +2595,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-metal-assisted-osc-sno-4-17,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-metal-assisted-osc-sno-4-18,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches: