QAM: Disabling again some failing clients

SUSE · Sep 18, 2020 · 59348bf · 59348bf
1 parent 2c63f40
commit 59348bf
Showing 1 changed file with 20 additions and 10 deletions.
diff --git a/terracumber_config/tf_files/SUSEManager-4.1-qam.tf b/terracumber_config/tf_files/SUSEManager-4.1-qam.tf
@@ -1,4 +1,4 @@
-// Mandatory variables for terracumber
+  // Mandatory variables for terracumber
 variable "URL_PREFIX" {
   type = "string"
   default = "https://ci.suse.de/view/Manager/view/Manager-4.1/job/manager-4.1-qam-setup-cucumber"
@@ -123,7 +123,7 @@ module "base2" {
   name_prefix = "qam-pip-41-"
   use_avahi   = false
   domain      = "qa.prv.suse.net"
-  images      = [ "sles11sp4", "sles12sp4", "sles15", "centos6o", "centos7" ]
+  images      = [ "sles11sp4", "sles12sp4", "sles15", /*"centos6o", */ "centos7" ]
 
   mirror = "minima-mirror.qa.prv.suse.net"
   use_mirror_images = true
@@ -149,7 +149,7 @@ module "base3" {
   name_prefix = "qam-pip-41-"
   use_avahi   = false
   domain      = "qa.prv.suse.net"
-  images      = [ "sles15sp1", "ubuntu1804", "ubuntu1604o", "ubuntu2004o", "centos8o" ]
+  images      = [ "sles15sp1", "ubuntu1804", /* "ubuntu1604o", "ubuntu2004o", */ "centos8o"  ]
 
   mirror = "minima-mirror.qa.prv.suse.net"
   use_mirror_images = true
@@ -329,6 +329,7 @@ module "centos7-client" {
   ssh_key_path  = "./salt/controller/id_rsa.pub"
 }
 
+/*
 module "centos6-client" {
   providers = {
     libvirt = libvirt.classic179
@@ -346,6 +347,7 @@ module "centos6-client" {
   server_configuration =  { hostname = "qam-pip-41-pxy.qa.prv.suse.net" }
   ssh_key_path = "./salt/controller/id_rsa.pub"
 }
+*/
 
 module "sles12sp4-minion" {
   providers = {
@@ -475,6 +477,7 @@ module "centos7-minion" {
   ssh_key_path           = "./salt/controller/id_rsa.pub"
 }
 
+/*
 module "centos6-minion" {
   providers = {
     libvirt = libvirt.classic179
@@ -514,6 +517,7 @@ module "ubuntu2004-minion" {
   use_os_released_updates = false
   ssh_key_path           = "./salt/controller/id_rsa.pub"
 }
+*/
 
 module "ubuntu1804-minion" {
   providers = {
@@ -536,6 +540,7 @@ module "ubuntu1804-minion" {
   ssh_key_path           = "./salt/controller/id_rsa.pub"
 }
 
+/*
 module "ubuntu1604-minion" {
   providers = {
     libvirt = libvirt.classic181
@@ -554,6 +559,7 @@ module "ubuntu1604-minion" {
   use_os_released_updates = false
   ssh_key_path = "./salt/controller/id_rsa.pub"
 }
+*/
 
 module "sles12sp4-sshminion" {
   providers = {
@@ -659,6 +665,7 @@ module "centos7-sshminion" {
   ssh_key_path = "./salt/controller/id_rsa.pub"
 }
 
+/*
 module "centos6-sshminion" {
   providers = {
     libvirt = libvirt.classic179
@@ -692,6 +699,7 @@ module "ubuntu2004-sshminion" {
   use_os_released_updates = false
   ssh_key_path       = "./salt/controller/id_rsa.pub"
 }
+*/
 
 module "ubuntu1804-sshminion" {
   providers = {
@@ -710,6 +718,7 @@ module "ubuntu1804-sshminion" {
   ssh_key_path       = "./salt/controller/id_rsa.pub"
 }
 
+/*
 module "ubuntu1604-sshminion" {
   source = "./modules/sshminion"
   base_configuration = module.base.configuration
@@ -723,6 +732,7 @@ module "ubuntu1604-sshminion" {
   use_os_released_updates = false
   ssh_key_path = "./salt/controller/id_rsa.pub"
 }
+*/
 
 module "controller" {
   source             = "./modules/controller"
@@ -744,9 +754,9 @@ module "controller" {
   server_configuration = module.server.configuration
   proxy_configuration  = module.proxy.configuration
 
-  centos6_client_configuration = module.centos6-client.configuration
-  centos6_minion_configuration = module.centos6-minion.configuration
-  centos6_sshminion_configuration = module.centos6-sshminion.configuration
+#  centos6_client_configuration = module.centos6-client.configuration
+#  centos6_minion_configuration = module.centos6-minion.configuration
+#  centos6_sshminion_configuration = module.centos6-sshminion.configuration
 
   centos7_client_configuration    = module.centos7-client.configuration
   centos7_minion_configuration    = module.centos7-minion.configuration
@@ -775,14 +785,14 @@ module "controller" {
   sle15sp1_minion_configuration    = module.sles15sp1-minion.configuration
   sle15sp1_sshminion_configuration = module.sles15sp1-sshminion.configuration
 
-  ubuntu1604_minion_configuration = module.ubuntu1604-minion.configuration
-  ubuntu1604_sshminion_configuration = module.ubuntu1604-sshminion.configuration
+#  ubuntu1604_minion_configuration = module.ubuntu1604-minion.configuration
+#  ubuntu1604_sshminion_configuration = module.ubuntu1604-sshminion.configuration
 
   ubuntu1804_minion_configuration = module.ubuntu1804-minion.configuration
   ubuntu1804_sshminion_configuration = module.ubuntu1804-sshminion.configuration
 
-  ubuntu2004_minion_configuration = module.ubuntu2004-minion.configuration
-  ubuntu2004_sshminion_configuration = module.ubuntu2004-sshminion.configuration
+#  ubuntu2004_minion_configuration = module.ubuntu2004-minion.configuration
+#  ubuntu2004_sshminion_configuration = module.ubuntu2004-sshminion.configuration
 }
 
 resource "null_resource" "server_extra_nfs_mounts" {