Skip to content

Use template and tfvars for salt shaker products and update tf file p…#1958

Draft
maximenoel8 wants to merge 3 commits intoSUSE:masterfrom
maximenoel8:tempplate_salt_shaker
Draft

Use template and tfvars for salt shaker products and update tf file p…#1958
maximenoel8 wants to merge 3 commits intoSUSE:masterfrom
maximenoel8:tempplate_salt_shaker

Conversation

@maximenoel8
Copy link
Copy Markdown
Contributor

@maximenoel8 maximenoel8 commented Mar 25, 2026

Consolidate Salt Shaker Terraform configuration into a single template

Previously, each Salt Shaker job had its own dedicated .tf file, leading to ~60 near-identical files differing only in image, MAC address, and a few strings.

This PR introduces a shared template approach, following the same pattern already used by the personal environments pipeline.

Changes

  • templates/salt-shaker.tf — single reusable Terraform template, selects the active environment via ENVIRONMENT
  • variables/salt-shaker.tf — declares all variables including the ENVIRONMENT_CONFIGURATION map
  • tfvars/salt-shaker/salt-shaker.tfvars — consolidates all per-distro config (image, MAC, URLs, mail subjects, salt_obs_flavor) into a single map keyed by environment name (e.g. next-almalinux8-bundle, testing-sles15sp6)
  • pipeline-salt-shaker.groovy — updated to use the shared template and append ENVIRONMENT from mutableParams.minion
  • Jenkins job files — removed tf_file parameter, added correct mutableParams.minion key per job, fixed bundle jobs that were incorrectly passing bare params to pipeline.run()

Question

Looking at the bundle vs non-bundle variants, the only differences are the MAC address, job name, and mail subject wording — salt_obs_flavor is identical in both. The actual bundle vs classic distinction is already handled at runtime by the salt_flavor parameter passed to salt-test.

Could the non-bundle jobs be removed entirely, leaving only the bundle variants?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant