Head branch is now 5.1

SUSE · Sep 2, 2024 · d028e9d · d028e9d
1 parent 643e009
commit d028e9d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/terracumber_config/tf_files/SUSEManager-5.0-build-validation-NUE.tf b/terracumber_config/tf_files/SUSEManager-5.0-build-validation-NUE.tf
@@ -177,8 +177,7 @@ module "server_containerized" {
   }
   main_disk_size = 3000
   runtime = "podman"
-  # Temporary using the correct URL for the 5.0.1 BV only. See https://github.com/SUSE/spacewalk/issues/25120
-  container_repository = "registry.suse.de/suse/maintenance/35237/suse_sle-15-sp6_update_products_manager50_update_containerfile/suse/manager/5.0/x86_64"
+  container_repository = "registry.suse.de/suse/sle-15-sp6/update/products/manager50/containerfile"
 
   server_mounted_mirror          = "minima-mirror-ci-bv.mgr.suse.de"
   java_debugging                 = false
@@ -216,8 +215,7 @@ module "proxy_containerized" {
     password = "admin"
   }
   runtime = "podman"
-  # Temporary using the correct URL for the 5.0.1 BV only. See https://github.com/SUSE/spacewalk/issues/25120
-  container_repository = "registry.suse.de/suse/maintenance/35237/suse_sle-15-sp6_update_products_manager50_update_containerfile/suse/manager/5.0/x86_64"
+  container_repository = "registry.suse.de/suse/sle-15-sp6/update/products/manager50/containerfile/suse/manager/5.0/x86_64"
   auto_configure            = false
   ssh_key_path              = "./salt/controller/id_rsa.pub"
 }

diff --git a/terracumber_config/tf_files/SUSEManager-5.0-build-validation-PRV.tf b/terracumber_config/tf_files/SUSEManager-5.0-build-validation-PRV.tf
@@ -323,7 +323,7 @@ module "server_containerized" {
   }
   main_disk_size = 3000
   runtime = "podman"
-  container_repository = "registry.suse.de/suse/sle-15-sp6/update/products/manager50/containerfile/suse/manager/5.0/x86_64"
+  container_repository = "registry.suse.de/suse/sle-15-sp6/update/products/manager50/containerfile"
 
   server_mounted_mirror          = "minima-mirror-ci-bv.mgr.prv.suse.net"
   java_debugging                 = false
@@ -365,8 +365,6 @@ module "proxy_containerized" {
   }
   runtime = "podman"
   container_repository = "registry.suse.de/suse/sle-15-sp6/update/products/manager50/containerfile/suse/manager/5.0/x86_64"
-  // Most recent code. Enable again once Beta 2 will be approved:
-  // container_repository = "registry.suse.de/devel/galaxy/manager/head/containerfile/suse/manager/5.0/x86_64"
   auto_configure            = false
   ssh_key_path              = "./salt/controller/id_rsa.pub"
 }

diff --git a/terracumber_config/tf_files/SUSEManager-Head-NUE.tf b/terracumber_config/tf_files/SUSEManager-Head-NUE.tf
@@ -156,7 +156,7 @@ module "cucumber_testsuite" {
       additional_packages = [ "venv-salt-minion" ]
       install_salt_bundle = true
       runtime = "podman"
-      container_repository = "registry.suse.de/devel/galaxy/manager/head/containerfile/suse/manager/5.0/x86_64"
+      container_repository = "registry.suse.de/devel/galaxy/manager/head/containerfile/suse/manager/5.1/x86_64"
       container_tag = "latest"
     }
     suse-minion = {

diff --git a/terracumber_config/tf_files/SUSEManager-Head-refenv-NUE.tf b/terracumber_config/tf_files/SUSEManager-Head-refenv-NUE.tf
@@ -158,7 +158,7 @@ module "cucumber_testsuite" {
       additional_packages = [ "venv-salt-minion" ]
       install_salt_bundle = true
       runtime = "podman"
-      container_repository = "registry.suse.de/devel/galaxy/manager/head/containerfile/suse/manager/5.0/x86_64"
+      container_repository = "registry.suse.de/devel/galaxy/manager/head/containerfile/suse/manager/5.1/x86_64"
       container_tag = "latest"
     }
     suse-minion = {