From 7a6f1856e393bdc76fae019817e74f14de712d77 Mon Sep 17 00:00:00 2001
From: Daniel Pawlik <dpawlik@redhat.com>
Date: Wed, 3 Jul 2024 13:31:31 +0200
Subject: [PATCH] DNM Checking CRC Cloud with image based on OCP 4.16 rc4

This is early test PR that uses new way for deploying the CRC -
crc-cloud [1] and image that is base on OCP 4.16 rc4
with small modifications [2]. In the future, that image would be created
by the nodepool-builder, but right now it is just a PoC (Proof of concept).
Also is worth to mention, that the base job includes few workarounds
until the PR in the official projects are not merged [3][4][5]

[1] https://github.com/crc-org/crc-cloud
[2] https://softwarefactory-project.io/r/c/software-factory/sf-infra/+/31853
[3] https://github.com/crc-org/crc-cloud/pull/188
[4] https://github.com/crc-org/crc-cloud/pull/189
[5] https://github.com/crc-org/crc-cloud/pull/190
---
 ci/playbooks/collect-logs.yml |  2 ++
 zuul.d/base.yaml              | 20 ++++++++++++++++++--
 zuul.d/kuttl_multinode.yaml   |  2 +-
 zuul.d/nodeset.yaml           | 17 +++++++++++++++++
 4 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/ci/playbooks/collect-logs.yml b/ci/playbooks/collect-logs.yml
index 23d9aa1a5e..974426a712 100644
--- a/ci/playbooks/collect-logs.yml
+++ b/ci/playbooks/collect-logs.yml
@@ -119,6 +119,8 @@
               cp /etc/containers/registries.conf {{ ansible_user_dir }}/zuul-output/logs/
               cp -r /etc/containers/registries.conf.d {{ ansible_user_dir }}/zuul-output/logs/
               chown -R "{{ ansible_user }}" {{ ansible_user_dir }}/zuul-output/logs/registries.conf.d
+              cp -r {{ ansible_user_dir }}/workdir/*log {{ ansible_user_dir }}/zuul-output/logs/crc-cloud/
+              chown -R "{{ ansible_user }}" {{ ansible_user_dir }}/zuul-output/logs/crc-cloud/
 
         - name: Copy generated documentation if available
           when:
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 0a34670ca6..0ba6136e11 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -122,10 +122,10 @@
 # crc_ci_bootstrap_networking using *extra-vars*.
 - job:
     name: cifmw-podified-multinode-edpm-base-crc
-    parent: base-extracted-crc
+    parent: base-crc-cloud
     timeout: 10800
     attempts: 1
-    nodeset: centos-9-medium-centos-9-crc-extracted-2-39-0-3xl
+    nodeset: centos-9-medium-centos-9-crc-cloud-ocp-4-16-3xl
     irrelevant-files: *ir_files
     required-projects: &multinode_edpm_rp
       - openstack-k8s-operators/ci-framework
@@ -147,6 +147,7 @@
       - ci/playbooks/collect-logs.yml
       - ci/playbooks/multinode-autohold.yml
     vars: &multinode_edpm_vars
+      wait_for_mcp: false
       zuul_log_collection: true
       registry_login_enabled: true
       push_registry: quay.rdoproject.org
@@ -306,3 +307,18 @@
       - ci/playbooks/e2e-prepare.yml
       - ci/playbooks/dump_zuul_data.yml
       - ci/playbooks/pre-ci-bootstrap.yml
+
+- job:
+    name: cifmw-podified-multinode-edpm-base-crc-cloud
+    parent: base-crc-cloud
+    timeout: 10800
+    attempts: 1
+    nodeset: centos-9-medium-centos-9-crc-cloud-ocp-4-16-3xl
+    irrelevant-files: *ir_files
+    required-projects: *multinode_edpm_rp
+    roles: *multinode_edpm_roles
+    pre-run: *multinode_edpm_pre_run
+    post-run: *multinode_edpm_post_run
+    vars:
+      <<: *multinode_edpm_vars
+      wait_for_mcp: false
diff --git a/zuul.d/kuttl_multinode.yaml b/zuul.d/kuttl_multinode.yaml
index 25e3efc700..ffbeb75c87 100644
--- a/zuul.d/kuttl_multinode.yaml
+++ b/zuul.d/kuttl_multinode.yaml
@@ -4,7 +4,7 @@
     parent: cifmw-podified-multinode-edpm-base-crc
     timeout: 7200
     abstract: true
-    nodeset: centos-9-medium-crc-extracted-2-39-0-3xl
+    nodeset: centos-9-medium-centos-9-crc-cloud-ocp-4-16-3xl
     vars:
       zuul_log_collection: true
     extra-vars:
diff --git a/zuul.d/nodeset.yaml b/zuul.d/nodeset.yaml
index c363bfdb59..4740c3fd72 100644
--- a/zuul.d/nodeset.yaml
+++ b/zuul.d/nodeset.yaml
@@ -279,3 +279,20 @@
     nodes:
       - name: controller
         label: centos-9-stream-crc-2-39-0-xl
+
+- nodeset:
+    name: centos-9-medium-centos-9-crc-cloud-ocp-4-16-3xl
+    nodes:
+      - name: controller
+        label: cloud-centos-9-stream-tripleo-medium
+      - name: compute-0
+        label: cloud-centos-9-stream-tripleo
+      - name: crc
+        label: crc-cloud-ocp-4-16-0-3xl
+    groups:
+      - name: computes
+        nodes:
+          - compute-0
+      - name: ocps
+        nodes:
+          - crc