Add support for server container image variable / Add possibility to specify different registry for proxy and server (#1594)

maximenoel8 · web-flow · commit 8e0e43ebc56a · 2025-03-19T10:04:05.000+13:00
diff --git a/jenkins_pipelines/environments/common/pipeline-build-validation.groovy b/jenkins_pipelines/environments/common/pipeline-build-validation.groovy
@@ -24,7 +24,9 @@ def run(params) {
         def products_and_salt_migration_stage_result_fail = false
         def retail_stage_result_fail = false
         def containerization_stage_result_fail = false
-        def container_repository = params.container_repository ?: null
+        def server_container_repository = params.server_container_repository ?: null
+        def proxy_container_repository = params.proxy_container_repository ?: null
+        def server_container_image = params.server_container_image ?: ''
 
         env.common_params = "--outputdir ${resultdir} --tf ${params.tf_file} --gitfolder ${resultdir}/sumaform"
 
@@ -66,7 +68,29 @@ def run(params) {
                         }
                     }
                     // Run Terracumber to deploy the environment
-                    sh "set +x; source /home/jenkins/.credentials set -x; export TF_VAR_CONTAINER_REPOSITORY=${container_repository}; export TF_VAR_CUCUMBER_GITREPO=${params.cucumber_gitrepo}; export TF_VAR_CUCUMBER_BRANCH=${params.cucumber_ref}; export TF_VAR_PRODUCT_VERSION=${params.product_version}; export TERRAFORM=${params.terraform_bin}; export TERRAFORM_PLUGINS=${params.terraform_bin_plugins}; ./terracumber-cli ${common_params} --logfile ${resultdirbuild}/sumaform.log --init --taint '.*(domain|main_disk|data_disk|database_disk|standalone_provisioning|server_extra_nfs_mounts).*' --custom-repositories ${WORKSPACE}/custom_repositories.json --sumaform-backend ${params.sumaform_backend} --use-tf-resource-cleaner --tf-resources-to-keep ${params.minions_to_run.split(', ').join(' ')} --runstep provision"
+                    sh """
+                        set +x
+                        source /home/jenkins/.credentials
+                        set -x
+                    
+                        export TF_VAR_SERVER_CONTAINER_REPOSITORY=${server_container_repository}
+                        export TF_VAR_PROXY_CONTAINER_REPOSITORY=${proxy_container_repository}
+                        export TF_VAR_SERVER_CONTAINER_IMAGE=${server_container_image}
+                        export TF_VAR_CUCUMBER_GITREPO=${params.cucumber_gitrepo}
+                        export TF_VAR_CUCUMBER_BRANCH=${params.cucumber_ref}
+                        export TERRAFORM=${params.terraform_bin}
+                        export TERRAFORM_PLUGINS=${params.terraform_bin_plugins}
+                    
+                        ./terracumber-cli ${common_params} \
+                            --logfile ${resultdirbuild}/sumaform.log \
+                            --init \
+                            --taint '.*(domain|main_disk|data_disk|database_disk|standalone_provisioning|server_extra_nfs_mounts).*' \
+                            --custom-repositories ${WORKSPACE}/custom_repositories.json \
+                            --sumaform-backend ${params.sumaform_backend} \
+                            --use-tf-resource-cleaner \
+                            --tf-resources-to-keep ${params.minions_to_run.split(', ').join(' ')} \
+                            --runstep provision
+                    """
                     // Generate features
                     sh "./terracumber-cli ${common_params} --logfile ${resultdirbuild}/testsuite.log --runstep cucumber --cucumber-cmd '${env.exports} cd /root/spacewalk/testsuite; rake utils:generate_build_validation_features'"
                     // Generate rake files
diff --git a/jenkins_pipelines/environments/manager-5.0-qe-build-validation-NUE b/jenkins_pipelines/environments/manager-5.0-qe-build-validation-NUE
@@ -39,7 +39,9 @@ node('sumaform-cucumber') {
                     value: minionList,
                     defaultValue: minionList,
                     description: 'Node list to run during BV'),
-            string(name: 'container_repository', defaultValue: 'registry.suse.de/suse/sle-15-sp6/update/products/manager50/update/containerfile', description: 'Proxy and server container registry'),
+            string(name: 'server_container_repository', defaultValue: 'registry.suse.de/suse/sle-15-sp6/update/products/manager50/update/containerfile', description: 'Server container registry'),
+            string(name: 'proxy_container_repository', defaultValue: 'registry.suse.de/suse/sle-15-sp6/update/products/manager50/update/containerfile', description: 'Proxy container registry'),
+            string(name: 'server_container_image', defaultValue: '', description: 'Server container image'),
             booleanParam(name: 'use_previous_terraform_state', defaultValue: false, description: 'Use previous Terraform state'),
             booleanParam(name: 'must_deploy', defaultValue: true, description: 'Deploy'),
             booleanParam(name: 'must_run_core', defaultValue: true, description: 'Run Core features'),
diff --git a/jenkins_pipelines/environments/manager-5.0-qe-build-validation-PRV b/jenkins_pipelines/environments/manager-5.0-qe-build-validation-PRV
@@ -39,7 +39,9 @@ node('sumaform-cucumber-provo') {
                     value: minionList,
                     defaultValue: minionList,
                     description: 'Node list to run during BV'),
-            string(name: 'container_repository', defaultValue: 'registry.suse.de/suse/sle-15-sp6/update/products/manager50/update/containerfile', description: 'Proxy and server container registry'),
+            string(name: 'server_container_repository', defaultValue: 'registry.suse.de/suse/sle-15-sp6/update/products/manager50/update/containerfile', description: 'Server container registry'),
+            string(name: 'proxy_container_repository', defaultValue: 'registry.suse.de/suse/sle-15-sp6/update/products/manager50/update/containerfile', description: 'Proxy container registry'),
+            string(name: 'server_container_image', defaultValue: '', description: 'Server container image'),
             booleanParam(name: 'use_previous_terraform_state', defaultValue: false, description: 'Use previous Terraform state'),
             booleanParam(name: 'must_deploy', defaultValue: true, description: 'Deploy'),
             booleanParam(name: 'must_run_core', defaultValue: true, description: 'Run Core features'),
diff --git a/jenkins_pipelines/environments/manager-5.0-qe-sle-update-NUE b/jenkins_pipelines/environments/manager-5.0-qe-sle-update-NUE
@@ -22,7 +22,9 @@ node('sumaform-cucumber') {
                     value: minionList,
                     defaultValue: minionList,
                     description: 'Node list to run during BV'),
-            string(name: 'container_repository', defaultValue: 'registry.suse.de/suse/sle-15-sp6/update/products/manager50/update/containerfile', description: 'Proxy and server container registry'),
+            string(name: 'server_container_repository', defaultValue: 'registry.suse.de/suse/sle-15-sp6/update/products/manager50/update/containerfile', description: 'Server container registry'),
+            string(name: 'proxy_container_repository', defaultValue: 'registry.suse.de/suse/sle-15-sp6/update/products/manager50/update/containerfile', description: 'Proxy container registry'),
+            string(name: 'server_container_image', defaultValue: '', description: 'Server container image'),
             // This is different than other pipelines to make it work with the simple proxy_traditional without refactoring all feature files
             booleanParam(name: 'use_previous_terraform_state', defaultValue: true, description: 'Use previous Terraform state'),
             booleanParam(name: 'must_deploy', defaultValue: true, description: 'Deploy'),
diff --git a/jenkins_pipelines/environments/manager-5.0-qe-sle-update-PRV b/jenkins_pipelines/environments/manager-5.0-qe-sle-update-PRV
@@ -22,7 +22,9 @@ node('sumaform-cucumber-provo') {
                     value: minionList,
                     defaultValue: minionList,
                     description: 'Node list to run during BV'),
-            string(name: 'container_repository', defaultValue: 'registry.suse.de/suse/sle-15-sp6/update/products/manager50/update/containerfile', description: 'Proxy and server container registry'),
+            string(name: 'server_container_repository', defaultValue: 'registry.suse.de/suse/sle-15-sp6/update/products/manager50/update/containerfile', description: 'Server container registry'),
+            string(name: 'proxy_container_repository', defaultValue: 'registry.suse.de/suse/sle-15-sp6/update/products/manager50/update/containerfile', description: 'Proxy container registry'),
+            string(name: 'server_container_image', defaultValue: '', description: 'Server container image'),
             // This is different than other pipelines to make it work with the simple proxy_traditional without refactoring all feature files
             booleanParam(name: 'use_previous_terraform_state', defaultValue: true, description: 'Use previous Terraform state'),
             booleanParam(name: 'must_deploy', defaultValue: true, description: 'Deploy'),
diff --git a/jenkins_pipelines/environments/manager-5.1-qe-build-validation-NUE b/jenkins_pipelines/environments/manager-5.1-qe-build-validation-NUE
@@ -37,7 +37,9 @@ node('sumaform-cucumber') {
                     value: minionList,
                     defaultValue: minionList,
                     description: 'Node list to run during BV'),
-            string(name: 'container_repository', defaultValue: 'registry.suse.de/suse/sle-15-sp7/update/products/multilinuxmanager51/containerfile', description: 'Proxy and server container registry'),
+            string(name: 'server_container_repository', defaultValue: 'registry.suse.de/suse/sle-15-sp7/update/products/multilinuxmanager51/containerfile', description: 'Server container registry'),
+            string(name: 'proxy_container_repository', defaultValue: 'registry.suse.de/suse/sle-15-sp7/update/products/multilinuxmanager51/containerfile', description: 'Proxy container registry'),
+            string(name: 'server_container_image', defaultValue: '', description: 'Server container image'),
             booleanParam(name: 'use_previous_terraform_state', defaultValue: false, description: 'Use previous Terraform state'),
             booleanParam(name: 'must_deploy', defaultValue: true, description: 'Deploy'),
             booleanParam(name: 'must_run_core', defaultValue: true, description: 'Run Core features'),
diff --git a/jenkins_pipelines/environments/manager-qe-continuous-build-validation-NUE b/jenkins_pipelines/environments/manager-qe-continuous-build-validation-NUE
@@ -39,7 +39,9 @@ node('sumaform-cucumber') {
                     value: minionList,
                     defaultValue: minionList,
                     description: 'Node list to run during BV'),
-            string(name: 'container_repository', defaultValue: 'registry.suse.de/devel/galaxy/manager/head/containerfile', description: 'Proxy and server container registry'),
+            string(name: 'server_container_repository', defaultValue: 'registry.suse.de/devel/galaxy/manager/head/containerfile', description: 'Server container registry'),
+            string(name: 'proxy_container_repository', defaultValue: 'registry.suse.de/devel/galaxy/manager/head/containerfile', description: 'Proxy container registry'),
+            string(name: 'server_container_image', defaultValue: '', description: 'Server container image'),
             booleanParam(name: 'use_previous_terraform_state', defaultValue: false, description: 'Use previous Terraform state'),
             booleanParam(name: 'must_deploy', defaultValue: true, description: 'Deploy'),
             booleanParam(name: 'must_run_core', defaultValue: true, description: 'Run Core features'),
diff --git a/jenkins_pipelines/environments/qe-build-validation-cleaning-pipeline b/jenkins_pipelines/environments/qe-build-validation-cleaning-pipeline
@@ -31,7 +31,8 @@ node {
                         string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
                         string(name: 'terracumber_gitrepo', defaultValue: 'https://github.com/uyuni-project/terracumber.git', description: 'Terracumber Git Repository'),
                         string(name: 'terracumber_ref', defaultValue: 'master', description: 'Terracumber Git ref (branch, tag...)'),
-                        string(name: 'container_repository', defaultValue: 'registry.suse.de/suse/sle-15-sp6/update/products/manager50/update/containerfile', description: 'Proxy and server container registry'),
+                        string(name: 'server_container_repository', defaultValue: 'registry.suse.de/suse/sle-15-sp6/update/products/manager50/update/containerfile', description: 'Server container registry'),
+                        string(name: 'proxy_container_repository', defaultValue: 'registry.suse.de/suse/sle-15-sp6/update/products/manager50/update/containerfile', description: 'Proxy container registry'),
                         booleanParam(name: 'delete_all_resources', defaultValue: false, description: 'Proxy, Monitoring and Retail will be redeployed')
                 ])
         ])
diff --git a/jenkins_pipelines/environments/uyuni-master-qe-build-validation-NUE b/jenkins_pipelines/environments/uyuni-master-qe-build-validation-NUE
@@ -39,7 +39,9 @@ node('sumaform-cucumber') {
                     value: minionList,
                     defaultValue: minionList,
                     description: 'Node list to run during BV'),
-            string(name: 'container_repository', defaultValue: 'registry.opensuse.org/systemsmanagement/uyuni/master/containers', description: 'Proxy and server container registry'),
+            string(name: 'server_container_repository', defaultValue: 'registry.opensuse.org/systemsmanagement/uyuni/master/containers', description: 'Server container registry'),
+            string(name: 'proxy_container_repository', defaultValue: 'registry.opensuse.org/systemsmanagement/uyuni/master/containers', description: 'Proxy container registry'),
+            string(name: 'server_container_image', defaultValue: '', description: 'Server container image'),
             booleanParam(name: 'use_previous_terraform_state', defaultValue: false, description: 'Use previous Terraform state'),
             booleanParam(name: 'must_deploy', defaultValue: true, description: 'Deploy'),
             booleanParam(name: 'must_run_core', defaultValue: true, description: 'Run Core features'),
diff --git a/jenkins_pipelines/environments/uyuni-master-qe-build-validation-PRV b/jenkins_pipelines/environments/uyuni-master-qe-build-validation-PRV
@@ -39,7 +39,9 @@ node('sumaform-cucumber-provo') {
                     value: minionList,
                     defaultValue: minionList,
                     description: 'Node list to run during BV'),
-            string(name: 'container_repository', defaultValue: 'registry.opensuse.org/systemsmanagement/uyuni/master/containers', description: 'Proxy and server container registry'),
+            string(name: 'server_container_repository', defaultValue: 'registry.opensuse.org/systemsmanagement/uyuni/master/containers', description: 'Server container registry'),
+            string(name: 'proxy_container_repository', defaultValue: 'registry.opensuse.org/systemsmanagement/uyuni/master/containers', description: 'Proxy container registry'),
+            string(name: 'server_container_image', defaultValue: '', description: 'Server container image'),
             booleanParam(name: 'use_previous_terraform_state', defaultValue: false, description: 'Use previous Terraform state'),
             booleanParam(name: 'must_deploy', defaultValue: true, description: 'Deploy'),
             booleanParam(name: 'must_run_core', defaultValue: true, description: 'Run Core features'),
diff --git a/terracumber_config/tf_files/MLM-5.1-build-validation-NUE.tf b/terracumber_config/tf_files/MLM-5.1-build-validation-NUE.tf
@@ -64,10 +64,19 @@ variable "SCC_PASSWORD" {
   type = string
 }
 
-variable "CONTAINER_REPOSITORY" {
+variable "SERVER_CONTAINER_REPOSITORY" {
   type = string
 }
 
+variable "PROXY_CONTAINER_REPOSITORY" {
+  type = string
+}
+
+variable "SERVER_CONTAINER_IMAGE" {
+  type = string
+  default = ""
+}
+
 variable "GIT_USER" {
   type = string
   default = null // Not needed for master, as it is public
@@ -182,7 +191,8 @@ module "server_containerized" {
     data_pool          = "ssd"
   }
   runtime = "podman"
-  container_repository  = var.CONTAINER_REPOSITORY
+  container_repository  = var.SERVER_CONTAINER_REPOSITORY
+  container_image       = var.SERVER_CONTAINER_IMAGE
   main_disk_size        = 100
   repository_disk_size  = 3072
   database_disk_size    = 150
@@ -218,7 +228,7 @@ module "proxy_containerized" {
     memory             = 4096
   }
   runtime                   = "podman"
-  container_repository      = var.CONTAINER_REPOSITORY
+  container_repository      = var.PROXY_CONTAINER_REPOSITORY
   container_tag             = "latest"
   auto_configure            = false
   ssh_key_path              = "./salt/controller/id_rsa.pub"
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
@@ -64,10 +64,19 @@ variable "SCC_PASSWORD" {
   type = string
 }
 
-variable "CONTAINER_REPOSITORY" {
+variable "SERVER_CONTAINER_REPOSITORY" {
   type = string
 }
 
+variable "PROXY_CONTAINER_REPOSITORY" {
+  type = string
+}
+
+variable "SERVER_CONTAINER_IMAGE" {
+  type = string
+  default = ""
+}
+
 variable "GIT_USER" {
   type = string
   default = null
@@ -129,7 +138,8 @@ module "server_containerized" {
   main_disk_size        = 1500
   runtime               = "podman"
   // Temporary workaround to see if we pass proxy stage. Also needs to be updated on next MU
-  container_repository  = var.CONTAINER_REPOSITORY
+  container_repository  = var.SERVER_CONTAINER_REPOSITORY
+  container_image       = var.SERVER_CONTAINER_IMAGE
   container_tag         = "latest"
   server_mounted_mirror = "minima-mirror-ci-bv.mgr.suse.de"
 
@@ -168,7 +178,7 @@ module "proxy_containerized" {
   }
 
   runtime              = "podman"
-  container_repository = var.CONTAINER_REPOSITORY
+  container_repository = var.PROXY_CONTAINER_REPOSITORY
   container_tag        = "latest"
 
   auto_configure        = false
diff --git a/terracumber_config/tf_files/SUSEManager-5.0-SLE-update-PRV.tf b/terracumber_config/tf_files/SUSEManager-5.0-SLE-update-PRV.tf
@@ -64,10 +64,19 @@ variable "SCC_PASSWORD" {
   type = string
 }
 
-variable "CONTAINER_REPOSITORY" {
+variable "SERVER_CONTAINER_REPOSITORY" {
   type = string
 }
 
+variable "PROXY_CONTAINER_REPOSITORY" {
+  type = string
+}
+
+variable "SERVER_CONTAINER_IMAGE" {
+  type = string
+  default = ""
+}
+
 variable "GIT_USER" {
   type = string
   default = null
@@ -129,7 +138,8 @@ module "server_containerized" {
   main_disk_size        = 1500
   runtime               = "podman"
   // Temporary workaround to see if we pass proxy stage. Also needs to be updated on next MU
-  container_repository  = var.CONTAINER_REPOSITORY
+  container_repository  = var.SERVER_CONTAINER_REPOSITORY
+  container_image       = var.SERVER_CONTAINER_IMAGE
   container_tag         = "latest"
   server_mounted_mirror = "minima-mirror-ci-bv.mgr.prv.suse.net"
 
@@ -168,7 +178,7 @@ module "proxy_containerized" {
   }
 
   runtime              = "podman"
-  container_repository  = var.CONTAINER_REPOSITORY
+  container_repository  = var.PROXY_CONTAINER_REPOSITORY
   container_tag         = "latest"
 
   auto_configure            = false
diff --git a/terracumber_config/tf_files/SUSEManager-5.0-alternative-base-OS-NUE.tf b/terracumber_config/tf_files/SUSEManager-5.0-alternative-base-OS-NUE.tf
@@ -64,10 +64,19 @@ variable "SCC_PASSWORD" {
   type = string
 }
 
-variable "CONTAINER_REPOSITORY" {
+variable "SERVER_CONTAINER_REPOSITORY" {
   type = string
 }
 
+variable "PROXY_CONTAINER_REPOSITORY" {
+  type = string
+}
+
+variable "SERVER_CONTAINER_IMAGE" {
+  type = string
+  default = ""
+}
+
 variable "GIT_USER" {
   type = string
   default = null
@@ -129,7 +138,8 @@ module "server_containerized" {
 
   main_disk_size        = 1500
   runtime               = "podman"
-  container_repository  = var.CONTAINER_REPOSITORY
+  container_repository  = var.SERVER_CONTAINER_REPOSITORY
+  container_image       = var.SERVER_CONTAINER_IMAGE
   container_tag         = "latest"
   server_mounted_mirror = "minima-mirror-ci-bv.mgr.suse.de"
 
@@ -168,7 +178,7 @@ module "proxy_containerized" {
   }
 
   runtime              = "podman"
-  container_repository  = var.CONTAINER_REPOSITORY
+  container_repository  = var.PROXY_CONTAINER_REPOSITORY
   container_tag        = "latest"
 
   auto_configure        = false
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
@@ -64,10 +64,19 @@ variable "SCC_PASSWORD" {
   type = string
 }
 
-variable "CONTAINER_REPOSITORY" {
+variable "SERVER_CONTAINER_REPOSITORY" {
   type = string
 }
 
+variable "PROXY_CONTAINER_REPOSITORY" {
+  type = string
+}
+
+variable "SERVER_CONTAINER_IMAGE" {
+  type = string
+  default = ""
+}
+
 variable "GIT_USER" {
   type = string
   default = null // Not needed for master, as it is public
@@ -182,7 +191,8 @@ module "server_containerized" {
     data_pool          = "ssd"
   }
   runtime = "podman"
-  container_repository  = var.CONTAINER_REPOSITORY
+  container_repository  = var.SERVER_CONTAINER_REPOSITORY
+  container_image       = var.SERVER_CONTAINER_IMAGE
   main_disk_size        = 100
   repository_disk_size  = 3072
   database_disk_size    = 150
@@ -218,7 +228,7 @@ module "proxy_containerized" {
     memory             = 4096
   }
   runtime                   = "podman"
-  container_repository      = var.CONTAINER_REPOSITORY
+  container_repository      = var.PROXY_CONTAINER_REPOSITORY
   container_tag             = "latest"
   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
diff --git a/terracumber_config/tf_files/SUSEManager-continuous-build-validation-NUE.tf b/terracumber_config/tf_files/SUSEManager-continuous-build-validation-NUE.tf
diff --git a/terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf b/terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf
diff --git a/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf b/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf
