Remove SUSE Manager 4.2

uyuni-project · Sep 12, 2024 · 489b2a7 · 489b2a7
1 parent 337587c
commit 489b2a7
Show file tree

Hide file tree

Showing 24 changed files with 19 additions and 280 deletions.
diff --git a/backend_modules/null/host/variables.tf b/backend_modules/null/host/variables.tf
@@ -127,7 +127,7 @@ variable "volume_provider_settings" {
 }
 
 variable "product_version" {
-  description = "One of: 4.2-nightly, 4.2-released, 4.3-nightly, 4.3-released, 4.3-pr, 4.3-beta, 4.3-VM-nightly, 4.3-VM-released, head, uyuni-master, uyuni-released, uyuni-pr"
+  description = "One of: 4.3-nightly, 4.3-released, 4.3-pr, 4.3-beta, 4.3-VM-nightly, 4.3-VM-released, 5.0-nightly, 5.0-released, head, uyuni-master, uyuni-released, uyuni-pr"
   type        = string
   default     = "5.0-released"
 }
diff --git a/main.tf.ssh.example b/main.tf.ssh.example
@@ -20,7 +20,7 @@ module "server" {
   base_configuration = module.base.configuration
 
   name = "server"
-  product_version = "4.2-nightly"
+  product_version = "4.3-nightly"
   // see modules/suse_manager/variables.tf for possible values
 
   // connect_to_additional_network = true

diff --git a/modules/build_host/variables.tf b/modules/build_host/variables.tf
@@ -8,7 +8,7 @@ variable "name" {
 }
 
 variable "product_version" {
-  description = "A valid SUSE Manager version (eg. 4.2-nightly, head) see README_ADVANCED.md"
+  description = "A valid SUSE Manager version (eg. 4.3-nightly, head) see README_ADVANCED.md"
   default     = "released"
 }
 

diff --git a/modules/client/variables.tf b/modules/client/variables.tf
@@ -8,7 +8,7 @@ variable "name" {
 }
 
 variable "product_version" {
-  description = "A valid SUSE Manager version (eg. 4.2-nightly, head) see README_ADVANCED.md"
+  description = "A valid SUSE Manager version (eg. 4.3-nightly) see README_ADVANCED.md"
   default     = "released"
 }
 

diff --git a/modules/controller/main.tf b/modules/controller/main.tf
@@ -1,7 +1,5 @@
 variable "testsuite-branch" {
   default = {
-    "4.2-released"   = "Manager-4.2"
-    "4.2-nightly"    = "Manager-4.2"
     "4.3-released"   = "Manager-4.3"
     "4.3-nightly"    = "Manager-4.3"
     "4.3-pr"         = "Manager-4.3"

diff --git a/modules/cucumber_testsuite/variables.tf b/modules/cucumber_testsuite/variables.tf
@@ -84,7 +84,7 @@ variable "host_settings" {
 
 // server
 variable "product_version" {
-  description = "One of: 4.2-nightly, 4.2-released, 4.3-nightly, 4.3-released, 4.3-pr, 4.3-beta, 4.3-VM-nightly, 4.3-VM-released, head, uyuni-master, uyuni-released, uyuni-pr"
+  description = "One of: 4.3-nightly, 4.3-released, 4.3-pr, 4.3-beta, 4.3-VM-nightly, 4.3-VM-released, 5.0-nightly, 5.0-released, head, uyuni-master, uyuni-released, uyuni-pr"
   type        = string
 }
 

diff --git a/modules/grafana/main.tf b/modules/grafana/main.tf
@@ -10,10 +10,10 @@ module "grafana" {
     mirror          = var.base_configuration["mirror"]
     server          = var.server_configuration["hostname"]
     locust          = var.locust_configuration["hostname"]
-    product_version = "4.2-nightly"
+    product_version = "4.3-nightly"
   }
 
-  image   = "sles12sp5"
+  image   = "sles15sp4o"
   provider_settings = var.provider_settings
 }
 

diff --git a/modules/minion/variables.tf b/modules/minion/variables.tf
@@ -13,7 +13,7 @@ variable "roles" {
 }
 
 variable "product_version" {
-  description = "A valid SUSE Manager version (eg. 4.2-nightly, head) see README_ADVANCED.md"
+  description = "A valid SUSE Manager version (eg. 4.3-nightly, head) see README_ADVANCED.md"
   default     = "released"
 }
 

diff --git a/modules/proxy/main.tf b/modules/proxy/main.tf
@@ -1,15 +1,13 @@
 variable "images" {
   default = {
-    "4.2-released"   = "sles15sp3o"
-    "4.2-nightly"    = "sles15sp3o"
-    "4.2-build_image"= "sles15sp3o"
     "4.3-released"   = "sles15sp4o"
     "4.3-nightly"    = "sles15sp4o"
     "4.3-pr"         = "sles15sp4o"
     "4.3-beta"       = "sles15sp4o"
     "4.3-build_image"= "sles15sp4o"
     "4.3-VM-nightly" = "sles15sp4o"
     "4.3-VM-released"= "sles15sp4o"
+    # Uyuni non-podman deprecated in September 2024:
     "uyuni-master"   = "opensuse155o"
     "uyuni-released" = "opensuse155o"
     "uyuni-pr"       = "opensuse155o"

diff --git a/modules/proxy/variables.tf b/modules/proxy/variables.tf
@@ -8,7 +8,7 @@ variable "name" {
 }
 
 variable "product_version" {
-  description = "One of: 4.2-released, 4.2-nightly, 4.2-build_image, 4.3-released, 4.3-nightly, 4.3-pr, 4.3-beta, 4.3-build_image, 4.3-VM-nightly, 4.3-VM-released, head, uyuni-master, uyuni-released, uyuni-pr"
+  description = "One of: 4.3-released, 4.3-nightly, 4.3-pr, 4.3-beta, 4.3-build_image, 4.3-VM-nightly, 4.3-VM-released, 5.0-nightly, 5.0-released, head, uyuni-master, uyuni-released, uyuni-pr"
   type        = string
 }
 

diff --git a/modules/server/main.tf b/modules/server/main.tf
@@ -1,8 +1,5 @@
 variable "images" {
   default = {
-    "4.2-released"    = "sles15sp3o"
-    "4.2-nightly"     = "sles15sp3o"
-    "4.2-build_image" = "sles15sp3o"
     "4.3-released"    = "sles15sp4o"
     "4.3-nightly"     = "sles15sp4o"
     "4.3-pr"          = "sles15sp4o"
@@ -11,6 +8,7 @@ variable "images" {
     "4.3-paygo"       = "suma-server-43-paygo"
     "4.3-VM-nightly"  = "suma43VM-ign"
     "4.3-VM-released" = "suma43VM-ign"
+    # Uyuni non-podman deprecated in September 2024:
     "uyuni-master"    = "opensuse155o"
     "uyuni-released"  = "opensuse155o"
     "uyuni-pr"        = "opensuse155o"

diff --git a/modules/server/variables.tf b/modules/server/variables.tf
@@ -8,7 +8,7 @@ variable "name" {
 }
 
 variable "product_version" {
-  description = "One of: 4.2-released, 4.2-nightly, 4.2-build_image, 4.3-released, 4.3-nightly, 4.3-pr, 4.3-beta, 4.3-build_image, 4.3-paygo, 4.3-VM-nightly, 4.3-VM-released, head, uyuni-master, uyuni-released, uyuni-pr"
+  description = "One of: 4.3-released, 4.3-nightly, 4.3-pr, 4.3-beta, 4.3-build_image, 4.3-paygo, 4.3-VM-nightly, 4.3-VM-released, 5.0-released, 5.0-nightly, head, uyuni-master, uyuni-released, uyuni-pr"
   type        = string
 }
 

diff --git a/modules/sshminion/variables.tf b/modules/sshminion/variables.tf
@@ -8,7 +8,7 @@ variable "name" {
 }
 
 variable "product_version" {
-  description = "A valid SUSE Manager version (eg. 4.2-nightly, head) see README_ADVANCED.md"
+  description = "A valid SUSE Manager version (eg. 4.3-nightly, head) see README_ADVANCED.md"
   default     = "released"
 }
 

diff --git a/modules/virthost/variables.tf b/modules/virthost/variables.tf
@@ -8,7 +8,7 @@ variable "name" {
 }
 
 variable "product_version" {
-  description = "A valid SUSE Manager version (eg. 4.2-nightly, head) see README_ADVANCED.md"
+  description = "A valid SUSE Manager version (eg. 4.3-nightly, head) see README_ADVANCED.md"
   default     = "released"
 }
 

diff --git a/salt/mirror/etc/minima.yaml b/salt/mirror/etc/minima.yaml
@@ -121,28 +121,16 @@ scc:
     - SLE-Module-Containers15-SP4-Pool
     - SLE-Module-Containers15-SP4-Updates
     # SUSE Manager Server
-    - SLE-Product-SUSE-Manager-Server-4.2-Pool
-    - SLE-Product-SUSE-Manager-Server-4.2-Updates
-    - SLE-Module-SUSE-Manager-Server-4.2-Pool
-    - SLE-Module-SUSE-Manager-Server-4.2-Updates
     - SLE-Product-SUSE-Manager-Server-4.3-Pool
     - SLE-Product-SUSE-Manager-Server-4.3-Updates
     - SLE-Module-SUSE-Manager-Server-4.3-Pool
     - SLE-Module-SUSE-Manager-Server-4.3-Updates
     # SUSE Manager Proxy
-    - SLE-Product-SUSE-Manager-Proxy-4.2-Pool
-    - SLE-Product-SUSE-Manager-Proxy-4.2-Updates
-    - SLE-Module-SUSE-Manager-Proxy-4.2-Pool
-    - SLE-Module-SUSE-Manager-Proxy-4.2-Updates
     - SLE-Product-SUSE-Manager-Proxy-4.3-Pool
     - SLE-Product-SUSE-Manager-Proxy-4.3-Updates
     - SLE-Module-SUSE-Manager-Proxy-4.3-Pool
     - SLE-Module-SUSE-Manager-Proxy-4.3-Updates
     # Retail Branch Server
-    - SLE-Product-SUSE-Manager-Retail-Branch-Server-4.2-Pool
-    - SLE-Product-SUSE-Manager-Retail-Branch-Server-4.2-Updates
-    - SLE-Module-SUSE-Manager-Retail-Branch-Server-4.2-Pool
-    - SLE-Module-SUSE-Manager-Retail-Branch-Server-4.2-Updates
     - SLE-Product-SUSE-Manager-Retail-Branch-Server-4.3-Pool
     - SLE-Product-SUSE-Manager-Retail-Branch-Server-4.3-Updates
     - SLE-Module-SUSE-Manager-Retail-Branch-Server-4.3-Pool
@@ -229,46 +217,6 @@ http:
   - url: http://download.suse.de/ibs/SUSE:/Maintenance:/Test:/SLE-Module-Web-Scripting:/15-SP4:/x86_64/update
     archs: [x86_64]
 
-  # SUSE Manager Head (SLE15-SP3)
-  - url: http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/Head/images/repo/SLE-Module-SUSE-Manager-Server-4.2-POOL-x86_64-Media1
-    archs: [x86_64]
-  - url: http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/Head:/ToSLE/SLE_15_SP3/
-    archs: [x86_64]
-
-  # SUSE Manager Head Proxy (SLE15-SP3)
-  - url: http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/Head/images/repo/SLE-Module-SUSE-Manager-Proxy-4.2-POOL-x86_64-Media1
-    archs: [x86_64]
-  - url: http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/Head:/ToSLE/SLE_15_SP3/
-    archs: [x86_64]
-
-  # SUSE Manager 4.2 devel
-  - url: http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/4.2/SLE_15_SP3
-    archs: [x86_64]
-  - url: http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/4.2:/ToSLE/SLE_15_SP3/
-    archs: [x86_64]
-  - url: http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/4.2/images/repo/SLE-Module-SUSE-Manager-Testing-Overlay-4.2-POOL-x86_64-Media1/
-    archs: [x86_64]
-
-  # SLE 12 (GA and all SPs) Manager Tools 4.2 devel
-  - url: http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/4.2:/SLE12-SUSE-Manager-Tools/images/repo/SLE-12-Manager-Tools-POOL-x86_64-Media1
-    archs: [x86_64]
-
-  # SLE 15 Manager Tools 4.2 devel
-  - url: http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/4.2:/SLE15-SUSE-Manager-Tools/images/repo/SLE-15-Manager-Tools-POOL-x86_64-Media1
-    archs: [x86_64]
-
-  # RES 7 Manager Tools 4.2 devel
-  - url: http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/4.2:/RES7-SUSE-Manager-Tools/SUSE_RES-7_Update_standard
-    archs: [x86_64]
-
-  # RES 8 Manager Tools 4.2 devel
-  - url: http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/4.2:/RES8-SUSE-Manager-Tools/SUSE_RES-8_Update_standard
-    archs: [x86_64]
-
-  # Ubuntu 20.04 Manager Tools 4.2 devel
-  - url: http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/4.2:/Ubuntu20.04-SUSE-Manager-Tools/xUbuntu_20.04
-    archs: [amd64]
-
   # SUSE Manager 4.3 devel
   - url: http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/4.3/SLE_15_SP4
     archs: [x86_64]
@@ -309,12 +257,6 @@ http:
   - url: https://download.suse.de/download/ibs/Devel:/Galaxy:/Manager:/4.3:/Debian11-SUSE-Manager-Tools/Debian_11/
     archs: [amd64]
 
-  # SUSE Manager Head devel
-  - url: http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/Head/SLE_15_SP3
-    archs: [x86_64]
-  - url: http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/Head/images/repo/SLE-Module-SUSE-Manager-Testing-Overlay-4.2-POOL-x86_64-Media1/
-    archs: [x86_64]
-
   # SLE 12 (GA and all SPs) Manager Tools Head devel
   - url: http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/Head:/SLE12-SUSE-Manager-Tools/images/repo/SLE-12-Manager-Tools-Beta-POOL-x86_64-Media1
     archs: [x86_64]

diff --git a/salt/repos/proxy.sls b/salt/repos/proxy.sls
@@ -1,8 +1,6 @@
 {% if 'proxy' in grains.get('roles') %}
 include:
-  {%- if '4.2' in grains['product_version'] %}
-  - repos.proxy42
-  {%- elif '4.3' in grains['product_version'] %}
+  {%- if '4.3' in grains['product_version'] %}
   - repos.proxy43
   {%- else %}
   # Non-podman version deprecated in September 2024:

diff --git a/salt/repos/proxy42.sls b/salt/repos/proxy42.sls
diff --git a/salt/repos/server.sls b/salt/repos/server.sls
@@ -1,9 +1,7 @@
 {% if 'server' in grains.get('roles') %}
 
 include:
-  {%- if '4.2' in grains['product_version'] %}
-  - repos.server42
-  {%- elif '4.3' in grains['product_version'] %}
+  {%- if '4.3' in grains['product_version'] %}
   - repos.server43
   {%- else %}
   # Non-podman version deprecated in September 2024: