From bc8ad4b0a19e25a1cee6ae0fb9ac67d064ca1c11 Mon Sep 17 00:00:00 2001
From: Eduardo Olivares <eolivare@redhat.com>
Date: Mon, 16 Dec 2024 15:15:16 +0100
Subject: [PATCH] Remove ubuntu guest image from tobiko

With recent changes in tobiko 0.8.4, the tobiko pods will download an
already customized image instead of using official ubuntu images that
were customized during tobiko execution.
---
 container-images/tcib/base/tobiko/tobiko.yaml |  4 ---
 zuul.d/job.yaml                               | 27 ++++++++++++++++++-
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/container-images/tcib/base/tobiko/tobiko.yaml b/container-images/tcib/base/tobiko/tobiko.yaml
index 474545a..d57f7cf 100644
--- a/container-images/tcib/base/tobiko/tobiko.yaml
+++ b/container-images/tcib/base/tobiko/tobiko.yaml
@@ -15,10 +15,6 @@ tcib_actions:
     | tar -zxvf - -C /usr/local/bin/
 - run: 'git clone https://opendev.org/x/tobiko /usr/local/src/tobiko'
 - run: 'pip install -e /usr/local/src/tobiko -c /usr/local/src/tobiko/upper-constraints.txt -r /usr/local/src/tobiko/extra-requirements.txt'
-- run: >-
-    curl
-    https://cloud-images.ubuntu.com/minimal/releases/jammy/release/ubuntu-22.04-minimal-cloudimg-amd64.img
-    -o /usr/local/share/ubuntu-minimal
 - run: python3 -m pip install --upgrade pip
 - run: python3 -m pip install 'tox==4.13'
 - run: cp /usr/share/tcib/container-images/tcib/base/tobiko/run_tobiko.sh /usr/local/bin/run_tobiko.sh
diff --git a/zuul.d/job.yaml b/zuul.d/job.yaml
index 3c3c1e4..067fea7 100644
--- a/zuul.d/job.yaml
+++ b/zuul.d/job.yaml
@@ -30,7 +30,32 @@
       cifmw_test_operator_tobiko_registry: "{{ cifmw_test_operator_tempest_registry }}"
       cifmw_test_operator_tobiko_namespace: "{{ cifmw_test_operator_tempest_namespace }}"
       cifmw_test_operator_tobiko_image_tag: "{{ content_provider_dlrn_md5_hash }}"
-      cifmw_test_operator_tobiko_testenv: "sanity"
+      cifmw_test_operator_tobiko_override_conf:
+        ubuntu:
+          customized_image_provided: "True"
+          image_url: "https://chandankumar.fedorapeople.org/ubuntu-minimal-customized-enp3s0"
+      cifmw_test_operator_tobiko_workflow:
+        - stepName: sanity
+          testenv: sanity
+        - stepName: scenario-nova
+          testenv: nova
+      # enabling heat is needed for some tobiko tests
+      cifmw_edpm_prepare_kustomizations:
+        - apiVersion: kustomize.config.k8s.io/v1beta1
+          kind: Kustomization
+          namespace: openstack
+          patches:
+          - patch: |-
+              apiVersion: core.openstack.org/v1beta1
+              kind: OpenStackControlPlane
+              metadata:
+                name: unused
+              spec:
+                heat:
+                  enabled: true
+            target:
+              kind: OpenStackControlPlane
+
 
 - job:
     name: tcib-crc-podified-edpm-baremetal