From e7c231e54eb93bb94afcbd58e859aa85ad65cf64 Mon Sep 17 00:00:00 2001
From: Emma Foley <elfiesmelfie@users.noreply.github.com>
Date: Fri, 31 May 2024 12:43:01 +0100
Subject: [PATCH] Revert "[zuul] Give OCP 4.12 jobs more resources (#600)"
 (#603)

This change is blocking the gates, due to jobs being queued
indefinitely.

This reverts commit 429cc3bad77e337877f62f271f92a2a45725c7ea.
---
 .zuul.yaml | 50 +++-----------------------------------------------
 1 file changed, 3 insertions(+), 47 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 75d9ce78..f81d81ff 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -7,14 +7,6 @@
       - name: crc
         label: coreos-crc-extracted-2-19-0-xxl
 
-- nodeset:
-    name: stf-crc_extracted-ocp412-new
-    nodes:
-      - name: controller
-        label: cloud-centos-9-stream-tripleo-vexxhost
-      - name: crc
-        label: coreos-crc-extracted-2-19-0-3xl
-
 - nodeset:
     name: stf-crc_extracted-ocp414
     nodes:
@@ -137,7 +129,7 @@
     parent: stf-crc-nightly_bundles
     description: |
       Deploy STF using the nightly bundles on OCP 4.12
-    nodeset: stf-crc_extracted-ocp412-new
+    nodeset: stf-crc_extracted-ocp412
 
 - job:
     name: stf-crc-ocp_414-nightly_bundles
@@ -151,7 +143,7 @@
     parent: stf-crc-local_build
     description: |
       Build images locally and deploy STF on OCP 4.12
-    nodeset: stf-crc_extracted-ocp412-new
+    nodeset: stf-crc_extracted-ocp412
 
 - job:
     name: stf-crc-ocp_414-local_build
@@ -165,7 +157,7 @@
     parent: stf-crc-local_build-index_deploy
     description: |
       Build STF locally and deploy from index on OCP 4.12
-    nodeset: stf-crc_extracted-ocp412-new
+    nodeset: stf-crc_extracted-ocp412
 
 - job:
     name: stf-crc-ocp_414-local_build-index_deploy
@@ -193,39 +185,3 @@
       jobs:
         - stf-crc-ocp_412-nightly_bundles
         - stf-crc-ocp_414-nightly_bundles
-    github-check:
-      jobs:
-        - stf-crc-ocp_412-local_build
-        - stf-crc-ocp_412-local_build-index_deploy
-        - stf-crc-ocp_412-local_build-index_deploy:
-            nodeset:
-              #name: 3xl
-              nodes:
-               - name: controller
-                 label: cloud-centos-9-stream-tripleo-vexxhost
-               - name: crc
-                 label: coreos-crc-extracted-2-19-0-3xl
-        - stf-crc-ocp_412-local_build-index_deploy:
-            nodeset:
-              #name: 4xlargdde
-              nodes:
-               - name: controller
-                 label: cloud-centos-9-stream-tripleo-vexxhost
-               - name: crc
-                 label: coreos-crc-extracted-2-19-0-4xlarge
-        - stf-crc-ocp_412-local_build-index_deploy:
-            nodeset:
-              #name: 5xlarge
-              nodes:
-               - name: controller
-                 label: cloud-centos-9-stream-tripleo-vexxhost
-               - name: crc
-                 label: coreos-crc-extracted-2-19-0-5xlarge
-        - stf-crc-ocp_412-local_build-index_deploy:
-            nodeset:
-              #name: 6xlarge
-              nodes:
-               - name: controller
-                 label: cloud-centos-9-stream-tripleo-vexxhost
-               - name: crc
-                 label: coreos-crc-extracted-2-19-0-6xlarge