Skip to content

Commit 59348bf

Browse files
committed
QAM: Disabling again some failing clients
1 parent 2c63f40 commit 59348bf

File tree

1 file changed

+20
-10
lines changed

1 file changed

+20
-10
lines changed

terracumber_config/tf_files/SUSEManager-4.1-qam.tf

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Mandatory variables for terracumber
1+
// Mandatory variables for terracumber
22
variable "URL_PREFIX" {
33
type = "string"
44
default = "https://ci.suse.de/view/Manager/view/Manager-4.1/job/manager-4.1-qam-setup-cucumber"
@@ -123,7 +123,7 @@ module "base2" {
123123
name_prefix = "qam-pip-41-"
124124
use_avahi = false
125125
domain = "qa.prv.suse.net"
126-
images = [ "sles11sp4", "sles12sp4", "sles15", "centos6o", "centos7" ]
126+
images = [ "sles11sp4", "sles12sp4", "sles15", /*"centos6o", */ "centos7" ]
127127

128128
mirror = "minima-mirror.qa.prv.suse.net"
129129
use_mirror_images = true
@@ -149,7 +149,7 @@ module "base3" {
149149
name_prefix = "qam-pip-41-"
150150
use_avahi = false
151151
domain = "qa.prv.suse.net"
152-
images = [ "sles15sp1", "ubuntu1804", "ubuntu1604o", "ubuntu2004o", "centos8o" ]
152+
images = [ "sles15sp1", "ubuntu1804", /* "ubuntu1604o", "ubuntu2004o", */ "centos8o" ]
153153

154154
mirror = "minima-mirror.qa.prv.suse.net"
155155
use_mirror_images = true
@@ -329,6 +329,7 @@ module "centos7-client" {
329329
ssh_key_path = "./salt/controller/id_rsa.pub"
330330
}
331331

332+
/*
332333
module "centos6-client" {
333334
providers = {
334335
libvirt = libvirt.classic179
@@ -346,6 +347,7 @@ module "centos6-client" {
346347
server_configuration = { hostname = "qam-pip-41-pxy.qa.prv.suse.net" }
347348
ssh_key_path = "./salt/controller/id_rsa.pub"
348349
}
350+
*/
349351

350352
module "sles12sp4-minion" {
351353
providers = {
@@ -475,6 +477,7 @@ module "centos7-minion" {
475477
ssh_key_path = "./salt/controller/id_rsa.pub"
476478
}
477479

480+
/*
478481
module "centos6-minion" {
479482
providers = {
480483
libvirt = libvirt.classic179
@@ -514,6 +517,7 @@ module "ubuntu2004-minion" {
514517
use_os_released_updates = false
515518
ssh_key_path = "./salt/controller/id_rsa.pub"
516519
}
520+
*/
517521

518522
module "ubuntu1804-minion" {
519523
providers = {
@@ -536,6 +540,7 @@ module "ubuntu1804-minion" {
536540
ssh_key_path = "./salt/controller/id_rsa.pub"
537541
}
538542

543+
/*
539544
module "ubuntu1604-minion" {
540545
providers = {
541546
libvirt = libvirt.classic181
@@ -554,6 +559,7 @@ module "ubuntu1604-minion" {
554559
use_os_released_updates = false
555560
ssh_key_path = "./salt/controller/id_rsa.pub"
556561
}
562+
*/
557563

558564
module "sles12sp4-sshminion" {
559565
providers = {
@@ -659,6 +665,7 @@ module "centos7-sshminion" {
659665
ssh_key_path = "./salt/controller/id_rsa.pub"
660666
}
661667

668+
/*
662669
module "centos6-sshminion" {
663670
providers = {
664671
libvirt = libvirt.classic179
@@ -692,6 +699,7 @@ module "ubuntu2004-sshminion" {
692699
use_os_released_updates = false
693700
ssh_key_path = "./salt/controller/id_rsa.pub"
694701
}
702+
*/
695703

696704
module "ubuntu1804-sshminion" {
697705
providers = {
@@ -710,6 +718,7 @@ module "ubuntu1804-sshminion" {
710718
ssh_key_path = "./salt/controller/id_rsa.pub"
711719
}
712720

721+
/*
713722
module "ubuntu1604-sshminion" {
714723
source = "./modules/sshminion"
715724
base_configuration = module.base.configuration
@@ -723,6 +732,7 @@ module "ubuntu1604-sshminion" {
723732
use_os_released_updates = false
724733
ssh_key_path = "./salt/controller/id_rsa.pub"
725734
}
735+
*/
726736

727737
module "controller" {
728738
source = "./modules/controller"
@@ -744,9 +754,9 @@ module "controller" {
744754
server_configuration = module.server.configuration
745755
proxy_configuration = module.proxy.configuration
746756

747-
centos6_client_configuration = module.centos6-client.configuration
748-
centos6_minion_configuration = module.centos6-minion.configuration
749-
centos6_sshminion_configuration = module.centos6-sshminion.configuration
757+
# centos6_client_configuration = module.centos6-client.configuration
758+
# centos6_minion_configuration = module.centos6-minion.configuration
759+
# centos6_sshminion_configuration = module.centos6-sshminion.configuration
750760

751761
centos7_client_configuration = module.centos7-client.configuration
752762
centos7_minion_configuration = module.centos7-minion.configuration
@@ -775,14 +785,14 @@ module "controller" {
775785
sle15sp1_minion_configuration = module.sles15sp1-minion.configuration
776786
sle15sp1_sshminion_configuration = module.sles15sp1-sshminion.configuration
777787

778-
ubuntu1604_minion_configuration = module.ubuntu1604-minion.configuration
779-
ubuntu1604_sshminion_configuration = module.ubuntu1604-sshminion.configuration
788+
# ubuntu1604_minion_configuration = module.ubuntu1604-minion.configuration
789+
# ubuntu1604_sshminion_configuration = module.ubuntu1604-sshminion.configuration
780790

781791
ubuntu1804_minion_configuration = module.ubuntu1804-minion.configuration
782792
ubuntu1804_sshminion_configuration = module.ubuntu1804-sshminion.configuration
783793

784-
ubuntu2004_minion_configuration = module.ubuntu2004-minion.configuration
785-
ubuntu2004_sshminion_configuration = module.ubuntu2004-sshminion.configuration
794+
# ubuntu2004_minion_configuration = module.ubuntu2004-minion.configuration
795+
# ubuntu2004_sshminion_configuration = module.ubuntu2004-sshminion.configuration
786796
}
787797

788798
resource "null_resource" "server_extra_nfs_mounts" {

0 commit comments

Comments
 (0)