Use template and tfvars for salt shaker products and update tf file p…#1958
Draft
maximenoel8 wants to merge 3 commits intoSUSE:masterfrom
Draft
Use template and tfvars for salt shaker products and update tf file p…#1958maximenoel8 wants to merge 3 commits intoSUSE:masterfrom
maximenoel8 wants to merge 3 commits intoSUSE:masterfrom
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Consolidate Salt Shaker Terraform configuration into a single template
Previously, each Salt Shaker job had its own dedicated
.tffile, 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 viaENVIRONMENTvariables/salt-shaker.tf— declares all variables including theENVIRONMENT_CONFIGURATIONmaptfvars/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 appendENVIRONMENTfrommutableParams.miniontf_fileparameter, added correctmutableParams.minionkey per job, fixed bundle jobs that were incorrectly passing bareparamstopipeline.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_flavoris identical in both. The actual bundle vs classic distinction is already handled at runtime by thesalt_flavorparameter passed tosalt-test.Could the non-bundle jobs be removed entirely, leaving only the bundle variants?