mirror of
https://github.com/saltstack/salt.git
synced 2025-04-16 17:50:20 +00:00
Github variables wont do the trick
This commit is contained in:
parent
91dc936543
commit
4081406715
2 changed files with 21 additions and 6 deletions
|
@ -1,6 +1,14 @@
|
||||||
nox_version: "2022.8.7"
|
nox_version: "2022.8.7"
|
||||||
python_version: "3.10.15"
|
python_version: "3.10.15"
|
||||||
relenv_version: "0.18.0"
|
relenv_version: "0.18.0"
|
||||||
mandatory_os_slugs:
|
pr-testrun-slugs:
|
||||||
- ubuntu-22.04
|
- ubuntu-24.04-pkg
|
||||||
- ubuntu-22.04-arm64
|
- ubuntu-24.04
|
||||||
|
- rockylinux-9
|
||||||
|
- rockylinux-9-pkg
|
||||||
|
- windows-2022
|
||||||
|
- windows-2022-pkg
|
||||||
|
- macos-15
|
||||||
|
- macos-15-pkg
|
||||||
|
full-testrun-slugs:
|
||||||
|
- all
|
||||||
|
|
13
tools/ci.py
13
tools/ci.py
|
@ -937,7 +937,10 @@ def _environment_slugs(ctx, slugdef, labels):
|
||||||
Environment slug defenitions can be a comma separated list. An "all" item
|
Environment slug defenitions can be a comma separated list. An "all" item
|
||||||
in the list will include all os and package slugs.
|
in the list will include all os and package slugs.
|
||||||
"""
|
"""
|
||||||
requests = [_.strip().lower() for _ in slugdef.split(",") if _.strip()]
|
if isinstance(slugdef, list):
|
||||||
|
requests = slugdef
|
||||||
|
else:
|
||||||
|
requests = [_.strip().lower() for _ in slugdef.split(",") if _.strip()]
|
||||||
label_requests = [
|
label_requests = [
|
||||||
_[0].rsplit(":", 1)[1] for _ in labels if _[0].startswith("test:os:")
|
_[0].rsplit(":", 1)[1] for _ in labels if _[0].startswith("test:os:")
|
||||||
]
|
]
|
||||||
|
@ -1074,16 +1077,20 @@ def workflow_config(
|
||||||
full = True
|
full = True
|
||||||
requested_slugs = _environment_slugs(
|
requested_slugs = _environment_slugs(
|
||||||
ctx,
|
ctx,
|
||||||
os.environ.get("FULL_TESTRUN_SLUGS", "") or "all",
|
tools.utils.get_cicd_shared_context()["full-testrun-slugs"],
|
||||||
labels,
|
labels,
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
requested_slugs = _environment_slugs(
|
requested_slugs = _environment_slugs(
|
||||||
ctx,
|
ctx,
|
||||||
os.environ.get("PR_TESTRUN_SLUGS", ""),
|
tools.utils.get_cicd_shared_context()["pr-testrun-slugs"],
|
||||||
labels,
|
labels,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
ctx.info(f"{'==== requested slugs ====':^80s}")
|
||||||
|
ctx.info(f"{pprint.pformat(requested_slugs)}")
|
||||||
|
ctx.info(f"{'==== end requested slugs ====':^80s}")
|
||||||
|
|
||||||
ctx.info(f"{'==== labels ====':^80s}")
|
ctx.info(f"{'==== labels ====':^80s}")
|
||||||
ctx.info(f"{pprint.pformat(labels)}")
|
ctx.info(f"{pprint.pformat(labels)}")
|
||||||
ctx.info(f"{'==== end labels ====':^80s}")
|
ctx.info(f"{'==== end labels ====':^80s}")
|
||||||
|
|
Loading…
Add table
Reference in a new issue