From 654fa6e960c1a5cd8c0f5a33996bf5998269f29e Mon Sep 17 00:00:00 2001
From: Oscar Barrios <obarrios@suse.com>
Date: Thu, 5 Sep 2024 17:32:39 +0200
Subject: [PATCH] Update Uyuni-Master-tests-code-coverage.tf (#1344)

---
 .../Uyuni-Master-tests-code-coverage.tf       | 27 ++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/terracumber_config/tf_files/Uyuni-Master-tests-code-coverage.tf b/terracumber_config/tf_files/Uyuni-Master-tests-code-coverage.tf
index a95aba3d9..fc6ebdb05 100644
--- a/terracumber_config/tf_files/Uyuni-Master-tests-code-coverage.tf
+++ b/terracumber_config/tf_files/Uyuni-Master-tests-code-coverage.tf
@@ -102,13 +102,16 @@ module "cucumber_testsuite" {
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
 
-  images = ["rocky8o", "opensuse155o", "ubuntu2204o", "sles15sp4o"]
+  images = ["rocky8o", "opensuse155o", "leapmicro55o", "ubuntu2204o", "sles15sp4o"]
 
   use_avahi    = false
   name_prefix  = "suma-codecov-"
   domain       = "mgr.prv.suse.net"
   from_email   = "root@suse.com"
 
+  container_server = true
+  container_proxy  = true
+
   mirror                   = "minima-mirror-ci-bv.mgr.prv.suse.net"
   use_mirror_images        = true
   
@@ -129,7 +132,7 @@ module "cucumber_testsuite" {
         vcpu = 6
       }
     }
-    server = {
+    server_containerized = {
       provider_settings = {
         mac = "aa:b2:92:04:00:f1"
         memory = 65536
@@ -137,14 +140,21 @@ module "cucumber_testsuite" {
       }
       main_disk_size       = 400
       login_timeout        = 28800
+      runtime = "podman"
+      container_repository = "registry.opensuse.org/systemsmanagement/uyuni/master/containers_leap_15.6"
+      container_tag = "latest"
+      helm_chart_url = "oci://registry.opensuse.org/systemsmanagement/uyuni/master/charts/uyuni/server"
     }
-    proxy = {
+    proxy_containerized = {
       provider_settings = {
         mac = "aa:b2:92:04:00:f2"
         memory = 16384
       }
       additional_packages = [ "venv-salt-minion" ]
       install_salt_bundle = true
+      runtime = "podman"
+      container_repository = "registry.opensuse.org/systemsmanagement/uyuni/master/containers_leap_15.6"
+      container_tag = "latest"
     }
     suse-minion = {
       image = "opensuse155o"
@@ -202,6 +212,15 @@ module "cucumber_testsuite" {
       additional_packages = [ "venv-salt-minion" ]
       install_salt_bundle = true
     }
+    dhcp-dns = {
+      name = "dhcp-dns"
+      image = "opensuse155o"
+      hypervisor = {
+        host        = "screwdriver.mgr.prv.suse.net"
+        user        = "root"
+        private_key = file("~/.ssh/id_rsa")
+      }
+    }
     kvm-host = {
       image = "opensuse155o"
       name = "min-kvm"
@@ -217,7 +236,7 @@ module "cucumber_testsuite" {
   }
   
   provider_settings = {
-    pool               = "default"
+    pool               = "ssd"
     network_name       = null
     bridge             = "br1"
     additional_network = "192.168.112.0/24"