Rename module pr pipelines (#1477)

SUSE · Nov 27, 2024 · bac114b · bac114b
1 parent 5f19e85
commit bac114b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 34 deletions.
diff --git a/.github/workflows/sumaform-validation.yml b/.github/workflows/sumaform-validation.yml
@@ -4,6 +4,7 @@ on:
   pull_request:
     paths:
       - 'terracumber_config/tf_files/**'
+      - '!terracumber_config/tf_files/PR-testing-template.tf'
 
 jobs:
   validate_sumaform:

diff --git a/jenkins_pipelines/environments/uyuni-prs-ci-tests b/jenkins_pipelines/environments/uyuni-prs-ci-tests
@@ -49,7 +49,7 @@ node('pull-request-test-nue') {
         additional_repo_url = params.additional_repo_url;
         terraform_parallelism = params.terraform_parallelism;
         sumaform_gitrepo = "https://github.com/uyuni-project/sumaform.git";
-        sumaform_ref = "master";
+        sumaform_ref = "rename_cucumber_testsuite_module";
         secondary_exports = ""
         cucumber_gitrepo = params.cucumber_gitrepo;
         cucumber_ref = params.cucumber_ref;

diff --git a/terracumber_config/tf_files/PR-testing-template.tf b/terracumber_config/tf_files/PR-testing-template.tf
@@ -55,7 +55,7 @@ module "cucumber_testsuite" {
         memory = 2048
       }
     }
-    dhcp-dns = {
+    dhcp_dns = {
       name = "dhcp-dns"
       image = "opensuse155o"
       hypervisor = {
@@ -88,37 +88,29 @@ module "cucumber_testsuite" {
       provider_settings = {
         mac = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].mac["proxy"]
       }
-      additional_packages = [ "venv-salt-minion" ]
-      install_salt_bundle = true
       runtime = "podman"
     }
-    suse-minion = {
+    suse_minion = {
       image = var.SUSE_MINION_IMAGE
-      name = "min-suse"
       provider_settings = {
         mac = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].mac["suse-minion"]
         vcpu = 2
         memory = 2048
       }
       additional_repos = local.additional_repos["suse-minion"]
-      additional_packages = [ "venv-salt-minion" ]
-      install_salt_bundle = true
     }
-    suse-sshminion = {
+    suse_sshminion = {
       image = var.SUSE_MINION_IMAGE
-      name = "minssh-suse"
       provider_settings = {
         mac = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].mac["suse-sshminion"]
         vcpu = 2
         memory = 2048
       }
       additional_repos = local.additional_repos["suse-minion"]
-      additional_packages = [ "venv-salt-minion", "iptables" ]
-      install_salt_bundle = true
+      additional_packages = [ "iptables" ]
     }
-    redhat-minion = {
+    rhlike_minion = {
       image = var.RHLIKE_MINION_IMAGE
-      name = "min-rhlike"
       provider_settings = {
         mac = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].mac["rhlike-minion"]
         memory = 2048
@@ -127,12 +119,9 @@ module "cucumber_testsuite" {
       additional_repos = {
         client_repo = var.RHLIKE_CLIENT_REPO,
       }
-      additional_packages = [ "venv-salt-minion" ]
-      install_salt_bundle = true
     }
-    debian-minion = {
+    deblike_minion = {
       image = var.DEBLIKE_MINION_IMAGE
-      name = "min-deblike"
       provider_settings = {
         mac = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].mac["deblike-minion"]
         vcpu = 2
@@ -141,43 +130,32 @@ module "cucumber_testsuite" {
       additional_repos = {
         client_repo = var.DEBLIKE_CLIENT_REPO,
       }
-      additional_packages = [ "venv-salt-minion" ]
-      // FIXME: cloudl-init fails if venv-salt-minion is not avaiable
-      // We can set "install_salt_bundle = true" as soon as venv-salt-minion is available Uyuni:Stable
-      install_salt_bundle = true
     }
-    build-host = {
+    build_host = {
       image = "sles15sp4o"
-      name = "min-build"
       provider_settings = {
         mac = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].mac["build-host"]
         memory = 2048
       }
       additional_repos = {
         tools_update_pr = var.SLE_CLIENT_REPO
       }
-      additional_packages = [ "venv-salt-minion" ]
-      install_salt_bundle = true
     }
-    pxeboot-minion = {
+    pxeboot_minion = {
       image = "sles15sp4o"
       additional_repos = {
         tools_update_pr = var.SLE_CLIENT_REPO
       }
-      additional_packages = [ "venv-salt-minion" ]
-      install_salt_bundle = true
     }
-    kvm-host = {
+    kvm_host = {
       image = var.IMAGE
-      name = "min-kvm"
-
+
       provider_settings = {
         mac = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].mac["kvm-host"]
       }
       additional_repos_only = var.ADDITIONAL_REPOS_ONLY
       additional_repos = local.additional_repos["kvm-host"]
-      additional_packages = [ "venv-salt-minion", "mkisofs" ]
-      install_salt_bundle = true
+      additional_packages = [ "mkisofs" ]
     }
   }