Remove KVM host from HEAD and Master

Not removing it from the test projects since those could test 4.3 still. Each squad should decide what to do with it.
SUSE · Sep 19, 2024 · 6ead9bd · 6ead9bd
1 parent da5ebab
commit 6ead9bd
Show file tree

Hide file tree

Showing 12 changed files with 0 additions and 129 deletions.
diff --git a/terracumber_config/tf_files/PR-testing-template.tf b/terracumber_config/tf_files/PR-testing-template.tf
@@ -167,18 +167,6 @@ module "cucumber_testsuite" {
       additional_packages = [ "venv-salt-minion" ]
       install_salt_bundle = true
     }
-    kvm-host = {
-      image = var.IMAGE
-      name = "min-kvm"
-
-      provider_settings = {
-        mac = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].mac["kvm-host"]
-      }
-      additional_repos_only = var.ADDITIONAL_REPOS_ONLY
-      additional_repos = local.additional_repos["kvm-host"]
-      additional_packages = [ "venv-salt-minion", "mkisofs" ]
-      install_salt_bundle = true
-    }
   }
 
   provider_settings = {

diff --git a/terracumber_config/tf_files/SUSEManager-Head-NUE.tf b/terracumber_config/tf_files/SUSEManager-Head-NUE.tf
@@ -228,17 +228,6 @@ module "cucumber_testsuite" {
         private_key = file("~/.ssh/id_rsa")
       }
     }
-    kvm-host = {
-      image = "sles15sp4o"
-      name = "min-kvm"
-      provider_settings = {
-        mac = "aa:b2:93:01:00:be"
-        vcpu = 4
-        memory = 4096
-      }
-      additional_packages = [ "venv-salt-minion" ]
-      install_salt_bundle = true
-    }
   }
 
   provider_settings = {

diff --git a/terracumber_config/tf_files/SUSEManager-Head-refenv-NUE.tf b/terracumber_config/tf_files/SUSEManager-Head-refenv-NUE.tf
@@ -218,17 +218,6 @@ module "cucumber_testsuite" {
       additional_packages = [ "venv-salt-minion" ]
       install_salt_bundle = true
     }
-    kvm-host = {
-      image = "sles15sp4o"
-      name = "min-kvm"
-      provider_settings = {
-        mac = "aa:b2:93:01:00:ce"
-        vcpu = 2
-        memory = 2048
-      }
-      additional_packages = [ "venv-salt-minion" ]
-      install_salt_bundle = true
-    }
   }
   provider_settings = {
     pool = "ssd"

diff --git a/terracumber_config/tf_files/Uyuni-Master-K3S.tf b/terracumber_config/tf_files/Uyuni-Master-K3S.tf
@@ -222,16 +222,6 @@ module "cucumber_testsuite" {
       additional_packages = [ "venv-salt-minion" ]
       install_salt_bundle = true
     }
-    kvm-host = {
-      image = "opensuse155o"
-      name = "min-kvm"
-
-      provider_settings = {
-        mac = "aa:b2:93:01:00:1e"
-      }
-      additional_packages = [ "venv-salt-minion" ]
-      install_salt_bundle = true
-    }
   }
 
   provider_settings = {

diff --git a/terracumber_config/tf_files/Uyuni-Master-NUE.tf b/terracumber_config/tf_files/Uyuni-Master-NUE.tf
@@ -211,18 +211,6 @@ module "cucumber_testsuite" {
       additional_packages = [ "venv-salt-minion" ]
       install_salt_bundle = true
     }
-    kvm-host = {
-      image = "opensuse155o"
-      name = "min-kvm"
-
-      provider_settings = {
-        mac = "aa:b2:93:01:00:de"
-        vcpu = 4
-        memory = 4096
-      }
-      additional_packages = [ "venv-salt-minion", "mkisofs" ]
-      install_salt_bundle = true
-    }
   }
 
   provider_settings = {

diff --git a/terracumber_config/tf_files/Uyuni-Master-PRV.tf b/terracumber_config/tf_files/Uyuni-Master-PRV.tf
@@ -211,18 +211,6 @@ module "cucumber_testsuite" {
       additional_packages = [ "venv-salt-minion" ]
       install_salt_bundle = true
     }
-    kvm-host = {
-      image = "opensuse155o"
-      name = "min-kvm"
-
-      provider_settings = {
-        mac = "aa:b2:92:03:00:de"
-        vcpu = 4
-        memory = 4096
-      }
-      additional_packages = [ "venv-salt-minion", "mkisofs" ]
-      install_salt_bundle = true
-    }
   }
 
   provider_settings = {

diff --git a/terracumber_config/tf_files/Uyuni-Master-podman.tf b/terracumber_config/tf_files/Uyuni-Master-podman.tf
@@ -216,16 +216,6 @@ module "cucumber_testsuite" {
         private_key = file("~/.ssh/id_rsa")
       }
     }
-    kvm-host = {
-      image = "opensuse155o"
-      name = "min-kvm"
-
-      provider_settings = {
-        mac = "aa:b2:93:01:00:2e"
-      }
-      additional_packages = [ "venv-salt-minion" ]
-      install_salt_bundle = true
-    }
   }
 
   provider_settings = {

diff --git a/terracumber_config/tf_files/Uyuni-Master-refenv-NUE.tf b/terracumber_config/tf_files/Uyuni-Master-refenv-NUE.tf
@@ -216,17 +216,6 @@ module "cucumber_testsuite" {
       additional_packages = [ "venv-salt-minion" ]
       install_salt_bundle = true
     }
-    kvm-host = {
-      image = "opensuse155o"
-      name = "min-kvm"
-      provider_settings = {
-        mac = "aa:b2:93:01:00:ee"
-        vcpu = 2
-        memory = 2048
-      }
-      additional_packages = [ "venv-salt-minion" ]
-      install_salt_bundle = true
-    }
   }
   provider_settings = {
     pool = "ssd"

diff --git a/terracumber_config/tf_files/Uyuni-Master-tests-code-coverage.tf b/terracumber_config/tf_files/Uyuni-Master-tests-code-coverage.tf
@@ -218,18 +218,6 @@ module "cucumber_testsuite" {
         private_key = file("~/.ssh/id_rsa")
       }
     }
-    kvm-host = {
-      image = "opensuse155o"
-      name = "min-kvm"
-
-      provider_settings = {
-        mac = "aa:b2:92:04:00:fa"
-        vcpu = 4
-        memory = 8192
-      }
-      additional_packages = [ "venv-salt-minion" ]
-      install_salt_bundle = true
-    }
   }
 
   provider_settings = {

diff --git a/terracumber_config/tf_files/tfvars/PR-testing-NUE-environments.tfvars b/terracumber_config/tf_files/tfvars/PR-testing-NUE-environments.tfvars
@@ -16,7 +16,6 @@ ENVIRONMENT_CONFIGURATION = {
       redhat-minion  = "aa:b2:93:01:03:56"
       debian-minion  = "aa:b2:93:01:03:57"
       build-host     = "aa:b2:93:01:03:59"
-      kvm-host       = "aa:b2:93:01:03:5a"
     }
     hypervisor = "suma-08.mgr.suse.de"
     additional_network = "192.168.111.0/24"
@@ -33,7 +32,6 @@ ENVIRONMENT_CONFIGURATION = {
       redhat-minion  = "aa:b2:93:01:03:62"
       debian-minion  = "aa:b2:93:01:03:64"
       build-host     = "aa:b2:93:01:03:65"
-      kvm-host       = "aa:b2:93:01:03:66"
     }
     hypervisor = "suma-08.mgr.suse.de"
     additional_network = "192.168.112.0/24"
@@ -50,7 +48,6 @@ ENVIRONMENT_CONFIGURATION = {
       redhat-minion  = "aa:b2:93:01:03:6e"
       debian-minion  = "aa:b2:93:01:03:70"
       build-host     = "aa:b2:93:01:03:71"
-      kvm-host       = "aa:b2:93:01:03:72"
     }
     hypervisor = "suma-08.mgr.suse.de"
     additional_network = "192.168.113.0/24"
@@ -67,7 +64,6 @@ ENVIRONMENT_CONFIGURATION = {
       redhat-minion  = "aa:b2:93:01:03:7a"
       debian-minion  = "aa:b2:93:01:03:7c"
       build-host     = "aa:b2:93:01:03:7d"
-      kvm-host       = "aa:b2:93:01:03:7e"
     }
     hypervisor = "suma-08.mgr.suse.de"
     additional_network = "192.168.114.0/24"
@@ -84,7 +80,6 @@ ENVIRONMENT_CONFIGURATION = {
       redhat-minion  = "aa:b2:93:01:03:86"
       debian-minion  = "aa:b2:93:01:03:88"
       build-host     = "aa:b2:93:01:03:89"
-      kvm-host       = "aa:b2:93:01:03:8a"
     }
     hypervisor = "suma-08.mgr.suse.de"
     additional_network = "192.168.115.0/24"
@@ -101,7 +96,6 @@ ENVIRONMENT_CONFIGURATION = {
       redhat-minion  = "aa:b2:93:01:03:92"
       debian-minion  = "aa:b2:93:01:03:94"
       build-host     = "aa:b2:93:01:03:95"
-      kvm-host       = "aa:b2:93:01:03:96"
     }
     hypervisor = "suma-08.mgr.suse.de"
     additional_network = "192.168.116.0/24"

diff --git a/terracumber_config/tf_files/tfvars/PR-testing-PRV-environments.tfvars b/terracumber_config/tf_files/tfvars/PR-testing-PRV-environments.tfvars
@@ -16,7 +16,6 @@ ENVIRONMENT_CONFIGURATION = {
       rhlike-minion  = "aa:b2:92:04:00:06"
       deblike-minion = "aa:b2:92:04:00:07"
       build-host     = "aa:b2:92:04:00:09"
-      kvm-host       = "aa:b2:92:04:00:0a"
     }
     hypervisor = "romulus.mgr.prv.suse.net"
     additional_network = "192.168.101.0/24"
@@ -33,7 +32,6 @@ ENVIRONMENT_CONFIGURATION = {
       rhlike-minion  = "aa:b2:92:04:00:16"
       deblike-minion = "aa:b2:92:04:00:17"
       build-host     = "aa:b2:92:04:00:19"
-      kvm-host       = "aa:b2:92:04:00:1a"
     }
     hypervisor = "romulus.mgr.prv.suse.net"
     additional_network = "192.168.102.0/24"
@@ -50,7 +48,6 @@ ENVIRONMENT_CONFIGURATION = {
       rhlike-minion  = "aa:b2:92:04:00:26"
       deblike-minion = "aa:b2:92:04:00:27"
       build-host     = "aa:b2:92:04:00:29"
-      kvm-host       = "aa:b2:92:04:00:2a"
     }
     hypervisor = "vulcan.mgr.prv.suse.net"
     additional_network = "192.168.103.0/24"
@@ -67,7 +64,6 @@ ENVIRONMENT_CONFIGURATION = {
       rhlike-minion  = "aa:b2:92:04:00:36"
       deblike-minion = "aa:b2:92:04:00:37"
       build-host     = "aa:b2:92:04:00:39"
-      kvm-host       = "aa:b2:92:04:00:3a"
     }
     hypervisor = "vulcan.mgr.prv.suse.net"
     additional_network = "192.168.104.0/24"
@@ -84,7 +80,6 @@ ENVIRONMENT_CONFIGURATION = {
       rhlike-minion  = "aa:b2:92:04:00:46"
       deblike-minion = "aa:b2:92:04:00:47"
       build-host     = "aa:b2:92:04:00:49"
-      kvm-host       = "aa:b2:92:04:00:4a"
     }
     hypervisor = "hyperion.mgr.prv.suse.net"
     additional_network = "192.168.105.0/24"
@@ -101,7 +96,6 @@ ENVIRONMENT_CONFIGURATION = {
       rhlike-minion  = "aa:b2:92:04:00:56"
       deblike-minion = "aa:b2:92:04:00:57"
       build-host     = "aa:b2:92:04:00:59"
-      kvm-host       = "aa:b2:92:04:00:5a"
     }
     hypervisor = "hyperion.mgr.prv.suse.net"
     additional_network = "192.168.106.0/24"
@@ -118,7 +112,6 @@ ENVIRONMENT_CONFIGURATION = {
       rhlike-minion  = "aa:b2:92:04:00:66"
       deblike-minion = "aa:b2:92:04:00:67"
       build-host     = "aa:b2:92:04:00:69"
-      kvm-host       = "aa:b2:92:04:00:6a"
     }
     hypervisor = "daiquiri.mgr.prv.suse.net"
     additional_network = "192.168.107.0/24"
@@ -135,7 +128,6 @@ ENVIRONMENT_CONFIGURATION = {
       rhlike-minion  = "aa:b2:92:04:00:76"
       deblike-minion = "aa:b2:92:04:00:77"
       build-host     = "aa:b2:92:04:00:79"
-      kvm-host       = "aa:b2:92:04:00:7a"
     }
     hypervisor = "daiquiri.mgr.prv.suse.net"
     additional_network = "192.168.108.0/24"
@@ -152,7 +144,6 @@ ENVIRONMENT_CONFIGURATION = {
       rhlike-minion  = "aa:b2:92:04:00:86"
       deblike-minion = "aa:b2:92:04:00:87"
       build-host     = "aa:b2:92:04:00:89"
-      kvm-host       = "aa:b2:92:04:00:8a"
     }
     hypervisor = "mojito.mgr.prv.suse.net"
     additional_network = "192.168.109.0/24"
@@ -169,7 +160,6 @@ ENVIRONMENT_CONFIGURATION = {
       rhlike-minion  = "aa:b2:92:04:00:96"
       deblike-minion = "aa:b2:92:04:00:97"
       build-host     = "aa:b2:92:04:00:99"
-      kvm-host       = "aa:b2:92:04:00:9a"
     }
     hypervisor = "mojito.mgr.prv.suse.net"
     additional_network = "192.168.110.0/24"

diff --git a/terracumber_config/tf_files/tfvars/PR-testing-additionnal-repos.tf b/terracumber_config/tf_files/tfvars/PR-testing-additionnal-repos.tf
@@ -29,15 +29,6 @@ locals {
     suse-minion = {
       tools_update_pr = "${var.SLE_CLIENT_REPO}"
     }
-    kvm-host = {
-      client_repo = "${var.OPENSUSE_CLIENT_REPO}"
-      master_sumaform_tools_repo = "${var.MASTER_SUMAFORM_TOOLS_REPO}"
-      test_packages_repo = "${var.TEST_PACKAGES_REPO}"
-      non_os_pool = "http://${var.MIRROR}/distribution/leap/15.5/repo/non-oss/"
-      os_pool = "http://${var.MIRROR}/distribution/leap/15.5/repo/oss/"
-      os_update = "${var.UPDATE_REPO}"
-      os_additional_repo = "${var.ADDITIONAL_REPO_URL}"
-    }
   } : {
     server = {
       pull_request_repo = "${var.PULL_REQUEST_REPO}"
@@ -48,8 +39,5 @@ locals {
     suse-minion = {
       tools_update_pr = "${var.SLE_CLIENT_REPO}"
     }
-    kvm-host = {
-      tools_update_pr = "${var.SLE_CLIENT_REPO}"
-    }
   }
 }