Update last mac addresses

Rename sle update basic to PRV Remove incorrect comment
SUSE · Oct 8, 2024 · c620068 · c620068
1 parent 0a77688
commit c620068
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 26 deletions.
diff --git a/...es/environments/manager-4.3-qe-sle-update → ...nvironments/manager-4.3-qe-sle-update-PRV b/...es/environments/manager-4.3-qe-sle-update → ...nvironments/manager-4.3-qe-sle-update-PRV
@@ -8,7 +8,7 @@ node('sumaform-cucumber-provo') {
         parameters([
             string(name: 'cucumber_gitrepo', defaultValue: 'https://github.com/SUSE/spacewalk.git', description: 'Testsuite Git Repository'),
             string(name: 'cucumber_ref', defaultValue: 'Manager-4.3', description: 'Branch prepared for the MU tested'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/SUSEManager-4.3-SLE-update.tf', description: 'Path to the tf file to be used'),
+            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/SUSEManager-4.3-SLE-update-PRV.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),

diff --git a/...es/environments/manager-5.0-qe-sle-update → ...nvironments/manager-5.0-qe-sle-update-PRV b/...es/environments/manager-5.0-qe-sle-update → ...nvironments/manager-5.0-qe-sle-update-PRV
@@ -8,7 +8,7 @@ node('sumaform-cucumber-provo') {
         parameters([
             string(name: 'cucumber_gitrepo', defaultValue: 'https://github.com/SUSE/spacewalk.git', description: 'Testsuite Git Repository'),
             string(name: 'cucumber_ref', defaultValue: 'Manager-5.0', description: 'Branch prepared for the MU tested'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/SUSEManager-5.0-SLE-update.tf', description: 'Path to the tf file to be used'),
+            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/SUSEManager-5.0-SLE-update-PRV.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),

diff --git a/terracumber_config/tf_files/SUSEManager-4.3-SLE-update-NUE.tf b/terracumber_config/tf_files/SUSEManager-4.3-SLE-update-NUE.tf
@@ -66,12 +66,12 @@ variable "SCC_PASSWORD" {
 
 variable "GIT_USER" {
   type = string
-  default = null // Not needed for master, as it is public
+  default = null
 }
 
 variable "GIT_PASSWORD" {
   type = string
-  default = null // Not needed for master, as it is public
+  default = null
 }
 
 terraform {
@@ -115,7 +115,7 @@ module "server" {
   base_configuration = module.base.configuration
   name               = "server"
   provider_settings = {
-    mac                = "aa:b2:93:01:03:98"
+    mac                = "aa:b2:93:01:02:61"
     memory             = 16384
     vcpu               = 4
     data_pool          = "ssd"
@@ -150,7 +150,7 @@ module "proxy" {
   base_configuration = module.base.configuration
   name               = "proxy"
   provider_settings  = {
-    mac      = "aa:b2:93:01:03:99"
+    mac      = "aa:b2:93:01:02:62"
     memory   = 4096
   }
   server_configuration = {
@@ -177,7 +177,7 @@ module "sles15sp4_minion" {
   name               = "sles15sp4-minion"
   image              = "sles15sp4o"
   provider_settings  = {
-    mac    = "aa:b2:93:01:03:9a"
+    mac    = "aa:b2:93:01:02:63"
     vcpu   = 2
     memory = 2048
   }
@@ -192,7 +192,7 @@ module "controller" {
   base_configuration = module.base.configuration
   name               = "controller"
   provider_settings = {
-    mac                = "aa:b2:93:01:03:97"
+    mac                = "aa:b2:93:01:02:60"
     memory             = 16384
     vcpu               = 8
   }

diff --git a/...ig/tf_files/SUSEManager-4.3-SLE-update.tf → ...f_files/SUSEManager-4.3-SLE-update-PRV.tf b/...ig/tf_files/SUSEManager-4.3-SLE-update.tf → ...f_files/SUSEManager-4.3-SLE-update-PRV.tf
@@ -66,12 +66,12 @@ variable "SCC_PASSWORD" {
 
 variable "GIT_USER" {
   type = string
-  default = null // Not needed for master, as it is public
+  default = null
 }
 
 variable "GIT_PASSWORD" {
   type = string
-  default = null // Not needed for master, as it is public
+  default = null
 }
 
 terraform {
@@ -168,8 +168,6 @@ module "proxy" {
   use_os_released_updates   = true
   ssh_key_path              = "./salt/controller/id_rsa.pub"
 
-  //proxy_additional_repos
-
 }
 
 module "sles15sp4_minion" {
@@ -189,8 +187,6 @@ module "sles15sp4_minion" {
   use_os_released_updates = false
   ssh_key_path            = "./salt/controller/id_rsa.pub"
 
-  //sle15sp4-minion_additional_repos
-
 }
 
 module "controller" {

diff --git a/terracumber_config/tf_files/SUSEManager-5.0-SLE-update-NUE.tf b/terracumber_config/tf_files/SUSEManager-5.0-SLE-update-NUE.tf
@@ -66,12 +66,12 @@ variable "SCC_PASSWORD" {
 
 variable "GIT_USER" {
   type = string
-  default = null // Not needed for master, as it is public
+  default = null
 }
 
 variable "GIT_PASSWORD" {
   type = string
-  default = null // Not needed for master, as it is public
+  default = null
 }
 
 terraform {
@@ -116,7 +116,7 @@ module "server_containerized" {
   name               = "server"
   image              = "slemicro55o"
   provider_settings = {
-    mac                = "aa:b2:93:01:03:9c"
+    mac                = "aa:b2:93:01:02:71"
     memory             = 16384
     vcpu               = 4
     data_pool          = "ssd"
@@ -154,7 +154,7 @@ module "proxy_containerized" {
   name               = "proxy"
   image              = "slemicro55o"
   provider_settings  = {
-    mac                = "aa:b2:93:01:03:9d"
+    mac                = "aa:b2:93:01:02:72"
     memory             = 4096
   }
   server_configuration = {
@@ -179,7 +179,7 @@ module "sles15sp6_minion" {
   name               = "sles15sp6-minion"
   image              = "sles15sp6o"
   provider_settings  = {
-    mac    = "aa:b2:93:01:03:9e"
+    mac    = "aa:b2:93:01:02:73"
     vcpu   = 2
     memory = 2048
   }
@@ -195,7 +195,7 @@ module "controller" {
   base_configuration = module.base.configuration
   name               = "controller"
   provider_settings = {
-    mac                = "aa:b2:93:01:03:9b"
+    mac                = "aa:b2:93:01:02:70"
     memory             = 16384
     vcpu               = 8
   }

diff --git a/...ig/tf_files/SUSEManager-5.0-SLE-update.tf → ...f_files/SUSEManager-5.0-SLE-update-PRV.tf b/...ig/tf_files/SUSEManager-5.0-SLE-update.tf → ...f_files/SUSEManager-5.0-SLE-update-PRV.tf
@@ -66,12 +66,12 @@ variable "SCC_PASSWORD" {
 
 variable "GIT_USER" {
   type = string
-  default = null // Not needed for master, as it is public
+  default = null
 }
 
 variable "GIT_PASSWORD" {
   type = string
-  default = null // Not needed for master, as it is public
+  default = null
 }
 
 terraform {
@@ -171,8 +171,6 @@ module "proxy_containerized" {
   auto_configure            = false
   ssh_key_path              = "./salt/controller/id_rsa.pub"
 
-  //proxy_additional_repos
-
 }
 
 module "sles15sp6_minion" {
@@ -192,8 +190,6 @@ module "sles15sp6_minion" {
   use_os_released_updates = false
   ssh_key_path            = "./salt/controller/id_rsa.pub"
 
-  //sle15sp6-minion_additional_repos
-
 }
 
 module "controller" {