Remove nested VM entries

SUSE · Jan 4, 2024 · a4cc206 · a4cc206
1 parent 9d20cdf
commit a4cc206
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 186 deletions.
diff --git a/terracumber_config/tf_files/PR-testing-template.tf b/terracumber_config/tf_files/PR-testing-template.tf
@@ -156,20 +156,7 @@ module "cucumber_testsuite" {
     kvm-host = {
       image = var.IMAGE
       name = "min-kvm"
-      additional_grains = {
-        hvm_disk_image = {
-          leap = {
-            hostname = "suma-pr${var.ENVIRONMENT}-min-nested"
-            image = "http://${var.DOWNLOAD_ENDPOINT}/distribution/leap/15.5/appliances/openSUSE-Leap-15.5-Minimal-VM.x86_64-Cloud.qcow2"
-            hash = "http://${var.DOWNLOAD_ENDPOINT}/distribution/leap/15.5/appliances/openSUSE-Leap-15.5-Minimal-VM.x86_64-Cloud.qcow2.sha256"
-          }
-          sles = {
-            hostname = "suma-pr${var.ENVIRONMENT}-min-nested"
-            image = "http://${var.DOWNLOAD_ENDPOINT}/install/SLE-15-SP4-Minimal-GM/SLES15-SP4-Minimal-VM.x86_64-OpenStack-Cloud-GM.qcow2"
-            hash = "http://${var.DOWNLOAD_ENDPOINT}/install/SLE-15-SP4-Minimal-GM/SLES15-SP4-Minimal-VM.x86_64-OpenStack-Cloud-GM.qcow2.sha256"
-          }
-        }
-      }
+
       provider_settings = {
         mac = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].mac["kvm-host"]
       }
@@ -179,8 +166,7 @@ module "cucumber_testsuite" {
       install_salt_bundle = true
     }
   }
-  nested_vm_host = "suma-pr${var.ENVIRONMENT}-min-nested"
-  nested_vm_mac =  var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].mac["nested-vm"]
+
   provider_settings = {
     pool               = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].pool
     network_name       = null

diff --git a/terracumber_config/tf_files/SUSE-Manager-4.3-PR-tests-env5.tf b/terracumber_config/tf_files/SUSE-Manager-4.3-PR-tests-env5.tf
@@ -281,20 +281,7 @@ module "cucumber_testsuite" {
     kvm-host = {
       image = "sles15sp4o"
       name = "min-kvm"
-      additional_grains = {
-        hvm_disk_image = {
-          leap = {
-            hostname = "suma-pr5-min-nested"
-            image = "http://minima-mirror-ci-bv.mgr.prv.suse.net/distribution/leap/15.5/appliances/openSUSE-Leap-15.5-Minimal-VM.x86_64-Cloud.qcow2"
-            hash = "http://minima-mirror-ci-bv.mgr.prv.suse.net/distribution/leap/15.5/appliances/openSUSE-Leap-15.5-Minimal-VM.x86_64-Cloud.qcow2.sha256"
-          }
-          sles = {
-            hostname = "suma-pr5-min-nested"
-            image = "http://minima-mirror-ci-bv.mgr.prv.suse.net/install/SLE-15-SP4-Minimal-GM/SLES15-SP4-Minimal-VM.x86_64-OpenStack-Cloud-GM.qcow2"
-            hash = "http://minima-mirror-ci-bv.mgr.prv.suse.net/install/SLE-15-SP4-Minimal-GM/SLES15-SP4-Minimal-VM.x86_64-OpenStack-Cloud-GM.qcow2.sha256"
-          }
-        }
-      }
+
       provider_settings = {
         mac = "aa:b2:92:04:00:4a"
       }
@@ -305,8 +292,7 @@ module "cucumber_testsuite" {
       install_salt_bundle = true
     }
   }
-  nested_vm_host = "suma-pr5-min-nested"
-  nested_vm_mac =  "aa:b2:92:04:00:4b"
+
   provider_settings = {
     pool               = "ssd"
     network_name       = null

diff --git a/terracumber_config/tf_files/SUSE-Manager-4.3-PR-tests-env6.tf b/terracumber_config/tf_files/SUSE-Manager-4.3-PR-tests-env6.tf
@@ -281,20 +281,7 @@ module "cucumber_testsuite" {
     kvm-host = {
       image = "sles15sp4o"
       name = "min-kvm"
-      additional_grains = {
-        hvm_disk_image = {
-          leap = {
-            hostname = "suma-pr6-min-nested"
-            image = "http://minima-mirror-ci-bv.mgr.prv.suse.net/distribution/leap/15.5/appliances/openSUSE-Leap-15.5-Minimal-VM.x86_64-Cloud.qcow2"
-            hash = "http://minima-mirror-ci-bv.mgr.prv.suse.net/distribution/leap/15.5/appliances/openSUSE-Leap-15.5-Minimal-VM.x86_64-Cloud.qcow2.sha256"
-          }
-          sles = {
-            hostname = "suma-pr6-min-nested"
-            image = "http://minima-mirror-ci-bv.mgr.prv.suse.net/install/SLE-15-SP4-Minimal-GM/SLES15-SP4-Minimal-VM.x86_64-OpenStack-Cloud-GM.qcow2"
-            hash = "http://minima-mirror-ci-bv.mgr.prv.suse.net/install/SLE-15-SP4-Minimal-GM/SLES15-SP4-Minimal-VM.x86_64-OpenStack-Cloud-GM.qcow2.sha256"
-          }
-        }
-      }
+
       provider_settings = {
         mac = "aa:b2:92:04:00:5a"
       }
@@ -305,8 +292,7 @@ module "cucumber_testsuite" {
       install_salt_bundle = true
     }
   }
-  nested_vm_host = "suma-pr6-min-nested"
-  nested_vm_mac =  "aa:b2:92:04:00:5b"
+
   provider_settings = {
     pool               = "ssd"
     network_name       = null

diff --git a/terracumber_config/tf_files/SUSEManager-4.3-NUE.tf b/terracumber_config/tf_files/SUSEManager-4.3-NUE.tf
@@ -231,7 +231,7 @@ module "cucumber_testsuite" {
       install_salt_bundle = true
     }
   }
-  nested_vm_host = "min-nested"
+
   provider_settings = {
     pool = "ssd"
     network_name = null

diff --git a/terracumber_config/tf_files/SUSEManager-4.3-PRV.tf b/terracumber_config/tf_files/SUSEManager-4.3-PRV.tf
@@ -219,15 +219,7 @@ module "cucumber_testsuite" {
     kvm-host = {
       image = "sles15sp4o"
       name = "min-kvm"
-      additional_grains = {
-        hvm_disk_image = {
-          leap = {
-            hostname = "min-nested"
-            image = "http://minima-mirror-ci-bv.mgr.prv.suse.net/distribution/leap/15.5/appliances/openSUSE-Leap-15.5-Minimal-VM.x86_64-Cloud.qcow2"
-            hash = "http://minima-mirror-ci-bv.mgr.prv.suse.net/distribution/leap/15.5/appliances/openSUSE-Leap-15.5-Minimal-VM.x86_64-Cloud.qcow2.sha256"
-          }
-        }
-      }
+
       provider_settings = {
         mac = "aa:b2:92:03:00:8e"
         vcpu = 4
@@ -237,7 +229,7 @@ module "cucumber_testsuite" {
       install_salt_bundle = true
     }
   }
-  nested_vm_host = "min-nested"
+
   provider_settings = {
     pool = "ssd"
     network_name = null

diff --git a/terracumber_config/tf_files/SUSEManager-Head-NUE.tf b/terracumber_config/tf_files/SUSEManager-Head-NUE.tf
@@ -210,20 +210,7 @@ module "cucumber_testsuite" {
     kvm-host = {
       image = "sles15sp4o"
       name = "min-kvm"
-      additional_grains = {
-        hvm_disk_image = {
-          leap = {
-            hostname = "suma-head-min-nested"
-            image = "http://minima-mirror-ci-bv.mgr.suse.de/distribution/leap/15.5/appliances/openSUSE-Leap-15.5-Minimal-VM.x86_64-Cloud.qcow2"
-            hash = "http://minima-mirror-ci-bv.mgr.suse.de/distribution/leap/15.5/appliances/openSUSE-Leap-15.5-Minimal-VM.x86_64-Cloud.qcow2.sha256"
-          }
-          sles = {
-            hostname = "suma-head-min-nested"
-            image = "http://minima-mirror-ci-bv.mgr.suse.de/install/SLE-15-SP4-Minimal-GM/SLES15-SP4-Minimal-VM.x86_64-OpenStack-Cloud-GM.qcow2"
-            hash = "http://minima-mirror-ci-bv.mgr.suse.de/install/SLE-15-SP4-Minimal-GM/SLES15-SP4-Minimal-VM.x86_64-OpenStack-Cloud-GM.qcow2.sha256"
-          }
-        }
-      }
+
       provider_settings = {
         mac = "aa:b2:93:01:00:be"
         vcpu = 4
@@ -233,8 +220,7 @@ module "cucumber_testsuite" {
       install_salt_bundle = true
     }
   }
-  nested_vm_host = "suma-head-min-nested"
-  nested_vm_mac =  "aa:b2:93:01:00:bf"
+
   provider_settings = {
     pool = "ssd"
     network_name = null

diff --git a/terracumber_config/tf_files/SUSEManager-Test-Hexagon-NUE.tf b/terracumber_config/tf_files/SUSEManager-Test-Hexagon-NUE.tf
@@ -217,20 +217,7 @@ module "cucumber_testsuite" {
     kvm-host = {
       image = "opensuse155o"
       name = "min-kvm"
-      additional_grains = {
-        hvm_disk_image = {
-          leap = {
-            hostname = "suma-testhexagon-min-nested"
-            image = "http://minima-mirror-ci-bv.mgr.suse.de/distribution/leap/15.5/appliances/openSUSE-Leap-15.5-Minimal-VM.x86_64-Cloud.qcow2"
-            hash = "http://minima-mirror-ci-bv.mgr.suse.de/distribution/leap/15.5/appliances/openSUSE-Leap-15.5-Minimal-VM.x86_64-Cloud.qcow2.sha256"
-          }
-          sles = {
-            hostname = "suma-testhexagon-min-nested"
-            image = "http://minima-mirror-ci-bv.mgr.suse.de/install/SLE-15-SP4-Minimal-GM/SLES15-SP4-Minimal-VM.x86_64-OpenStack-Cloud-GM.qcow2"
-            hash = "http://minima-mirror-ci-bv.mgr.suse.de/install/SLE-15-SP4-Minimal-GM/SLES15-SP4-Minimal-VM.x86_64-OpenStack-Cloud-GM.qcow2.sha256"
-          }
-        }
-      }
+
       provider_settings = {
         mac = "aa:b2:93:01:00:5e"
         vcpu = 4
@@ -240,8 +227,7 @@ module "cucumber_testsuite" {
       install_salt_bundle = true
     }
   }
-  nested_vm_host = "suma-testhexagon-min-nested"
-  nested_vm_mac =  "aa:b2:93:01:00:5f"
+
   provider_settings = {
     pool         = "ssd"
     network_name = null

diff --git a/terracumber_config/tf_files/Uyuni-Master-K3S.tf b/terracumber_config/tf_files/Uyuni-Master-K3S.tf
@@ -205,29 +205,15 @@ module "cucumber_testsuite" {
     kvm-host = {
       image = "opensuse154o"
       name = "min-kvm"
-      additional_grains = {
-        hvm_disk_image = {
-          leap = {
-            hostname = "uyuni-master-k3s-min-nested"
-            image = "http://minima-mirror-ci-bv.mgr.suse.de/distribution/leap/15.5/appliances/openSUSE-Leap-15.5-Minimal-VM.x86_64-Cloud.qcow2"
-            hash = "http://minima-mirror-ci-bv.mgr.suse.de/distribution/leap/15.5/appliances/openSUSE-Leap-15.5-Minimal-VM.x86_64-Cloud.qcow2.sha256"
-          }
-          sles = {
-            hostname = "uyuni-master-k3s-min-nested"
-            image = "http://minima-mirror-ci-bv.mgr.suse.de/install/SLE-15-SP4-Minimal-GM/SLES15-SP4-Minimal-VM.x86_64-OpenStack-Cloud-GM.qcow2"
-            hash = "http://minima-mirror-ci-bv.mgr.suse.de/install/SLE-15-SP4-Minimal-GM/SLES15-SP4-Minimal-VM.x86_64-OpenStack-Cloud-GM.qcow2.sha256"
-          }
-        }
-      }
+
       provider_settings = {
         mac = "aa:b2:93:01:00:3e"
       }
       additional_packages = [ "venv-salt-minion" ]
       install_salt_bundle = true
     }
   }
-  nested_vm_host = "uyuni-master-k3s-min-nested"
-  nested_vm_mac =  "aa:b2:93:01:00:3f"
+
   provider_settings = {
     pool               = "ssd"
     network_name       = null

diff --git a/terracumber_config/tf_files/Uyuni-Master-NUE.tf b/terracumber_config/tf_files/Uyuni-Master-NUE.tf
@@ -213,20 +213,7 @@ module "cucumber_testsuite" {
     kvm-host = {
       image = "opensuse155o"
       name = "min-kvm"
-      additional_grains = {
-        hvm_disk_image = {
-          leap = {
-            hostname = "uyuni-master-min-nested"
-            image = "http://minima-mirror-ci-bv.mgr.suse.de/distribution/leap/15.5/appliances/openSUSE-Leap-15.5-Minimal-VM.x86_64-Cloud.qcow2"
-            hash = "http://minima-mirror-ci-bv.mgr.suse.de/distribution/leap/15.5/appliances/openSUSE-Leap-15.5-Minimal-VM.x86_64-Cloud.qcow2.sha256"
-          }
-          sles = {
-            hostname = "uyuni-master-min-nested"
-            image = "http://minima-mirror-ci-bv.mgr.suse.de/install/SLE-15-SP4-Minimal-GM/SLES15-SP4-Minimal-VM.x86_64-OpenStack-Cloud-GM.qcow2"
-            hash = "http://minima-mirror-ci-bv.mgr.suse.de/install/SLE-15-SP4-Minimal-GM/SLES15-SP4-Minimal-VM.x86_64-OpenStack-Cloud-GM.qcow2.sha256"
-          }
-        }
-      }
+
       provider_settings = {
         mac = "aa:b2:93:01:00:de"
         vcpu = 4
@@ -236,8 +223,7 @@ module "cucumber_testsuite" {
       install_salt_bundle = true
     }
   }
-  nested_vm_host = "uyuni-master-min-nested"
-  nested_vm_mac =  "aa:b2:93:01:00:df"
+
   provider_settings = {
     pool               = "ssd"
     network_name       = null

diff --git a/terracumber_config/tf_files/Uyuni-Master-PRV.tf b/terracumber_config/tf_files/Uyuni-Master-PRV.tf
@@ -213,20 +213,7 @@ module "cucumber_testsuite" {
     kvm-host = {
       image = "opensuse155o"
       name = "min-kvm"
-      additional_grains = {
-        hvm_disk_image = {
-          leap = {
-            hostname = "uyuni-master-min-nested"
-            image = "http://minima-mirror-ci-bv.mgr.prv.suse.net/distribution/leap/15.5/appliances/openSUSE-Leap-15.5-Minimal-VM.x86_64-Cloud.qcow2"
-            hash = "http://minima-mirror-ci-bv.mgr.prv.suse.net/distribution/leap/15.5/appliances/openSUSE-Leap-15.5-Minimal-VM.x86_64-Cloud.qcow2.sha256"
-          }
-          sles = {
-            hostname = "uyuni-master-min-nested"
-            image = "http://minima-mirror-ci-bv.mgr.prv.suse.net/install/SLE-15-SP4-Minimal-GM/SLES15-SP4-Minimal-VM.x86_64-OpenStack-Cloud-GM.qcow2"
-            hash = "http://minima-mirror-ci-bv.mgr.prv.suse.net/install/SLE-15-SP4-Minimal-GM/SLES15-SP4-Minimal-VM.x86_64-OpenStack-Cloud-GM.qcow2.sha256"
-          }
-        }
-      }
+
       provider_settings = {
         mac = "aa:b2:92:03:00:de"
         vcpu = 4
@@ -236,8 +223,7 @@ module "cucumber_testsuite" {
       install_salt_bundle = true
     }
   }
-  nested_vm_host = "uyuni-master-min-nested"
-  nested_vm_mac =  "aa:b2:92:03:00:df"
+
   provider_settings = {
     pool               = "images"
     network_name       = null

diff --git a/terracumber_config/tf_files/Uyuni-Master-podman.tf b/terracumber_config/tf_files/Uyuni-Master-podman.tf
@@ -205,29 +205,15 @@ module "cucumber_testsuite" {
     kvm-host = {
       image = "opensuse154o"
       name = "min-kvm"
-      additional_grains = {
-        hvm_disk_image = {
-          leap = {
-            hostname = "uyuni-master-podman-min-nested"
-            image = "http://minima-mirror-ci-bv.mgr.suse.de/distribution/leap/15.5/appliances/openSUSE-Leap-15.5-Minimal-VM.x86_64-Cloud.qcow2"
-            hash = "http://minima-mirror-ci-bv.mgr.suse.de/distribution/leap/15.5/appliances/openSUSE-Leap-15.5-Minimal-VM.x86_64-Cloud.qcow2.sha256"
-          }
-          sles = {
-            hostname = "uyuni-master-podman-min-nested"
-            image = "http://minima-mirror-ci-bv.mgr.suse.de/install/SLE-15-SP4-Minimal-GM/SLES15-SP4-Minimal-VM.x86_64-OpenStack-Cloud-GM.qcow2"
-            hash = "http://minima-mirror-ci-bv.mgr.suse.de/install/SLE-15-SP4-Minimal-GM/SLES15-SP4-Minimal-VM.x86_64-OpenStack-Cloud-GM.qcow2.sha256"
-          }
-        }
-      }
+
       provider_settings = {
         mac = "aa:b2:93:01:00:2e"
       }
       additional_packages = [ "venv-salt-minion" ]
       install_salt_bundle = true
     }
   }
-  nested_vm_host = "uyuni-master-podman-min-nested"
-  nested_vm_mac =  "aa:b2:93:01:00:2f"
+
   provider_settings = {
     pool               = "ssd"
     network_name       = null

diff --git a/terracumber_config/tf_files/Uyuni-Master-tests-code-coverage.tf b/terracumber_config/tf_files/Uyuni-Master-tests-code-coverage.tf
@@ -202,20 +202,7 @@ module "cucumber_testsuite" {
     kvm-host = {
       image = "opensuse155o"
       name = "min-kvm"
-      additional_grains = {
-        hvm_disk_image = {
-          leap = {
-            hostname = "min-nested"
-            image = "http://minima-mirror-ci-bv.mgr.prv.suse.net/distribution/leap/15.5/appliances/openSUSE-Leap-15.5-Minimal-VM.x86_64-Cloud.qcow2"
-            hash = "http://minima-mirror-ci-bv.mgr.prv.suse.net/distribution/leap/15.5/appliances/openSUSE-Leap-15.5-Minimal-VM.x86_64-Cloud.qcow2.sha256"
-          }
-          sles = {
-            hostname = "min-nested"
-            image = "http://minima-mirror-ci-bv.mgr.prv.suse.net/install/SLE-15-SP4-Minimal-GM/SLES15-SP4-Minimal-VM.x86_64-OpenStack-Cloud-GM.qcow2"
-            hash = "http://minima-mirror-ci-bv.mgr.prv.suse.net/install/SLE-15-SP4-Minimal-GM/SLES15-SP4-Minimal-VM.x86_64-OpenStack-Cloud-GM.qcow2.sha256"
-          }
-        }
-      }
+
       provider_settings = {
         mac = "aa:b2:92:04:00:fa"
         memory = 8192
@@ -224,7 +211,7 @@ module "cucumber_testsuite" {
       install_salt_bundle = true
     }
   }
-  nested_vm_host = "min-nested"
+
   provider_settings = {
     pool               = "default"
     network_name       = null