From 2430a0eeb3e042bc2c14059b62fb7631388a0d26 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 17 Sep 2023 18:06:08 +0100 Subject: [PATCH 001/147] Don't erase collected coverage data on test failure re-runs Fixes #65214 Signed-off-by: Pedro Algarvio --- noxfile.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/noxfile.py b/noxfile.py index 6f5e9a9d7df..e963b98427b 100644 --- a/noxfile.py +++ b/noxfile.py @@ -369,9 +369,10 @@ def _install_coverage_requirement(session): ) -def _run_with_coverage(session, *test_cmd, env=None): +def _run_with_coverage(session, *test_cmd, env=None, on_rerun=False): _install_coverage_requirement(session) - session.run("coverage", "erase") + if on_rerun is False: + session.run("coverage", "erase") if env is None: env = {} @@ -1013,7 +1014,7 @@ def pytest_tornado(session, coverage): session.notify(session_name.replace("pytest-", "test-")) -def _pytest(session, coverage, cmd_args, env=None): +def _pytest(session, coverage, cmd_args, env=None, on_rerun=False): # Create required artifacts directories _create_ci_directories() @@ -1067,6 +1068,7 @@ def _pytest(session, coverage, cmd_args, env=None): "pytest", *args, env=env, + on_rerun=on_rerun, ) else: session.run("python", "-m", "pytest", *args, env=env) @@ -1159,7 +1161,13 @@ def _ci_test(session, transport, onedir=False): ] + chunk_cmd ) - _pytest(session, coverage=track_code_coverage, cmd_args=pytest_args, env=env) + _pytest( + session, + coverage=track_code_coverage, + cmd_args=pytest_args, + env=env, + on_rerun=True, + ) @nox.session(python=_PYTHON_VERSIONS, name="ci-test") From 29a57d2d3276e0e3e9b44b96a1153ddc4656b335 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 17 Sep 2023 12:45:01 +0100 Subject: [PATCH 002/147] Generate the XML code coverage reports before trying to use them Signed-off-by: Pedro Algarvio --- .github/workflows/test-action-macos.yml | 5 +++ .github/workflows/test-action.yml | 5 +++ .../test-package-downloads-action-linux.yml | 5 +++ .../test-package-downloads-action-macos.yml | 5 +++ .../test-package-downloads-action-windows.yml | 5 +++ noxfile.py | 38 +++++++++++++++++++ tools/vm.py | 24 ++++++++++++ 7 files changed, 87 insertions(+) diff --git a/.github/workflows/test-action-macos.yml b/.github/workflows/test-action-macos.yml index 18f413ca874..eabbcddac51 100644 --- a/.github/workflows/test-action-macos.yml +++ b/.github/workflows/test-action-macos.yml @@ -415,6 +415,11 @@ jobs: run: | nox -e combine-coverage + - name: Create XML Coverage Reports + if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' + run: | + nox -e create-xml-coverage-reports + - name: Prepare Test Run Artifacts id: download-artifacts-from-vm if: always() && job.status != 'cancelled' diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index 31945d0a8a4..aedb60612a3 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -373,6 +373,11 @@ jobs: run: | tools --timestamps vm combine-coverage ${{ inputs.distro-slug }} + - name: Create XML Coverage Reports + if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' + run: | + tools --timestamps vm create-xml-coverage-reports ${{ inputs.distro-slug }} + - name: Download Test Run Artifacts id: download-artifacts-from-vm if: always() && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' diff --git a/.github/workflows/test-package-downloads-action-linux.yml b/.github/workflows/test-package-downloads-action-linux.yml index d303aa115df..0d88f596d29 100644 --- a/.github/workflows/test-package-downloads-action-linux.yml +++ b/.github/workflows/test-package-downloads-action-linux.yml @@ -258,6 +258,11 @@ jobs: run: | tools --timestamps vm combine-coverage ${{ inputs.distro-slug }} + - name: Create XML Coverage Reports + if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' + run: | + tools --timestamps vm create-xml-coverage-reports ${{ inputs.distro-slug }} + - name: Download Test Run Artifacts id: download-artifacts-from-vm if: always() && steps.spin-up-vm.outcome == 'success' diff --git a/.github/workflows/test-package-downloads-action-macos.yml b/.github/workflows/test-package-downloads-action-macos.yml index 126aa89c082..2e362959407 100644 --- a/.github/workflows/test-package-downloads-action-macos.yml +++ b/.github/workflows/test-package-downloads-action-macos.yml @@ -242,6 +242,11 @@ jobs: run: | nox --force-color -e combine-coverage + - name: Create XML Coverage Reports + if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' + run: | + tools --timestamps vm create-xml-coverage-reports ${{ inputs.distro-slug }} + - name: Prepare Test Run Artifacts id: download-artifacts-from-vm if: always() && job.status != 'cancelled' diff --git a/.github/workflows/test-package-downloads-action-windows.yml b/.github/workflows/test-package-downloads-action-windows.yml index 2f9e77fb156..2e20ee8455b 100644 --- a/.github/workflows/test-package-downloads-action-windows.yml +++ b/.github/workflows/test-package-downloads-action-windows.yml @@ -263,6 +263,11 @@ jobs: run: | tools --timestamps vm combine-coverage ${{ inputs.distro-slug }} + - name: Create XML Coverage Reports + if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' + run: | + tools --timestamps vm create-xml-coverage-reports ${{ inputs.distro-slug }} + - name: Download Test Run Artifacts id: download-artifacts-from-vm if: always() && steps.spin-up-vm.outcome == 'success' diff --git a/noxfile.py b/noxfile.py index e963b98427b..0c634474e81 100644 --- a/noxfile.py +++ b/noxfile.py @@ -1378,6 +1378,44 @@ def create_html_coverage_report(session): ) +@nox.session(python="3", name="create-xml-coverage-reports") +def create_xml_coverage_reports(session): + _install_coverage_requirement(session) + env = { + # The full path to the .coverage data file. Makes sure we always write + # them to the same directory + "COVERAGE_FILE": str(COVERAGE_FILE), + } + + # Generate report for tests code coverage + try: + session.run( + "coverage", + "xml", + "-o", + str(COVERAGE_OUTPUT_DIR.joinpath("tests.xml").relative_to(REPO_ROOT)), + "--omit=salt/*,artifacts/salt/*", + "--include=tests/*", + env=env, + ) + except CommandFailed: + session_warn(session, "Failed to generate the tests XML code coverage report") + + # Generate report for salt code coverage + try: + session.run( + "coverage", + "xml", + "-o", + str(COVERAGE_OUTPUT_DIR.joinpath("salt.xml").relative_to(REPO_ROOT)), + "--omit=tests/*", + "--include=salt/*,artifacts/salt/*", + env=env, + ) + except CommandFailed: + session_warn(session, "Failed to generate the source XML code coverage report") + + class Tee: """ Python class to mimic linux tee behaviour diff --git a/tools/vm.py b/tools/vm.py index 8988fe32f1e..08fcb28b44f 100644 --- a/tools/vm.py +++ b/tools/vm.py @@ -547,6 +547,24 @@ def combine_coverage(ctx: Context, name: str): ctx.exit(returncode) +@vm.command( + name="create-xml-coverage-reports", + arguments={ + "name": { + "help": "The VM Name", + "metavar": "VM_NAME", + }, + }, +) +def create_xml_coverage_reports(ctx: Context, name: str): + """ + Create XML code coverage reports in the VM. + """ + vm = VM(ctx=ctx, name=name, region_name=ctx.parser.options.region) + returncode = vm.create_xml_coverage_reports() + ctx.exit(returncode) + + @vm.command( name="download-artifacts", arguments={ @@ -1415,6 +1433,12 @@ class VM: """ return self.run_nox("combine-coverage", session_args=[self.name]) + def create_xml_coverage_reports(self): + """ + Create XML coverage reports + """ + return self.run_nox("create-xml-coverage-reports", session_args=[self.name]) + def compress_dependencies(self): """ Compress .nox/ into nox..tar.* in the VM From e8115ec126f51f83c99fec3a5f30bf4067c9ac93 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 18 Sep 2023 14:44:04 +0100 Subject: [PATCH 003/147] Fix `onedir` code coverage collection and reporting Signed-off-by: Pedro Algarvio --- .coveragerc | 7 ++++++- noxfile.py | 32 ++++++++++++++++---------------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/.coveragerc b/.coveragerc index 2579c96f9cd..40da2c6666d 100644 --- a/.coveragerc +++ b/.coveragerc @@ -7,6 +7,11 @@ relative_files = True omit = setup.py .nox/* +source = + pkg + salt + tests + tools [report] # Regexes for lines to exclude from consideration @@ -32,7 +37,7 @@ ignore_errors = True [paths] salt = salt/ - artifacts/salt + artifacts/salt/lib/python3.*/site-packages/salt **/testing/salt/ **\testing\salt tests = diff --git a/noxfile.py b/noxfile.py index 0c634474e81..586b3231418 100644 --- a/noxfile.py +++ b/noxfile.py @@ -443,8 +443,8 @@ def _run_with_coverage(session, *test_cmd, env=None, on_rerun=False): "xml", "-o", str(COVERAGE_OUTPUT_DIR.joinpath("tests.xml").relative_to(REPO_ROOT)), - "--omit=salt/*", - "--include=tests/*", + "--omit=salt/*,artifacts/salt/*", + "--include=tests/*,pkg/tests/*", env=coverage_base_env, ) # Generate report for salt code coverage @@ -453,8 +453,8 @@ def _run_with_coverage(session, *test_cmd, env=None, on_rerun=False): "xml", "-o", str(COVERAGE_OUTPUT_DIR.joinpath("salt.xml").relative_to(REPO_ROOT)), - "--omit=tests/*", - "--include=salt/*", + "--omit=tests/*,pkg/tests/*", + "--include=salt/*,artifacts/salt/*", env=coverage_base_env, ) # Generate html report for tests code coverage @@ -463,8 +463,8 @@ def _run_with_coverage(session, *test_cmd, env=None, on_rerun=False): "html", "-d", str(COVERAGE_OUTPUT_DIR.joinpath("html").relative_to(REPO_ROOT)), - "--omit=salt/*", - "--include=tests/*", + "--omit=salt/*,artifacts/salt/*", + "--include=tests/*,pkg/tests/*", env=coverage_base_env, ) # Generate html report for salt code coverage @@ -473,8 +473,8 @@ def _run_with_coverage(session, *test_cmd, env=None, on_rerun=False): "html", "-d", str(COVERAGE_OUTPUT_DIR.joinpath("html").relative_to(REPO_ROOT)), - "--omit=tests/*", - "--include=salt/*", + "--omit=tests/*,pkg/tests/*", + "--include=salt/*,artifacts/salt/*", env=coverage_base_env, ) @@ -524,8 +524,8 @@ def _report_coverage(session): COVERAGE_OUTPUT_DIR.relative_to(REPO_ROOT) / "coverage-salt.json" ) cmd_args = [ - "--omit=tests/*", - "--include=salt/*", + "--omit=tests/*,pkg/tests/*", + "--include=salt/*,artifacts/salt/*", ] elif report_section == "tests": @@ -533,15 +533,15 @@ def _report_coverage(session): COVERAGE_OUTPUT_DIR.relative_to(REPO_ROOT) / "coverage-tests.json" ) cmd_args = [ - "--omit=salt/*", - "--include=tests/*", + "--omit=salt/*,artifacts/salt/*", + "--include=tests/*,pkg/tests/*", ] else: json_coverage_file = ( COVERAGE_OUTPUT_DIR.relative_to(REPO_ROOT) / "coverage.json" ) cmd_args = [ - "--include=salt/*,tests/*", + "--include=salt/*,artifacts/salt/*,tests/*,pkg/tests/*", ] session.run( @@ -1372,7 +1372,7 @@ def create_html_coverage_report(session): "html", "-d", str(COVERAGE_OUTPUT_DIR.joinpath("html").relative_to(REPO_ROOT)), - "--include=salt/*,tests/*", + "--include=salt/*,artifacts/salt/*,tests/*,pkg/tests/*", "--show-contexts", env=env, ) @@ -1395,7 +1395,7 @@ def create_xml_coverage_reports(session): "-o", str(COVERAGE_OUTPUT_DIR.joinpath("tests.xml").relative_to(REPO_ROOT)), "--omit=salt/*,artifacts/salt/*", - "--include=tests/*", + "--include=tests/*,pkg/tests/*", env=env, ) except CommandFailed: @@ -1408,7 +1408,7 @@ def create_xml_coverage_reports(session): "xml", "-o", str(COVERAGE_OUTPUT_DIR.joinpath("salt.xml").relative_to(REPO_ROOT)), - "--omit=tests/*", + "--omit=tests/*,pkg/tests/*", "--include=salt/*,artifacts/salt/*", env=env, ) From 6d0224f08c4b9a1f1ed9f1f7f603e99f0ffbf00d Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 26 Sep 2023 12:58:26 +0100 Subject: [PATCH 004/147] Also install `tornado` before starting Salt Signed-off-by: Pedro Algarvio --- tests/pytests/integration/modules/test_virt.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/pytests/integration/modules/test_virt.py b/tests/pytests/integration/modules/test_virt.py index 0d13fcf3f15..c39851305bc 100644 --- a/tests/pytests/integration/modules/test_virt.py +++ b/tests/pytests/integration/modules/test_virt.py @@ -23,11 +23,11 @@ pytestmark = [ def _install_salt_dependencies(container): dependencies = [] for package, version in salt.version.dependency_information(): - if package not in ("packaging", "looseversion"): + if package.lower() not in ("tornado", "packaging", "looseversion"): # These are newer base dependencies which the container might not # yet have continue - dependencies.append(f"{package}=={version}") + dependencies.append(f"{package.lower()}=={version}") if dependencies: ret = container.run("python3", "-m", "pip", "install", *dependencies) log.debug("Install missing dependecies ret: %s", ret) From c14310b77eabdb4a4c647b4a5537c23c7b69b986 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Sat, 9 Sep 2023 00:53:17 -0700 Subject: [PATCH 005/147] Upgrade relenv to 0.13.11 --- .github/workflows/ci.yml | 12 ++++++------ .github/workflows/nightly.yml | 12 ++++++------ .github/workflows/scheduled.yml | 12 ++++++------ .github/workflows/staging.yml | 12 ++++++------ cicd/shared-gh-workflows-context.yml | 2 +- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a5f116d802a..dd5f2f8d295 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -442,7 +442,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} - relenv-version: "0.13.10" + relenv-version: "0.13.11" python-version: "3.10.13" build-salt-onedir: @@ -458,7 +458,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} - relenv-version: "0.13.10" + relenv-version: "0.13.11" python-version: "3.10.13" build-rpm-pkgs: @@ -470,7 +470,7 @@ jobs: uses: ./.github/workflows/build-rpm-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.13.10" + relenv-version: "0.13.11" python-version: "3.10.13" build-deb-pkgs: @@ -482,7 +482,7 @@ jobs: uses: ./.github/workflows/build-deb-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.13.10" + relenv-version: "0.13.11" python-version: "3.10.13" build-windows-pkgs: @@ -494,7 +494,7 @@ jobs: uses: ./.github/workflows/build-windows-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.13.10" + relenv-version: "0.13.11" python-version: "3.10.13" build-macos-pkgs: @@ -506,7 +506,7 @@ jobs: uses: ./.github/workflows/build-macos-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.13.10" + relenv-version: "0.13.11" python-version: "3.10.13" amazonlinux-2-pkg-tests: diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 9e990f0b18c..a50c6e84612 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -491,7 +491,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} - relenv-version: "0.13.10" + relenv-version: "0.13.11" python-version: "3.10.13" build-salt-onedir: @@ -507,7 +507,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} - relenv-version: "0.13.10" + relenv-version: "0.13.11" python-version: "3.10.13" build-rpm-pkgs: @@ -519,7 +519,7 @@ jobs: uses: ./.github/workflows/build-rpm-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.13.10" + relenv-version: "0.13.11" python-version: "3.10.13" build-deb-pkgs: @@ -531,7 +531,7 @@ jobs: uses: ./.github/workflows/build-deb-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.13.10" + relenv-version: "0.13.11" python-version: "3.10.13" build-windows-pkgs: @@ -543,7 +543,7 @@ jobs: uses: ./.github/workflows/build-windows-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.13.10" + relenv-version: "0.13.11" python-version: "3.10.13" environment: nightly sign-packages: false @@ -558,7 +558,7 @@ jobs: uses: ./.github/workflows/build-macos-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.13.10" + relenv-version: "0.13.11" python-version: "3.10.13" environment: nightly sign-packages: true diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index a8417b801cd..473b9849435 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -476,7 +476,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} - relenv-version: "0.13.10" + relenv-version: "0.13.11" python-version: "3.10.13" build-salt-onedir: @@ -492,7 +492,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} - relenv-version: "0.13.10" + relenv-version: "0.13.11" python-version: "3.10.13" build-rpm-pkgs: @@ -504,7 +504,7 @@ jobs: uses: ./.github/workflows/build-rpm-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.13.10" + relenv-version: "0.13.11" python-version: "3.10.13" build-deb-pkgs: @@ -516,7 +516,7 @@ jobs: uses: ./.github/workflows/build-deb-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.13.10" + relenv-version: "0.13.11" python-version: "3.10.13" build-windows-pkgs: @@ -528,7 +528,7 @@ jobs: uses: ./.github/workflows/build-windows-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.13.10" + relenv-version: "0.13.11" python-version: "3.10.13" build-macos-pkgs: @@ -540,7 +540,7 @@ jobs: uses: ./.github/workflows/build-macos-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.13.10" + relenv-version: "0.13.11" python-version: "3.10.13" amazonlinux-2-pkg-tests: diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index f171609066d..65662a349f1 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -486,7 +486,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} - relenv-version: "0.13.10" + relenv-version: "0.13.11" python-version: "3.10.13" build-salt-onedir: @@ -502,7 +502,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} - relenv-version: "0.13.10" + relenv-version: "0.13.11" python-version: "3.10.13" build-rpm-pkgs: @@ -514,7 +514,7 @@ jobs: uses: ./.github/workflows/build-rpm-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.13.10" + relenv-version: "0.13.11" python-version: "3.10.13" build-deb-pkgs: @@ -526,7 +526,7 @@ jobs: uses: ./.github/workflows/build-deb-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.13.10" + relenv-version: "0.13.11" python-version: "3.10.13" build-windows-pkgs: @@ -538,7 +538,7 @@ jobs: uses: ./.github/workflows/build-windows-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.13.10" + relenv-version: "0.13.11" python-version: "3.10.13" environment: staging sign-packages: ${{ inputs.sign-windows-packages }} @@ -553,7 +553,7 @@ jobs: uses: ./.github/workflows/build-macos-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.13.10" + relenv-version: "0.13.11" python-version: "3.10.13" environment: staging sign-packages: true diff --git a/cicd/shared-gh-workflows-context.yml b/cicd/shared-gh-workflows-context.yml index 13d7bbb7754..74eebe098ca 100644 --- a/cicd/shared-gh-workflows-context.yml +++ b/cicd/shared-gh-workflows-context.yml @@ -1,3 +1,3 @@ nox_version: "2022.8.7" python_version: "3.10.13" -relenv_version: "0.13.10" +relenv_version: "0.13.11" From 93859b1e6c5dda6e01624fc9ef09cec365dcb5f8 Mon Sep 17 00:00:00 2001 From: jeanluc Date: Tue, 19 Sep 2023 00:14:19 +0200 Subject: [PATCH 006/147] Improve error message with multiple string-valued state args --- changelog/38098.fixed.md | 1 + salt/state.py | 56 ++++++++++++------- .../pytests/unit/state/test_state_compiler.py | 44 +++++++++++++++ 3 files changed, 82 insertions(+), 19 deletions(-) create mode 100644 changelog/38098.fixed.md diff --git a/changelog/38098.fixed.md b/changelog/38098.fixed.md new file mode 100644 index 00000000000..b40a693e456 --- /dev/null +++ b/changelog/38098.fixed.md @@ -0,0 +1 @@ +Improved error message when state arguments are accidentally passed as a string diff --git a/salt/state.py b/salt/state.py index ae18e541217..25004b6ee1c 100644 --- a/salt/state.py +++ b/salt/state.py @@ -486,17 +486,21 @@ class Compiler: fun += 1 for arg in body[state]: if isinstance(arg, str): - fun += 1 - if " " in arg.strip(): + if "." in state: errors.append( - 'The function "{}" in state ' - '"{}" in SLS "{}" has ' - "whitespace, a function with whitespace is " - "not supported, perhaps this is an argument " - 'that is missing a ":"'.format( - arg, name, body["__sls__"] - ) + "Argument not formed as a dictionary in state " + f"'{name}' in SLS '{body['__sls__']}': '{arg}'" ) + else: + fun += 1 + if " " in arg.strip(): + errors.append( + f'The function "{arg}" in state ' + f'"{name}" in SLS "{body["__sls__"]}" has ' + "whitespace, a function with whitespace is " + "not supported, perhaps this is an argument" + ' that is missing a ":"' + ) elif isinstance(arg, dict): # The arg is a dict, if the arg is require or # watch, it must be a list. @@ -597,8 +601,11 @@ class Compiler: ) elif fun > 1: errors.append( - "Too many functions declared in state '{}' in " - "SLS '{}'".format(state, body["__sls__"]) + f"Too many functions declared in state '{state}' in " + f"SLS '{body['__sls__']}'. Please choose one of the following: " + + ", ".join( + arg for arg in body[state] if isinstance(arg, str) + ) ) return errors @@ -1509,14 +1516,22 @@ class State: fun += 1 for arg in body[state]: if isinstance(arg, str): - fun += 1 - if " " in arg.strip(): + if "." in state: errors.append( - 'The function "{}" in state "{}" in SLS "{}" has ' - "whitespace, a function with whitespace is not " - "supported, perhaps this is an argument that is " - 'missing a ":"'.format(arg, name, body["__sls__"]) + "Argument not formed as a dictionary in state " + f"'{name}' in SLS '{body['__sls__']}': '{arg}'" ) + else: + fun += 1 + if " " in arg.strip(): + errors.append( + f'The function "{arg}" in state ' + f'"{name}" in SLS "{body["__sls__"]}" has ' + "whitespace, a function with whitespace is " + "not supported, perhaps this is an argument" + ' that is missing a ":"' + ) + elif isinstance(arg, dict): # The arg is a dict, if the arg is require or # watch, it must be a list. @@ -1615,8 +1630,11 @@ class State: ) elif fun > 1: errors.append( - "Too many functions declared in state '{}' in " - "SLS '{}'".format(state, body["__sls__"]) + f"Too many functions declared in state '{state}' in " + f"SLS '{body['__sls__']}'. Please choose one of the following: " + + ", ".join( + arg for arg in body[state] if isinstance(arg, str) + ) ) return errors diff --git a/tests/pytests/unit/state/test_state_compiler.py b/tests/pytests/unit/state/test_state_compiler.py index eb4321eb724..79d3a7e8013 100644 --- a/tests/pytests/unit/state/test_state_compiler.py +++ b/tests/pytests/unit/state/test_state_compiler.py @@ -1099,3 +1099,47 @@ def test_verify_onlyif_cmd_opts_exclude(minion_opts): timeout=5, success_retcodes=1, ) + + +@pytest.mark.parametrize("verifier", (salt.state.State, salt.state.Compiler)) +@pytest.mark.parametrize( + "high,err_msg", + ( + ( + {"/some/file": {"file.managed": ["source:salt://bla"]}}, + "Argument not formed as a dictionary", + ), + ( + {"/some/file": {"file": ["managed", "source:salt://bla"]}}, + "Please choose one of the following: managed, source:salt", + ), + ), +) +def test_verify_high_too_many_functions_declared_error_message( + high, err_msg, minion_opts, verifier +): + """ + Ensure the error message when a list item of a state call is + accidentally passed as a string instead of a single-item dict + is more meaningful. Example: + + /some/file: + file.managed: + - source:salt://bla + + /some/file: + file: + - managed + - source:salt://bla + + Issue #38098. + """ + high[next(iter(high))]["__sls__"] = "sls" + with patch("salt.state.State._gather_pillar"): + if verifier is salt.state.Compiler: + state_obj = verifier(minion_opts, []) + else: + state_obj = verifier(minion_opts) + res = state_obj.verify_high(high) + assert isinstance(res, list) + assert any(err_msg in x for x in res) From a35e60dd7291cb0993e468a19d6c75311bed13e0 Mon Sep 17 00:00:00 2001 From: jeanluc Date: Tue, 19 Sep 2023 11:34:33 +0200 Subject: [PATCH 007/147] Fix new reactor test after rebase --- tests/pytests/unit/state/test_reactor_compiler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pytests/unit/state/test_reactor_compiler.py b/tests/pytests/unit/state/test_reactor_compiler.py index e170a1c0f61..36c914232b8 100644 --- a/tests/pytests/unit/state/test_reactor_compiler.py +++ b/tests/pytests/unit/state/test_reactor_compiler.py @@ -416,7 +416,7 @@ def test_compiler_verify_high_short_sls(minion_opts, tmp_path, high, exp): }, [ "The require statement in state 'add_test_2' in SLS '/srv/reactor/start.sls' needs to be formed as a list", - "Too many functions declared in state 'local.cmd.run' in SLS '/srv/reactor/start.sls'", + "Argument not formed as a dictionary in state 'add_test_2' in SLS '/srv/reactor/start.sls': 'cmd.run'", ], ), ( From f79cee60753d369534287f91b748a0fc66154482 Mon Sep 17 00:00:00 2001 From: jeanluc Date: Mon, 25 Sep 2023 22:53:21 +0200 Subject: [PATCH 008/147] Remove new err msg again. Report state ID, not module --- salt/state.py | 80 +++++++++---------- .../unit/state/test_reactor_compiler.py | 2 +- .../pytests/unit/state/test_state_compiler.py | 4 +- 3 files changed, 41 insertions(+), 45 deletions(-) diff --git a/salt/state.py b/salt/state.py index 25004b6ee1c..d5956981eed 100644 --- a/salt/state.py +++ b/salt/state.py @@ -483,24 +483,20 @@ class Compiler: else: fun = 0 if "." in state: + # This should not happen usually since `pad_funcs` + # is run on rendered templates fun += 1 for arg in body[state]: if isinstance(arg, str): - if "." in state: + fun += 1 + if " " in arg.strip(): errors.append( - "Argument not formed as a dictionary in state " - f"'{name}' in SLS '{body['__sls__']}': '{arg}'" + f'The function "{arg}" in state ' + f'"{name}" in SLS "{body["__sls__"]}" has ' + "whitespace, a function with whitespace is " + "not supported, perhaps this is an argument" + ' that is missing a ":"' ) - else: - fun += 1 - if " " in arg.strip(): - errors.append( - f'The function "{arg}" in state ' - f'"{name}" in SLS "{body["__sls__"]}" has ' - "whitespace, a function with whitespace is " - "not supported, perhaps this is an argument" - ' that is missing a ":"' - ) elif isinstance(arg, dict): # The arg is a dict, if the arg is require or # watch, it must be a list. @@ -595,17 +591,22 @@ class Compiler: if state == "require" or state == "watch": continue errors.append( - "No function declared in state '{}' in SLS '{}'".format( - state, body["__sls__"] - ) + f"No function declared in state '{name}' in SLS " + f"'{body['__sls__']}'" ) elif fun > 1: + funs = ( + [state.split(".", maxsplit=1)[1]] + if "." in state + else [] + ) + funs.extend( + arg for arg in body[state] if isinstance(arg, str) + ) errors.append( - f"Too many functions declared in state '{state}' in " - f"SLS '{body['__sls__']}'. Please choose one of the following: " - + ", ".join( - arg for arg in body[state] if isinstance(arg, str) - ) + f"Too many functions declared in state '{name}' in " + f"SLS '{body['__sls__']}'. Please choose one of " + "the following: " + ", ".join(funs) ) return errors @@ -1513,24 +1514,20 @@ class State: else: fun = 0 if "." in state: + # This should not happen usually since `_handle_state_decls` + # is run on rendered templates fun += 1 for arg in body[state]: if isinstance(arg, str): - if "." in state: + fun += 1 + if " " in arg.strip(): errors.append( - "Argument not formed as a dictionary in state " - f"'{name}' in SLS '{body['__sls__']}': '{arg}'" + f'The function "{arg}" in state ' + f'"{name}" in SLS "{body["__sls__"]}" has ' + "whitespace, a function with whitespace is " + "not supported, perhaps this is an argument" + ' that is missing a ":"' ) - else: - fun += 1 - if " " in arg.strip(): - errors.append( - f'The function "{arg}" in state ' - f'"{name}" in SLS "{body["__sls__"]}" has ' - "whitespace, a function with whitespace is " - "not supported, perhaps this is an argument" - ' that is missing a ":"' - ) elif isinstance(arg, dict): # The arg is a dict, if the arg is require or @@ -1624,17 +1621,16 @@ class State: if state == "require" or state == "watch": continue errors.append( - "No function declared in state '{}' in SLS '{}'".format( - state, body["__sls__"] - ) + f"No function declared in state '{name}' in SLS " + f"'{body['__sls__']}'" ) elif fun > 1: + funs = [state.split(".", maxsplit=1)[1]] if "." in state else [] + funs.extend(arg for arg in body[state] if isinstance(arg, str)) errors.append( - f"Too many functions declared in state '{state}' in " - f"SLS '{body['__sls__']}'. Please choose one of the following: " - + ", ".join( - arg for arg in body[state] if isinstance(arg, str) - ) + f"Too many functions declared in state '{name}' in " + f"SLS '{body['__sls__']}'. Please choose one of " + "the following: " + ", ".join(funs) ) return errors diff --git a/tests/pytests/unit/state/test_reactor_compiler.py b/tests/pytests/unit/state/test_reactor_compiler.py index 36c914232b8..d0f03fbfdb7 100644 --- a/tests/pytests/unit/state/test_reactor_compiler.py +++ b/tests/pytests/unit/state/test_reactor_compiler.py @@ -416,7 +416,7 @@ def test_compiler_verify_high_short_sls(minion_opts, tmp_path, high, exp): }, [ "The require statement in state 'add_test_2' in SLS '/srv/reactor/start.sls' needs to be formed as a list", - "Argument not formed as a dictionary in state 'add_test_2' in SLS '/srv/reactor/start.sls': 'cmd.run'", + "Too many functions declared in state 'add_test_2' in SLS '/srv/reactor/start.sls'. Please choose one of the following: cmd.run, cmd.run", ], ), ( diff --git a/tests/pytests/unit/state/test_state_compiler.py b/tests/pytests/unit/state/test_state_compiler.py index 79d3a7e8013..e03d4caee5a 100644 --- a/tests/pytests/unit/state/test_state_compiler.py +++ b/tests/pytests/unit/state/test_state_compiler.py @@ -1107,11 +1107,11 @@ def test_verify_onlyif_cmd_opts_exclude(minion_opts): ( ( {"/some/file": {"file.managed": ["source:salt://bla"]}}, - "Argument not formed as a dictionary", + "Too many functions declared in state '/some/file' in SLS 'sls'. Please choose one of the following: managed, source:salt://bla", ), ( {"/some/file": {"file": ["managed", "source:salt://bla"]}}, - "Please choose one of the following: managed, source:salt", + "Too many functions declared in state '/some/file' in SLS 'sls'. Please choose one of the following: managed, source:salt://bla", ), ), ) From a6cf0b7570163babf8dc4d9185c30cc9284e7844 Mon Sep 17 00:00:00 2001 From: ScriptAutomate Date: Thu, 28 Sep 2023 10:59:47 -0500 Subject: [PATCH 009/147] Use currently pinned centosstream-9 ami for cloud --- cicd/amis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cicd/amis.yml b/cicd/amis.yml index 2500f3c2b2e..efa0bef8829 100644 --- a/cicd/amis.yml +++ b/cicd/amis.yml @@ -1 +1 @@ -centosstream-9-x86_64: ami-0dfa940714a95b497 +centosstream-9-x86_64: ami-091986d83f4c0bdd7 From 4608a470b0540bc9f90b5519990c82551e1ea328 Mon Sep 17 00:00:00 2001 From: Megan Wilhite Date: Fri, 17 Mar 2023 13:25:45 -0600 Subject: [PATCH 010/147] Migrate the package tests to use the main test dependencies --- .pre-commit-config.yaml | 29 --- noxfile.py | 13 +- pkg/tests/conftest.py | 12 +- pkg/tests/support/helpers.py | 12 +- requirements/static/ci/pkgtests-windows.in | 4 - requirements/static/ci/pkgtests.in | 3 - .../static/ci/py3.10/pkgtests-windows.txt | 168 ------------------ requirements/static/ci/py3.10/pkgtests.txt | 160 ----------------- 8 files changed, 13 insertions(+), 388 deletions(-) delete mode 100644 requirements/static/ci/pkgtests-windows.in delete mode 100644 requirements/static/ci/pkgtests.in delete mode 100644 requirements/static/ci/py3.10/pkgtests-windows.txt delete mode 100644 requirements/static/ci/py3.10/pkgtests.txt diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7a97ad415a1..e235d12bdb0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -970,35 +970,6 @@ repos: - requirements/static/ci/invoke.in # <---- Invoke ----------------------------------------------------------------------------------------------------- - # <---- PKG ci requirements----------------------------------------------------------------------------------------- - - id: pip-tools-compile - alias: compile-ci-pkg-3.10-requirements - name: PKG tests CI Py3.10 Requirements - files: ^requirements/((base|zeromq|pytest)\.txt|static/(pkg/linux\.in|ci/((pkgtests|common)\.in|py3\.10/pkgtests\.in)))$ - pass_filenames: false - args: - - -v - - --py-version=3.10 - - --platform=linux - - --include=requirements/base.txt - - --include=requirements/zeromq.txt - - requirements/static/ci/pkgtests.in - - - id: pip-tools-compile - alias: compile-ci-windows-pkg-3.10-requirements - name: PKG tests Windows CI Py3.10 Requirements - files: ^requirements/((base|zeromq|pytest)\.txt|static/(pkg/linux\.in|ci/((pkgtests-windows|common)\.in|py3\.10/pkgtests-windows\.in)))$ - pass_filenames: false - args: - - -v - - --py-version=3.10 - - --platform=windows - - --include=requirements/base.txt - - --include=requirements/zeromq.txt - - requirements/static/ci/pkgtests-windows.in - - # <---- PKG ci requirements----------------------------------------------------------------------------------------- - # ----- Tools ----------------------------------------------------------------------------------------------------> - id: pip-tools-compile diff --git a/noxfile.py b/noxfile.py index 586b3231418..a2cddd986fe 100644 --- a/noxfile.py +++ b/noxfile.py @@ -1877,18 +1877,7 @@ def test_pkgs_onedir(session): # Install requirements if _upgrade_pip_setuptools_and_wheel(session, onedir=True): - if IS_WINDOWS: - file_name = "pkgtests-windows.txt" - else: - file_name = "pkgtests.txt" - - requirements_file = os.path.join( - "requirements", "static", "ci", pydir, file_name - ) - - install_command = ["--progress-bar=off", "-r", requirements_file] - session.install(*install_command, silent=PIP_INSTALL_SILENT) - + _install_requirements(session, "zeromq") env = { "ONEDIR_TESTRUN": "1", "PKG_TEST_TYPE": chunk, diff --git a/pkg/tests/conftest.py b/pkg/tests/conftest.py index 407f5b334a6..efbf6ed70de 100644 --- a/pkg/tests/conftest.py +++ b/pkg/tests/conftest.py @@ -76,7 +76,7 @@ def pytest_addoption(parser): """ test_selection_group = parser.getgroup("Tests Runtime Selection") test_selection_group.addoption( - "--system-service", + "--pkg-system-service", default=False, action="store_true", help="Run the daemons as system services", @@ -148,7 +148,7 @@ def pytest_runtest_setup(item): @pytest.fixture(scope="session") def salt_factories_root_dir(request, tmp_path_factory): root_dir = SaltPkgInstall.salt_factories_root_dir( - request.config.getoption("--system-service") + request.config.getoption("--pkg-system-service") ) if root_dir is not None: yield root_dir @@ -169,7 +169,7 @@ def salt_factories_config(salt_factories_root_dir): return { "code_dir": CODE_DIR, "root_dir": salt_factories_root_dir, - "system_install": True, + "system_service": True, } @@ -177,7 +177,7 @@ def salt_factories_config(salt_factories_root_dir): def install_salt(request, salt_factories_root_dir): with SaltPkgInstall( conf_dir=salt_factories_root_dir / "etc" / "salt", - system_service=request.config.getoption("--system-service"), + pkg_system_service=request.config.getoption("--pkg-system-service"), upgrade=request.config.getoption("--upgrade"), downgrade=request.config.getoption("--downgrade"), no_uninstall=request.config.getoption("--no-uninstall"), @@ -391,7 +391,7 @@ def salt_master(salt_factories, install_salt, state_tree, pillar_tree): master_script = False if master_script: - salt_factories.system_install = False + salt_factories.system_service = False scripts_dir = salt_factories.root_dir / "Scripts" scripts_dir.mkdir(exist_ok=True) salt_factories.scripts_dir = scripts_dir @@ -409,7 +409,7 @@ def salt_master(salt_factories, install_salt, state_tree, pillar_tree): salt_pkg_install=install_salt, python_executable=python_executable, ) - salt_factories.system_install = True + salt_factories.system_service = True else: factory = salt_factories.salt_master_daemon( random_string("master-"), diff --git a/pkg/tests/support/helpers.py b/pkg/tests/support/helpers.py index 91b6bf0fb5e..7cc96fee175 100644 --- a/pkg/tests/support/helpers.py +++ b/pkg/tests/support/helpers.py @@ -50,8 +50,8 @@ log = logging.getLogger(__name__) @attr.s(kw_only=True, slots=True) class SaltPkgInstall: + pkg_system_service: bool = attr.ib(default=False) proc: Subprocess = attr.ib(init=False, repr=False) - system_service: bool = attr.ib(default=False) # Paths root: pathlib.Path = attr.ib(default=None) @@ -679,7 +679,7 @@ class SaltPkgInstall: ret = self.proc.run(str(self.ssm_bin), "remove", "salt-minion", "confirm") self._check_retcode(ret) - if self.system_service: + if self.pkg_system_service: self._install_system_service() elif platform.is_darwin(): @@ -1234,7 +1234,7 @@ class PkgMixin: @attr.s(kw_only=True) class DaemonPkgMixin(PkgMixin): def __attrs_post_init__(self): - if not platform.is_windows() and self.salt_pkg_install.system_service: + if not platform.is_windows() and self.salt_pkg_install.pkg_system_service: if platform.is_darwin(): self.write_launchd_conf() else: @@ -1262,7 +1262,7 @@ class SaltMaster(DaemonPkgMixin, master.SaltMaster): DaemonPkgMixin.__attrs_post_init__(self) def _get_impl_class(self): - if self.system_install and self.salt_pkg_install.system_service: + if self.system_service and self.salt_pkg_install.pkg_system_service: if platform.is_windows(): return PkgSsmSaltDaemonImpl if platform.is_darwin(): @@ -1343,7 +1343,7 @@ class SaltMinion(DaemonPkgMixin, minion.SaltMinion): DaemonPkgMixin.__attrs_post_init__(self) def _get_impl_class(self): - if self.system_install and self.salt_pkg_install.system_service: + if self.system_service and self.salt_pkg_install.pkg_system_service: if platform.is_windows(): return PkgSsmSaltDaemonImpl if platform.is_darwin(): @@ -1379,7 +1379,7 @@ class SaltApi(DaemonPkgMixin, api.SaltApi): DaemonPkgMixin.__attrs_post_init__(self) def _get_impl_class(self): - if self.system_install and self.salt_pkg_install.system_service: + if self.system_service and self.salt_pkg_install.pkg_system_service: if platform.is_windows(): return PkgSsmSaltDaemonImpl if platform.is_darwin(): diff --git a/requirements/static/ci/pkgtests-windows.in b/requirements/static/ci/pkgtests-windows.in deleted file mode 100644 index 53cdcf3e5fc..00000000000 --- a/requirements/static/ci/pkgtests-windows.in +++ /dev/null @@ -1,4 +0,0 @@ -cherrypy -pytest-salt-factories==1.0.0rc17 -pythonnet==3.0.1 -wmi==1.5.1; sys_platform == 'win32' diff --git a/requirements/static/ci/pkgtests.in b/requirements/static/ci/pkgtests.in deleted file mode 100644 index d08dda215a0..00000000000 --- a/requirements/static/ci/pkgtests.in +++ /dev/null @@ -1,3 +0,0 @@ -cherrypy -pytest-salt-factories==1.0.0rc17 -docker diff --git a/requirements/static/ci/py3.10/pkgtests-windows.txt b/requirements/static/ci/py3.10/pkgtests-windows.txt deleted file mode 100644 index 3e6d0a345e3..00000000000 --- a/requirements/static/ci/py3.10/pkgtests-windows.txt +++ /dev/null @@ -1,168 +0,0 @@ -# -# This file is autogenerated by pip-compile -# To update, run: -# -# pip-compile --output-file=requirements/static/ci/py3.10/pkgtests-windows.txt requirements/base.txt requirements/static/ci/pkgtests-windows.in requirements/zeromq.txt -# -attrs==22.2.0 - # via - # pytest - # pytest-salt-factories - # pytest-shell-utilities - # pytest-skip-markers - # pytest-system-statistics -autocommand==2.2.2 - # via jaraco.text -certifi==2023.07.22 - # via requests -cffi==1.15.1 - # via clr-loader -charset-normalizer==3.0.1 - # via requests -cheroot==9.0.0 - # via cherrypy -cherrypy==18.8.0 - # via -r requirements/static/ci/pkgtests-windows.in -clr-loader==0.2.5 - # via pythonnet -colorama==0.4.6 - # via pytest -contextvars==2.4 - # via -r requirements/base.txt -distlib==0.3.6 - # via virtualenv -distro==1.8.0 - # via - # -r requirements/base.txt - # pytest-skip-markers -exceptiongroup==1.1.0 - # via pytest -filelock==3.9.0 - # via virtualenv -idna==3.4 - # via requests -immutables==0.19 - # via contextvars -inflect==6.0.2 - # via jaraco.text -iniconfig==2.0.0 - # via pytest -jaraco.classes==3.2.3 - # via jaraco.collections -jaraco.collections==3.8.0 - # via cherrypy -jaraco.context==4.3.0 - # via jaraco.text -jaraco.functools==3.5.2 - # via - # cheroot - # jaraco.text - # tempora -jaraco.text==3.11.1 - # via jaraco.collections -jinja2==3.1.2 - # via -r requirements/base.txt -jmespath==1.0.1 - # via -r requirements/base.txt -looseversion==1.0.3 - # via -r requirements/base.txt -markupsafe==2.1.2 - # via - # -r requirements/base.txt - # jinja2 -more-itertools==9.0.0 - # via - # cheroot - # cherrypy - # jaraco.classes - # jaraco.functools - # jaraco.text -msgpack==1.0.4 - # via - # -r requirements/base.txt - # pytest-salt-factories -packaging==23.0 - # via - # -r requirements/base.txt - # pytest -platformdirs==2.6.2 - # via virtualenv -pluggy==1.0.0 - # via pytest -portend==3.1.0 - # via cherrypy -psutil==5.9.4 - # via - # -r requirements/base.txt - # pytest-salt-factories - # pytest-shell-utilities - # pytest-system-statistics -pycparser==2.21 - # via cffi -pycryptodomex==3.17 - # via -r requirements/crypto.txt -pydantic==1.10.4 - # via inflect -pytest-helpers-namespace==2021.12.29 - # via - # pytest-salt-factories - # pytest-shell-utilities -pytest-salt-factories==1.0.0rc17 - # via -r requirements/static/ci/pkgtests-windows.in -pytest-shell-utilities==1.8.0 - # via pytest-salt-factories -pytest-skip-markers==1.4.1 - # via - # pytest-salt-factories - # pytest-shell-utilities - # pytest-system-statistics -pytest-system-statistics==1.0.2 - # via pytest-salt-factories -pytest-tempdir==2019.10.12 - # via pytest-salt-factories -pytest==7.2.1 - # via - # pytest-helpers-namespace - # pytest-salt-factories - # pytest-shell-utilities - # pytest-skip-markers - # pytest-system-statistics - # pytest-tempdir -pythonnet==3.0.1 - # via -r requirements/static/ci/pkgtests-windows.in -pytz==2022.7.1 - # via tempora -pywin32==305 - # via - # pytest-skip-markers - # wmi -pyyaml==6.0.1 - # via -r requirements/base.txt -pyzmq==25.0.2 ; sys_platform == "win32" - # via - # -r requirements/zeromq.txt - # pytest-salt-factories -requests==2.31.0 - # via -r requirements/base.txt -six==1.16.0 - # via cheroot -tempora==5.2.1 - # via portend -tomli==2.0.1 - # via pytest -typing-extensions==4.4.0 - # via - # pydantic - # pytest-shell-utilities - # pytest-system-statistics -urllib3==1.26.14 - # via requests -virtualenv==20.18.0 - # via pytest-salt-factories -wmi==1.5.1 ; sys_platform == "win32" - # via -r requirements/static/ci/pkgtests-windows.in -zc.lockfile==2.0 - # via cherrypy - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/requirements/static/ci/py3.10/pkgtests.txt b/requirements/static/ci/py3.10/pkgtests.txt deleted file mode 100644 index 3c6b9d2e2d8..00000000000 --- a/requirements/static/ci/py3.10/pkgtests.txt +++ /dev/null @@ -1,160 +0,0 @@ -# -# This file is autogenerated by pip-compile -# To update, run: -# -# pip-compile --output-file=requirements/static/ci/py3.10/pkgtests.txt requirements/base.txt requirements/static/ci/pkgtests.in requirements/zeromq.txt -# -attrs==22.2.0 - # via - # pytest - # pytest-salt-factories - # pytest-shell-utilities - # pytest-skip-markers - # pytest-system-statistics -autocommand==2.2.2 - # via jaraco.text -certifi==2023.07.22 - # via requests -charset-normalizer==3.0.1 - # via requests -cheroot==9.0.0 - # via cherrypy -cherrypy==18.8.0 - # via -r requirements/static/ci/pkgtests.in -contextvars==2.4 - # via -r requirements/base.txt -distlib==0.3.6 - # via virtualenv -distro==1.8.0 - # via - # -r requirements/base.txt - # pytest-skip-markers -docker==6.1.3 - # via -r requirements/static/ci/pkgtests.in -exceptiongroup==1.1.0 - # via pytest -filelock==3.9.0 - # via virtualenv -idna==3.4 - # via requests -immutables==0.19 - # via contextvars -inflect==6.0.2 - # via jaraco.text -iniconfig==2.0.0 - # via pytest -jaraco.classes==3.2.3 - # via jaraco.collections -jaraco.collections==3.8.0 - # via cherrypy -jaraco.context==4.2.0 - # via jaraco.text -jaraco.functools==3.5.2 - # via - # cheroot - # jaraco.text -jaraco.text==3.11.0 - # via jaraco.collections -jinja2==3.1.2 - # via -r requirements/base.txt -jmespath==1.0.1 - # via -r requirements/base.txt -looseversion==1.0.3 - # via -r requirements/base.txt -markupsafe==2.1.1 - # via - # -r requirements/base.txt - # jinja2 -more-itertools==9.0.0 - # via - # cheroot - # cherrypy - # jaraco.classes - # jaraco.functools - # jaraco.text -msgpack==1.0.4 - # via - # -r requirements/base.txt - # pytest-salt-factories -packaging==23.0 - # via - # -r requirements/base.txt - # docker - # pytest -platformdirs==2.6.2 - # via virtualenv -pluggy==1.0.0 - # via pytest -portend==3.1.0 - # via cherrypy -psutil==5.9.4 - # via - # -r requirements/base.txt - # pytest-salt-factories - # pytest-shell-utilities - # pytest-system-statistics -pycryptodomex==3.16.0 - # via -r requirements/crypto.txt -pydantic==1.10.4 - # via inflect -pytest-helpers-namespace==2021.12.29 - # via - # pytest-salt-factories - # pytest-shell-utilities -pytest-salt-factories==1.0.0rc17 - # via -r requirements/static/ci/pkgtests.in -pytest-shell-utilities==1.8.0 - # via pytest-salt-factories -pytest-skip-markers==1.4.1 - # via - # pytest-salt-factories - # pytest-shell-utilities - # pytest-system-statistics -pytest-system-statistics==1.0.2 - # via pytest-salt-factories -pytest-tempdir==2019.10.12 - # via pytest-salt-factories -pytest==7.2.1 - # via - # pytest-helpers-namespace - # pytest-salt-factories - # pytest-shell-utilities - # pytest-skip-markers - # pytest-system-statistics - # pytest-tempdir -pytz==2022.7.1 - # via tempora -pyyaml==6.0.1 - # via -r requirements/base.txt -pyzmq==25.0.2 - # via - # -r requirements/zeromq.txt - # pytest-salt-factories -requests==2.31.0 - # via - # -r requirements/base.txt - # docker -six==1.16.0 - # via cheroot -tempora==5.2.0 - # via portend -tomli==2.0.1 - # via pytest -typing-extensions==4.4.0 - # via - # pydantic - # pytest-shell-utilities - # pytest-system-statistics -urllib3==1.26.14 - # via - # docker - # requests -virtualenv==20.17.1 - # via pytest-salt-factories -websocket-client==1.5.1 - # via docker -zc.lockfile==2.0 - # via cherrypy - -# The following packages are considered to be unsafe in a requirements file: -# setuptools From ab783334da32ff3936f86a20425637ae222c5043 Mon Sep 17 00:00:00 2001 From: Megan Wilhite Date: Tue, 29 Aug 2023 09:55:59 -0600 Subject: [PATCH 011/147] Force generate scripts for Salt master on windows package tests --- pkg/tests/conftest.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/tests/conftest.py b/pkg/tests/conftest.py index efbf6ed70de..c9211e8a4ae 100644 --- a/pkg/tests/conftest.py +++ b/pkg/tests/conftest.py @@ -392,6 +392,7 @@ def salt_master(salt_factories, install_salt, state_tree, pillar_tree): if master_script: salt_factories.system_service = False + salt_factories.generate_scripts = True scripts_dir = salt_factories.root_dir / "Scripts" scripts_dir.mkdir(exist_ok=True) salt_factories.scripts_dir = scripts_dir @@ -401,13 +402,13 @@ def salt_master(salt_factories, install_salt, state_tree, pillar_tree): python_executable = install_salt.bin_dir / "python.exe" if install_salt.relenv: python_executable = install_salt.install_dir / "Scripts" / "python.exe" + salt_factories.python_executable = python_executable factory = salt_factories.salt_master_daemon( random_string("master-"), defaults=config_defaults, overrides=config_overrides, factory_class=SaltMasterWindows, salt_pkg_install=install_salt, - python_executable=python_executable, ) salt_factories.system_service = True else: From 05b141d93418f210df466f94e87416ef52cf35a5 Mon Sep 17 00:00:00 2001 From: Megan Wilhite Date: Tue, 5 Sep 2023 13:10:26 -0600 Subject: [PATCH 012/147] Ensure we don't call .bat minion file with python --- pkg/tests/conftest.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/tests/conftest.py b/pkg/tests/conftest.py index c9211e8a4ae..6609f2ddcc2 100644 --- a/pkg/tests/conftest.py +++ b/pkg/tests/conftest.py @@ -474,11 +474,16 @@ def salt_minion(salt_factories, salt_master, install_salt): "winrepo_dir_ng" ] = rf"{salt_factories.root_dir}\srv\salt\win\repo_ng" config_overrides["winrepo_source_dir"] = r"salt://win/repo_ng" + + if install_salt.classic and platform.is_windows(): + salt_factories.python_executable = None + factory = salt_master.salt_minion_daemon( minion_id, overrides=config_overrides, defaults=config_defaults, ) + # Salt factories calls salt.utils.verify.verify_env # which sets root perms on /srv/salt and /srv/pillar since we are running # the test suite as root, but we want to run Salt master as salt From 0fde37e4d5aee878f3446645debf5a7075dfc035 Mon Sep 17 00:00:00 2001 From: Megan Wilhite Date: Mon, 11 Sep 2023 09:46:27 -0600 Subject: [PATCH 013/147] Add workaround for salt-master on classic mac pkg tests --- pkg/tests/conftest.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkg/tests/conftest.py b/pkg/tests/conftest.py index 6609f2ddcc2..36c60b0e57b 100644 --- a/pkg/tests/conftest.py +++ b/pkg/tests/conftest.py @@ -412,6 +412,10 @@ def salt_master(salt_factories, install_salt, state_tree, pillar_tree): ) salt_factories.system_service = True else: + + if install_salt.classic and platform.is_darwin(): + os.environ["PATH"] += ":/opt/salt/bin" + factory = salt_factories.salt_master_daemon( random_string("master-"), defaults=config_defaults, @@ -478,6 +482,9 @@ def salt_minion(salt_factories, salt_master, install_salt): if install_salt.classic and platform.is_windows(): salt_factories.python_executable = None + if install_salt.classic and platform.is_darwin(): + os.environ["PATH"] += ":/opt/salt/bin" + factory = salt_master.salt_minion_daemon( minion_id, overrides=config_overrides, From ac7db60b86a1544c20fda5eab1b7110435cde617 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 27 Sep 2023 13:02:01 +0100 Subject: [PATCH 014/147] Reuse the onedir CI virtualenvs Signed-off-by: Pedro Algarvio --- .github/workflows/ci.yml | 21 ++++++++ .github/workflows/nightly.yml | 21 ++++++++ .github/workflows/release.yml | 33 ++++++++++++ .github/workflows/scheduled.yml | 21 ++++++++ .github/workflows/staging.yml | 54 +++++++++++++++++++ .../test-pkg-repo-downloads.yml.jinja | 3 ++ .../templates/test-salt-pkg.yml.jinja | 3 ++ .../test-package-downloads-action-linux.yml | 12 ++--- .../test-package-downloads-action-macos.yml | 12 ++--- .../test-package-downloads-action-windows.yml | 12 ++--- .../workflows/test-packages-action-macos.yml | 11 ++-- .github/workflows/test-packages-action.yml | 20 ++----- noxfile.py | 19 ++++++- 13 files changed, 188 insertions(+), 54 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dd5f2f8d295..0cea99f036d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -518,6 +518,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: amazonlinux-2 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -537,6 +538,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centos-7 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -556,6 +558,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centosstream-8 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -575,6 +578,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centosstream-9 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -594,6 +598,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-10 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -613,6 +618,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-11 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -632,6 +638,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-11-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -651,6 +658,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-3 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -670,6 +678,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-4 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -689,6 +698,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-4-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -708,6 +718,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-20.04 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -727,6 +738,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-20.04-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -746,6 +758,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-22.04 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -765,6 +778,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-22.04-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -784,6 +798,7 @@ jobs: uses: ./.github/workflows/test-packages-action-macos.yml with: distro-slug: macos-12 + nox-session: ci-test-onedir platform: darwin arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -803,6 +818,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2016 + nox-session: ci-test-onedir platform: windows arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -822,6 +838,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2016 + nox-session: ci-test-onedir platform: windows arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -841,6 +858,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2019 + nox-session: ci-test-onedir platform: windows arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -860,6 +878,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2019 + nox-session: ci-test-onedir platform: windows arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -879,6 +898,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2022 + nox-session: ci-test-onedir platform: windows arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -898,6 +918,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2022 + nox-session: ci-test-onedir platform: windows arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index a50c6e84612..439bcb1a74b 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -573,6 +573,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: amazonlinux-2 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -592,6 +593,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centos-7 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -611,6 +613,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centosstream-8 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -630,6 +633,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centosstream-9 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -649,6 +653,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-10 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -668,6 +673,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-11 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -687,6 +693,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-11-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -706,6 +713,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-3 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -725,6 +733,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-4 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -744,6 +753,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-4-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -763,6 +773,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-20.04 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -782,6 +793,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-20.04-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -801,6 +813,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-22.04 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -820,6 +833,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-22.04-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -839,6 +853,7 @@ jobs: uses: ./.github/workflows/test-packages-action-macos.yml with: distro-slug: macos-12 + nox-session: ci-test-onedir platform: darwin arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -858,6 +873,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2016 + nox-session: ci-test-onedir platform: windows arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -877,6 +893,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2016 + nox-session: ci-test-onedir platform: windows arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -896,6 +913,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2019 + nox-session: ci-test-onedir platform: windows arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -915,6 +933,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2019 + nox-session: ci-test-onedir platform: windows arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -934,6 +953,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2022 + nox-session: ci-test-onedir platform: windows arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -953,6 +973,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2022 + nox-session: ci-test-onedir platform: windows arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ba317516c00..fdfc6123999 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -233,6 +233,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: almalinux-8 + nox-session: ci-test-onedir platform: linux arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -254,6 +255,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: almalinux-8-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -275,6 +277,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: almalinux-9 + nox-session: ci-test-onedir platform: linux arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -296,6 +299,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: almalinux-9-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -317,6 +321,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: amazonlinux-2 + nox-session: ci-test-onedir platform: linux arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -338,6 +343,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: amazonlinux-2-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -359,6 +365,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: centos-7 + nox-session: ci-test-onedir platform: linux arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -380,6 +387,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: centos-7-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -401,6 +409,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: centosstream-8 + nox-session: ci-test-onedir platform: linux arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -422,6 +431,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: centosstream-8-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -443,6 +453,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: centosstream-9 + nox-session: ci-test-onedir platform: linux arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -464,6 +475,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: centosstream-9-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -485,6 +497,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: debian-10 + nox-session: ci-test-onedir platform: linux arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -506,6 +519,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: debian-11 + nox-session: ci-test-onedir platform: linux arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -527,6 +541,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: debian-11-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -548,6 +563,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: fedora-37 + nox-session: ci-test-onedir platform: linux arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -569,6 +585,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: fedora-37-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -590,6 +607,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: fedora-38 + nox-session: ci-test-onedir platform: linux arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -611,6 +629,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: fedora-38-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -632,6 +651,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: photonos-3 + nox-session: ci-test-onedir platform: linux arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -653,6 +673,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: photonos-4 + nox-session: ci-test-onedir platform: linux arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -674,6 +695,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: photonos-4-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -695,6 +717,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: ubuntu-20.04 + nox-session: ci-test-onedir platform: linux arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -716,6 +739,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: ubuntu-20.04-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -737,6 +761,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: ubuntu-22.04 + nox-session: ci-test-onedir platform: linux arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -758,6 +783,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: ubuntu-22.04-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -779,6 +805,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: ubuntu-22.04 + nox-session: ci-test-onedir platform: linux arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -800,6 +827,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: ubuntu-22.04-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -821,6 +849,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-macos.yml with: distro-slug: macos-12 + nox-session: ci-test-onedir platform: darwin arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -842,6 +871,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-macos.yml with: distro-slug: macos-12 + nox-session: ci-test-onedir platform: darwin arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -863,6 +893,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-windows.yml with: distro-slug: windows-2022 + nox-session: ci-test-onedir platform: windows arch: amd64 pkg-type: nsis @@ -884,6 +915,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-windows.yml with: distro-slug: windows-2022 + nox-session: ci-test-onedir platform: windows arch: amd64 pkg-type: msi @@ -905,6 +937,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-windows.yml with: distro-slug: windows-2022 + nox-session: ci-test-onedir platform: windows arch: amd64 pkg-type: onedir diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 473b9849435..02863403cfe 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -552,6 +552,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: amazonlinux-2 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -571,6 +572,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centos-7 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -590,6 +592,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centosstream-8 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -609,6 +612,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centosstream-9 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -628,6 +632,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-10 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -647,6 +652,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-11 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -666,6 +672,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-11-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -685,6 +692,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-3 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -704,6 +712,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-4 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -723,6 +732,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-4-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -742,6 +752,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-20.04 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -761,6 +772,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-20.04-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -780,6 +792,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-22.04 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -799,6 +812,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-22.04-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -818,6 +832,7 @@ jobs: uses: ./.github/workflows/test-packages-action-macos.yml with: distro-slug: macos-12 + nox-session: ci-test-onedir platform: darwin arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -837,6 +852,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2016 + nox-session: ci-test-onedir platform: windows arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -856,6 +872,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2016 + nox-session: ci-test-onedir platform: windows arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -875,6 +892,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2019 + nox-session: ci-test-onedir platform: windows arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -894,6 +912,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2019 + nox-session: ci-test-onedir platform: windows arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -913,6 +932,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2022 + nox-session: ci-test-onedir platform: windows arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -932,6 +952,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2022 + nox-session: ci-test-onedir platform: windows arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 65662a349f1..d1c4ff26ca4 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -568,6 +568,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: amazonlinux-2 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -587,6 +588,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centos-7 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -606,6 +608,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centosstream-8 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -625,6 +628,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centosstream-9 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -644,6 +648,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-10 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -663,6 +668,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-11 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -682,6 +688,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-11-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -701,6 +708,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-3 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -720,6 +728,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-4 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -739,6 +748,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-4-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -758,6 +768,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-20.04 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -777,6 +788,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-20.04-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -796,6 +808,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-22.04 + nox-session: ci-test-onedir platform: linux arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -815,6 +828,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-22.04-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -834,6 +848,7 @@ jobs: uses: ./.github/workflows/test-packages-action-macos.yml with: distro-slug: macos-12 + nox-session: ci-test-onedir platform: darwin arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -853,6 +868,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2016 + nox-session: ci-test-onedir platform: windows arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -872,6 +888,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2016 + nox-session: ci-test-onedir platform: windows arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -891,6 +908,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2019 + nox-session: ci-test-onedir platform: windows arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -910,6 +928,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2019 + nox-session: ci-test-onedir platform: windows arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -929,6 +948,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2022 + nox-session: ci-test-onedir platform: windows arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -948,6 +968,7 @@ jobs: uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2022 + nox-session: ci-test-onedir platform: windows arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -2170,6 +2191,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: almalinux-8 + nox-session: ci-test-onedir platform: linux arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -2190,6 +2212,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: almalinux-8-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -2210,6 +2233,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: almalinux-9 + nox-session: ci-test-onedir platform: linux arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -2230,6 +2254,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: almalinux-9-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -2250,6 +2275,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: amazonlinux-2 + nox-session: ci-test-onedir platform: linux arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -2270,6 +2296,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: amazonlinux-2-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -2290,6 +2317,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: centos-7 + nox-session: ci-test-onedir platform: linux arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -2310,6 +2338,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: centos-7-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -2330,6 +2359,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: centosstream-8 + nox-session: ci-test-onedir platform: linux arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -2350,6 +2380,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: centosstream-8-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -2370,6 +2401,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: centosstream-9 + nox-session: ci-test-onedir platform: linux arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -2390,6 +2422,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: centosstream-9-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -2410,6 +2443,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: debian-10 + nox-session: ci-test-onedir platform: linux arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -2430,6 +2464,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: debian-11 + nox-session: ci-test-onedir platform: linux arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -2450,6 +2485,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: debian-11-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -2470,6 +2506,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: fedora-37 + nox-session: ci-test-onedir platform: linux arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -2490,6 +2527,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: fedora-37-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -2510,6 +2548,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: fedora-38 + nox-session: ci-test-onedir platform: linux arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -2530,6 +2569,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: fedora-38-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -2550,6 +2590,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: photonos-3 + nox-session: ci-test-onedir platform: linux arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -2570,6 +2611,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: photonos-4 + nox-session: ci-test-onedir platform: linux arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -2590,6 +2632,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: photonos-4-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -2610,6 +2653,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: ubuntu-20.04 + nox-session: ci-test-onedir platform: linux arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -2630,6 +2674,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: ubuntu-20.04-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -2650,6 +2695,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: ubuntu-22.04 + nox-session: ci-test-onedir platform: linux arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -2670,6 +2716,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: ubuntu-22.04-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -2690,6 +2737,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: ubuntu-22.04 + nox-session: ci-test-onedir platform: linux arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -2710,6 +2758,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: ubuntu-22.04-arm64 + nox-session: ci-test-onedir platform: linux arch: aarch64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -2730,6 +2779,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-macos.yml with: distro-slug: macos-12 + nox-session: ci-test-onedir platform: darwin arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -2750,6 +2800,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-macos.yml with: distro-slug: macos-12 + nox-session: ci-test-onedir platform: darwin arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -2770,6 +2821,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-windows.yml with: distro-slug: windows-2022 + nox-session: ci-test-onedir platform: windows arch: amd64 pkg-type: nsis @@ -2790,6 +2842,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-windows.yml with: distro-slug: windows-2022 + nox-session: ci-test-onedir platform: windows arch: amd64 pkg-type: msi @@ -2810,6 +2863,7 @@ jobs: uses: ./.github/workflows/test-package-downloads-action-windows.yml with: distro-slug: windows-2022 + nox-session: ci-test-onedir platform: windows arch: amd64 pkg-type: onedir diff --git a/.github/workflows/templates/test-pkg-repo-downloads.yml.jinja b/.github/workflows/templates/test-pkg-repo-downloads.yml.jinja index 4c09280c34d..83bcce62f80 100644 --- a/.github/workflows/templates/test-pkg-repo-downloads.yml.jinja +++ b/.github/workflows/templates/test-pkg-repo-downloads.yml.jinja @@ -51,6 +51,7 @@ uses: ./.github/workflows/test-package-downloads-action-linux.yml with: distro-slug: <{ slug }> + nox-session: ci-test-onedir platform: linux arch: <{ arch }> cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }> @@ -88,6 +89,7 @@ uses: ./.github/workflows/test-package-downloads-action-macos.yml with: distro-slug: <{ slug }> + nox-session: ci-test-onedir platform: darwin arch: <{ arch }> cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }> @@ -124,6 +126,7 @@ uses: ./.github/workflows/test-package-downloads-action-windows.yml with: distro-slug: <{ slug }> + nox-session: ci-test-onedir platform: windows arch: <{ arch }> pkg-type: <{ pkg_type.lower() }> diff --git a/.github/workflows/templates/test-salt-pkg.yml.jinja b/.github/workflows/templates/test-salt-pkg.yml.jinja index 2765e3150d8..b1f446c7e2f 100644 --- a/.github/workflows/templates/test-salt-pkg.yml.jinja +++ b/.github/workflows/templates/test-salt-pkg.yml.jinja @@ -47,6 +47,7 @@ uses: ./.github/workflows/test-packages-action.yml with: distro-slug: <{ slug }> + nox-session: ci-test-onedir platform: linux arch: <{ arch }> salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -74,6 +75,7 @@ uses: ./.github/workflows/test-packages-action-macos.yml with: distro-slug: <{ slug }> + nox-session: ci-test-onedir platform: darwin arch: <{ arch }> salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -103,6 +105,7 @@ uses: ./.github/workflows/test-packages-action.yml with: distro-slug: <{ slug }> + nox-session: ci-test-onedir platform: windows arch: <{ arch }> salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" diff --git a/.github/workflows/test-package-downloads-action-linux.yml b/.github/workflows/test-package-downloads-action-linux.yml index 0d88f596d29..3674111e8ee 100644 --- a/.github/workflows/test-package-downloads-action-linux.yml +++ b/.github/workflows/test-package-downloads-action-linux.yml @@ -53,7 +53,7 @@ on: required: false type: string description: The nox session to run - default: test-pkgs-onedir + default: ci-test-onedir env: @@ -149,12 +149,6 @@ jobs: run: | tools --timestamps vm destroy --no-wait ${{ inputs.distro-slug }} - - name: Upload Nox Requirements Tarball - uses: actions/upload-artifact@v3 - with: - name: nox-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-download-${{ inputs.arch }} - path: nox.${{ inputs.distro-slug }}.tar.* - test: name: Test runs-on: @@ -233,7 +227,7 @@ jobs: tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ - --nox-session=${{ inputs.nox-session }} ${{ inputs.distro-slug }} -- download-pkgs + --nox-session=${{ inputs.nox-session }}-pkgs ${{ inputs.distro-slug }} -- download-pkgs - name: Run Package Download Tests env: @@ -251,7 +245,7 @@ jobs: tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ - --nox-session=${{ inputs.nox-session }} --rerun-failures ${{ inputs.distro-slug }} -- download-pkgs + --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ inputs.distro-slug }} -- download-pkgs - name: Combine Coverage Reports if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' diff --git a/.github/workflows/test-package-downloads-action-macos.yml b/.github/workflows/test-package-downloads-action-macos.yml index 2e362959407..afe0f51ca9f 100644 --- a/.github/workflows/test-package-downloads-action-macos.yml +++ b/.github/workflows/test-package-downloads-action-macos.yml @@ -58,7 +58,7 @@ on: required: false type: string description: The nox session to run - default: test-pkgs-onedir + default: ci-test-onedir env: @@ -138,12 +138,6 @@ jobs: run: | nox --force-color -e compress-dependencies -- ${{ inputs.distro-slug }} - - name: Upload Nox Requirements Tarball - uses: actions/upload-artifact@v3 - with: - name: nox-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-download-${{ inputs.arch }} - path: nox.${{ inputs.distro-slug }}.tar.* - test: name: Test runs-on: ${{ inputs.distro-slug }} @@ -208,7 +202,7 @@ jobs: LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" DOWNLOAD_TEST_PACKAGE_TYPE: ${{ inputs.pkg-type }} run: | - sudo -E nox --force-color -e ${{ inputs.nox-session }} -- download-pkgs + sudo -E nox --force-color -e ${{ inputs.nox-session }}-pkgs -- download-pkgs - name: Run Package Download Tests env: @@ -231,7 +225,7 @@ jobs: SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} DOWNLOAD_TEST_PACKAGE_TYPE: ${{ inputs.pkg-type }} run: | - sudo -E nox --force-color -e ${{ inputs.nox-session }} -- download-pkgs + sudo -E nox --force-color -e ${{ inputs.nox-session }}-pkgs -- download-pkgs - name: Fix file ownership run: | diff --git a/.github/workflows/test-package-downloads-action-windows.yml b/.github/workflows/test-package-downloads-action-windows.yml index 2e20ee8455b..e297d5922da 100644 --- a/.github/workflows/test-package-downloads-action-windows.yml +++ b/.github/workflows/test-package-downloads-action-windows.yml @@ -48,7 +48,7 @@ on: required: false type: string description: The nox session to run - default: test-pkgs-onedir + default: ci-test-onedir skip-code-coverage: required: false type: boolean @@ -154,12 +154,6 @@ jobs: run: | tools --timestamps vm destroy --no-wait ${{ inputs.distro-slug }} - - name: Upload Nox Requirements Tarball - uses: actions/upload-artifact@v3 - with: - name: nox-${{ inputs.distro-slug }}-${{ inputs.pkg-type }}-${{ inputs.nox-session }}-download-${{ inputs.arch }} - path: nox.${{ inputs.distro-slug }}.tar.* - test: name: Test runs-on: @@ -238,7 +232,7 @@ jobs: tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ - --nox-session=${{ inputs.nox-session }} ${{ inputs.distro-slug }} -- download-pkgs + --nox-session=${{ inputs.nox-session }}-pkgs ${{ inputs.distro-slug }} -- download-pkgs - name: Run Package Download Tests env: @@ -256,7 +250,7 @@ jobs: tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ - --nox-session=${{ inputs.nox-session }} --rerun-failures ${{ inputs.distro-slug }} -- download-pkgs + --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ inputs.distro-slug }} -- download-pkgs - name: Combine Coverage Reports if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' diff --git a/.github/workflows/test-packages-action-macos.yml b/.github/workflows/test-packages-action-macos.yml index f5e8add0e48..9f963b09ba0 100644 --- a/.github/workflows/test-packages-action-macos.yml +++ b/.github/workflows/test-packages-action-macos.yml @@ -49,7 +49,7 @@ on: required: false type: string description: The nox session to run - default: test-pkgs-onedir + default: ci-test-onedir skip-code-coverage: required: false type: boolean @@ -158,11 +158,6 @@ jobs: run: | nox --force-color -e compress-dependencies -- ${{ inputs.distro-slug }} - - name: Upload Nox Requirements Tarball - uses: actions/upload-artifact@v3 - with: - name: nox-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-${{ inputs.arch }} - path: nox.${{ inputs.distro-slug }}.tar.* test: name: Test @@ -237,7 +232,7 @@ jobs: GITHUB_ACTIONS_PIPELINE: "1" SKIP_INITIAL_GH_ACTIONS_FAILURES: "1" run: | - sudo -E nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.test-chunk }} \ + sudo -E nox --force-color -e ${{ inputs.nox-session }}-pkgs -- ${{ matrix.test-chunk }} \ ${{ matrix.version && format('--prev-version {0}', matrix.version) || ''}} - name: Run Package Tests @@ -251,7 +246,7 @@ jobs: SKIP_INITIAL_GH_ACTIONS_FAILURES: "1" COVERAGE_CONTEXT: ${{ inputs.distro-slug }} run: | - sudo -E nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.test-chunk }} \ + sudo -E nox --force-color -e ${{ inputs.nox-session }}-pkgs -- ${{ matrix.test-chunk }} \ ${{ matrix.version && format('--prev-version {0}', matrix.version) || ''}} - name: Fix file ownership diff --git a/.github/workflows/test-packages-action.yml b/.github/workflows/test-packages-action.yml index d8dc4815474..bf60d0c5032 100644 --- a/.github/workflows/test-packages-action.yml +++ b/.github/workflows/test-packages-action.yml @@ -44,7 +44,7 @@ on: required: false type: string description: The nox session to run - default: test-pkgs-onedir + default: ci-test-onedir skip-code-coverage: required: false type: boolean @@ -173,20 +173,6 @@ jobs: run: | tools --timestamps vm destroy --no-wait ${{ inputs.distro-slug }} - - name: Define Nox Upload Artifact Name - id: nox-artifact-name - run: | - if [ "${{ contains(inputs.distro-slug, 'windows') }}" != "true" ]; then - echo "name=nox-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-${{ inputs.arch }}" >> "${GITHUB_OUTPUT}" - else - echo "name=nox-${{ inputs.distro-slug }}-${{ inputs.pkg-type }}-${{ inputs.nox-session }}-${{ inputs.arch }}" >> "${GITHUB_OUTPUT}" - fi - - - name: Upload Nox Requirements Tarball - uses: actions/upload-artifact@v3 - with: - name: ${{ steps.nox-artifact-name.outputs.name }} - path: nox.${{ inputs.distro-slug }}.tar.* test: name: Test @@ -267,13 +253,13 @@ jobs: - name: Show System Info & Test Plan run: | tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ - --nox-session=${{ inputs.nox-session }} ${{ inputs.distro-slug }} -- ${{ matrix.test-chunk }} \ + --nox-session=${{ inputs.nox-session }}-pkgs ${{ inputs.distro-slug }} -- ${{ matrix.test-chunk }} \ ${{ matrix.version && format('--prev-version {0}', matrix.version) || ''}} - name: Run Package Tests run: | tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ - --nox-session=${{ inputs.nox-session }} --rerun-failures ${{ inputs.distro-slug }} -- ${{ matrix.test-chunk }} \ + --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ inputs.distro-slug }} -- ${{ matrix.test-chunk }} \ ${{ matrix.version && format('--prev-version {0}', matrix.version) || ''}} - name: Download Test Run Artifacts diff --git a/noxfile.py b/noxfile.py index a2cddd986fe..6bf890a0ffd 100644 --- a/noxfile.py +++ b/noxfile.py @@ -1820,10 +1820,25 @@ def build(session): @nox.session( python=str(ONEDIR_PYTHON_PATH), - name="test-pkgs-onedir", + name="ci-test-onedir-pkgs", venv_params=["--system-site-packages"], ) -def test_pkgs_onedir(session): +def ci_test_onedir_pkgs(session): + from nox.virtualenv import VirtualEnv + + session_warn(session, "Replacing VirtualEnv instance...") + + ci_test_onedir_path = REPO_ROOT / ".nox" / "ci-test-onedir" + session._runner.venv = VirtualEnv( + str(ci_test_onedir_path.relative_to(REPO_ROOT)), + interpreter=session._runner.func.python, + reuse_existing=True, + venv=session._runner.venv.venv_or_virtualenv == "venv", + venv_params=session._runner.venv.venv_params, + ) + os.environ["VIRTUAL_ENV"] = session._runner.venv.location + session._runner.venv.create() + if not ONEDIR_ARTIFACT_PATH.exists(): session.error( "The salt onedir artifact, expected to be in '{}', was not found".format( From 6dff22e227a809c04a086f1e37c60b8f9c051e42 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 26 Sep 2023 14:03:46 +0100 Subject: [PATCH 015/147] Properly constraint CI requirements from PKG requirements Signed-off-by: Pedro Algarvio --- .pre-commit-config.yaml | 201 +++- requirements/static/ci/changelog.in | 2 + requirements/static/ci/cloud.in | 2 + requirements/static/ci/common.in | 4 +- requirements/static/ci/crypto.in | 2 + requirements/static/ci/darwin.in | 2 + requirements/static/ci/freebsd.in | 2 + requirements/static/ci/invoke.in | 2 + requirements/static/ci/lint.in | 2 + requirements/static/ci/linux.in | 4 +- requirements/static/ci/py3.10/changelog.txt | 31 +- requirements/static/ci/py3.10/cloud.txt | 934 +++++++++++---- .../static/ci/py3.10/darwin-crypto.txt | 2 +- requirements/static/ci/py3.10/darwin.txt | 119 +- requirements/static/ci/py3.10/docs.txt | 4 +- .../static/ci/py3.10/freebsd-crypto.txt | 2 +- requirements/static/ci/py3.10/freebsd.txt | 100 +- requirements/static/ci/py3.10/invoke.txt | 10 +- requirements/static/ci/py3.10/lint.txt | 986 +++++++++++----- .../static/ci/py3.10/linux-crypto.txt | 2 +- requirements/static/ci/py3.10/linux.txt | 98 +- requirements/static/ci/py3.10/tools.txt | 2 +- .../static/ci/py3.10/windows-crypto.txt | 2 +- requirements/static/ci/py3.10/windows.txt | 143 ++- requirements/static/ci/py3.11/tools.txt | 2 +- requirements/static/ci/py3.7/cloud.txt | 992 +++++++++++----- requirements/static/ci/py3.7/docs.txt | 10 +- .../static/ci/py3.7/freebsd-crypto.txt | 2 +- requirements/static/ci/py3.7/freebsd.txt | 101 +- requirements/static/ci/py3.7/invoke.txt | 10 +- requirements/static/ci/py3.7/lint.txt | 1037 ++++++++++++----- requirements/static/ci/py3.7/linux-crypto.txt | 2 +- requirements/static/ci/py3.7/linux.txt | 105 +- .../static/ci/py3.7/windows-crypto.txt | 2 +- requirements/static/ci/py3.7/windows.txt | 141 ++- requirements/static/ci/py3.8/changelog.txt | 31 +- requirements/static/ci/py3.8/cloud.txt | 994 +++++++++++----- requirements/static/ci/py3.8/docs.txt | 4 +- .../static/ci/py3.8/freebsd-crypto.txt | 2 +- requirements/static/ci/py3.8/freebsd.txt | 103 +- requirements/static/ci/py3.8/invoke.txt | 10 +- requirements/static/ci/py3.8/lint.txt | 1027 +++++++++++----- requirements/static/ci/py3.8/linux-crypto.txt | 2 +- requirements/static/ci/py3.8/linux.txt | 101 +- .../static/ci/py3.8/windows-crypto.txt | 2 +- requirements/static/ci/py3.8/windows.txt | 141 ++- requirements/static/ci/py3.9/changelog.txt | 31 +- requirements/static/ci/py3.9/cloud.txt | 989 +++++++++++----- .../static/ci/py3.9/darwin-crypto.txt | 2 +- requirements/static/ci/py3.9/darwin.txt | 119 +- requirements/static/ci/py3.9/docs.txt | 4 +- .../static/ci/py3.9/freebsd-crypto.txt | 2 +- requirements/static/ci/py3.9/freebsd.txt | 100 +- requirements/static/ci/py3.9/invoke.txt | 10 +- requirements/static/ci/py3.9/lint.txt | 1026 +++++++++++----- requirements/static/ci/py3.9/linux-crypto.txt | 2 +- requirements/static/ci/py3.9/linux.txt | 98 +- requirements/static/ci/py3.9/tools.txt | 2 +- .../static/ci/py3.9/windows-crypto.txt | 2 +- requirements/static/ci/py3.9/windows.txt | 141 ++- requirements/static/ci/windows.in | 2 + requirements/static/pkg/py3.10/darwin.txt | 2 +- requirements/static/pkg/py3.10/freebsd.txt | 2 +- requirements/static/pkg/py3.10/linux.txt | 2 +- requirements/static/pkg/py3.10/windows.txt | 2 +- requirements/static/pkg/py3.7/freebsd.txt | 2 +- requirements/static/pkg/py3.7/linux.txt | 2 +- requirements/static/pkg/py3.7/windows.txt | 2 +- requirements/static/pkg/py3.8/freebsd.txt | 2 +- requirements/static/pkg/py3.8/linux.txt | 2 +- requirements/static/pkg/py3.8/windows.txt | 2 +- requirements/static/pkg/py3.9/darwin.txt | 2 +- requirements/static/pkg/py3.9/freebsd.txt | 2 +- requirements/static/pkg/py3.9/linux.txt | 2 +- requirements/static/pkg/py3.9/windows.txt | 2 +- 75 files changed, 7342 insertions(+), 2695 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e235d12bdb0..f6aa4fdba1a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -46,7 +46,7 @@ repos: )$ - repo: https://github.com/s0undt3ch/python-tools-scripts - rev: "0.12.0" + rev: "0.15.0" hooks: - id: tools alias: check-changelog-entries @@ -102,10 +102,12 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.7 - --platform=linux - --include=requirements/base.txt - --include=requirements/zeromq.txt + - --no-emit-index-url - requirements/static/pkg/linux.in - id: pip-tools-compile @@ -115,10 +117,12 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.8 - --platform=linux - --include=requirements/base.txt - --include=requirements/zeromq.txt + - --no-emit-index-url - requirements/static/pkg/linux.in - id: pip-tools-compile @@ -128,10 +132,12 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.9 - --platform=linux - --include=requirements/base.txt - --include=requirements/zeromq.txt + - --no-emit-index-url - requirements/static/pkg/linux.in - id: pip-tools-compile @@ -141,10 +147,12 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.10 - --platform=linux - --include=requirements/base.txt - --include=requirements/zeromq.txt + - --no-emit-index-url - requirements/static/pkg/linux.in - id: pip-tools-compile @@ -154,10 +162,12 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.7 - --platform=freebsd - --include=requirements/base.txt - --include=requirements/zeromq.txt + - --no-emit-index-url - requirements/static/pkg/freebsd.in - id: pip-tools-compile @@ -167,10 +177,12 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.8 - --platform=freebsd - --include=requirements/base.txt - --include=requirements/zeromq.txt + - --no-emit-index-url - requirements/static/pkg/freebsd.in - id: pip-tools-compile @@ -180,10 +192,12 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.9 - --platform=freebsd - --include=requirements/base.txt - --include=requirements/zeromq.txt + - --no-emit-index-url - requirements/static/pkg/freebsd.in - id: pip-tools-compile @@ -193,10 +207,12 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.10 - --platform=freebsd - --include=requirements/base.txt - --include=requirements/zeromq.txt + - --no-emit-index-url - requirements/static/pkg/freebsd.in - id: pip-tools-compile @@ -206,9 +222,11 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.9 - --platform=darwin - --include=requirements/darwin.txt + - --no-emit-index-url - requirements/static/pkg/darwin.in - id: pip-tools-compile @@ -218,9 +236,11 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.10 - --platform=darwin - --include=requirements/darwin.txt + - --no-emit-index-url - requirements/static/pkg/darwin.in - id: pip-tools-compile @@ -230,9 +250,11 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.7 - --platform=windows - --include=requirements/windows.txt + - --no-emit-index-url - requirements/static/pkg/windows.in - id: pip-tools-compile @@ -242,9 +264,11 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.8 - --platform=windows - --include=requirements/windows.txt + - --no-emit-index-url - requirements/static/pkg/windows.in - id: pip-tools-compile @@ -254,9 +278,11 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.9 - --platform=windows - --include=requirements/windows.txt + - --no-emit-index-url - requirements/static/pkg/windows.in - id: pip-tools-compile @@ -266,9 +292,11 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.10 - --platform=windows - --include=requirements/windows.txt + - --no-emit-index-url - requirements/static/pkg/windows.in # <---- Packaging Requirements ------------------------------------------------------------------------------------- @@ -281,6 +309,7 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.7 - --platform=linux - --include=requirements/base.txt @@ -288,16 +317,17 @@ repos: - --include=requirements/pytest.txt - --include=requirements/static/pkg/linux.in - --include=requirements/static/ci/common.in - - --pip-args=--constraint=requirements/static/pkg/py{py_version}/linux.txt + - --no-emit-index-url - requirements/static/ci/linux.in - id: pip-tools-compile alias: compile-ci-linux-3.8-zmq-requirements name: Linux CI Py3.8 ZeroMQ Requirements - files: ^requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(linux\.in|common\.in)|pkg/py3\.8/linux\.txt))$ + files: ^requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(linux\.in|common\.in)|py3\.8/linux\.txt))$ pass_filenames: false args: - -v + - --build-isolation - --py-version=3.8 - --platform=linux - --include=requirements/base.txt @@ -305,16 +335,17 @@ repos: - --include=requirements/pytest.txt - --include=requirements/static/pkg/linux.in - --include=requirements/static/ci/common.in - - --pip-args=--constraint=requirements/static/pkg/py{py_version}/linux.txt + - --no-emit-index-url - requirements/static/ci/linux.in - id: pip-tools-compile alias: compile-ci-linux-3.9-zmq-requirements name: Linux CI Py3.9 ZeroMQ Requirements - files: ^requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(linux\.in|common\.in)|pkg/py3\.9/linux\.txt))$ + files: ^requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(linux\.in|common\.in)|py3\.9/linux\.txt))$ pass_filenames: false args: - -v + - --build-isolation - --py-version=3.9 - --platform=linux - --include=requirements/base.txt @@ -322,16 +353,17 @@ repos: - --include=requirements/pytest.txt - --include=requirements/static/pkg/linux.in - --include=requirements/static/ci/common.in - - --pip-args=--constraint=requirements/static/pkg/py{py_version}/linux.txt + - --no-emit-index-url - requirements/static/ci/linux.in - id: pip-tools-compile alias: compile-ci-linux-3.10-zmq-requirements name: Linux CI Py3.10 ZeroMQ Requirements - files: ^requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(linux\.in|common\.in)|pkg/py3\.10/linux\.txt))$ + files: ^requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(linux\.in|common\.in)|py3\.10/linux\.txt))$ pass_filenames: false args: - -v + - --build-isolation - --py-version=3.10 - --platform=linux - --include=requirements/base.txt @@ -339,7 +371,7 @@ repos: - --include=requirements/pytest.txt - --include=requirements/static/pkg/linux.in - --include=requirements/static/ci/common.in - - --pip-args=--constraint=requirements/static/pkg/py{py_version}/linux.txt + - --no-emit-index-url - requirements/static/ci/linux.in - id: pip-tools-compile @@ -349,10 +381,11 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.7 - --platform=linux - --out-prefix=linux - - --pip-args=--constraint=requirements/static/pkg/py{py_version}/linux.txt + - --no-emit-index-url - requirements/static/ci/crypto.in - id: pip-tools-compile @@ -362,10 +395,11 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.8 - --platform=linux - --out-prefix=linux - - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt + - --no-emit-index-url - requirements/static/ci/crypto.in - id: pip-tools-compile @@ -375,10 +409,11 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.9 - --platform=linux - --out-prefix=linux - - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt + - --no-emit-index-url - requirements/static/ci/crypto.in - id: pip-tools-compile @@ -389,10 +424,11 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.10 - --platform=linux - --out-prefix=linux - - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt + - --no-emit-index-url - requirements/static/ci/crypto.in @@ -403,6 +439,7 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.7 - --platform=freebsd - --include=requirements/base.txt @@ -410,16 +447,17 @@ repos: - --include=requirements/pytest.txt - --include=requirements/static/pkg/freebsd.in - --include=requirements/static/ci/common.in - - --pip-args=--constraint=requirements/static/pkg/py{py_version}/freebsd.txt + - --no-emit-index-url - requirements/static/ci/freebsd.in - id: pip-tools-compile alias: compile-ci-freebsd-3.8-zmq-requirements name: FreeBSD CI Py3.8 ZeroMQ Requirements - files: ^requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(freebsd|common)\.in|pkg/py3\.8/freebsd\.txt))$ + files: ^requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(freebsd|common)\.in|py3\.8/freebsd\.txt))$ pass_filenames: false args: - -v + - --build-isolation - --py-version=3.8 - --platform=freebsd - --include=requirements/base.txt @@ -427,16 +465,17 @@ repos: - --include=requirements/pytest.txt - --include=requirements/static/pkg/freebsd.in - --include=requirements/static/ci/common.in - - --pip-args=--constraint=requirements/static/pkg/py{py_version}/freebsd.txt + - --no-emit-index-url - requirements/static/ci/freebsd.in - id: pip-tools-compile alias: compile-ci-freebsd-3.9-zmq-requirements name: FreeBSD CI Py3.9 ZeroMQ Requirements - files: ^requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(freebsd|common)\.in|pkg/py3\.9/freebsd\.txt))$ + files: ^requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(freebsd|common)\.in|py3\.9/freebsd\.txt))$ pass_filenames: false args: - -v + - --build-isolation - --py-version=3.9 - --platform=freebsd - --include=requirements/base.txt @@ -444,16 +483,17 @@ repos: - --include=requirements/pytest.txt - --include=requirements/static/pkg/freebsd.in - --include=requirements/static/ci/common.in - - --pip-args=--constraint=requirements/static/pkg/py{py_version}/freebsd.txt + - --no-emit-index-url - requirements/static/ci/freebsd.in - id: pip-tools-compile alias: compile-ci-freebsd-3.10-zmq-requirements name: FreeBSD CI Py3.10 ZeroMQ Requirements - files: ^requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(freebsd|common)\.in|pkg/py3\.10/freebsd\.txt))$ + files: ^requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(freebsd|common)\.in|py3\.10/freebsd\.txt))$ pass_filenames: false args: - -v + - --build-isolation - --py-version=3.10 - --platform=freebsd - --include=requirements/base.txt @@ -461,7 +501,7 @@ repos: - --include=requirements/pytest.txt - --include=requirements/static/pkg/freebsd.in - --include=requirements/static/ci/common.in - - --pip-args=--constraint=requirements/static/pkg/py{py_version}/freebsd.txt + - --no-emit-index-url - requirements/static/ci/freebsd.in - id: pip-tools-compile @@ -471,10 +511,11 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.7 - --platform=freebsd - --out-prefix=freebsd - - --pip-args=--constraint=requirements/static/ci/py{py_version}/freebsd.txt + - --no-emit-index-url - requirements/static/ci/crypto.in - id: pip-tools-compile @@ -484,10 +525,11 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.8 - --platform=freebsd - --out-prefix=freebsd - - --pip-args=--constraint=requirements/static/ci/py{py_version}/freebsd.txt + - --no-emit-index-url - requirements/static/ci/crypto.in - id: pip-tools-compile @@ -497,10 +539,11 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.9 - --platform=freebsd - --out-prefix=freebsd - - --pip-args=--constraint=requirements/static/ci/py{py_version}/freebsd.txt + - --no-emit-index-url - requirements/static/ci/crypto.in - id: pip-tools-compile @@ -511,42 +554,45 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.10 - --platform=freebsd - --out-prefix=freebsd - - --pip-args=--constraint=requirements/static/ci/py{py_version}/freebsd.txt + - --no-emit-index-url - requirements/static/ci/crypto.in - id: pip-tools-compile alias: compile-ci-darwin-3.9-zmq-requirements name: Darwin CI Py3.9 ZeroMQ Requirements - files: ^(requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(darwin|common)\.in|pkg/py3\.9/darwin\.txt)))$ + files: ^(requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(darwin|common)\.in|py3\.9/darwin\.txt)))$ pass_filenames: false args: - -v + - --build-isolation - --py-version=3.9 - --platform=darwin - --include=requirements/darwin.txt - --include=requirements/pytest.txt - --include=requirements/static/pkg/darwin.in - --include=requirements/static/ci/common.in - - --pip-args=--constraint=requirements/static/pkg/py{py_version}/darwin.txt + - --no-emit-index-url - requirements/static/ci/darwin.in - id: pip-tools-compile alias: compile-ci-darwin-3.10-zmq-requirements name: Darwin CI Py3.10 ZeroMQ Requirements - files: ^(requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(darwin|common)\.in|pkg/py3\.10/darwin\.txt)))$ + files: ^(requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(darwin|common)\.in|py3\.10/darwin\.txt)))$ pass_filenames: false args: - -v + - --build-isolation - --py-version=3.10 - --platform=darwin - --include=requirements/darwin.txt - --include=requirements/pytest.txt - --include=requirements/static/pkg/darwin.in - --include=requirements/static/ci/common.in - - --pip-args=--constraint=requirements/static/pkg/py{py_version}/darwin.txt + - --no-emit-index-url - requirements/static/ci/darwin.in - id: pip-tools-compile @@ -556,10 +602,11 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.9 - --platform=darwin - --out-prefix=darwin - - --pip-args=--constraint=requirements/static/ci/py{py_version}/darwin.txt + - --no-emit-index-url - requirements/static/ci/crypto.in - id: pip-tools-compile @@ -569,74 +616,79 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.10 - --platform=darwin - --out-prefix=darwin - - --pip-args=--constraint=requirements/static/ci/py{py_version}/darwin.txt + - --no-emit-index-url - requirements/static/ci/crypto.in - id: pip-tools-compile alias: compile-ci-windows-3.7-zmq-requirements name: Windows CI Py3.7 ZeroMQ Requirements - files: requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(windows|common)\.in|pkg/py3\.7/windows\.txt))$ + files: requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(windows|common)\.in|py3\.7/windows\.txt))$ pass_filenames: false args: - -v + - --build-isolation - --py-version=3.7 - --platform=windows - --include=requirements/windows.txt - --include=requirements/pytest.txt - --include=requirements/static/pkg/windows.in - --include=requirements/static/ci/common.in - - --pip-args=--constraint=requirements/static/pkg/py{py_version}/windows.txt + - --no-emit-index-url - requirements/static/ci/windows.in - id: pip-tools-compile alias: compile-ci-windows-3.8-zmq-requirements name: Windows CI Py3.8 ZeroMQ Requirements - files: requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(windows|common)\.in|pkg/py3\.8/windows\.txt))$ + files: requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(windows|common)\.in|py3\.8/windows\.txt))$ pass_filenames: false args: - -v + - --build-isolation - --py-version=3.8 - --platform=windows - --include=requirements/windows.txt - --include=requirements/pytest.txt - --include=requirements/static/pkg/windows.in - --include=requirements/static/ci/common.in - - --pip-args=--constraint=requirements/static/pkg/py{py_version}/windows.txt + - --no-emit-index-url - requirements/static/ci/windows.in - id: pip-tools-compile alias: compile-ci-windows-3.9-zmq-requirements name: Windows CI Py3.9 ZeroMQ Requirements - files: requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(windows|common)\.in|pkg/py3\.9/windows\.txt))$ + files: requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(windows|common)\.in|py3\.9/windows\.txt))$ pass_filenames: false args: - -v + - --build-isolation - --py-version=3.9 - --platform=windows - --include=requirements/windows.txt - --include=requirements/pytest.txt - --include=requirements/static/pkg/windows.in - --include=requirements/static/ci/common.in - - --pip-args=--constraint=requirements/static/pkg/py{py_version}/windows.txt + - --no-emit-index-url - requirements/static/ci/windows.in - id: pip-tools-compile alias: compile-ci-windows-3.10-zmq-requirements name: Windows CI Py3.10 ZeroMQ Requirements - files: requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(windows|common)\.in|pkg/py3\.10/windows\.txt))$ + files: requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(windows|common)\.in|py3\.10/windows\.txt))$ pass_filenames: false args: - -v + - --build-isolation - --py-version=3.10 - --platform=windows - --include=requirements/windows.txt - --include=requirements/pytest.txt - --include=requirements/static/pkg/windows.in - --include=requirements/static/ci/common.in - - --pip-args=--constraint=requirements/static/pkg/py{py_version}/windows.txt + - --no-emit-index-url - requirements/static/ci/windows.in - id: pip-tools-compile @@ -646,10 +698,11 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.7 - --platform=windows - --out-prefix=windows - - --pip-args=--constraint=requirements/static/ci/py{py_version}/windows.txt + - --no-emit-index-url - requirements/static/ci/crypto.in - id: pip-tools-compile @@ -659,10 +712,11 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.8 - --platform=windows - --out-prefix=windows - - --pip-args=--constraint=requirements/static/ci/py{py_version}/windows.txt + - --no-emit-index-url - requirements/static/ci/crypto.in - id: pip-tools-compile @@ -672,10 +726,11 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.9 - --platform=windows - --out-prefix=windows - - --pip-args=--constraint=requirements/static/ci/py{py_version}/windows.txt + - --no-emit-index-url - requirements/static/ci/crypto.in - id: pip-tools-compile @@ -685,10 +740,11 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.10 - --platform=windows - --out-prefix=windows - - --pip-args=--constraint=requirements/static/ci/py{py_version}/windows.txt + - --no-emit-index-url - requirements/static/ci/crypto.in # <---- CI Requirements -------------------------------------------------------------------------------------------- @@ -702,13 +758,14 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.7 - --include=requirements/base.txt - --include=requirements/zeromq.txt - --include=requirements/pytest.txt - --include=requirements/static/pkg/linux.in - --include=requirements/static/ci/common.in - - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt + - --no-emit-index-url - requirements/static/ci/cloud.in - id: pip-tools-compile @@ -718,13 +775,14 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.8 - --include=requirements/base.txt - --include=requirements/zeromq.txt - --include=requirements/pytest.txt - --include=requirements/static/pkg/linux.in - --include=requirements/static/ci/common.in - - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt + - --no-emit-index-url - requirements/static/ci/cloud.in - id: pip-tools-compile @@ -734,13 +792,14 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.9 - --include=requirements/base.txt - --include=requirements/zeromq.txt - --include=requirements/pytest.txt - --include=requirements/static/pkg/linux.in - --include=requirements/static/ci/common.in - - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt + - --no-emit-index-url - requirements/static/ci/cloud.in - id: pip-tools-compile @@ -750,13 +809,14 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.10 - --include=requirements/base.txt - --include=requirements/zeromq.txt - --include=requirements/pytest.txt - --include=requirements/static/pkg/linux.in - --include=requirements/static/ci/common.in - - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt + - --no-emit-index-url - requirements/static/ci/cloud.in # <---- Cloud CI Requirements -------------------------------------------------------------------------------------- @@ -768,10 +828,12 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.7 - --platform=linux - --include=requirements/base.txt - --include=requirements/zeromq.txt + - --no-emit-index-url - requirements/static/ci/docs.in - id: pip-tools-compile @@ -781,10 +843,12 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.8 - --platform=linux - --include=requirements/base.txt - --include=requirements/zeromq.txt + - --no-emit-index-url - requirements/static/ci/docs.in - id: pip-tools-compile @@ -794,10 +858,12 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.9 - --platform=linux - --include=requirements/base.txt - --include=requirements/zeromq.txt + - --no-emit-index-url - requirements/static/ci/docs.in - id: pip-tools-compile @@ -807,10 +873,12 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.10 - --platform=linux - --include=requirements/base.txt - --include=requirements/zeromq.txt + - --no-emit-index-url - requirements/static/ci/docs.in # <---- Doc CI Requirements ---------------------------------------------------------------------------------------- @@ -823,6 +891,7 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.7 - --platform=linux - --include=requirements/base.txt @@ -830,7 +899,7 @@ repos: - --include=requirements/static/pkg/linux.in - --include=requirements/static/ci/linux.in - --include=requirements/static/ci/common.in - - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt + - --no-emit-index-url - requirements/static/ci/lint.in - id: pip-tools-compile @@ -840,6 +909,7 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.8 - --platform=linux - --include=requirements/base.txt @@ -847,7 +917,7 @@ repos: - --include=requirements/static/pkg/linux.in - --include=requirements/static/ci/linux.in - --include=requirements/static/ci/common.in - - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt + - --no-emit-index-url - requirements/static/ci/lint.in - id: pip-tools-compile @@ -857,6 +927,7 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.9 - --platform=linux - --include=requirements/base.txt @@ -864,7 +935,7 @@ repos: - --include=requirements/static/pkg/linux.in - --include=requirements/static/ci/linux.in - --include=requirements/static/ci/common.in - - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt + - --no-emit-index-url - requirements/static/ci/lint.in - id: pip-tools-compile @@ -874,6 +945,7 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.10 - --platform=linux - --include=requirements/base.txt @@ -881,7 +953,7 @@ repos: - --include=requirements/static/pkg/linux.in - --include=requirements/static/ci/linux.in - --include=requirements/static/ci/common.in - - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt + - --no-emit-index-url - requirements/static/ci/lint.in # <---- Lint CI Requirements --------------------------------------------------------------------------------------- @@ -894,9 +966,10 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.8 - --platform=linux - - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt + - --no-emit-index-url - requirements/static/ci/changelog.in - id: pip-tools-compile @@ -906,9 +979,10 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.9 - --platform=linux - - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt + - --no-emit-index-url - requirements/static/ci/changelog.in - id: pip-tools-compile @@ -918,9 +992,10 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.10 - --platform=linux - - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt + - --no-emit-index-url - requirements/static/ci/changelog.in # <---- Changelog -------------------------------------------------------------------------------------------------- @@ -932,8 +1007,9 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.7 - - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt + - --no-emit-index-url - requirements/static/ci/invoke.in - id: pip-tools-compile @@ -943,8 +1019,9 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.8 - - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt + - --no-emit-index-url - requirements/static/ci/invoke.in - id: pip-tools-compile @@ -954,8 +1031,9 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.9 - - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt + - --no-emit-index-url - requirements/static/ci/invoke.in - id: pip-tools-compile @@ -965,12 +1043,12 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.10 - - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt + - --no-emit-index-url - requirements/static/ci/invoke.in # <---- Invoke ----------------------------------------------------------------------------------------------------- - # ----- Tools ----------------------------------------------------------------------------------------------------> - id: pip-tools-compile alias: compile-ci-tools-3.9-requirements @@ -979,8 +1057,9 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.9 - - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt + - --no-emit-index-url - requirements/static/ci/tools.in - id: pip-tools-compile @@ -990,8 +1069,9 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.10 - - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt + - --no-emit-index-url - requirements/static/ci/tools.in - id: pip-tools-compile @@ -1001,8 +1081,9 @@ repos: pass_filenames: false args: - -v + - --build-isolation - --py-version=3.11 - - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt + - --no-emit-index-url - requirements/static/ci/tools.in # <---- Tools ----------------------------------------------------------------------------------------------------- diff --git a/requirements/static/ci/changelog.in b/requirements/static/ci/changelog.in index 5f923d27d45..ffff2d99916 100644 --- a/requirements/static/ci/changelog.in +++ b/requirements/static/ci/changelog.in @@ -1,3 +1,5 @@ +--constraint=./py{py_version}/{platform}.txt + towncrier==22.12.0 looseversion packaging diff --git a/requirements/static/ci/cloud.in b/requirements/static/ci/cloud.in index 0d60c2d9a43..29675cccf05 100644 --- a/requirements/static/ci/cloud.in +++ b/requirements/static/ci/cloud.in @@ -1,4 +1,6 @@ # Cloud tests requirements +--constraint=./py{py_version}/{platform}.txt + apache-libcloud>=2.5.0 netaddr profitbricks diff --git a/requirements/static/ci/common.in b/requirements/static/ci/common.in index 44ad3a33d3d..5763cac19de 100644 --- a/requirements/static/ci/common.in +++ b/requirements/static/ci/common.in @@ -1,13 +1,15 @@ # Requirements in this file apply to all platforms. # We can also exclude platforms from the requirements using markers, but if a requirement only applies # to a particular platform, please add it to the corresponding `.in` file in this directory. +--constraint=../pkg/py{py_version}/{platform}.txt + azure==4.0.0; sys_platform != 'win32' apache-libcloud>=1.5.0; sys_platform != 'win32' boto3>=1.17.67 boto>=2.46.0 cassandra-driver>=2.0 certifi>=2022.12.07 -cffi>=1.15.1 +cffi>=1.14.6 cherrypy>=17.4.1 clustershell croniter>=0.3.0,!=0.3.22"; sys_platform != 'win32' diff --git a/requirements/static/ci/crypto.in b/requirements/static/ci/crypto.in index 83e67bcfc7e..0724745aad2 100644 --- a/requirements/static/ci/crypto.in +++ b/requirements/static/ci/crypto.in @@ -1,2 +1,4 @@ +--constraint=./py{py_version}/{platform}.txt + m2crypto pycryptodome diff --git a/requirements/static/ci/darwin.in b/requirements/static/ci/darwin.in index 9ab7e15587a..49b95223e8b 100644 --- a/requirements/static/ci/darwin.in +++ b/requirements/static/ci/darwin.in @@ -2,6 +2,8 @@ # XXX: Temporarily do not install pylxd. # pylxd(or likely ws4py) will cause the test suite to hang at the finish line under runtests.py # pylxd>=2.2.5 +--constraint=../pkg/py{py_version}/{platform}.txt + yamlordereddictloader pygit2>=1.2.0 yamllint diff --git a/requirements/static/ci/freebsd.in b/requirements/static/ci/freebsd.in index 00f34fddee4..b628d6514a2 100644 --- a/requirements/static/ci/freebsd.in +++ b/requirements/static/ci/freebsd.in @@ -1,4 +1,6 @@ # FreeBSD static CI requirements +--constraint=../pkg/py{py_version}/{platform}.txt + pygit2==1.8.0 yamllint mercurial diff --git a/requirements/static/ci/invoke.in b/requirements/static/ci/invoke.in index 87633def656..4b924892386 100644 --- a/requirements/static/ci/invoke.in +++ b/requirements/static/ci/invoke.in @@ -1,3 +1,5 @@ +--constraint=./py{py_version}/{platform}.txt + invoke blessings pyyaml diff --git a/requirements/static/ci/lint.in b/requirements/static/ci/lint.in index 66fd8c7fa96..86ed3a61c28 100644 --- a/requirements/static/ci/lint.in +++ b/requirements/static/ci/lint.in @@ -1,4 +1,6 @@ # Lint requirements +--constraint=./py{py_version}/{platform}.txt + docker pylint==2.4.4 SaltPyLint>=2023.3.8 diff --git a/requirements/static/ci/linux.in b/requirements/static/ci/linux.in index a76d02ccc5c..34c2c054a27 100644 --- a/requirements/static/ci/linux.in +++ b/requirements/static/ci/linux.in @@ -1,4 +1,6 @@ # Linux static CI requirements +--constraint=../pkg/py{py_version}/{platform}.txt + pyiface pygit2<1.1.0; python_version <= '3.8' pygit2>=1.4.0; python_version > '3.8' @@ -13,4 +15,4 @@ mercurial hglib redis-py-cluster python-consul -slack_bolt +slack-bolt diff --git a/requirements/static/ci/py3.10/changelog.txt b/requirements/static/ci/py3.10/changelog.txt index 0865f49c94b..00114bce949 100644 --- a/requirements/static/ci/py3.10/changelog.txt +++ b/requirements/static/ci/py3.10/changelog.txt @@ -2,26 +2,37 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.10/changelog.txt --pip-args='--constraint=requirements/static/ci/py3.10/linux.txt' requirements/static/ci/changelog.in +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.10/changelog.txt requirements/static/ci/changelog.in # click-default-group==1.2.2 # via towncrier -click==7.1.2 +click==7.1.1 # via + # -c requirements/static/ci/py3.10/linux.txt # click-default-group # towncrier incremental==17.5.0 # via towncrier jinja2==3.1.2 - # via towncrier -looseversion==1.0.3 - # via -r requirements/static/ci/changelog.in -markupsafe==2.0.1 - # via jinja2 -packaging==23.0 - # via -r requirements/static/ci/changelog.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # towncrier +looseversion==1.0.2 + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/changelog.in +markupsafe==2.1.2 + # via + # -c requirements/static/ci/py3.10/linux.txt + # jinja2 +packaging==22.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/changelog.in tomli==2.0.1 - # via towncrier + # via + # -c requirements/static/ci/py3.10/linux.txt + # towncrier towncrier==22.12.0 # via -r requirements/static/ci/changelog.in diff --git a/requirements/static/ci/py3.10/cloud.txt b/requirements/static/ci/py3.10/cloud.txt index b51bde02565..e48350786cf 100644 --- a/requirements/static/ci/py3.10/cloud.txt +++ b/requirements/static/ci/py3.10/cloud.txt @@ -2,28 +2,38 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.10/cloud.txt --pip-args='--constraint=requirements/static/ci/py3.10/linux.txt' requirements/base.txt requirements/pytest.txt requirements/static/ci/cloud.in requirements/static/ci/common.in requirements/static/pkg/linux.in requirements/zeromq.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.10/cloud.txt requirements/base.txt requirements/pytest.txt requirements/static/ci/cloud.in requirements/static/ci/common.in requirements/static/pkg/linux.in requirements/zeromq.txt # -adal==1.2.7 +adal==1.2.3 # via + # -c requirements/static/ci/py3.10/linux.txt # azure-datalake-store # msrestazure aiohttp==3.8.5 - # via etcd3-py + # via + # -c requirements/static/ci/py3.10/linux.txt + # etcd3-py aiosignal==1.2.0 - # via aiohttp + # via + # -c requirements/static/ci/py3.10/linux.txt + # aiohttp apache-libcloud==2.5.0 ; sys_platform != "win32" # via + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/cloud.in # -r requirements/static/ci/common.in -asn1crypto==1.4.0 +asn1crypto==1.3.0 # via + # -c requirements/static/ci/py3.10/linux.txt # certvalidator # oscrypto async-timeout==4.0.2 - # via aiohttp + # via + # -c requirements/static/ci/py3.10/linux.txt + # aiohttp attrs==23.1.0 # via + # -c requirements/static/ci/py3.10/linux.txt # aiohttp # jsonschema # pytest @@ -32,11 +42,16 @@ attrs==23.1.0 # pytest-skip-markers # pytest-system-statistics azure-applicationinsights==0.1.0 - # via azure -azure-batch==4.1.3 - # via azure -azure-common==1.1.27 # via + # -c requirements/static/ci/py3.10/linux.txt + # azure +azure-batch==4.1.3 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure +azure-common==1.1.18 + # via + # -c requirements/static/ci/py3.10/linux.txt # azure-applicationinsights # azure-batch # azure-cosmosdb-table @@ -112,107 +127,205 @@ azure-common==1.1.27 # azure-storage-file # azure-storage-queue azure-cosmosdb-nspkg==2.0.2 - # via azure-cosmosdb-table -azure-cosmosdb-table==1.0.6 - # via azure -azure-datalake-store==0.0.52 - # via azure -azure-eventgrid==1.3.0 - # via azure + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-cosmosdb-table +azure-cosmosdb-table==1.0.5 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure +azure-datalake-store==0.0.44 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure +azure-eventgrid==1.2.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure azure-graphrbac==0.40.0 - # via azure + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure azure-keyvault==1.1.0 - # via azure + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure azure-loganalytics==0.1.0 - # via azure + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure azure-mgmt-advisor==1.0.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-applicationinsights==0.1.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-authorization==0.50.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-batch==5.0.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-batchai==2.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-billing==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-cdn==3.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-cognitiveservices==3.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-commerce==1.0.1 - # via azure-mgmt -azure-mgmt-compute==4.6.2 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt +azure-mgmt-compute==4.6.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-consumption==2.0.0 - # via azure-mgmt -azure-mgmt-containerinstance==1.5.0 - # via azure-mgmt -azure-mgmt-containerregistry==2.8.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt +azure-mgmt-containerinstance==1.4.1 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt +azure-mgmt-containerregistry==2.7.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-containerservice==4.4.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-cosmosdb==0.4.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-datafactory==0.6.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-datalake-analytics==0.6.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-datalake-nspkg==3.0.1 # via + # -c requirements/static/ci/py3.10/linux.txt # azure-mgmt-datalake-analytics # azure-mgmt-datalake-store azure-mgmt-datalake-store==0.5.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-datamigration==1.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-devspaces==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-devtestlabs==2.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-dns==2.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-eventgrid==1.0.0 - # via azure-mgmt -azure-mgmt-eventhub==2.6.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt +azure-mgmt-eventhub==2.5.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-hanaonazure==0.1.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-iotcentral==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-iothub==0.5.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-iothubprovisioningservices==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-keyvault==1.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-loganalytics==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-logic==3.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-machinelearningcompute==0.4.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-managementgroups==0.1.0 - # via azure-mgmt -azure-mgmt-managementpartner==0.1.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt +azure-mgmt-managementpartner==0.1.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-maps==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-marketplaceordering==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-media==1.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-monitor==0.5.2 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-msi==0.2.0 - # via azure-mgmt -azure-mgmt-network==2.7.0 - # via azure-mgmt -azure-mgmt-notificationhubs==2.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt +azure-mgmt-network==2.6.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt +azure-mgmt-notificationhubs==2.0.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-nspkg==3.0.2 # via + # -c requirements/static/ci/py3.10/linux.txt # azure-mgmt-advisor # azure-mgmt-applicationinsights # azure-mgmt-authorization @@ -239,10 +352,12 @@ azure-mgmt-nspkg==3.0.2 # azure-mgmt-logic # azure-mgmt-machinelearningcompute # azure-mgmt-managementgroups + # azure-mgmt-managementpartner # azure-mgmt-maps # azure-mgmt-marketplaceordering # azure-mgmt-monitor # azure-mgmt-msi + # azure-mgmt-notificationhubs # azure-mgmt-policyinsights # azure-mgmt-powerbiembedded # azure-mgmt-recoveryservices @@ -251,6 +366,7 @@ azure-mgmt-nspkg==3.0.2 # azure-mgmt-relay # azure-mgmt-reservations # azure-mgmt-scheduler + # azure-mgmt-search # azure-mgmt-servicefabric # azure-mgmt-signalr # azure-mgmt-sql @@ -259,50 +375,92 @@ azure-mgmt-nspkg==3.0.2 # azure-mgmt-trafficmanager # azure-mgmt-web azure-mgmt-policyinsights==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-powerbiembedded==2.0.0 - # via azure-mgmt -azure-mgmt-rdbms==1.9.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt +azure-mgmt-rdbms==1.8.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-recoveryservices==0.3.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-recoveryservicesbackup==0.3.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-redis==5.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-relay==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-reservations==0.2.1 - # via azure-mgmt -azure-mgmt-resource==2.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt +azure-mgmt-resource==2.1.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-scheduler==2.0.0 - # via azure-mgmt -azure-mgmt-search==2.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt +azure-mgmt-search==2.0.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-servicebus==0.5.3 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-servicefabric==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-signalr==0.1.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-sql==0.9.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-storage==2.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-subscription==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-trafficmanager==0.50.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-web==0.35.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt==4.0.0 - # via azure + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure azure-nspkg==3.0.2 # via + # -c requirements/static/ci/py3.10/linux.txt # azure-applicationinsights # azure-batch # azure-cosmosdb-nspkg + # azure-eventgrid # azure-graphrbac # azure-keyvault # azure-loganalytics @@ -311,82 +469,135 @@ azure-nspkg==3.0.2 # azure-servicefabric # azure-servicemanagement-legacy azure-servicebus==0.21.1 - # via azure -azure-servicefabric==6.3.0.0 - # via azure -azure-servicemanagement-legacy==0.20.7 - # via azure -azure-storage-blob==1.5.0 - # via azure -azure-storage-common==1.4.2 # via + # -c requirements/static/ci/py3.10/linux.txt + # azure +azure-servicefabric==6.3.0.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure +azure-servicemanagement-legacy==0.20.6 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure +azure-storage-blob==1.5.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure +azure-storage-common==1.4.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-cosmosdb-table # azure-storage-blob # azure-storage-file # azure-storage-queue azure-storage-file==1.4.0 - # via azure -azure-storage-queue==1.4.0 - # via azure -azure==4.0.0 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in -backports.entry-points-selectable==1.1.0 - # via virtualenv -bcrypt==3.2.0 # via + # -c requirements/static/ci/py3.10/linux.txt + # azure +azure-storage-queue==1.4.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure +azure==4.0.0 ; sys_platform != "win32" + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in +backports.entry-points-selectable==1.1.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # virtualenv +bcrypt==3.1.6 + # via + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/common.in # paramiko boto3==1.21.46 # via + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/common.in # moto boto==2.49.0 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in botocore==1.24.46 # via + # -c requirements/static/ci/py3.10/linux.txt # boto3 # moto # s3transfer cachetools==4.2.2 - # via google-auth -cassandra-driver==3.25.0 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # google-auth +cassandra-driver==3.23.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in certifi==2023.07.22 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/common.in # kubernetes # msrest # requests certvalidator==0.11.1 - # via vcert -cffi==1.15.1 # via + # -c requirements/static/ci/py3.10/linux.txt + # vcert +cffi==1.14.6 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/common.in # azure-datalake-store # bcrypt # cryptography # pynacl -charset-normalizer==2.0.12 +charset-normalizer==3.2.0 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # aiohttp # requests -cheetah3==3.2.6.post1 - # via -r requirements/static/ci/common.in +cheetah3==3.2.6.post2 + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in cheroot==8.5.2 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # cherrypy cherrypy==18.6.1 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/linux.in -click==8.0.1 - # via geomet +click==7.1.1 + # via + # -c requirements/static/ci/py3.10/linux.txt + # geomet clustershell==1.8.3 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in contextvars==2.4 - # via -r requirements/base.txt -croniter==1.0.15 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/base.txt +croniter==0.3.29 ; sys_platform != "win32" + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in cryptography==41.0.4 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/pkg/linux.in # adal # azure-cosmosdb-table @@ -401,121 +612,207 @@ cryptography==41.0.4 # smbprotocol # vcert distlib==0.3.2 - # via virtualenv -distro==1.6.0 # via + # -c requirements/static/ci/py3.10/linux.txt + # virtualenv +distro==1.5.0 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/base.txt # pytest-skip-markers -dnspython==2.1.0 +dnspython==1.16.0 # via + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/common.in # python-etcd docker==6.1.3 - # via -r requirements/pytest.txt + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/pytest.txt etcd3-py==0.1.6 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in exceptiongroup==1.0.4 - # via pytest + # via + # -c requirements/static/ci/py3.10/linux.txt + # pytest filelock==3.0.12 - # via virtualenv + # via + # -c requirements/static/ci/py3.10/linux.txt + # virtualenv flaky==3.7.0 - # via -r requirements/pytest.txt + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/pytest.txt frozenlist==1.3.0 # via + # -c requirements/static/ci/py3.10/linux.txt # aiohttp # aiosignal genshi==0.7.5 - # via -r requirements/static/ci/common.in -geomet==0.2.1.post1 - # via cassandra-driver -gitdb==4.0.7 - # via gitpython + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in +geomet==0.1.2 + # via + # -c requirements/static/ci/py3.10/linux.txt + # cassandra-driver +gitdb==4.0.5 + # via + # -c requirements/static/ci/py3.10/linux.txt + # gitpython gitpython==3.1.35 - # via -r requirements/static/ci/common.in -google-auth==2.1.0 - # via kubernetes + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in +google-auth==1.6.3 + # via + # -c requirements/static/ci/py3.10/linux.txt + # kubernetes idna==2.8 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # etcd3-py # requests # yarl -immutables==0.19 - # via contextvars -importlib-metadata==6.0.0 - # via -r requirements/static/pkg/linux.in -iniconfig==1.1.1 - # via pytest -ipaddress==1.0.23 - # via kubernetes -isodate==0.6.0 - # via msrest -jaraco.classes==3.2.1 - # via jaraco.collections -jaraco.collections==3.4.0 - # via cherrypy -jaraco.functools==3.3.0 +immutables==0.15 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # contextvars +importlib-metadata==6.0.0 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/pkg/linux.in +iniconfig==1.0.1 + # via + # -c requirements/static/ci/py3.10/linux.txt + # pytest +ipaddress==1.0.22 + # via + # -c requirements/static/ci/py3.10/linux.txt + # kubernetes +isodate==0.6.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # msrest +jaraco.classes==3.2.1 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # jaraco.collections +jaraco.collections==3.4.0 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # cherrypy +jaraco.functools==2.0 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # cheroot # jaraco.text # tempora jaraco.text==3.5.1 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # jaraco.collections jinja2==3.1.2 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/base.txt # junos-eznc # moto -jmespath==0.10.0 +jmespath==1.0.1 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # boto3 # botocore jsonschema==3.2.0 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in junos-eznc==2.6.0 ; sys_platform != "win32" and python_version <= "3.10" - # via -r requirements/static/ci/common.in -jxmlease==1.0.3 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in -kazoo==2.8.0 ; sys_platform != "win32" and sys_platform != "darwin" - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in +jxmlease==1.0.1 ; sys_platform != "win32" + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in +kazoo==2.6.1 ; sys_platform != "win32" and sys_platform != "darwin" + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in keyring==5.7.1 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in kubernetes==3.0.0 - # via -r requirements/static/ci/common.in -libnacl==1.8.0 ; sys_platform != "win32" and sys_platform != "darwin" - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in +libnacl==1.7.1 ; sys_platform != "win32" and sys_platform != "darwin" + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in looseversion==1.0.2 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/base.txt lxml==4.9.1 # via + # -c requirements/static/ci/py3.10/linux.txt # junos-eznc # ncclient mako==1.2.2 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in markupsafe==2.1.2 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/base.txt # jinja2 # mako # moto # werkzeug -mock==4.0.3 - # via -r requirements/pytest.txt -more-itertools==8.8.0 +mock==3.0.5 # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/pytest.txt +more-itertools==5.0.0 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # cheroot # cherrypy # jaraco.classes # jaraco.functools moto==3.0.1 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in msgpack==1.0.2 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/base.txt # pytest-salt-factories -msrest==0.6.21 +msrest==0.6.14 # via + # -c requirements/static/ci/py3.10/linux.txt # azure-applicationinsights # azure-eventgrid # azure-keyvault @@ -528,20 +825,18 @@ msrest==0.6.21 # azure-mgmt-dns # azure-mgmt-eventhub # azure-mgmt-keyvault - # azure-mgmt-managementpartner # azure-mgmt-media # azure-mgmt-network - # azure-mgmt-notificationhubs # azure-mgmt-rdbms # azure-mgmt-resource - # azure-mgmt-search # azure-mgmt-servicebus # azure-mgmt-servicefabric # azure-mgmt-signalr # azure-servicefabric # msrestazure -msrestazure==0.6.4 +msrestazure==0.6.3 # via + # -c requirements/static/ci/py3.10/linux.txt # azure-batch # azure-eventgrid # azure-graphrbac @@ -608,112 +903,174 @@ msrestazure==0.6.4 # azure-mgmt-web multidict==6.0.2 # via + # -c requirements/static/ci/py3.10/linux.txt # aiohttp # yarl ncclient==0.6.9 - # via junos-eznc + # via + # -c requirements/static/ci/py3.10/linux.txt + # junos-eznc netaddr==0.7.19 # via + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/cloud.in # junos-eznc ntlm-auth==1.3.0 # via requests-ntlm oauthlib==3.2.2 - # via requests-oauthlib -oscrypto==1.2.1 - # via certvalidator -packaging==21.3 # via + # -c requirements/static/ci/py3.10/linux.txt + # requests-oauthlib +oscrypto==1.2.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # certvalidator +packaging==22.0 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/base.txt # docker # pytest paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin" # via + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/common.in # junos-eznc # ncclient # scp passlib==1.7.4 - # via -r requirements/static/ci/common.in -platformdirs==2.3.0 - # via virtualenv -pluggy==1.0.0 - # via pytest -portend==2.7.1 - # via cherrypy + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in +pathtools==0.1.2 + # via + # -c requirements/static/ci/py3.10/linux.txt + # watchdog +platformdirs==2.2.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # virtualenv +pluggy==0.13.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # pytest +portend==2.4 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # cherrypy profitbricks==4.1.3 # via -r requirements/static/ci/cloud.in psutil==5.8.0 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/base.txt # pytest-salt-factories # pytest-shell-utilities # pytest-system-statistics -pyasn1-modules==0.2.8 - # via google-auth +pyasn1-modules==0.2.4 + # via + # -c requirements/static/ci/py3.10/linux.txt + # google-auth pyasn1==0.4.8 # via + # -c requirements/static/ci/py3.10/linux.txt # pyasn1-modules # rsa pycparser==2.21 ; python_version >= "3.9" # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/linux.in # cffi -pycryptodomex==3.10.1 - # via -r requirements/crypto.txt +pycryptodomex==3.9.8 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/crypto.txt pyinotify==0.9.6 ; sys_platform != "win32" and sys_platform != "darwin" and platform_system != "openbsd" - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in pyjwt==2.4.0 - # via adal + # via + # -c requirements/static/ci/py3.10/linux.txt + # adal pynacl==1.5.0 # via + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/common.in # paramiko pyopenssl==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/pkg/linux.in # etcd3-py pyparsing==3.0.9 # via + # -c requirements/static/ci/py3.10/linux.txt # junos-eznc - # packaging pypsexec==0.1.0 # via -r requirements/static/ci/cloud.in -pyrsistent==0.18.0 - # via jsonschema -pyserial==3.5 - # via junos-eznc +pyrsistent==0.17.3 + # via + # -c requirements/static/ci/py3.10/linux.txt + # jsonschema +pyserial==3.4 + # via + # -c requirements/static/ci/py3.10/linux.txt + # junos-eznc pyspnego==0.8.0 # via # -r requirements/static/ci/cloud.in # smbprotocol pytest-custom-exit-code==0.3.0 - # via -r requirements/pytest.txt + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/pytest.txt pytest-helpers-namespace==2021.4.29 # via + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/pytest.txt # pytest-salt-factories # pytest-shell-utilities pytest-httpserver==1.0.4 - # via -r requirements/pytest.txt + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/pytest.txt pytest-salt-factories==1.0.0rc26 - # via -r requirements/pytest.txt + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/pytest.txt pytest-shell-utilities==1.8.0 - # via pytest-salt-factories + # via + # -c requirements/static/ci/py3.10/linux.txt + # pytest-salt-factories pytest-skip-markers==1.4.1 # via + # -c requirements/static/ci/py3.10/linux.txt # pytest-salt-factories # pytest-shell-utilities # pytest-system-statistics -pytest-subtests==0.5.0 - # via -r requirements/pytest.txt +pytest-subtests==0.4.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/pytest.txt pytest-system-statistics==1.0.2 - # via pytest-salt-factories -pytest-timeout==2.0.2 - # via -r requirements/pytest.txt + # via + # -c requirements/static/ci/py3.10/linux.txt + # pytest-salt-factories +pytest-timeout==1.4.2 + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/pytest.txt pytest==7.2.0 # via + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/pytest.txt # pytest-custom-exit-code # pytest-helpers-namespace @@ -723,8 +1080,10 @@ pytest==7.2.0 # pytest-subtests # pytest-system-statistics # pytest-timeout -python-dateutil==2.8.2 +python-dateutil==2.8.1 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/pkg/linux.in # adal # azure-cosmosdb-table @@ -735,19 +1094,30 @@ python-dateutil==2.8.2 # moto # vcert python-etcd==0.4.5 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in python-gnupg==0.4.8 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/pkg/linux.in pytz==2022.1 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # moto # tempora -pyvmomi==7.0.2 - # via -r requirements/static/ci/common.in +pyvmomi==6.7.1.2018.12 + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in pywinrm==0.3.0 # via -r requirements/static/ci/cloud.in pyyaml==6.0.1 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/base.txt # clustershell # junos-eznc @@ -756,14 +1126,20 @@ pyyaml==6.0.1 # yamlordereddictloader pyzmq==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/zeromq.txt # pytest-salt-factories requests-ntlm==1.1.0 # via pywinrm requests-oauthlib==1.3.0 - # via msrest + # via + # -c requirements/static/ci/py3.10/linux.txt + # msrest requests==2.31.0 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # adal @@ -786,36 +1162,58 @@ requests==2.31.0 # requests-oauthlib # responses # vcert -responses==0.14.0 - # via moto +responses==0.10.6 + # via + # -c requirements/static/ci/py3.10/linux.txt + # moto rfc3987==1.3.8 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in rpm-vercmp==0.1.2 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/pkg/linux.in rsa==4.7.2 - # via google-auth -s3transfer==0.5.0 - # via boto3 -scp==0.14.1 - # via junos-eznc + # via + # -c requirements/static/ci/py3.10/linux.txt + # google-auth +s3transfer==0.5.2 + # via + # -c requirements/static/ci/py3.10/linux.txt + # boto3 +scp==0.13.2 + # via + # -c requirements/static/ci/py3.10/linux.txt + # junos-eznc semantic-version==2.9.0 - # via etcd3-py + # via + # -c requirements/static/ci/py3.10/linux.txt + # etcd3-py setproctitle==1.3.2 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/pkg/linux.in six==1.16.0 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # bcrypt # cassandra-driver # cheroot # etcd3-py # genshi # geomet + # google-auth # isodate # jsonschema # junos-eznc # kazoo # kubernetes - # msrestazure + # mock + # more-itertools # ncclient # paramiko # profitbricks @@ -832,64 +1230,104 @@ smbprotocol==1.10.1 # via # -r requirements/static/ci/cloud.in # pypsexec -smmap==4.0.0 - # via gitdb +smmap==3.0.4 + # via + # -c requirements/static/ci/py3.10/linux.txt + # gitdb sqlparse==0.4.4 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in strict-rfc3339==0.7 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in tempora==4.1.1 - # via portend + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # portend timelib==0.2.5 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/pkg/linux.in toml==0.10.2 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in tomli==2.0.1 - # via pytest -transitions==0.8.9 - # via junos-eznc + # via + # -c requirements/static/ci/py3.10/linux.txt + # pytest +transitions==0.8.1 + # via + # -c requirements/static/ci/py3.10/linux.txt + # junos-eznc typing-extensions==4.2.0 # via + # -c requirements/static/ci/py3.10/linux.txt # pytest-shell-utilities # pytest-system-statistics urllib3==1.26.6 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # botocore # docker # kubernetes # python-etcd # requests - # responses vcert==0.7.4 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in -virtualenv==20.8.0 # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in +virtualenv==20.7.2 + # via + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/common.in # pytest-salt-factories -watchdog==2.1.5 - # via -r requirements/static/ci/common.in +watchdog==0.10.3 + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in websocket-client==0.40.0 # via + # -c requirements/static/ci/py3.10/linux.txt # docker # kubernetes wempy==0.2.1 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in werkzeug==2.2.3 # via + # -c requirements/static/ci/py3.10/linux.txt # moto # pytest-httpserver xmltodict==0.12.0 # via + # -c requirements/static/ci/py3.10/linux.txt # moto # pywinrm yamlordereddictloader==0.4.0 - # via junos-eznc + # via + # -c requirements/static/ci/py3.10/linux.txt + # junos-eznc yarl==1.7.2 - # via aiohttp -zc.lockfile==2.0 - # via cherrypy + # via + # -c requirements/static/ci/py3.10/linux.txt + # aiohttp +zc.lockfile==1.4 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # cherrypy zipp==3.6.0 - # via importlib-metadata + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/static/ci/py3.10/darwin-crypto.txt b/requirements/static/ci/py3.10/darwin-crypto.txt index 73a0145e1dc..6b855b4848e 100644 --- a/requirements/static/ci/py3.10/darwin-crypto.txt +++ b/requirements/static/ci/py3.10/darwin-crypto.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.10/darwin-crypto.txt --pip-args='--constraint=requirements/static/ci/py3.10/darwin.txt' requirements/static/ci/crypto.in +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.10/darwin-crypto.txt requirements/static/ci/crypto.in # m2crypto==0.38.0 # via -r requirements/static/ci/crypto.in diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index 3e7941d1037..67cfd61cefc 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.10/darwin.txt --pip-args='--constraint=requirements/static/pkg/py3.10/darwin.txt' requirements/darwin.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/darwin.in requirements/static/pkg/darwin.in +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.10/darwin.txt requirements/darwin.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/darwin.in requirements/static/pkg/darwin.in # adal==1.2.5 # via @@ -14,6 +14,7 @@ aiosignal==1.2.0 # via aiohttp apache-libcloud==2.5.0 ; sys_platform != "win32" # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt # -r requirements/darwin.txt # -r requirements/static/ci/common.in asn1crypto==1.3.0 @@ -352,30 +353,36 @@ cassandra-driver==3.23.0 # via -r requirements/static/ci/common.in certifi==2023.07.22 # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt # -r requirements/static/ci/common.in # kubernetes # msrest # requests certvalidator==0.11.1 # via vcert -cffi==1.15.1 +cffi==1.14.6 # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt # -r requirements/static/ci/common.in # azure-datalake-store # bcrypt # cryptography # pygit2 # pynacl -charset-normalizer==2.0.12 +charset-normalizer==3.2.0 # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt # aiohttp # requests cheetah3==3.2.6.post2 # via -r requirements/static/ci/common.in cheroot==8.5.2 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt + # cherrypy cherrypy==18.6.1 # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt # -r requirements/darwin.txt # -r requirements/static/ci/common.in click==7.0 @@ -383,11 +390,14 @@ click==7.0 clustershell==1.8.1 # via -r requirements/static/ci/common.in contextvars==2.4 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt + # -r requirements/base.txt croniter==0.3.29 ; sys_platform != "win32" # via -r requirements/static/ci/common.in cryptography==41.0.4 # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt # -r requirements/darwin.txt # adal # azure-cosmosdb-table @@ -402,6 +412,7 @@ distlib==0.3.2 # via virtualenv distro==1.5.0 # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt # -r requirements/base.txt # pytest-skip-markers dnspython==1.16.0 @@ -427,9 +438,12 @@ genshi==0.7.5 geomet==0.1.2 # via cassandra-driver gitdb==4.0.5 - # via gitpython + # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt + # gitpython gitpython==3.1.35 # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt # -r requirements/darwin.txt # -r requirements/static/ci/common.in google-auth==1.6.3 @@ -438,14 +452,19 @@ hglib==2.6.1 # via -r requirements/static/ci/darwin.in idna==2.8 # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt # -r requirements/darwin.txt # etcd3-py # requests # yarl immutables==0.15 - # via contextvars + # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt + # contextvars importlib-metadata==6.0.0 - # via -r requirements/darwin.txt + # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt + # -r requirements/darwin.txt iniconfig==1.0.1 # via pytest ipaddress==1.0.22 @@ -453,23 +472,32 @@ ipaddress==1.0.22 isodate==0.6.0 # via msrest jaraco.classes==3.2.1 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt + # jaraco.collections jaraco.collections==3.4.0 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt + # cherrypy jaraco.functools==2.0 # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt # cheroot # jaraco.text # tempora jaraco.text==3.5.1 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt + # jaraco.collections jinja2==3.1.2 # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt # -r requirements/base.txt # junos-eznc # moto jmespath==1.0.1 # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # boto3 @@ -485,9 +513,13 @@ keyring==5.7.1 kubernetes==3.0.0 # via -r requirements/static/ci/common.in linode-python==1.1.1 - # via -r requirements/darwin.txt + # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt + # -r requirements/darwin.txt looseversion==1.0.2 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt + # -r requirements/base.txt lxml==4.9.1 # via # junos-eznc @@ -496,6 +528,7 @@ mako==1.2.2 # via -r requirements/static/ci/common.in markupsafe==2.1.2 # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt # -r requirements/base.txt # jinja2 # mako @@ -507,6 +540,7 @@ mock==3.0.5 # via -r requirements/pytest.txt more-itertools==8.2.0 # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt # cheroot # cherrypy # jaraco.classes @@ -515,6 +549,7 @@ moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt # -r requirements/base.txt # pytest-salt-factories msrest==0.6.19 @@ -621,8 +656,9 @@ oauthlib==3.2.2 # via requests-oauthlib oscrypto==1.2.0 # via certvalidator -packaging==21.3 +packaging==22.0 # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt # -r requirements/base.txt # docker # pytest @@ -642,9 +678,12 @@ platformdirs==2.2.0 pluggy==0.13.1 # via pytest portend==2.6 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt + # cherrypy psutil==5.8.0 # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt # -r requirements/base.txt # pytest-salt-factories # pytest-shell-utilities @@ -653,16 +692,20 @@ pyasn1-modules==0.2.4 # via google-auth pyasn1==0.4.8 # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt # -r requirements/darwin.txt # pyasn1-modules # rsa pycparser==2.21 ; python_version >= "3.9" # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt # -r requirements/darwin.txt # -r requirements/static/ci/common.in # cffi pycryptodomex==3.9.8 - # via -r requirements/crypto.txt + # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt + # -r requirements/crypto.txt pygit2==1.9.1 # via -r requirements/static/ci/darwin.in pyjwt==2.4.0 @@ -673,12 +716,11 @@ pynacl==1.5.0 # paramiko pyopenssl==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt # -r requirements/darwin.txt # etcd3-py pyparsing==3.0.9 - # via - # junos-eznc - # packaging + # via junos-eznc pyrsistent==0.17.3 # via jsonschema pyserial==3.4 @@ -720,6 +762,7 @@ pytest==7.2.0 # pytest-timeout python-dateutil==2.8.0 # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt # -r requirements/darwin.txt # adal # azure-cosmosdb-table @@ -732,15 +775,19 @@ python-dateutil==2.8.0 python-etcd==0.4.5 # via -r requirements/static/ci/common.in python-gnupg==0.4.8 - # via -r requirements/darwin.txt + # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt + # -r requirements/darwin.txt pytz==2022.1 # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt # moto # tempora pyvmomi==6.7.1.2018.12 # via -r requirements/static/ci/common.in pyyaml==6.0.1 # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt # -r requirements/base.txt # clustershell # junos-eznc @@ -750,12 +797,14 @@ pyyaml==6.0.1 # yamlordereddictloader pyzmq==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt # -r requirements/zeromq.txt # pytest-salt-factories requests-oauthlib==1.3.0 # via msrest requests==2.31.0 # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # adal @@ -789,9 +838,12 @@ scp==0.13.2 semantic-version==2.9.0 # via etcd3-py setproctitle==1.3.2 - # via -r requirements/darwin.txt + # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt + # -r requirements/darwin.txt six==1.16.0 # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt # bcrypt # cassandra-driver # cheroot @@ -815,15 +867,21 @@ six==1.16.0 # virtualenv # websocket-client smmap==3.0.2 - # via gitdb + # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt + # gitdb sqlparse==0.4.4 # via -r requirements/static/ci/common.in strict-rfc3339==0.7 # via -r requirements/static/ci/common.in tempora==4.1.1 - # via portend + # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt + # portend timelib==0.2.5 - # via -r requirements/darwin.txt + # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt + # -r requirements/darwin.txt toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 @@ -836,6 +894,7 @@ typing-extensions==4.2.0 # pytest-system-statistics urllib3==1.26.6 # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt # botocore # docker # kubernetes @@ -848,7 +907,9 @@ virtualenv==20.7.2 # -r requirements/static/ci/common.in # pytest-salt-factories vultr==1.0.1 - # via -r requirements/darwin.txt + # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt + # -r requirements/darwin.txt watchdog==0.10.3 # via -r requirements/static/ci/common.in websocket-client==0.40.0 @@ -872,9 +933,13 @@ yamlordereddictloader==0.4.0 yarl==1.7.2 # via aiohttp zc.lockfile==2.0 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt + # cherrypy zipp==3.12.0 - # via importlib-metadata + # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt + # importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/static/ci/py3.10/docs.txt b/requirements/static/ci/py3.10/docs.txt index 588b8682f56..f28d784c99d 100644 --- a/requirements/static/ci/py3.10/docs.txt +++ b/requirements/static/ci/py3.10/docs.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.10/docs.txt requirements/base.txt requirements/static/ci/docs.in requirements/zeromq.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.10/docs.txt requirements/base.txt requirements/static/ci/docs.in requirements/zeromq.txt # alabaster==0.7.12 # via sphinx @@ -12,7 +12,7 @@ certifi==2023.07.22 # via # -c requirements/static/ci/py3.10/linux.txt # requests -charset-normalizer==2.0.12 +charset-normalizer==3.2.0 # via # -c requirements/static/ci/py3.10/linux.txt # requests diff --git a/requirements/static/ci/py3.10/freebsd-crypto.txt b/requirements/static/ci/py3.10/freebsd-crypto.txt index 845b2de521b..da243ac9caf 100644 --- a/requirements/static/ci/py3.10/freebsd-crypto.txt +++ b/requirements/static/ci/py3.10/freebsd-crypto.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.10/freebsd-crypto.txt --pip-args='--constraint=requirements/static/ci/py3.10/freebsd.txt' requirements/static/ci/crypto.in +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.10/freebsd-crypto.txt requirements/static/ci/crypto.in # m2crypto==0.38.0 # via -r requirements/static/ci/crypto.in diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index e13428f69d4..2c5d4e8d71a 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.10/freebsd.txt --pip-args='--constraint=requirements/static/pkg/py3.10/freebsd.txt' requirements/base.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/freebsd.in requirements/static/pkg/freebsd.in requirements/zeromq.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.10/freebsd.txt requirements/base.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/freebsd.in requirements/static/pkg/freebsd.in requirements/zeromq.txt # adal==1.2.5 # via @@ -350,30 +350,36 @@ cassandra-driver==3.24.0 # via -r requirements/static/ci/common.in certifi==2023.07.22 # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # -r requirements/static/ci/common.in # kubernetes # msrest # requests certvalidator==0.11.1 # via vcert -cffi==1.15.1 +cffi==1.14.6 # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # -r requirements/static/ci/common.in # azure-datalake-store # bcrypt # cryptography # pygit2 # pynacl -charset-normalizer==2.0.12 +charset-normalizer==3.2.0 # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # aiohttp # requests cheetah3==3.2.6.post2 # via -r requirements/static/ci/common.in cheroot==8.5.2 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt + # cherrypy cherrypy==18.6.1 # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/freebsd.in click==7.1.2 @@ -381,11 +387,14 @@ click==7.1.2 clustershell==1.8.3 # via -r requirements/static/ci/common.in contextvars==2.4 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt + # -r requirements/base.txt croniter==0.3.29 ; sys_platform != "win32" # via -r requirements/static/ci/common.in cryptography==41.0.4 # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # -r requirements/static/pkg/freebsd.in # adal # azure-cosmosdb-table @@ -400,6 +409,7 @@ distlib==0.3.2 # via virtualenv distro==1.5.0 # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # -r requirements/base.txt # -r requirements/static/pkg/freebsd.in # pytest-skip-markers @@ -435,13 +445,18 @@ hglib==2.6.1 # via -r requirements/static/ci/freebsd.in idna==2.8 # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # etcd3-py # requests # yarl immutables==0.15 - # via contextvars + # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt + # contextvars importlib-metadata==6.0.0 - # via -r requirements/static/pkg/freebsd.in + # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt + # -r requirements/static/pkg/freebsd.in iniconfig==1.0.1 # via pytest ipaddress==1.0.22 @@ -449,23 +464,32 @@ ipaddress==1.0.22 isodate==0.6.0 # via msrest jaraco.classes==3.2.1 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt + # jaraco.collections jaraco.collections==3.4.0 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt + # cherrypy jaraco.functools==2.0 # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # cheroot # jaraco.text # tempora jaraco.text==3.5.1 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt + # jaraco.collections jinja2==3.1.2 # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # -r requirements/base.txt # junos-eznc # moto jmespath==1.0.1 # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # boto3 @@ -485,7 +509,9 @@ kubernetes==3.0.0 libnacl==1.7.1 ; sys_platform != "win32" and sys_platform != "darwin" # via -r requirements/static/ci/common.in looseversion==1.0.2 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt + # -r requirements/base.txt lxml==4.9.1 # via # junos-eznc @@ -494,6 +520,7 @@ mako==1.2.2 # via -r requirements/static/ci/common.in markupsafe==2.1.2 # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # -r requirements/base.txt # jinja2 # mako @@ -505,6 +532,7 @@ mock==3.0.5 # via -r requirements/pytest.txt more-itertools==5.0.0 # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # cheroot # cherrypy # jaraco.classes @@ -513,6 +541,7 @@ moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # -r requirements/base.txt # pytest-salt-factories msrest==0.6.19 @@ -619,8 +648,9 @@ oauthlib==3.2.2 # via requests-oauthlib oscrypto==1.2.0 # via certvalidator -packaging==21.3 +packaging==22.0 # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # -r requirements/base.txt # docker # pytest @@ -641,9 +671,12 @@ platformdirs==2.2.0 pluggy==0.13.0 # via pytest portend==2.4 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt + # cherrypy psutil==5.8.0 # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # -r requirements/base.txt # pytest-salt-factories # pytest-shell-utilities @@ -656,11 +689,14 @@ pyasn1==0.4.8 # rsa pycparser==2.21 ; python_version >= "3.9" # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/freebsd.in # cffi pycryptodomex==3.9.8 - # via -r requirements/crypto.txt + # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt + # -r requirements/crypto.txt pygit2==1.8.0 # via -r requirements/static/ci/freebsd.in pyinotify==0.9.6 ; sys_platform != "win32" and sys_platform != "darwin" and platform_system != "openbsd" @@ -673,12 +709,11 @@ pynacl==1.5.0 # paramiko pyopenssl==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # -r requirements/static/pkg/freebsd.in # etcd3-py pyparsing==3.0.9 - # via - # junos-eznc - # packaging + # via junos-eznc pyrsistent==0.17.3 # via jsonschema pyserial==3.4 @@ -720,6 +755,7 @@ pytest==7.2.0 # pytest-timeout python-dateutil==2.8.1 # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # -r requirements/static/pkg/freebsd.in # adal # azure-cosmosdb-table @@ -732,15 +768,19 @@ python-dateutil==2.8.1 python-etcd==0.4.5 # via -r requirements/static/ci/common.in python-gnupg==0.4.8 - # via -r requirements/static/pkg/freebsd.in + # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt + # -r requirements/static/pkg/freebsd.in pytz==2022.1 # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # moto # tempora pyvmomi==6.7.1.2018.12 # via -r requirements/static/ci/common.in pyyaml==6.0.1 # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # -r requirements/base.txt # clustershell # junos-eznc @@ -750,12 +790,14 @@ pyyaml==6.0.1 # yamlordereddictloader pyzmq==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # -r requirements/zeromq.txt # pytest-salt-factories requests-oauthlib==1.3.0 # via msrest requests==2.31.0 # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # adal @@ -788,9 +830,12 @@ scp==0.13.2 semantic-version==2.9.0 # via etcd3-py setproctitle==1.3.2 - # via -r requirements/static/pkg/freebsd.in + # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt + # -r requirements/static/pkg/freebsd.in six==1.16.0 # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # bcrypt # cassandra-driver # cheroot @@ -822,9 +867,13 @@ sqlparse==0.4.4 strict-rfc3339==0.7 # via -r requirements/static/ci/common.in tempora==4.1.1 - # via portend + # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt + # portend timelib==0.2.5 - # via -r requirements/static/pkg/freebsd.in + # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt + # -r requirements/static/pkg/freebsd.in toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 @@ -837,6 +886,7 @@ typing-extensions==4.2.0 # pytest-system-statistics urllib3==1.26.6 # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # botocore # docker # kubernetes @@ -869,9 +919,13 @@ yamlordereddictloader==0.4.0 yarl==1.7.2 # via aiohttp zc.lockfile==1.4 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt + # cherrypy zipp==3.12.0 - # via importlib-metadata + # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt + # importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/static/ci/py3.10/invoke.txt b/requirements/static/ci/py3.10/invoke.txt index bcca631927a..fbeaead2dd4 100644 --- a/requirements/static/ci/py3.10/invoke.txt +++ b/requirements/static/ci/py3.10/invoke.txt @@ -2,13 +2,17 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.10/invoke.txt --pip-args='--constraint=requirements/static/ci/py3.10/linux.txt' requirements/static/ci/invoke.in +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.10/invoke.txt requirements/static/ci/invoke.in # blessings==1.7 # via -r requirements/static/ci/invoke.in invoke==1.4.1 # via -r requirements/static/ci/invoke.in pyyaml==6.0.1 - # via -r requirements/static/ci/invoke.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/invoke.in six==1.16.0 - # via blessings + # via + # -c requirements/static/ci/py3.10/linux.txt + # blessings diff --git a/requirements/static/ci/py3.10/lint.txt b/requirements/static/ci/py3.10/lint.txt index 1425220878c..52d4a4bebda 100644 --- a/requirements/static/ci/py3.10/lint.txt +++ b/requirements/static/ci/py3.10/lint.txt @@ -2,42 +2,64 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.10/lint.txt --pip-args='--constraint=requirements/static/ci/py3.10/linux.txt' requirements/base.txt requirements/static/ci/common.in requirements/static/ci/lint.in requirements/static/ci/linux.in requirements/static/pkg/linux.in requirements/zeromq.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.10/lint.txt requirements/base.txt requirements/static/ci/common.in requirements/static/ci/lint.in requirements/static/ci/linux.in requirements/static/pkg/linux.in requirements/zeromq.txt # -adal==1.2.7 +adal==1.2.3 # via + # -c requirements/static/ci/py3.10/linux.txt # azure-datalake-store # msrestazure aiohttp==3.8.5 - # via etcd3-py -aiosignal==1.2.0 - # via aiohttp -ansible-core==2.14.1 - # via ansible -ansible==7.1.0 ; python_version >= "3.9" - # via -r requirements/static/ci/linux.in -apache-libcloud==3.3.1 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in -apscheduler==3.6.3 - # via python-telegram-bot -asn1crypto==1.4.0 # via + # -c requirements/static/ci/py3.10/linux.txt + # etcd3-py +aiosignal==1.2.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # aiohttp +ansible-core==2.14.1 + # via + # -c requirements/static/ci/py3.10/linux.txt + # ansible +ansible==7.1.0 ; python_version >= "3.9" + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/linux.in +apache-libcloud==2.5.0 ; sys_platform != "win32" + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in +apscheduler==3.6.3 + # via + # -c requirements/static/ci/py3.10/linux.txt + # python-telegram-bot +asn1crypto==1.3.0 + # via + # -c requirements/static/ci/py3.10/linux.txt # certvalidator # oscrypto astroid==2.3.3 # via pylint async-timeout==4.0.2 - # via aiohttp -attrs==21.2.0 # via + # -c requirements/static/ci/py3.10/linux.txt + # aiohttp +attrs==23.1.0 + # via + # -c requirements/static/ci/py3.10/linux.txt # aiohttp # jsonschema azure-applicationinsights==0.1.0 - # via azure -azure-batch==4.1.3 - # via azure -azure-common==1.1.27 # via + # -c requirements/static/ci/py3.10/linux.txt + # azure +azure-batch==4.1.3 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure +azure-common==1.1.18 + # via + # -c requirements/static/ci/py3.10/linux.txt # azure-applicationinsights # azure-batch # azure-cosmosdb-table @@ -113,107 +135,205 @@ azure-common==1.1.27 # azure-storage-file # azure-storage-queue azure-cosmosdb-nspkg==2.0.2 - # via azure-cosmosdb-table -azure-cosmosdb-table==1.0.6 - # via azure -azure-datalake-store==0.0.52 - # via azure -azure-eventgrid==1.3.0 - # via azure + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-cosmosdb-table +azure-cosmosdb-table==1.0.5 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure +azure-datalake-store==0.0.44 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure +azure-eventgrid==1.2.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure azure-graphrbac==0.40.0 - # via azure + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure azure-keyvault==1.1.0 - # via azure + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure azure-loganalytics==0.1.0 - # via azure + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure azure-mgmt-advisor==1.0.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-applicationinsights==0.1.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-authorization==0.50.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-batch==5.0.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-batchai==2.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-billing==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-cdn==3.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-cognitiveservices==3.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-commerce==1.0.1 - # via azure-mgmt -azure-mgmt-compute==4.6.2 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt +azure-mgmt-compute==4.6.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-consumption==2.0.0 - # via azure-mgmt -azure-mgmt-containerinstance==1.5.0 - # via azure-mgmt -azure-mgmt-containerregistry==2.8.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt +azure-mgmt-containerinstance==1.4.1 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt +azure-mgmt-containerregistry==2.7.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-containerservice==4.4.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-cosmosdb==0.4.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-datafactory==0.6.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-datalake-analytics==0.6.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-datalake-nspkg==3.0.1 # via + # -c requirements/static/ci/py3.10/linux.txt # azure-mgmt-datalake-analytics # azure-mgmt-datalake-store azure-mgmt-datalake-store==0.5.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-datamigration==1.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-devspaces==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-devtestlabs==2.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-dns==2.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-eventgrid==1.0.0 - # via azure-mgmt -azure-mgmt-eventhub==2.6.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt +azure-mgmt-eventhub==2.5.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-hanaonazure==0.1.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-iotcentral==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-iothub==0.5.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-iothubprovisioningservices==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-keyvault==1.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-loganalytics==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-logic==3.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-machinelearningcompute==0.4.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-managementgroups==0.1.0 - # via azure-mgmt -azure-mgmt-managementpartner==0.1.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt +azure-mgmt-managementpartner==0.1.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-maps==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-marketplaceordering==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-media==1.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-monitor==0.5.2 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-msi==0.2.0 - # via azure-mgmt -azure-mgmt-network==2.7.0 - # via azure-mgmt -azure-mgmt-notificationhubs==2.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt +azure-mgmt-network==2.6.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt +azure-mgmt-notificationhubs==2.0.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-nspkg==3.0.2 # via + # -c requirements/static/ci/py3.10/linux.txt # azure-mgmt-advisor # azure-mgmt-applicationinsights # azure-mgmt-authorization @@ -240,10 +360,12 @@ azure-mgmt-nspkg==3.0.2 # azure-mgmt-logic # azure-mgmt-machinelearningcompute # azure-mgmt-managementgroups + # azure-mgmt-managementpartner # azure-mgmt-maps # azure-mgmt-marketplaceordering # azure-mgmt-monitor # azure-mgmt-msi + # azure-mgmt-notificationhubs # azure-mgmt-policyinsights # azure-mgmt-powerbiembedded # azure-mgmt-recoveryservices @@ -252,6 +374,7 @@ azure-mgmt-nspkg==3.0.2 # azure-mgmt-relay # azure-mgmt-reservations # azure-mgmt-scheduler + # azure-mgmt-search # azure-mgmt-servicefabric # azure-mgmt-signalr # azure-mgmt-sql @@ -260,50 +383,92 @@ azure-mgmt-nspkg==3.0.2 # azure-mgmt-trafficmanager # azure-mgmt-web azure-mgmt-policyinsights==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-powerbiembedded==2.0.0 - # via azure-mgmt -azure-mgmt-rdbms==1.9.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt +azure-mgmt-rdbms==1.8.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-recoveryservices==0.3.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-recoveryservicesbackup==0.3.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-redis==5.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-relay==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-reservations==0.2.1 - # via azure-mgmt -azure-mgmt-resource==2.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt +azure-mgmt-resource==2.1.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-scheduler==2.0.0 - # via azure-mgmt -azure-mgmt-search==2.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt +azure-mgmt-search==2.0.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-servicebus==0.5.3 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-servicefabric==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-signalr==0.1.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-sql==0.9.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-storage==2.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-subscription==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-trafficmanager==0.50.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt-web==0.35.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-mgmt azure-mgmt==4.0.0 - # via azure + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure azure-nspkg==3.0.2 # via + # -c requirements/static/ci/py3.10/linux.txt # azure-applicationinsights # azure-batch # azure-cosmosdb-nspkg + # azure-eventgrid # azure-graphrbac # azure-keyvault # azure-loganalytics @@ -312,86 +477,138 @@ azure-nspkg==3.0.2 # azure-servicefabric # azure-servicemanagement-legacy azure-servicebus==0.21.1 - # via azure -azure-servicefabric==6.3.0.0 - # via azure -azure-servicemanagement-legacy==0.20.7 - # via azure -azure-storage-blob==1.5.0 - # via azure -azure-storage-common==1.4.2 # via + # -c requirements/static/ci/py3.10/linux.txt + # azure +azure-servicefabric==6.3.0.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure +azure-servicemanagement-legacy==0.20.6 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure +azure-storage-blob==1.5.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure +azure-storage-common==1.4.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure-cosmosdb-table # azure-storage-blob # azure-storage-file # azure-storage-queue azure-storage-file==1.4.0 - # via azure -azure-storage-queue==1.4.0 - # via azure -azure==4.0.0 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in -backports.entry-points-selectable==1.1.0 - # via virtualenv -bcrypt==3.2.0 # via + # -c requirements/static/ci/py3.10/linux.txt + # azure +azure-storage-queue==1.4.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # azure +azure==4.0.0 ; sys_platform != "win32" + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in +backports.entry-points-selectable==1.1.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # virtualenv +bcrypt==3.1.6 + # via + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/common.in # paramiko boto3==1.21.46 # via + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/common.in # moto boto==2.49.0 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in botocore==1.24.46 # via + # -c requirements/static/ci/py3.10/linux.txt # boto3 # moto # s3transfer cachetools==4.2.2 # via + # -c requirements/static/ci/py3.10/linux.txt # google-auth # python-telegram-bot -cassandra-driver==3.25.0 - # via -r requirements/static/ci/common.in +cassandra-driver==3.23.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in certifi==2023.07.22 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/common.in # kubernetes # msrest # python-telegram-bot # requests certvalidator==0.11.1 - # via vcert -cffi==1.15.1 # via + # -c requirements/static/ci/py3.10/linux.txt + # vcert +cffi==1.14.6 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/common.in # azure-datalake-store # bcrypt # cryptography # pygit2 # pynacl -charset-normalizer==2.0.4 +charset-normalizer==3.2.0 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # aiohttp # requests -cheetah3==3.2.6.post1 - # via -r requirements/static/ci/common.in +cheetah3==3.2.6.post2 + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in cheroot==8.5.2 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # cherrypy cherrypy==18.6.1 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/linux.in -click==8.0.1 - # via geomet +click==7.1.1 + # via + # -c requirements/static/ci/py3.10/linux.txt + # geomet clustershell==1.8.3 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in contextvars==2.4 - # via -r requirements/base.txt -croniter==1.0.15 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/base.txt +croniter==0.3.29 ; sys_platform != "win32" + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in cryptography==41.0.4 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/pkg/linux.in # adal # ansible-core @@ -404,99 +621,173 @@ cryptography==41.0.4 # pyopenssl # vcert distlib==0.3.2 - # via virtualenv -distro==1.6.0 - # via -r requirements/base.txt -dnspython==2.1.0 # via + # -c requirements/static/ci/py3.10/linux.txt + # virtualenv +distro==1.5.0 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/base.txt +dnspython==1.16.0 + # via + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/common.in # python-etcd docker==6.1.3 - # via -r requirements/static/ci/lint.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/lint.in etcd3-py==0.1.6 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in filelock==3.0.12 - # via virtualenv + # via + # -c requirements/static/ci/py3.10/linux.txt + # virtualenv frozenlist==1.3.0 # via + # -c requirements/static/ci/py3.10/linux.txt # aiohttp # aiosignal genshi==0.7.5 - # via -r requirements/static/ci/common.in -geomet==0.2.1.post1 - # via cassandra-driver -gitdb==4.0.7 - # via gitpython -gitpython==3.1.35 - # via -r requirements/static/ci/common.in -google-auth==2.0.1 - # via kubernetes -hglib==2.6.1 - # via -r requirements/static/ci/linux.in -idna==3.2 # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in +geomet==0.1.2 + # via + # -c requirements/static/ci/py3.10/linux.txt + # cassandra-driver +gitdb==4.0.5 + # via + # -c requirements/static/ci/py3.10/linux.txt + # gitpython +gitpython==3.1.35 + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in +google-auth==1.6.3 + # via + # -c requirements/static/ci/py3.10/linux.txt + # kubernetes +hglib==2.6.1 + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/linux.in +idna==2.8 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # etcd3-py # requests # yarl -immutables==0.19 - # via contextvars +immutables==0.15 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # contextvars importlib-metadata==6.0.0 - # via -r requirements/static/pkg/linux.in -ipaddress==1.0.23 - # via kubernetes + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/pkg/linux.in +ipaddress==1.0.22 + # via + # -c requirements/static/ci/py3.10/linux.txt + # kubernetes isodate==0.6.0 - # via msrest + # via + # -c requirements/static/ci/py3.10/linux.txt + # msrest isort==4.3.21 # via pylint jaraco.classes==3.2.1 - # via jaraco.collections -jaraco.collections==3.4.0 - # via cherrypy -jaraco.functools==3.3.0 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # jaraco.collections +jaraco.collections==3.4.0 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # cherrypy +jaraco.functools==2.0 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # cheroot # jaraco.text # tempora jaraco.text==3.5.1 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # jaraco.collections jinja2==3.1.2 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/base.txt # ansible-core # junos-eznc # moto -jmespath==0.10.0 +jmespath==1.0.1 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # boto3 # botocore jsonschema==3.2.0 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in junos-eznc==2.6.0 ; sys_platform != "win32" and python_version <= "3.10" - # via -r requirements/static/ci/common.in -jxmlease==1.0.3 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in -kazoo==2.8.0 ; sys_platform != "win32" and sys_platform != "darwin" - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in +jxmlease==1.0.1 ; sys_platform != "win32" + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in +kazoo==2.6.1 ; sys_platform != "win32" and sys_platform != "darwin" + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in keyring==5.7.1 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in kubernetes==3.0.0 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in lazy-object-proxy==1.4.3 # via astroid -libnacl==1.8.0 ; sys_platform != "win32" and sys_platform != "darwin" - # via -r requirements/static/ci/common.in +libnacl==1.7.1 ; sys_platform != "win32" and sys_platform != "darwin" + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in looseversion==1.0.2 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/base.txt lxml==4.9.1 # via + # -c requirements/static/ci/py3.10/linux.txt # junos-eznc # ncclient mako==1.2.2 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in markupsafe==2.1.2 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/base.txt # jinja2 # mako @@ -505,21 +796,31 @@ markupsafe==2.1.2 mccabe==0.6.1 # via pylint mercurial==6.0.1 - # via -r requirements/static/ci/linux.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/linux.in modernize==0.5 # via saltpylint -more-itertools==8.8.0 +more-itertools==5.0.0 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # cheroot # cherrypy # jaraco.classes # jaraco.functools moto==3.0.1 - # via -r requirements/static/ci/common.in -msgpack==1.0.2 - # via -r requirements/base.txt -msrest==0.6.21 # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in +msgpack==1.0.2 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/base.txt +msrest==0.6.14 + # via + # -c requirements/static/ci/py3.10/linux.txt # azure-applicationinsights # azure-eventgrid # azure-keyvault @@ -532,20 +833,18 @@ msrest==0.6.21 # azure-mgmt-dns # azure-mgmt-eventhub # azure-mgmt-keyvault - # azure-mgmt-managementpartner # azure-mgmt-media # azure-mgmt-network - # azure-mgmt-notificationhubs # azure-mgmt-rdbms # azure-mgmt-resource - # azure-mgmt-search # azure-mgmt-servicebus # azure-mgmt-servicefabric # azure-mgmt-signalr # azure-servicefabric # msrestazure -msrestazure==0.6.4 +msrestazure==0.6.3 # via + # -c requirements/static/ci/py3.10/linux.txt # azure-batch # azure-eventgrid # azure-graphrbac @@ -612,60 +911,103 @@ msrestazure==0.6.4 # azure-mgmt-web multidict==6.0.2 # via + # -c requirements/static/ci/py3.10/linux.txt # aiohttp # yarl ncclient==0.6.9 - # via junos-eznc -netaddr==0.8.0 - # via junos-eznc -oauthlib==3.2.2 - # via requests-oauthlib -oscrypto==1.2.1 - # via certvalidator -packaging==21.3 # via + # -c requirements/static/ci/py3.10/linux.txt + # junos-eznc +netaddr==0.7.19 + # via + # -c requirements/static/ci/py3.10/linux.txt + # junos-eznc +oauthlib==3.2.2 + # via + # -c requirements/static/ci/py3.10/linux.txt + # requests-oauthlib +oscrypto==1.2.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # certvalidator +packaging==22.0 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/base.txt # ansible-core # docker paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin" # via + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/common.in # junos-eznc # ncclient # scp passlib==1.7.4 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in pathspec==0.9.0 - # via yamllint + # via + # -c requirements/static/ci/py3.10/linux.txt + # yamllint +pathtools==0.1.2 + # via + # -c requirements/static/ci/py3.10/linux.txt + # watchdog platformdirs==2.2.0 - # via virtualenv -portend==2.7.1 - # via cherrypy + # via + # -c requirements/static/ci/py3.10/linux.txt + # virtualenv +portend==2.4 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # cherrypy psutil==5.8.0 - # via -r requirements/base.txt -pyasn1-modules==0.2.8 - # via google-auth + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/base.txt +pyasn1-modules==0.2.4 + # via + # -c requirements/static/ci/py3.10/linux.txt + # google-auth pyasn1==0.4.8 # via + # -c requirements/static/ci/py3.10/linux.txt # pyasn1-modules # rsa pycodestyle==2.5.0 # via saltpylint pycparser==2.21 ; python_version >= "3.9" # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/linux.in # cffi -pycryptodomex==3.10.1 - # via -r requirements/crypto.txt +pycryptodomex==3.9.8 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/crypto.txt pygit2==1.9.1 ; python_version >= "3.10" - # via -r requirements/static/ci/linux.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/linux.in pyiface==0.0.11 - # via -r requirements/static/ci/linux.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/linux.in pyinotify==0.9.6 ; sys_platform != "win32" and sys_platform != "darwin" and platform_system != "openbsd" - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in pyjwt==2.4.0 # via + # -c requirements/static/ci/py3.10/linux.txt # adal # twilio pylint==2.4.4 @@ -673,27 +1015,40 @@ pylint==2.4.4 # -r requirements/static/ci/lint.in # saltpylint pymysql==1.0.2 - # via -r requirements/static/ci/linux.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/linux.in pynacl==1.5.0 # via + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/common.in # paramiko pyopenssl==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/pkg/linux.in # etcd3-py pyparsing==3.0.9 # via + # -c requirements/static/ci/py3.10/linux.txt # junos-eznc - # packaging -pyrsistent==0.18.0 - # via jsonschema -pyserial==3.5 - # via junos-eznc -python-consul==1.1.0 - # via -r requirements/static/ci/linux.in -python-dateutil==2.8.2 +pyrsistent==0.17.3 # via + # -c requirements/static/ci/py3.10/linux.txt + # jsonschema +pyserial==3.4 + # via + # -c requirements/static/ci/py3.10/linux.txt + # junos-eznc +python-consul==1.1.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/linux.in +python-dateutil==2.8.1 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/pkg/linux.in # adal # azure-cosmosdb-table @@ -704,22 +1059,36 @@ python-dateutil==2.8.2 # moto # vcert python-etcd==0.4.5 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in python-gnupg==0.4.8 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/pkg/linux.in python-telegram-bot==13.7 - # via -r requirements/static/ci/linux.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/linux.in pytz==2022.1 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # apscheduler # moto # python-telegram-bot # tempora # twilio -pyvmomi==7.0.2 - # via -r requirements/static/ci/common.in + # tzlocal +pyvmomi==6.7.1.2018.12 + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in pyyaml==6.0.1 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/base.txt # ansible-core # clustershell @@ -728,15 +1097,26 @@ pyyaml==6.0.1 # yamllint # yamlordereddictloader pyzmq==23.2.0 - # via -r requirements/zeromq.txt + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/zeromq.txt redis-py-cluster==2.1.3 - # via -r requirements/static/ci/linux.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/linux.in redis==3.5.3 - # via redis-py-cluster + # via + # -c requirements/static/ci/py3.10/linux.txt + # redis-py-cluster requests-oauthlib==1.3.0 - # via msrest + # via + # -c requirements/static/ci/py3.10/linux.txt + # msrest requests==2.31.0 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # adal @@ -759,27 +1139,49 @@ requests==2.31.0 # twilio # vcert resolvelib==0.5.4 - # via ansible-core -responses==0.13.4 - # via moto + # via + # -c requirements/static/ci/py3.10/linux.txt + # ansible-core +responses==0.10.6 + # via + # -c requirements/static/ci/py3.10/linux.txt + # moto rfc3987==1.3.8 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in rpm-vercmp==0.1.2 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/pkg/linux.in rsa==4.7.2 - # via google-auth -s3transfer==0.5.0 - # via boto3 + # via + # -c requirements/static/ci/py3.10/linux.txt + # google-auth +s3transfer==0.5.2 + # via + # -c requirements/static/ci/py3.10/linux.txt + # boto3 saltpylint==2023.8.3 # via -r requirements/static/ci/lint.in -scp==0.13.6 - # via junos-eznc +scp==0.13.2 + # via + # -c requirements/static/ci/py3.10/linux.txt + # junos-eznc semantic-version==2.9.0 - # via etcd3-py + # via + # -c requirements/static/ci/py3.10/linux.txt + # etcd3-py setproctitle==1.3.2 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/pkg/linux.in six==1.16.0 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # apscheduler # astroid # bcrypt @@ -788,12 +1190,13 @@ six==1.16.0 # etcd3-py # genshi # geomet + # google-auth # isodate # jsonschema # junos-eznc # kazoo # kubernetes - # msrestazure + # more-itertools # ncclient # paramiko # python-consul @@ -805,67 +1208,118 @@ six==1.16.0 # virtualenv # websocket-client slack-bolt==1.15.5 - # via -r requirements/static/ci/linux.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/linux.in slack-sdk==3.19.5 - # via slack-bolt -smmap==4.0.0 - # via gitdb + # via + # -c requirements/static/ci/py3.10/linux.txt + # slack-bolt +smmap==3.0.4 + # via + # -c requirements/static/ci/py3.10/linux.txt + # gitdb sqlparse==0.4.4 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in strict-rfc3339==0.7 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in tempora==4.1.1 - # via portend + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # portend timelib==0.2.5 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/pkg/linux.in toml==0.10.2 # via + # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/common.in # -r requirements/static/ci/lint.in tornado==6.1 - # via python-telegram-bot -transitions==0.8.8 - # via junos-eznc + # via + # -c requirements/static/ci/py3.10/linux.txt + # python-telegram-bot +transitions==0.8.1 + # via + # -c requirements/static/ci/py3.10/linux.txt + # junos-eznc twilio==7.9.2 - # via -r requirements/static/ci/linux.in -tzlocal==3.0 - # via apscheduler + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/linux.in +tzlocal==2.1 + # via + # -c requirements/static/ci/py3.10/linux.txt + # apscheduler urllib3==1.26.6 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt # botocore # docker # kubernetes # python-etcd # requests - # responses vcert==0.7.4 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in virtualenv==20.7.2 - # via -r requirements/static/ci/common.in -watchdog==2.1.5 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in +watchdog==0.10.3 + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in websocket-client==0.40.0 # via + # -c requirements/static/ci/py3.10/linux.txt # docker # kubernetes wempy==0.2.1 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in werkzeug==2.2.3 - # via moto + # via + # -c requirements/static/ci/py3.10/linux.txt + # moto wrapt==1.11.1 # via astroid xmltodict==0.12.0 - # via moto + # via + # -c requirements/static/ci/py3.10/linux.txt + # moto yamllint==1.26.3 - # via -r requirements/static/ci/linux.in + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/linux.in yamlordereddictloader==0.4.0 - # via junos-eznc + # via + # -c requirements/static/ci/py3.10/linux.txt + # junos-eznc yarl==1.7.2 - # via aiohttp -zc.lockfile==2.0 - # via cherrypy -zipp==3.5.0 - # via importlib-metadata + # via + # -c requirements/static/ci/py3.10/linux.txt + # aiohttp +zc.lockfile==1.4 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # cherrypy +zipp==3.6.0 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/static/ci/py3.10/linux-crypto.txt b/requirements/static/ci/py3.10/linux-crypto.txt index 76ea98e30f5..f824107616f 100644 --- a/requirements/static/ci/py3.10/linux-crypto.txt +++ b/requirements/static/ci/py3.10/linux-crypto.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.10/linux-crypto.txt --pip-args='--constraint=requirements/static/ci/py3.10/linux.txt' requirements/static/ci/crypto.in +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.10/linux-crypto.txt requirements/static/ci/crypto.in # m2crypto==0.38.0 # via -r requirements/static/ci/crypto.in diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index 507deed426e..b2bf1178754 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.10/linux.txt --pip-args='--constraint=requirements/static/pkg/py3.10/linux.txt' requirements/base.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/linux.in requirements/static/pkg/linux.in requirements/zeromq.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.10/linux.txt requirements/base.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/linux.in requirements/static/pkg/linux.in requirements/zeromq.txt # adal==1.2.3 # via @@ -363,6 +363,7 @@ cassandra-driver==3.23.0 # via -r requirements/static/ci/common.in certifi==2023.07.22 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt # -r requirements/static/ci/common.in # kubernetes # msrest @@ -370,24 +371,29 @@ certifi==2023.07.22 # requests certvalidator==0.11.1 # via vcert -cffi==1.15.1 +cffi==1.14.6 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt # -r requirements/static/ci/common.in # azure-datalake-store # bcrypt # cryptography # pygit2 # pynacl -charset-normalizer==2.0.12 +charset-normalizer==3.2.0 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt # aiohttp # requests cheetah3==3.2.6.post2 # via -r requirements/static/ci/common.in cheroot==8.5.2 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # cherrypy cherrypy==18.6.1 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/linux.in click==7.1.1 @@ -395,11 +401,14 @@ click==7.1.1 clustershell==1.8.3 # via -r requirements/static/ci/common.in contextvars==2.4 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -r requirements/base.txt croniter==0.3.29 ; sys_platform != "win32" # via -r requirements/static/ci/common.in cryptography==41.0.4 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt # -r requirements/static/pkg/linux.in # adal # ansible-core @@ -415,6 +424,7 @@ distlib==0.3.2 # via virtualenv distro==1.5.0 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt # -r requirements/base.txt # pytest-skip-markers dnspython==1.16.0 @@ -449,13 +459,18 @@ hglib==2.6.1 # via -r requirements/static/ci/linux.in idna==2.8 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt # etcd3-py # requests # yarl immutables==0.15 - # via contextvars + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # contextvars importlib-metadata==6.0.0 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -r requirements/static/pkg/linux.in iniconfig==1.0.1 # via pytest ipaddress==1.0.22 @@ -463,24 +478,33 @@ ipaddress==1.0.22 isodate==0.6.0 # via msrest jaraco.classes==3.2.1 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # jaraco.collections jaraco.collections==3.4.0 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # cherrypy jaraco.functools==2.0 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt # cheroot # jaraco.text # tempora jaraco.text==3.5.1 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # jaraco.collections jinja2==3.1.2 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt # -r requirements/base.txt # ansible-core # junos-eznc # moto jmespath==1.0.1 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # boto3 @@ -500,7 +524,9 @@ kubernetes==3.0.0 libnacl==1.7.1 ; sys_platform != "win32" and sys_platform != "darwin" # via -r requirements/static/ci/common.in looseversion==1.0.2 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -r requirements/base.txt lxml==4.9.1 # via # junos-eznc @@ -509,6 +535,7 @@ mako==1.2.2 # via -r requirements/static/ci/common.in markupsafe==2.1.2 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt # -r requirements/base.txt # jinja2 # mako @@ -520,6 +547,7 @@ mock==3.0.5 # via -r requirements/pytest.txt more-itertools==5.0.0 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt # cheroot # cherrypy # jaraco.classes @@ -528,6 +556,7 @@ moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt # -r requirements/base.txt # pytest-salt-factories msrest==0.6.14 @@ -633,6 +662,7 @@ oscrypto==1.2.0 # via certvalidator packaging==22.0 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt # -r requirements/base.txt # ansible-core # docker @@ -654,9 +684,12 @@ platformdirs==2.2.0 pluggy==0.13.0 # via pytest portend==2.4 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # cherrypy psutil==5.8.0 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt # -r requirements/base.txt # pytest-salt-factories # pytest-shell-utilities @@ -669,11 +702,14 @@ pyasn1==0.4.8 # rsa pycparser==2.21 ; python_version >= "3.9" # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/linux.in # cffi pycryptodomex==3.9.8 - # via -r requirements/crypto.txt + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -r requirements/crypto.txt pygit2==1.9.1 ; python_version >= "3.10" # via -r requirements/static/ci/linux.in pyiface==0.0.11 @@ -692,6 +728,7 @@ pynacl==1.5.0 # paramiko pyopenssl==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt # -r requirements/static/pkg/linux.in # etcd3-py pyparsing==3.0.9 @@ -739,6 +776,7 @@ python-consul==1.1.0 # via -r requirements/static/ci/linux.in python-dateutil==2.8.1 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt # -r requirements/static/pkg/linux.in # adal # azure-cosmosdb-table @@ -751,11 +789,14 @@ python-dateutil==2.8.1 python-etcd==0.4.5 # via -r requirements/static/ci/common.in python-gnupg==0.4.8 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -r requirements/static/pkg/linux.in python-telegram-bot==13.7 # via -r requirements/static/ci/linux.in pytz==2022.1 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt # apscheduler # moto # python-telegram-bot @@ -766,6 +807,7 @@ pyvmomi==6.7.1.2018.12 # via -r requirements/static/ci/common.in pyyaml==6.0.1 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt # -r requirements/base.txt # ansible-core # clustershell @@ -776,6 +818,7 @@ pyyaml==6.0.1 # yamlordereddictloader pyzmq==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt # -r requirements/zeromq.txt # pytest-salt-factories redis-py-cluster==2.1.3 @@ -786,6 +829,7 @@ requests-oauthlib==1.3.0 # via msrest requests==2.31.0 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # adal @@ -814,7 +858,9 @@ responses==0.10.6 rfc3987==1.3.8 # via -r requirements/static/ci/common.in rpm-vercmp==0.1.2 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -r requirements/static/pkg/linux.in rsa==4.7.2 # via google-auth s3transfer==0.5.2 @@ -824,9 +870,12 @@ scp==0.13.2 semantic-version==2.9.0 # via etcd3-py setproctitle==1.3.2 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -r requirements/static/pkg/linux.in six==1.16.0 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt # apscheduler # bcrypt # cassandra-driver @@ -863,9 +912,13 @@ sqlparse==0.4.4 strict-rfc3339==0.7 # via -r requirements/static/ci/common.in tempora==4.1.1 - # via portend + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # portend timelib==0.2.5 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -r requirements/static/pkg/linux.in toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 @@ -884,6 +937,7 @@ tzlocal==2.1 # via apscheduler urllib3==1.26.6 # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt # botocore # docker # kubernetes @@ -916,9 +970,13 @@ yamlordereddictloader==0.4.0 yarl==1.7.2 # via aiohttp zc.lockfile==1.4 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # cherrypy zipp==3.6.0 - # via importlib-metadata + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/static/ci/py3.10/tools.txt b/requirements/static/ci/py3.10/tools.txt index 071ccd01dcd..816a0301c4a 100644 --- a/requirements/static/ci/py3.10/tools.txt +++ b/requirements/static/ci/py3.10/tools.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.10/tools.txt --pip-args='--constraint=requirements/static/ci/py3.10/linux.txt' requirements/static/ci/tools.in +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.10/tools.txt requirements/static/ci/tools.in # attrs==22.1.0 # via diff --git a/requirements/static/ci/py3.10/windows-crypto.txt b/requirements/static/ci/py3.10/windows-crypto.txt index ad36c32ac36..18248fac6f1 100644 --- a/requirements/static/ci/py3.10/windows-crypto.txt +++ b/requirements/static/ci/py3.10/windows-crypto.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.10/windows-crypto.txt --pip-args='--constraint=requirements/static/ci/py3.10/windows.txt' requirements/static/ci/crypto.in +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.10/windows-crypto.txt requirements/static/ci/crypto.in # m2crypto==0.37.1 # via -r requirements/static/ci/crypto.in diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index d424058dda0..ef036d7c20f 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.10/windows.txt --pip-args='--constraint=requirements/static/pkg/py3.10/windows.txt' requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/windows.in requirements/static/pkg/windows.in requirements/windows.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.10/windows.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/windows.in requirements/static/pkg/windows.in requirements/windows.txt # aiohttp==3.8.5 # via etcd3-py @@ -38,42 +38,53 @@ cassandra-driver==3.23.0 # via -r requirements/static/ci/common.in certifi==2023.07.22 # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt # -r requirements/static/ci/common.in # -r requirements/windows.txt # kubernetes # requests -cffi==1.15.1 +cffi==1.14.6 # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt # -r requirements/static/ci/common.in # -r requirements/windows.txt # clr-loader # cryptography # pygit2 # pynacl -charset-normalizer==2.1.1 +charset-normalizer==3.2.0 # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt # aiohttp # requests cheetah3==3.2.6.post1 # via -r requirements/static/ci/common.in cheroot==8.5.2 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt + # cherrypy cherrypy==18.6.1 # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt # -r requirements/static/ci/common.in # -r requirements/windows.txt click==7.1.2 # via geomet clr-loader==0.2.4 - # via pythonnet + # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt + # pythonnet clustershell==1.8.3 # via -r requirements/static/ci/common.in colorama==0.4.1 # via pytest contextvars==2.4 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt + # -r requirements/base.txt cryptography==41.0.4 # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt # -r requirements/windows.txt # etcd3-py # moto @@ -83,6 +94,7 @@ distlib==0.3.6 # via virtualenv distro==1.5.0 # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt # -r requirements/base.txt # pytest-skip-markers dmidecode==0.9.0 @@ -110,45 +122,64 @@ genshi==0.7.5 geomet==0.1.2 # via cassandra-driver gitdb==4.0.7 - # via gitpython + # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt + # gitpython gitpython==3.1.35 # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt # -r requirements/static/ci/common.in # -r requirements/windows.txt google-auth==1.6.3 # via kubernetes idna==2.8 # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt # etcd3-py # requests # yarl immutables==0.15 - # via contextvars + # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt + # contextvars importlib-metadata==6.0.0 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt + # -r requirements/windows.txt iniconfig==1.0.1 # via pytest ioloop==0.1a0 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt + # -r requirements/windows.txt ipaddress==1.0.22 # via kubernetes jaraco.classes==3.2.1 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt + # jaraco.collections jaraco.collections==3.3.0 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt + # cherrypy jaraco.functools==2.0 # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt # cheroot # jaraco.text # tempora jaraco.text==3.5.0 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt + # jaraco.collections jinja2==3.1.2 # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt # -r requirements/base.txt # moto jmespath==1.0.1 # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # boto3 @@ -160,13 +191,18 @@ keyring==5.7.1 kubernetes==3.0.0 # via -r requirements/static/ci/common.in looseversion==1.0.2 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt + # -r requirements/base.txt lxml==4.9.1 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt + # -r requirements/windows.txt mako==1.2.2 # via -r requirements/static/ci/common.in -markupsafe==2.1.1 +markupsafe==2.1.2 # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt # -r requirements/base.txt # jinja2 # mako @@ -176,6 +212,7 @@ mock==3.0.5 # via -r requirements/pytest.txt more-itertools==8.2.0 # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt # cheroot # cherrypy # jaraco.classes @@ -184,6 +221,7 @@ moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt # -r requirements/base.txt # pytest-salt-factories multidict==6.0.2 @@ -192,8 +230,9 @@ multidict==6.0.2 # yarl ntlm-auth==1.5.0 # via requests-ntlm -packaging==21.3 +packaging==22.0 # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt # -r requirements/base.txt # docker # pytest @@ -210,9 +249,12 @@ platformdirs==2.5.4 pluggy==0.13.0 # via pytest portend==2.6 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt + # cherrypy psutil==5.8.0 # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt # -r requirements/base.txt # pytest-salt-factories # pytest-shell-utilities @@ -221,30 +263,37 @@ pyasn1-modules==0.2.4 # via google-auth pyasn1==0.4.8 # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt # -r requirements/windows.txt # pyasn1-modules # rsa pycparser==2.21 ; python_version >= "3.9" # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt # -r requirements/static/ci/common.in # -r requirements/windows.txt # cffi pycryptodomex==3.10.1 - # via -r requirements/crypto.txt + # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt + # -r requirements/crypto.txt pygit2==1.9.1 # via -r requirements/static/ci/windows.in pymssql==2.2.7 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt + # -r requirements/windows.txt pymysql==1.0.2 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt + # -r requirements/windows.txt pynacl==1.5.0 # via -r requirements/static/ci/common.in pyopenssl==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt # -r requirements/windows.txt # etcd3-py -pyparsing==3.0.9 - # via packaging pyrsistent==0.17.3 # via jsonschema pytest-custom-exit-code==0.3.0 @@ -284,6 +333,7 @@ pytest==7.2.0 # pytest-timeout python-dateutil==2.8.1 # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt # -r requirements/windows.txt # botocore # kubernetes @@ -291,17 +341,23 @@ python-dateutil==2.8.1 python-etcd==0.4.5 # via -r requirements/static/ci/common.in python-gnupg==0.4.8 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt + # -r requirements/windows.txt pythonnet==3.0.1 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt + # -r requirements/windows.txt pytz==2022.1 # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt # moto # tempora pyvmomi==6.7.1.2018.12 # via -r requirements/static/ci/common.in pywin32==305 # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt # -r requirements/windows.txt # docker # pytest-skip-markers @@ -310,6 +366,7 @@ pywinrm==0.4.1 # via -r requirements/static/ci/windows.in pyyaml==6.0.1 # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt # -r requirements/base.txt # clustershell # kubernetes @@ -317,12 +374,14 @@ pyyaml==6.0.1 # yamllint pyzmq==25.0.2 ; sys_platform == "win32" # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt # -r requirements/zeromq.txt # pytest-salt-factories requests-ntlm==1.1.0 # via pywinrm requests==2.31.0 # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # -r requirements/windows.txt @@ -347,9 +406,12 @@ sed==0.3.1 semantic-version==2.10.0 # via etcd3-py setproctitle==1.3.2 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt + # -r requirements/windows.txt six==1.15.0 # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt # cassandra-driver # cheroot # etcd3-py @@ -365,15 +427,21 @@ six==1.15.0 # responses # websocket-client smmap==4.0.0 - # via gitdb + # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt + # gitdb sqlparse==0.4.4 # via -r requirements/static/ci/common.in strict-rfc3339==0.7 # via -r requirements/static/ci/common.in tempora==4.1.1 - # via portend + # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt + # portend timelib==0.2.5 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt + # -r requirements/windows.txt toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 @@ -384,6 +452,7 @@ typing-extensions==4.4.0 # pytest-system-statistics urllib3==1.26.6 # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt # -r requirements/windows.txt # botocore # docker @@ -407,9 +476,13 @@ werkzeug==2.2.3 # moto # pytest-httpserver wheel==0.38.4 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt + # -r requirements/windows.txt wmi==1.5.1 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt + # -r requirements/windows.txt xmltodict==0.12.0 # via # moto @@ -419,9 +492,13 @@ yamllint==1.28.0 yarl==1.8.1 # via aiohttp zc.lockfile==2.0 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt + # cherrypy zipp==3.12.0 - # via importlib-metadata + # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt + # importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/static/ci/py3.11/tools.txt b/requirements/static/ci/py3.11/tools.txt index f32fde3f91d..4e0c7ace511 100644 --- a/requirements/static/ci/py3.11/tools.txt +++ b/requirements/static/ci/py3.11/tools.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.11/tools.txt --pip-args='--constraint=requirements/static/ci/py3.11/linux.txt' requirements/static/ci/tools.in +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.11/tools.txt requirements/static/ci/tools.in # attrs==22.1.0 # via diff --git a/requirements/static/ci/py3.7/cloud.txt b/requirements/static/ci/py3.7/cloud.txt index 3263e1cad95..95b3302d68f 100644 --- a/requirements/static/ci/py3.7/cloud.txt +++ b/requirements/static/ci/py3.7/cloud.txt @@ -2,30 +2,42 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.7/cloud.txt --pip-args='--constraint=requirements/static/ci/py3.7/linux.txt' requirements/base.txt requirements/pytest.txt requirements/static/ci/cloud.in requirements/static/ci/common.in requirements/static/pkg/linux.in requirements/zeromq.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.7/cloud.txt requirements/base.txt requirements/pytest.txt requirements/static/ci/cloud.in requirements/static/ci/common.in requirements/static/pkg/linux.in requirements/zeromq.txt # -adal==1.2.7 +adal==1.2.3 # via + # -c requirements/static/ci/py3.7/linux.txt # azure-datalake-store # msrestazure aiohttp==3.8.5 - # via etcd3-py + # via + # -c requirements/static/ci/py3.7/linux.txt + # etcd3-py aiosignal==1.2.0 - # via aiohttp + # via + # -c requirements/static/ci/py3.7/linux.txt + # aiohttp apache-libcloud==2.5.0 ; sys_platform != "win32" # via + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/static/ci/cloud.in # -r requirements/static/ci/common.in -asn1crypto==1.4.0 +asn1crypto==1.3.0 # via + # -c requirements/static/ci/py3.7/linux.txt # certvalidator # oscrypto async-timeout==4.0.2 - # via aiohttp + # via + # -c requirements/static/ci/py3.7/linux.txt + # aiohttp asynctest==0.13.0 - # via aiohttp + # via + # -c requirements/static/ci/py3.7/linux.txt + # aiohttp attrs==23.1.0 # via + # -c requirements/static/ci/py3.7/linux.txt # aiohttp # jsonschema # pytest @@ -34,11 +46,16 @@ attrs==23.1.0 # pytest-skip-markers # pytest-system-statistics azure-applicationinsights==0.1.0 - # via azure -azure-batch==4.1.3 - # via azure -azure-common==1.1.27 # via + # -c requirements/static/ci/py3.7/linux.txt + # azure +azure-batch==4.1.3 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure +azure-common==1.1.18 + # via + # -c requirements/static/ci/py3.7/linux.txt # azure-applicationinsights # azure-batch # azure-cosmosdb-table @@ -114,107 +131,205 @@ azure-common==1.1.27 # azure-storage-file # azure-storage-queue azure-cosmosdb-nspkg==2.0.2 - # via azure-cosmosdb-table -azure-cosmosdb-table==1.0.6 - # via azure -azure-datalake-store==0.0.52 - # via azure -azure-eventgrid==1.3.0 - # via azure + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-cosmosdb-table +azure-cosmosdb-table==1.0.5 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure +azure-datalake-store==0.0.44 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure +azure-eventgrid==1.2.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure azure-graphrbac==0.40.0 - # via azure + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure azure-keyvault==1.1.0 - # via azure + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure azure-loganalytics==0.1.0 - # via azure + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure azure-mgmt-advisor==1.0.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-applicationinsights==0.1.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-authorization==0.50.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-batch==5.0.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-batchai==2.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-billing==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-cdn==3.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-cognitiveservices==3.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-commerce==1.0.1 - # via azure-mgmt -azure-mgmt-compute==4.6.2 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt +azure-mgmt-compute==4.6.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-consumption==2.0.0 - # via azure-mgmt -azure-mgmt-containerinstance==1.5.0 - # via azure-mgmt -azure-mgmt-containerregistry==2.8.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt +azure-mgmt-containerinstance==1.4.1 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt +azure-mgmt-containerregistry==2.7.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-containerservice==4.4.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-cosmosdb==0.4.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-datafactory==0.6.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-datalake-analytics==0.6.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-datalake-nspkg==3.0.1 # via + # -c requirements/static/ci/py3.7/linux.txt # azure-mgmt-datalake-analytics # azure-mgmt-datalake-store azure-mgmt-datalake-store==0.5.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-datamigration==1.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-devspaces==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-devtestlabs==2.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-dns==2.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-eventgrid==1.0.0 - # via azure-mgmt -azure-mgmt-eventhub==2.6.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt +azure-mgmt-eventhub==2.5.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-hanaonazure==0.1.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-iotcentral==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-iothub==0.5.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-iothubprovisioningservices==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-keyvault==1.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-loganalytics==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-logic==3.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-machinelearningcompute==0.4.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-managementgroups==0.1.0 - # via azure-mgmt -azure-mgmt-managementpartner==0.1.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt +azure-mgmt-managementpartner==0.1.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-maps==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-marketplaceordering==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-media==1.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-monitor==0.5.2 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-msi==0.2.0 - # via azure-mgmt -azure-mgmt-network==2.7.0 - # via azure-mgmt -azure-mgmt-notificationhubs==2.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt +azure-mgmt-network==2.6.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt +azure-mgmt-notificationhubs==2.0.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-nspkg==3.0.2 # via + # -c requirements/static/ci/py3.7/linux.txt # azure-mgmt-advisor # azure-mgmt-applicationinsights # azure-mgmt-authorization @@ -241,10 +356,12 @@ azure-mgmt-nspkg==3.0.2 # azure-mgmt-logic # azure-mgmt-machinelearningcompute # azure-mgmt-managementgroups + # azure-mgmt-managementpartner # azure-mgmt-maps # azure-mgmt-marketplaceordering # azure-mgmt-monitor # azure-mgmt-msi + # azure-mgmt-notificationhubs # azure-mgmt-policyinsights # azure-mgmt-powerbiembedded # azure-mgmt-recoveryservices @@ -253,6 +370,7 @@ azure-mgmt-nspkg==3.0.2 # azure-mgmt-relay # azure-mgmt-reservations # azure-mgmt-scheduler + # azure-mgmt-search # azure-mgmt-servicefabric # azure-mgmt-signalr # azure-mgmt-sql @@ -261,50 +379,92 @@ azure-mgmt-nspkg==3.0.2 # azure-mgmt-trafficmanager # azure-mgmt-web azure-mgmt-policyinsights==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-powerbiembedded==2.0.0 - # via azure-mgmt -azure-mgmt-rdbms==1.9.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt +azure-mgmt-rdbms==1.8.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-recoveryservices==0.3.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-recoveryservicesbackup==0.3.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-redis==5.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-relay==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-reservations==0.2.1 - # via azure-mgmt -azure-mgmt-resource==2.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt +azure-mgmt-resource==2.1.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-scheduler==2.0.0 - # via azure-mgmt -azure-mgmt-search==2.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt +azure-mgmt-search==2.0.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-servicebus==0.5.3 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-servicefabric==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-signalr==0.1.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-sql==0.9.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-storage==2.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-subscription==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-trafficmanager==0.50.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-web==0.35.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt==4.0.0 - # via azure + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure azure-nspkg==3.0.2 # via + # -c requirements/static/ci/py3.7/linux.txt # azure-applicationinsights # azure-batch # azure-cosmosdb-nspkg + # azure-eventgrid # azure-graphrbac # azure-keyvault # azure-loganalytics @@ -313,87 +473,144 @@ azure-nspkg==3.0.2 # azure-servicefabric # azure-servicemanagement-legacy azure-servicebus==0.21.1 - # via azure -azure-servicefabric==6.3.0.0 - # via azure -azure-servicemanagement-legacy==0.20.7 - # via azure -azure-storage-blob==1.5.0 - # via azure -azure-storage-common==1.4.2 # via + # -c requirements/static/ci/py3.7/linux.txt + # azure +azure-servicefabric==6.3.0.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure +azure-servicemanagement-legacy==0.20.6 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure +azure-storage-blob==1.5.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure +azure-storage-common==1.4.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-cosmosdb-table # azure-storage-blob # azure-storage-file # azure-storage-queue azure-storage-file==1.4.0 - # via azure -azure-storage-queue==1.4.0 - # via azure -azure==4.0.0 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in -backports.entry-points-selectable==1.1.0 - # via virtualenv -bcrypt==3.2.0 # via + # -c requirements/static/ci/py3.7/linux.txt + # azure +azure-storage-queue==1.4.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure +azure==4.0.0 ; sys_platform != "win32" + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in +backports.entry-points-selectable==1.1.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # virtualenv +bcrypt==3.1.6 + # via + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/static/ci/common.in # paramiko boto3==1.21.46 # via + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/static/ci/common.in # moto boto==2.49.0 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in botocore==1.24.46 # via + # -c requirements/static/ci/py3.7/linux.txt # boto3 # moto # s3transfer cachetools==4.2.2 - # via google-auth -cassandra-driver==3.25.0 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.7/linux.txt + # google-auth +cassandra-driver==3.23.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in certifi==2023.07.22 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/static/ci/common.in # kubernetes # msrest # requests certvalidator==0.11.1 - # via vcert -cffi==1.15.1 # via + # -c requirements/static/ci/py3.7/linux.txt + # vcert +cffi==1.14.6 + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/static/ci/common.in # azure-datalake-store # bcrypt # cryptography # napalm # pynacl -charset-normalizer==2.0.12 +charset-normalizer==3.2.0 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # aiohttp # requests -cheetah3==3.2.6.post1 - # via -r requirements/static/ci/common.in +cheetah3==3.2.6.post2 + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in cheroot==8.5.2 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # cherrypy cherrypy==18.6.1 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/linux.in -ciscoconfparse==1.5.46 - # via napalm -click==8.0.1 - # via geomet +ciscoconfparse==1.5.19 + # via + # -c requirements/static/ci/py3.7/linux.txt + # napalm +click==7.1.1 + # via + # -c requirements/static/ci/py3.7/linux.txt + # geomet clustershell==1.8.3 - # via -r requirements/static/ci/common.in -colorama==0.4.4 - # via ciscoconfparse + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in +colorama==0.4.3 + # via + # -c requirements/static/ci/py3.7/linux.txt + # ciscoconfparse contextvars==2.4 - # via -r requirements/base.txt -croniter==1.0.15 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/base.txt +croniter==0.3.29 ; sys_platform != "win32" + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in cryptography==41.0.4 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/static/pkg/linux.in # adal # azure-cosmosdb-table @@ -407,143 +624,225 @@ cryptography==41.0.4 # requests-ntlm # smbprotocol # vcert -distlib==0.3.3 - # via virtualenv -distro==1.6.0 +distlib==0.3.2 # via + # -c requirements/static/ci/py3.7/linux.txt + # virtualenv +distro==1.5.0 + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/base.txt # pytest-skip-markers -dnspython==2.1.0 +dnspython==1.16.0 # via + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/static/ci/common.in # ciscoconfparse # python-etcd docker==6.1.3 - # via -r requirements/pytest.txt + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/pytest.txt etcd3-py==0.1.6 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in exceptiongroup==1.0.4 - # via pytest + # via + # -c requirements/static/ci/py3.7/linux.txt + # pytest filelock==3.0.12 - # via virtualenv + # via + # -c requirements/static/ci/py3.7/linux.txt + # virtualenv flaky==3.7.0 - # via -r requirements/pytest.txt + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/pytest.txt frozenlist==1.3.0 # via + # -c requirements/static/ci/py3.7/linux.txt # aiohttp # aiosignal future==0.18.3 # via + # -c requirements/static/ci/py3.7/linux.txt # napalm # textfsm genshi==0.7.5 - # via -r requirements/static/ci/common.in -geomet==0.2.1.post1 - # via cassandra-driver -gitdb==4.0.7 - # via gitpython + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in +geomet==0.1.2 + # via + # -c requirements/static/ci/py3.7/linux.txt + # cassandra-driver +gitdb==4.0.5 + # via + # -c requirements/static/ci/py3.7/linux.txt + # gitpython gitpython==3.1.35 - # via -r requirements/static/ci/common.in -google-auth==2.1.0 - # via kubernetes + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in +google-auth==1.6.3 + # via + # -c requirements/static/ci/py3.7/linux.txt + # kubernetes idna==2.8 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # etcd3-py # requests # yarl -immutables==0.19 - # via contextvars -importlib-metadata==4.8.1 +immutables==0.15 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # contextvars +importlib-metadata==4.6.4 + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/static/pkg/linux.in # attrs # backports.entry-points-selectable - # click # jsonschema # mako # moto # pluggy # pytest # virtualenv -iniconfig==1.1.1 - # via pytest -ipaddress==1.0.23 - # via kubernetes -isodate==0.6.0 - # via msrest -jaraco.classes==3.2.1 - # via jaraco.collections -jaraco.collections==3.4.0 - # via cherrypy -jaraco.functools==3.3.0 +iniconfig==1.0.1 # via + # -c requirements/static/ci/py3.7/linux.txt + # pytest +ipaddress==1.0.22 + # via + # -c requirements/static/ci/py3.7/linux.txt + # kubernetes +isodate==0.6.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # msrest +jaraco.classes==3.2.1 + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # jaraco.collections +jaraco.collections==3.4.0 + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # cherrypy +jaraco.functools==2.0 + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # cheroot # jaraco.text # tempora jaraco.text==3.5.1 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # jaraco.collections jinja2==3.1.2 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/base.txt # junos-eznc # moto # napalm -jmespath==0.10.0 +jmespath==1.0.1 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # boto3 # botocore jsonschema==3.2.0 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.10" # via + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/static/ci/common.in # napalm -jxmlease==1.0.3 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in -kazoo==2.8.0 ; sys_platform != "win32" and sys_platform != "darwin" - # via -r requirements/static/ci/common.in +jxmlease==1.0.1 ; sys_platform != "win32" + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in +kazoo==2.6.1 ; sys_platform != "win32" and sys_platform != "darwin" + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in keyring==5.7.1 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in kubernetes==3.0.0 - # via -r requirements/static/ci/common.in -libnacl==1.8.0 ; sys_platform != "win32" and sys_platform != "darwin" - # via -r requirements/static/ci/common.in -loguru==0.6.0 - # via ciscoconfparse + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in +libnacl==1.7.1 ; sys_platform != "win32" and sys_platform != "darwin" + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in looseversion==1.0.2 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/base.txt lxml==4.9.1 # via + # -c requirements/static/ci/py3.7/linux.txt # junos-eznc # napalm # ncclient mako==1.2.2 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in markupsafe==2.1.2 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/base.txt # jinja2 # mako # moto # werkzeug -mock==4.0.3 - # via -r requirements/pytest.txt -more-itertools==8.8.0 +mock==3.0.5 # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/pytest.txt +more-itertools==5.0.0 + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # cheroot # cherrypy # jaraco.classes # jaraco.functools moto==3.0.1 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in msgpack==1.0.2 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/base.txt # pytest-salt-factories -msrest==0.6.21 +msrest==0.6.14 # via + # -c requirements/static/ci/py3.7/linux.txt # azure-applicationinsights # azure-eventgrid # azure-keyvault @@ -556,20 +855,18 @@ msrest==0.6.21 # azure-mgmt-dns # azure-mgmt-eventhub # azure-mgmt-keyvault - # azure-mgmt-managementpartner # azure-mgmt-media # azure-mgmt-network - # azure-mgmt-notificationhubs # azure-mgmt-rdbms # azure-mgmt-resource - # azure-mgmt-search # azure-mgmt-servicebus # azure-mgmt-servicefabric # azure-mgmt-signalr # azure-servicefabric # msrestazure -msrestazure==0.6.4 +msrestazure==0.6.3 # via + # -c requirements/static/ci/py3.7/linux.txt # azure-batch # azure-eventgrid # azure-graphrbac @@ -636,39 +933,52 @@ msrestazure==0.6.4 # azure-mgmt-web multidict==6.0.2 # via + # -c requirements/static/ci/py3.7/linux.txt # aiohttp # yarl -napalm==3.3.1 ; sys_platform != "win32" and python_version < "3.10" - # via -r requirements/static/ci/common.in -ncclient==0.6.12 +napalm==3.1.0 ; sys_platform != "win32" and python_version < "3.10" # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in +ncclient==0.6.4 + # via + # -c requirements/static/ci/py3.7/linux.txt # junos-eznc - # napalm netaddr==0.7.19 # via + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/static/ci/cloud.in # junos-eznc # napalm # pyeapi -netmiko==3.4.0 - # via napalm -ntc-templates==2.3.2 +netmiko==3.2.0 # via + # -c requirements/static/ci/py3.7/linux.txt + # napalm +ntc-templates==1.4.0 + # via + # -c requirements/static/ci/py3.7/linux.txt # junos-eznc - # netmiko ntlm-auth==1.3.0 # via requests-ntlm oauthlib==3.2.2 - # via requests-oauthlib -oscrypto==1.2.1 - # via certvalidator -packaging==21.3 # via + # -c requirements/static/ci/py3.7/linux.txt + # requests-oauthlib +oscrypto==1.2.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # certvalidator +packaging==22.0 + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/base.txt # docker # pytest paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin" # via + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/static/ci/common.in # junos-eznc # napalm @@ -677,56 +987,91 @@ paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin" # scp passlib==1.7.4 # via + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/static/ci/common.in # ciscoconfparse -platformdirs==2.3.0 - # via virtualenv -pluggy==1.0.0 - # via pytest -portend==2.7.1 - # via cherrypy +pathtools==0.1.2 + # via + # -c requirements/static/ci/py3.7/linux.txt + # watchdog +platformdirs==2.2.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # virtualenv +pluggy==0.13.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # pytest +portend==2.4 + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # cherrypy profitbricks==4.1.3 # via -r requirements/static/ci/cloud.in psutil==5.8.0 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/base.txt # pytest-salt-factories # pytest-shell-utilities # pytest-system-statistics -pyasn1-modules==0.2.8 - # via google-auth +pyasn1-modules==0.2.4 + # via + # -c requirements/static/ci/py3.7/linux.txt + # google-auth pyasn1==0.4.8 # via + # -c requirements/static/ci/py3.7/linux.txt # pyasn1-modules # rsa -pycparser==2.19 - # via cffi -pycryptodomex==3.10.1 - # via -r requirements/crypto.txt -pyeapi==0.8.4 - # via napalm +pycparser==2.17 + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # cffi +pycryptodomex==3.9.8 + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/crypto.txt +pyeapi==0.8.3 + # via + # -c requirements/static/ci/py3.7/linux.txt + # napalm pyinotify==0.9.6 ; sys_platform != "win32" and sys_platform != "darwin" and platform_system != "openbsd" - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in pyjwt==2.4.0 - # via adal + # via + # -c requirements/static/ci/py3.7/linux.txt + # adal pynacl==1.5.0 # via + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/static/ci/common.in # paramiko pyopenssl==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/static/pkg/linux.in # etcd3-py pyparsing==3.0.9 # via + # -c requirements/static/ci/py3.7/linux.txt # junos-eznc - # packaging pypsexec==0.1.0 # via -r requirements/static/ci/cloud.in -pyrsistent==0.18.0 - # via jsonschema -pyserial==3.5 +pyrsistent==0.17.3 # via + # -c requirements/static/ci/py3.7/linux.txt + # jsonschema +pyserial==3.4 + # via + # -c requirements/static/ci/py3.7/linux.txt # junos-eznc # netmiko pyspnego==0.8.0 @@ -734,31 +1079,48 @@ pyspnego==0.8.0 # -r requirements/static/ci/cloud.in # smbprotocol pytest-custom-exit-code==0.3.0 - # via -r requirements/pytest.txt + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/pytest.txt pytest-helpers-namespace==2021.4.29 # via + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/pytest.txt # pytest-salt-factories # pytest-shell-utilities pytest-httpserver==1.0.4 - # via -r requirements/pytest.txt + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/pytest.txt pytest-salt-factories==1.0.0rc26 - # via -r requirements/pytest.txt + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/pytest.txt pytest-shell-utilities==1.8.0 - # via pytest-salt-factories + # via + # -c requirements/static/ci/py3.7/linux.txt + # pytest-salt-factories pytest-skip-markers==1.4.1 # via + # -c requirements/static/ci/py3.7/linux.txt # pytest-salt-factories # pytest-shell-utilities # pytest-system-statistics -pytest-subtests==0.5.0 - # via -r requirements/pytest.txt +pytest-subtests==0.4.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/pytest.txt pytest-system-statistics==1.0.2 - # via pytest-salt-factories -pytest-timeout==2.0.2 - # via -r requirements/pytest.txt + # via + # -c requirements/static/ci/py3.7/linux.txt + # pytest-salt-factories +pytest-timeout==1.4.2 + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/pytest.txt pytest==7.2.0 # via + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/pytest.txt # pytest-custom-exit-code # pytest-helpers-namespace @@ -768,8 +1130,10 @@ pytest==7.2.0 # pytest-subtests # pytest-system-statistics # pytest-timeout -python-dateutil==2.8.2 +python-dateutil==2.8.1 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/static/pkg/linux.in # adal # azure-cosmosdb-table @@ -780,19 +1144,30 @@ python-dateutil==2.8.2 # moto # vcert python-etcd==0.4.5 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in python-gnupg==0.4.8 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/pkg/linux.in pytz==2022.1 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # moto # tempora -pyvmomi==7.0.2 - # via -r requirements/static/ci/common.in +pyvmomi==6.7.1.2018.12 + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in pywinrm==0.3.0 # via -r requirements/static/ci/cloud.in pyyaml==6.0.1 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/base.txt # clustershell # junos-eznc @@ -802,14 +1177,20 @@ pyyaml==6.0.1 # yamlordereddictloader pyzmq==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/zeromq.txt # pytest-salt-factories requests-ntlm==1.1.0 # via pywinrm requests-oauthlib==1.3.0 - # via msrest + # via + # -c requirements/static/ci/py3.7/linux.txt + # msrest requests==2.31.0 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # adal @@ -833,39 +1214,60 @@ requests==2.31.0 # requests-oauthlib # responses # vcert -responses==0.14.0 - # via moto -rfc3987==1.3.8 - # via -r requirements/static/ci/common.in -rpm-vercmp==0.1.2 - # via -r requirements/static/pkg/linux.in -rsa==4.7.2 - # via google-auth -s3transfer==0.5.0 - # via boto3 -scp==0.14.1 +responses==0.10.6 # via + # -c requirements/static/ci/py3.7/linux.txt + # moto +rfc3987==1.3.8 + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in +rpm-vercmp==0.1.2 + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/pkg/linux.in +rsa==4.7.2 + # via + # -c requirements/static/ci/py3.7/linux.txt + # google-auth +s3transfer==0.5.2 + # via + # -c requirements/static/ci/py3.7/linux.txt + # boto3 +scp==0.13.2 + # via + # -c requirements/static/ci/py3.7/linux.txt # junos-eznc # napalm # netmiko semantic-version==2.9.0 - # via etcd3-py + # via + # -c requirements/static/ci/py3.7/linux.txt + # etcd3-py setproctitle==1.3.2 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/pkg/linux.in six==1.16.0 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # bcrypt # cassandra-driver # cheroot # etcd3-py # genshi # geomet + # google-auth # isodate # jsonschema # junos-eznc # kazoo # kubernetes - # msrestazure + # mock + # more-itertools # ncclient # paramiko # profitbricks @@ -883,76 +1285,120 @@ smbprotocol==1.10.1 # via # -r requirements/static/ci/cloud.in # pypsexec -smmap==4.0.0 - # via gitdb -sqlparse==0.4.4 - # via -r requirements/static/ci/common.in -strict-rfc3339==0.7 - # via -r requirements/static/ci/common.in -tempora==4.1.1 - # via portend -tenacity==8.0.1 - # via netmiko -textfsm==1.1.2 +smmap==3.0.4 # via + # -c requirements/static/ci/py3.7/linux.txt + # gitdb +sqlparse==0.4.4 + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in +strict-rfc3339==0.7 + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in +tempora==4.1.1 + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # portend +terminal==0.4.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # ntc-templates +textfsm==1.1.0 + # via + # -c requirements/static/ci/py3.7/linux.txt # napalm + # netmiko # ntc-templates timelib==0.2.5 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/pkg/linux.in toml==0.10.2 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in tomli==2.0.1 - # via pytest -transitions==0.8.9 - # via junos-eznc + # via + # -c requirements/static/ci/py3.7/linux.txt + # pytest +transitions==0.8.1 + # via + # -c requirements/static/ci/py3.7/linux.txt + # junos-eznc typing-extensions==3.10.0.0 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # aiohttp # async-timeout # gitpython - # immutables # importlib-metadata # pytest-shell-utilities # pytest-system-statistics # yarl urllib3==1.26.6 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # botocore # docker # kubernetes # python-etcd # requests - # responses vcert==0.7.4 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in -virtualenv==20.8.0 # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in +virtualenv==20.7.2 + # via + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/static/ci/common.in # pytest-salt-factories -watchdog==2.1.5 - # via -r requirements/static/ci/common.in +watchdog==0.10.3 + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in websocket-client==0.40.0 # via + # -c requirements/static/ci/py3.7/linux.txt # docker # kubernetes wempy==0.2.1 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in werkzeug==2.2.3 # via + # -c requirements/static/ci/py3.7/linux.txt # moto # pytest-httpserver xmltodict==0.12.0 # via + # -c requirements/static/ci/py3.7/linux.txt # moto # pywinrm yamlordereddictloader==0.4.0 - # via junos-eznc + # via + # -c requirements/static/ci/py3.7/linux.txt + # junos-eznc yarl==1.7.2 - # via aiohttp -zc.lockfile==2.0 - # via cherrypy + # via + # -c requirements/static/ci/py3.7/linux.txt + # aiohttp +zc.lockfile==1.4 + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # cherrypy zipp==3.5.0 - # via importlib-metadata + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/static/ci/py3.7/docs.txt b/requirements/static/ci/py3.7/docs.txt index 31209a994b2..8b4c690f591 100644 --- a/requirements/static/ci/py3.7/docs.txt +++ b/requirements/static/ci/py3.7/docs.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.7/docs.txt requirements/base.txt requirements/static/ci/docs.in requirements/zeromq.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.7/docs.txt requirements/base.txt requirements/static/ci/docs.in requirements/zeromq.txt # alabaster==0.7.12 # via sphinx @@ -12,7 +12,7 @@ certifi==2023.07.22 # via # -c requirements/static/ci/py3.7/linux.txt # requests -charset-normalizer==2.0.12 +charset-normalizer==3.2.0 # via # -c requirements/static/ci/py3.7/linux.txt # requests @@ -108,7 +108,7 @@ msgpack==1.0.2 # -r requirements/base.txt myst-docutils[linkify]==0.18.1 # via -r requirements/static/ci/docs.in -packaging==21.3 +packaging==22.0 # via # -c requirements/static/ci/py3.7/linux.txt # -r requirements/base.txt @@ -129,10 +129,6 @@ pyenchant==3.2.2 # via sphinxcontrib-spelling pygments==2.8.1 # via sphinx -pyparsing==3.0.9 - # via - # -c requirements/static/ci/py3.7/linux.txt - # packaging pytz==2022.1 # via # -c requirements/static/ci/py3.7/linux.txt diff --git a/requirements/static/ci/py3.7/freebsd-crypto.txt b/requirements/static/ci/py3.7/freebsd-crypto.txt index 7c8974d75e9..d844d2f9716 100644 --- a/requirements/static/ci/py3.7/freebsd-crypto.txt +++ b/requirements/static/ci/py3.7/freebsd-crypto.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.7/freebsd-crypto.txt --pip-args='--constraint=requirements/static/ci/py3.7/freebsd.txt' requirements/static/ci/crypto.in +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.7/freebsd-crypto.txt requirements/static/ci/crypto.in # m2crypto==0.38.0 # via -r requirements/static/ci/crypto.in diff --git a/requirements/static/ci/py3.7/freebsd.txt b/requirements/static/ci/py3.7/freebsd.txt index ac7eb2ebaa2..55d42803c77 100644 --- a/requirements/static/ci/py3.7/freebsd.txt +++ b/requirements/static/ci/py3.7/freebsd.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.7/freebsd.txt --pip-args='--constraint=requirements/static/pkg/py3.7/freebsd.txt' requirements/base.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/freebsd.in requirements/static/pkg/freebsd.in requirements/zeromq.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.7/freebsd.txt requirements/base.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/freebsd.in requirements/static/pkg/freebsd.in requirements/zeromq.txt # adal==1.2.5 # via @@ -352,14 +352,16 @@ cassandra-driver==3.24.0 # via -r requirements/static/ci/common.in certifi==2023.07.22 # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt # -r requirements/static/ci/common.in # kubernetes # msrest # requests certvalidator==0.11.1 # via vcert -cffi==1.15.1 +cffi==1.14.6 # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt # -r requirements/static/ci/common.in # azure-datalake-store # bcrypt @@ -367,16 +369,20 @@ cffi==1.15.1 # napalm # pygit2 # pynacl -charset-normalizer==2.0.12 +charset-normalizer==3.2.0 # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt # aiohttp # requests cheetah3==3.2.6.post2 # via -r requirements/static/ci/common.in cheroot==8.5.2 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt + # cherrypy cherrypy==18.6.1 # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/freebsd.in ciscoconfparse==1.5.19 @@ -388,11 +394,14 @@ clustershell==1.8.3 colorama==0.4.3 # via ciscoconfparse contextvars==2.4 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt + # -r requirements/base.txt croniter==0.3.29 ; sys_platform != "win32" # via -r requirements/static/ci/common.in cryptography==41.0.4 # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt # -r requirements/static/pkg/freebsd.in # adal # azure-cosmosdb-table @@ -407,6 +416,7 @@ distlib==0.3.2 # via virtualenv distro==1.5.0 # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt # -r requirements/base.txt # -r requirements/static/pkg/freebsd.in # pytest-skip-markers @@ -447,13 +457,17 @@ hglib==2.6.1 # via -r requirements/static/ci/freebsd.in idna==2.8 # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt # etcd3-py # requests # yarl immutables==0.15 - # via contextvars + # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt + # contextvars importlib-metadata==4.6.4 # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt # -r requirements/static/pkg/freebsd.in # attrs # backports.entry-points-selectable @@ -470,24 +484,33 @@ ipaddress==1.0.22 isodate==0.6.0 # via msrest jaraco.classes==3.2.1 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt + # jaraco.collections jaraco.collections==3.4.0 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt + # cherrypy jaraco.functools==2.0 # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt # cheroot # jaraco.text # tempora jaraco.text==3.5.1 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt + # jaraco.collections jinja2==3.1.2 # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt # -r requirements/base.txt # junos-eznc # moto # napalm jmespath==1.0.1 # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # boto3 @@ -509,7 +532,9 @@ kubernetes==3.0.0 libnacl==1.7.1 ; sys_platform != "win32" and sys_platform != "darwin" # via -r requirements/static/ci/common.in looseversion==1.0.2 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt + # -r requirements/base.txt lxml==4.9.1 # via # junos-eznc @@ -519,6 +544,7 @@ mako==1.2.2 # via -r requirements/static/ci/common.in markupsafe==2.1.2 # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt # -r requirements/base.txt # jinja2 # mako @@ -530,6 +556,7 @@ mock==3.0.5 # via -r requirements/pytest.txt more-itertools==5.0.0 # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt # cheroot # cherrypy # jaraco.classes @@ -538,6 +565,7 @@ moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt # -r requirements/base.txt # pytest-salt-factories msrest==0.6.19 @@ -653,8 +681,9 @@ oauthlib==3.2.2 # via requests-oauthlib oscrypto==1.2.0 # via certvalidator -packaging==21.3 +packaging==22.0 # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt # -r requirements/base.txt # docker # pytest @@ -679,9 +708,12 @@ platformdirs==2.2.0 pluggy==0.13.0 # via pytest portend==2.4 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt + # cherrypy psutil==5.8.0 # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt # -r requirements/base.txt # pytest-salt-factories # pytest-shell-utilities @@ -693,9 +725,13 @@ pyasn1==0.4.8 # pyasn1-modules # rsa pycparser==2.17 - # via cffi + # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt + # cffi pycryptodomex==3.9.8 - # via -r requirements/crypto.txt + # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt + # -r requirements/crypto.txt pyeapi==0.8.3 # via napalm pygit2==1.8.0 @@ -710,12 +746,11 @@ pynacl==1.5.0 # paramiko pyopenssl==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt # -r requirements/static/pkg/freebsd.in # etcd3-py pyparsing==3.0.9 - # via - # junos-eznc - # packaging + # via junos-eznc pyrsistent==0.17.3 # via jsonschema pyserial==3.4 @@ -759,6 +794,7 @@ pytest==7.2.0 # pytest-timeout python-dateutil==2.8.1 # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt # -r requirements/static/pkg/freebsd.in # adal # azure-cosmosdb-table @@ -771,15 +807,19 @@ python-dateutil==2.8.1 python-etcd==0.4.5 # via -r requirements/static/ci/common.in python-gnupg==0.4.8 - # via -r requirements/static/pkg/freebsd.in + # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt + # -r requirements/static/pkg/freebsd.in pytz==2022.1 # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt # moto # tempora pyvmomi==6.7.1.2018.12 # via -r requirements/static/ci/common.in pyyaml==6.0.1 # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt # -r requirements/base.txt # clustershell # junos-eznc @@ -790,12 +830,14 @@ pyyaml==6.0.1 # yamlordereddictloader pyzmq==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt # -r requirements/zeromq.txt # pytest-salt-factories requests-oauthlib==1.3.0 # via msrest requests==2.31.0 # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # adal @@ -832,9 +874,12 @@ scp==0.13.2 semantic-version==2.9.0 # via etcd3-py setproctitle==1.3.2 - # via -r requirements/static/pkg/freebsd.in + # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt + # -r requirements/static/pkg/freebsd.in six==1.16.0 # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt # bcrypt # cassandra-driver # cheroot @@ -867,7 +912,9 @@ sqlparse==0.4.4 strict-rfc3339==0.7 # via -r requirements/static/ci/common.in tempora==4.1.1 - # via portend + # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt + # portend terminal==0.4.0 # via ntc-templates textfsm==1.1.0 @@ -876,7 +923,9 @@ textfsm==1.1.0 # netmiko # ntc-templates timelib==0.2.5 - # via -r requirements/static/pkg/freebsd.in + # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt + # -r requirements/static/pkg/freebsd.in toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 @@ -885,6 +934,7 @@ transitions==0.8.1 # via junos-eznc typing-extensions==3.10.0.0 # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt # aiohttp # async-timeout # gitpython @@ -894,6 +944,7 @@ typing-extensions==3.10.0.0 # yarl urllib3==1.26.6 # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt # botocore # docker # kubernetes @@ -926,9 +977,13 @@ yamlordereddictloader==0.4.0 yarl==1.7.2 # via aiohttp zc.lockfile==1.4 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt + # cherrypy zipp==3.5.0 - # via importlib-metadata + # via + # -c requirements/static/ci/../pkg/py3.7/freebsd.txt + # importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/static/ci/py3.7/invoke.txt b/requirements/static/ci/py3.7/invoke.txt index 669f7a7fce8..dfc00dd752f 100644 --- a/requirements/static/ci/py3.7/invoke.txt +++ b/requirements/static/ci/py3.7/invoke.txt @@ -2,13 +2,17 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.7/invoke.txt --pip-args='--constraint=requirements/static/ci/py3.7/linux.txt' requirements/static/ci/invoke.in +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.7/invoke.txt requirements/static/ci/invoke.in # blessings==1.7 # via -r requirements/static/ci/invoke.in invoke==1.4.1 # via -r requirements/static/ci/invoke.in pyyaml==6.0.1 - # via -r requirements/static/ci/invoke.in + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/invoke.in six==1.16.0 - # via blessings + # via + # -c requirements/static/ci/py3.7/linux.txt + # blessings diff --git a/requirements/static/ci/py3.7/lint.txt b/requirements/static/ci/py3.7/lint.txt index e07b834e8ef..4dddc1f9450 100644 --- a/requirements/static/ci/py3.7/lint.txt +++ b/requirements/static/ci/py3.7/lint.txt @@ -2,44 +2,68 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.7/lint.txt --pip-args='--constraint=requirements/static/ci/py3.7/linux.txt' requirements/base.txt requirements/static/ci/common.in requirements/static/ci/lint.in requirements/static/ci/linux.in requirements/static/pkg/linux.in requirements/zeromq.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.7/lint.txt requirements/base.txt requirements/static/ci/common.in requirements/static/ci/lint.in requirements/static/ci/linux.in requirements/static/pkg/linux.in requirements/zeromq.txt # -adal==1.2.7 +adal==1.2.3 # via + # -c requirements/static/ci/py3.7/linux.txt # azure-datalake-store # msrestazure aiohttp==3.8.5 - # via etcd3-py -aiosignal==1.2.0 - # via aiohttp -ansible-core==2.11.4 - # via ansible -ansible==4.4.0 ; python_version < "3.9" - # via -r requirements/static/ci/linux.in -apache-libcloud==3.3.1 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in -apscheduler==3.6.3 - # via python-telegram-bot -asn1crypto==1.4.0 # via + # -c requirements/static/ci/py3.7/linux.txt + # etcd3-py +aiosignal==1.2.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # aiohttp +ansible-core==2.11.7 + # via + # -c requirements/static/ci/py3.7/linux.txt + # ansible +ansible==4.4.0 ; python_version < "3.9" + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/linux.in +apache-libcloud==2.5.0 ; sys_platform != "win32" + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in +apscheduler==3.6.3 + # via + # -c requirements/static/ci/py3.7/linux.txt + # python-telegram-bot +asn1crypto==1.3.0 + # via + # -c requirements/static/ci/py3.7/linux.txt # certvalidator # oscrypto astroid==2.3.3 # via pylint async-timeout==4.0.2 - # via aiohttp -asynctest==0.13.0 - # via aiohttp -attrs==21.2.0 # via + # -c requirements/static/ci/py3.7/linux.txt + # aiohttp +asynctest==0.13.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # aiohttp +attrs==23.1.0 + # via + # -c requirements/static/ci/py3.7/linux.txt # aiohttp # jsonschema azure-applicationinsights==0.1.0 - # via azure -azure-batch==4.1.3 - # via azure -azure-common==1.1.27 # via + # -c requirements/static/ci/py3.7/linux.txt + # azure +azure-batch==4.1.3 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure +azure-common==1.1.18 + # via + # -c requirements/static/ci/py3.7/linux.txt # azure-applicationinsights # azure-batch # azure-cosmosdb-table @@ -115,107 +139,205 @@ azure-common==1.1.27 # azure-storage-file # azure-storage-queue azure-cosmosdb-nspkg==2.0.2 - # via azure-cosmosdb-table -azure-cosmosdb-table==1.0.6 - # via azure -azure-datalake-store==0.0.52 - # via azure -azure-eventgrid==1.3.0 - # via azure + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-cosmosdb-table +azure-cosmosdb-table==1.0.5 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure +azure-datalake-store==0.0.44 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure +azure-eventgrid==1.2.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure azure-graphrbac==0.40.0 - # via azure + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure azure-keyvault==1.1.0 - # via azure + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure azure-loganalytics==0.1.0 - # via azure + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure azure-mgmt-advisor==1.0.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-applicationinsights==0.1.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-authorization==0.50.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-batch==5.0.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-batchai==2.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-billing==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-cdn==3.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-cognitiveservices==3.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-commerce==1.0.1 - # via azure-mgmt -azure-mgmt-compute==4.6.2 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt +azure-mgmt-compute==4.6.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-consumption==2.0.0 - # via azure-mgmt -azure-mgmt-containerinstance==1.5.0 - # via azure-mgmt -azure-mgmt-containerregistry==2.8.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt +azure-mgmt-containerinstance==1.4.1 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt +azure-mgmt-containerregistry==2.7.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-containerservice==4.4.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-cosmosdb==0.4.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-datafactory==0.6.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-datalake-analytics==0.6.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-datalake-nspkg==3.0.1 # via + # -c requirements/static/ci/py3.7/linux.txt # azure-mgmt-datalake-analytics # azure-mgmt-datalake-store azure-mgmt-datalake-store==0.5.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-datamigration==1.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-devspaces==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-devtestlabs==2.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-dns==2.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-eventgrid==1.0.0 - # via azure-mgmt -azure-mgmt-eventhub==2.6.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt +azure-mgmt-eventhub==2.5.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-hanaonazure==0.1.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-iotcentral==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-iothub==0.5.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-iothubprovisioningservices==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-keyvault==1.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-loganalytics==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-logic==3.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-machinelearningcompute==0.4.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-managementgroups==0.1.0 - # via azure-mgmt -azure-mgmt-managementpartner==0.1.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt +azure-mgmt-managementpartner==0.1.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-maps==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-marketplaceordering==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-media==1.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-monitor==0.5.2 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-msi==0.2.0 - # via azure-mgmt -azure-mgmt-network==2.7.0 - # via azure-mgmt -azure-mgmt-notificationhubs==2.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt +azure-mgmt-network==2.6.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt +azure-mgmt-notificationhubs==2.0.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-nspkg==3.0.2 # via + # -c requirements/static/ci/py3.7/linux.txt # azure-mgmt-advisor # azure-mgmt-applicationinsights # azure-mgmt-authorization @@ -242,10 +364,12 @@ azure-mgmt-nspkg==3.0.2 # azure-mgmt-logic # azure-mgmt-machinelearningcompute # azure-mgmt-managementgroups + # azure-mgmt-managementpartner # azure-mgmt-maps # azure-mgmt-marketplaceordering # azure-mgmt-monitor # azure-mgmt-msi + # azure-mgmt-notificationhubs # azure-mgmt-policyinsights # azure-mgmt-powerbiembedded # azure-mgmt-recoveryservices @@ -254,6 +378,7 @@ azure-mgmt-nspkg==3.0.2 # azure-mgmt-relay # azure-mgmt-reservations # azure-mgmt-scheduler + # azure-mgmt-search # azure-mgmt-servicefabric # azure-mgmt-signalr # azure-mgmt-sql @@ -262,50 +387,92 @@ azure-mgmt-nspkg==3.0.2 # azure-mgmt-trafficmanager # azure-mgmt-web azure-mgmt-policyinsights==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-powerbiembedded==2.0.0 - # via azure-mgmt -azure-mgmt-rdbms==1.9.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt +azure-mgmt-rdbms==1.8.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-recoveryservices==0.3.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-recoveryservicesbackup==0.3.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-redis==5.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-relay==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-reservations==0.2.1 - # via azure-mgmt -azure-mgmt-resource==2.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt +azure-mgmt-resource==2.1.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-scheduler==2.0.0 - # via azure-mgmt -azure-mgmt-search==2.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt +azure-mgmt-search==2.0.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-servicebus==0.5.3 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-servicefabric==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-signalr==0.1.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-sql==0.9.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-storage==2.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-subscription==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-trafficmanager==0.50.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt-web==0.35.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-mgmt azure-mgmt==4.0.0 - # via azure + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure azure-nspkg==3.0.2 # via + # -c requirements/static/ci/py3.7/linux.txt # azure-applicationinsights # azure-batch # azure-cosmosdb-nspkg + # azure-eventgrid # azure-graphrbac # azure-keyvault # azure-loganalytics @@ -314,60 +481,90 @@ azure-nspkg==3.0.2 # azure-servicefabric # azure-servicemanagement-legacy azure-servicebus==0.21.1 - # via azure -azure-servicefabric==6.3.0.0 - # via azure -azure-servicemanagement-legacy==0.20.7 - # via azure -azure-storage-blob==1.5.0 - # via azure -azure-storage-common==1.4.2 # via + # -c requirements/static/ci/py3.7/linux.txt + # azure +azure-servicefabric==6.3.0.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure +azure-servicemanagement-legacy==0.20.6 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure +azure-storage-blob==1.5.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure +azure-storage-common==1.4.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure-cosmosdb-table # azure-storage-blob # azure-storage-file # azure-storage-queue azure-storage-file==1.4.0 - # via azure -azure-storage-queue==1.4.0 - # via azure -azure==4.0.0 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in -backports.entry-points-selectable==1.1.0 - # via virtualenv -backports.zoneinfo==0.2.1 - # via tzlocal -bcrypt==3.2.0 # via + # -c requirements/static/ci/py3.7/linux.txt + # azure +azure-storage-queue==1.4.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # azure +azure==4.0.0 ; sys_platform != "win32" + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in +backports.entry-points-selectable==1.1.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # virtualenv +bcrypt==3.1.6 + # via + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/static/ci/common.in # paramiko boto3==1.21.46 # via + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/static/ci/common.in # moto boto==2.49.0 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in botocore==1.24.46 # via + # -c requirements/static/ci/py3.7/linux.txt # boto3 # moto # s3transfer cachetools==4.2.2 # via + # -c requirements/static/ci/py3.7/linux.txt # google-auth # python-telegram-bot -cassandra-driver==3.25.0 - # via -r requirements/static/ci/common.in +cassandra-driver==3.23.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in certifi==2023.07.22 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/static/ci/common.in # kubernetes # msrest # python-telegram-bot # requests certvalidator==0.11.1 - # via vcert -cffi==1.15.1 # via + # -c requirements/static/ci/py3.7/linux.txt + # vcert +cffi==1.14.6 + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/static/ci/common.in # azure-datalake-store # bcrypt @@ -375,32 +572,56 @@ cffi==1.15.1 # napalm # pygit2 # pynacl -charset-normalizer==2.0.4 +charset-normalizer==3.2.0 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # aiohttp # requests -cheetah3==3.2.6.post1 - # via -r requirements/static/ci/common.in +cheetah3==3.2.6.post2 + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in cheroot==8.5.2 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # cherrypy cherrypy==18.6.1 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/linux.in -ciscoconfparse==1.5.46 - # via napalm -click==8.0.1 - # via geomet +ciscoconfparse==1.5.19 + # via + # -c requirements/static/ci/py3.7/linux.txt + # napalm +click==7.1.1 + # via + # -c requirements/static/ci/py3.7/linux.txt + # geomet clustershell==1.8.3 - # via -r requirements/static/ci/common.in -colorama==0.4.4 - # via ciscoconfparse + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in +colorama==0.4.3 + # via + # -c requirements/static/ci/py3.7/linux.txt + # ciscoconfparse contextvars==2.4 - # via -r requirements/base.txt -croniter==1.0.15 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/base.txt +croniter==0.3.29 ; sys_platform != "win32" + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in cryptography==41.0.4 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/static/pkg/linux.in # adal # ansible-core @@ -413,117 +634,188 @@ cryptography==41.0.4 # pyopenssl # vcert distlib==0.3.2 - # via virtualenv -distro==1.6.0 - # via -r requirements/base.txt -dnspython==2.1.0 # via + # -c requirements/static/ci/py3.7/linux.txt + # virtualenv +distro==1.5.0 + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/base.txt +dnspython==1.16.0 + # via + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/static/ci/common.in # ciscoconfparse # python-etcd docker==6.1.3 - # via -r requirements/static/ci/lint.in + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/lint.in etcd3-py==0.1.6 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in filelock==3.0.12 - # via virtualenv + # via + # -c requirements/static/ci/py3.7/linux.txt + # virtualenv frozenlist==1.3.0 # via + # -c requirements/static/ci/py3.7/linux.txt # aiohttp # aiosignal future==0.18.3 # via + # -c requirements/static/ci/py3.7/linux.txt # napalm # textfsm genshi==0.7.5 - # via -r requirements/static/ci/common.in -geomet==0.2.1.post1 - # via cassandra-driver -gitdb==4.0.7 - # via gitpython -gitpython==3.1.35 - # via -r requirements/static/ci/common.in -google-auth==2.0.1 - # via kubernetes -hglib==2.6.1 - # via -r requirements/static/ci/linux.in -idna==3.2 # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in +geomet==0.1.2 + # via + # -c requirements/static/ci/py3.7/linux.txt + # cassandra-driver +gitdb==4.0.5 + # via + # -c requirements/static/ci/py3.7/linux.txt + # gitpython +gitpython==3.1.35 + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in +google-auth==1.6.3 + # via + # -c requirements/static/ci/py3.7/linux.txt + # kubernetes +hglib==2.6.1 + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/linux.in +idna==2.8 + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # etcd3-py # requests # yarl -immutables==0.19 - # via contextvars +immutables==0.15 + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # contextvars importlib-metadata==4.6.4 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/static/pkg/linux.in + # attrs # backports.entry-points-selectable - # click # jsonschema # mako # moto # virtualenv -ipaddress==1.0.23 - # via kubernetes +ipaddress==1.0.22 + # via + # -c requirements/static/ci/py3.7/linux.txt + # kubernetes isodate==0.6.0 - # via msrest + # via + # -c requirements/static/ci/py3.7/linux.txt + # msrest isort==4.3.21 # via pylint jaraco.classes==3.2.1 - # via jaraco.collections -jaraco.collections==3.4.0 - # via cherrypy -jaraco.functools==3.3.0 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # jaraco.collections +jaraco.collections==3.4.0 + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # cherrypy +jaraco.functools==2.0 + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # cheroot # jaraco.text # tempora jaraco.text==3.5.1 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # jaraco.collections jinja2==3.1.2 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/base.txt # ansible-core # junos-eznc # moto # napalm -jmespath==0.10.0 +jmespath==1.0.1 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # boto3 # botocore jsonschema==3.2.0 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.10" # via + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/static/ci/common.in # napalm -jxmlease==1.0.3 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in -kazoo==2.8.0 ; sys_platform != "win32" and sys_platform != "darwin" - # via -r requirements/static/ci/common.in +jxmlease==1.0.1 ; sys_platform != "win32" + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in +kazoo==2.6.1 ; sys_platform != "win32" and sys_platform != "darwin" + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in keyring==5.7.1 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in kubernetes==3.0.0 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in lazy-object-proxy==1.4.3 # via astroid -libnacl==1.8.0 ; sys_platform != "win32" and sys_platform != "darwin" - # via -r requirements/static/ci/common.in -loguru==0.6.0 - # via ciscoconfparse +libnacl==1.7.1 ; sys_platform != "win32" and sys_platform != "darwin" + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in looseversion==1.0.2 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/base.txt lxml==4.9.1 # via + # -c requirements/static/ci/py3.7/linux.txt # junos-eznc # napalm # ncclient mako==1.2.2 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in markupsafe==2.1.2 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/base.txt # jinja2 # mako @@ -532,21 +824,31 @@ markupsafe==2.1.2 mccabe==0.6.1 # via pylint mercurial==6.0.1 - # via -r requirements/static/ci/linux.in + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/linux.in modernize==0.5 # via saltpylint -more-itertools==8.8.0 +more-itertools==5.0.0 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # cheroot # cherrypy # jaraco.classes # jaraco.functools moto==3.0.1 - # via -r requirements/static/ci/common.in -msgpack==1.0.2 - # via -r requirements/base.txt -msrest==0.6.21 # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in +msgpack==1.0.2 + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/base.txt +msrest==0.6.14 + # via + # -c requirements/static/ci/py3.7/linux.txt # azure-applicationinsights # azure-eventgrid # azure-keyvault @@ -559,20 +861,18 @@ msrest==0.6.21 # azure-mgmt-dns # azure-mgmt-eventhub # azure-mgmt-keyvault - # azure-mgmt-managementpartner # azure-mgmt-media # azure-mgmt-network - # azure-mgmt-notificationhubs # azure-mgmt-rdbms # azure-mgmt-resource - # azure-mgmt-search # azure-mgmt-servicebus # azure-mgmt-servicefabric # azure-mgmt-signalr # azure-servicefabric # msrestazure -msrestazure==0.6.4 +msrestazure==0.6.3 # via + # -c requirements/static/ci/py3.7/linux.txt # azure-batch # azure-eventgrid # azure-graphrbac @@ -639,36 +939,49 @@ msrestazure==0.6.4 # azure-mgmt-web multidict==6.0.2 # via + # -c requirements/static/ci/py3.7/linux.txt # aiohttp # yarl -napalm==3.3.1 ; sys_platform != "win32" and python_version < "3.10" - # via -r requirements/static/ci/common.in -ncclient==0.6.12 +napalm==3.1.0 ; sys_platform != "win32" and python_version < "3.10" # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in +ncclient==0.6.4 + # via + # -c requirements/static/ci/py3.7/linux.txt # junos-eznc - # napalm -netaddr==0.8.0 +netaddr==0.7.19 # via + # -c requirements/static/ci/py3.7/linux.txt # junos-eznc # napalm # pyeapi -netmiko==3.4.0 - # via napalm -ntc-templates==2.2.2 +netmiko==3.2.0 # via + # -c requirements/static/ci/py3.7/linux.txt + # napalm +ntc-templates==1.4.0 + # via + # -c requirements/static/ci/py3.7/linux.txt # junos-eznc - # netmiko oauthlib==3.2.2 - # via requests-oauthlib -oscrypto==1.2.1 - # via certvalidator -packaging==21.3 # via + # -c requirements/static/ci/py3.7/linux.txt + # requests-oauthlib +oscrypto==1.2.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # certvalidator +packaging==22.0 + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/base.txt # ansible-core # docker paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin" # via + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/static/ci/common.in # junos-eznc # napalm @@ -677,38 +990,71 @@ paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin" # scp passlib==1.7.4 # via + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/static/ci/common.in # ciscoconfparse pathspec==0.9.0 - # via yamllint + # via + # -c requirements/static/ci/py3.7/linux.txt + # yamllint +pathtools==0.1.2 + # via + # -c requirements/static/ci/py3.7/linux.txt + # watchdog platformdirs==2.2.0 - # via virtualenv -portend==2.7.1 - # via cherrypy + # via + # -c requirements/static/ci/py3.7/linux.txt + # virtualenv +portend==2.4 + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # cherrypy psutil==5.8.0 - # via -r requirements/base.txt -pyasn1-modules==0.2.8 - # via google-auth + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/base.txt +pyasn1-modules==0.2.4 + # via + # -c requirements/static/ci/py3.7/linux.txt + # google-auth pyasn1==0.4.8 # via + # -c requirements/static/ci/py3.7/linux.txt # pyasn1-modules # rsa pycodestyle==2.5.0 # via saltpylint -pycparser==2.20 - # via cffi -pycryptodomex==3.10.1 - # via -r requirements/crypto.txt -pyeapi==0.8.4 - # via napalm +pycparser==2.17 + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # cffi +pycryptodomex==3.9.8 + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/crypto.txt +pyeapi==0.8.3 + # via + # -c requirements/static/ci/py3.7/linux.txt + # napalm pygit2==1.0.3 ; python_version <= "3.8" - # via -r requirements/static/ci/linux.in + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/linux.in pyiface==0.0.11 - # via -r requirements/static/ci/linux.in + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/linux.in pyinotify==0.9.6 ; sys_platform != "win32" and sys_platform != "darwin" and platform_system != "openbsd" - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in pyjwt==2.4.0 # via + # -c requirements/static/ci/py3.7/linux.txt # adal # twilio pylint==2.4.4 @@ -716,29 +1062,41 @@ pylint==2.4.4 # -r requirements/static/ci/lint.in # saltpylint pymysql==1.0.2 - # via -r requirements/static/ci/linux.in + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/linux.in pynacl==1.5.0 # via + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/static/ci/common.in # paramiko pyopenssl==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/static/pkg/linux.in # etcd3-py pyparsing==3.0.9 # via + # -c requirements/static/ci/py3.7/linux.txt # junos-eznc - # packaging -pyrsistent==0.18.0 - # via jsonschema -pyserial==3.5 +pyrsistent==0.17.3 # via + # -c requirements/static/ci/py3.7/linux.txt + # jsonschema +pyserial==3.4 + # via + # -c requirements/static/ci/py3.7/linux.txt # junos-eznc # netmiko python-consul==1.1.0 - # via -r requirements/static/ci/linux.in -python-dateutil==2.8.2 # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/linux.in +python-dateutil==2.8.1 + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/static/pkg/linux.in # adal # azure-cosmosdb-table @@ -749,22 +1107,36 @@ python-dateutil==2.8.2 # moto # vcert python-etcd==0.4.5 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in python-gnupg==0.4.8 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/pkg/linux.in python-telegram-bot==13.7 - # via -r requirements/static/ci/linux.in + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/linux.in pytz==2022.1 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # apscheduler # moto # python-telegram-bot # tempora # twilio -pyvmomi==7.0.2 - # via -r requirements/static/ci/common.in + # tzlocal +pyvmomi==6.7.1.2018.12 + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in pyyaml==6.0.1 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/base.txt # ansible-core # clustershell @@ -774,15 +1146,26 @@ pyyaml==6.0.1 # yamllint # yamlordereddictloader pyzmq==23.2.0 - # via -r requirements/zeromq.txt + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/zeromq.txt redis-py-cluster==2.1.3 - # via -r requirements/static/ci/linux.in + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/linux.in redis==3.5.3 - # via redis-py-cluster + # via + # -c requirements/static/ci/py3.7/linux.txt + # redis-py-cluster requests-oauthlib==1.3.0 - # via msrest + # via + # -c requirements/static/ci/py3.7/linux.txt + # msrest requests==2.31.0 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # adal @@ -806,30 +1189,51 @@ requests==2.31.0 # twilio # vcert resolvelib==0.5.4 - # via ansible-core -responses==0.13.4 - # via moto + # via + # -c requirements/static/ci/py3.7/linux.txt + # ansible-core +responses==0.10.6 + # via + # -c requirements/static/ci/py3.7/linux.txt + # moto rfc3987==1.3.8 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in rpm-vercmp==0.1.2 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/pkg/linux.in rsa==4.7.2 - # via google-auth -s3transfer==0.5.0 - # via boto3 + # via + # -c requirements/static/ci/py3.7/linux.txt + # google-auth +s3transfer==0.5.2 + # via + # -c requirements/static/ci/py3.7/linux.txt + # boto3 saltpylint==2023.8.3 # via -r requirements/static/ci/lint.in -scp==0.13.6 +scp==0.13.2 # via + # -c requirements/static/ci/py3.7/linux.txt # junos-eznc # napalm # netmiko semantic-version==2.9.0 - # via etcd3-py + # via + # -c requirements/static/ci/py3.7/linux.txt + # etcd3-py setproctitle==1.3.2 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/pkg/linux.in six==1.16.0 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # apscheduler # astroid # bcrypt @@ -838,12 +1242,13 @@ six==1.16.0 # etcd3-py # genshi # geomet + # google-auth # isodate # jsonschema # junos-eznc # kazoo # kubernetes - # msrestazure + # more-itertools # ncclient # paramiko # python-consul @@ -856,83 +1261,139 @@ six==1.16.0 # virtualenv # websocket-client slack-bolt==1.15.5 - # via -r requirements/static/ci/linux.in -slack-sdk==3.19.5 - # via slack-bolt -smmap==4.0.0 - # via gitdb -sqlparse==0.4.4 - # via -r requirements/static/ci/common.in -strict-rfc3339==0.7 - # via -r requirements/static/ci/common.in -tempora==4.1.1 - # via portend -tenacity==8.0.1 - # via netmiko -textfsm==1.1.2 # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/linux.in +slack-sdk==3.19.5 + # via + # -c requirements/static/ci/py3.7/linux.txt + # slack-bolt +smmap==3.0.4 + # via + # -c requirements/static/ci/py3.7/linux.txt + # gitdb +sqlparse==0.4.4 + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in +strict-rfc3339==0.7 + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in +tempora==4.1.1 + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # portend +terminal==0.4.0 + # via + # -c requirements/static/ci/py3.7/linux.txt + # ntc-templates +textfsm==1.1.0 + # via + # -c requirements/static/ci/py3.7/linux.txt # napalm + # netmiko # ntc-templates timelib==0.2.5 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/pkg/linux.in toml==0.10.2 # via + # -c requirements/static/ci/py3.7/linux.txt # -r requirements/static/ci/common.in # -r requirements/static/ci/lint.in tornado==6.1 - # via python-telegram-bot -transitions==0.8.8 - # via junos-eznc + # via + # -c requirements/static/ci/py3.7/linux.txt + # python-telegram-bot +transitions==0.8.1 + # via + # -c requirements/static/ci/py3.7/linux.txt + # junos-eznc twilio==7.9.2 - # via -r requirements/static/ci/linux.in + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/linux.in typed-ast==1.4.1 # via astroid -typing-extensions==4.6.3 +typing-extensions==3.10.0.0 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # aiohttp # async-timeout # gitpython - # immutables # importlib-metadata # yarl -tzlocal==3.0 - # via apscheduler +tzlocal==2.1 + # via + # -c requirements/static/ci/py3.7/linux.txt + # apscheduler urllib3==1.26.6 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt # botocore # docker # kubernetes # python-etcd # requests - # responses vcert==0.7.4 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in virtualenv==20.7.2 - # via -r requirements/static/ci/common.in -watchdog==2.1.5 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in +watchdog==0.10.3 + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in websocket-client==0.40.0 # via + # -c requirements/static/ci/py3.7/linux.txt # docker # kubernetes wempy==0.2.1 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/common.in werkzeug==2.2.3 - # via moto + # via + # -c requirements/static/ci/py3.7/linux.txt + # moto wrapt==1.11.1 # via astroid xmltodict==0.12.0 - # via moto + # via + # -c requirements/static/ci/py3.7/linux.txt + # moto yamllint==1.26.3 - # via -r requirements/static/ci/linux.in + # via + # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/static/ci/linux.in yamlordereddictloader==0.4.0 - # via junos-eznc + # via + # -c requirements/static/ci/py3.7/linux.txt + # junos-eznc yarl==1.7.2 - # via aiohttp -zc.lockfile==2.0 - # via cherrypy + # via + # -c requirements/static/ci/py3.7/linux.txt + # aiohttp +zc.lockfile==1.4 + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # cherrypy zipp==3.5.0 - # via importlib-metadata + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -c requirements/static/ci/py3.7/linux.txt + # importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/static/ci/py3.7/linux-crypto.txt b/requirements/static/ci/py3.7/linux-crypto.txt index 1c23cef2513..e3d058b2656 100644 --- a/requirements/static/ci/py3.7/linux-crypto.txt +++ b/requirements/static/ci/py3.7/linux-crypto.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.7/linux-crypto.txt --pip-args='--constraint=requirements/static/pkg/py3.7/linux.txt' requirements/static/ci/crypto.in +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.7/linux-crypto.txt requirements/static/ci/crypto.in # m2crypto==0.38.0 # via -r requirements/static/ci/crypto.in diff --git a/requirements/static/ci/py3.7/linux.txt b/requirements/static/ci/py3.7/linux.txt index ccaac64e1f2..811dd6e72af 100644 --- a/requirements/static/ci/py3.7/linux.txt +++ b/requirements/static/ci/py3.7/linux.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.7/linux.txt --pip-args='--constraint=requirements/static/pkg/py3.7/linux.txt' requirements/base.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/linux.in requirements/static/pkg/linux.in requirements/zeromq.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.7/linux.txt requirements/base.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/linux.in requirements/static/pkg/linux.in requirements/zeromq.txt # adal==1.2.3 # via @@ -365,6 +365,7 @@ cassandra-driver==3.23.0 # via -r requirements/static/ci/common.in certifi==2023.07.22 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt # -r requirements/static/ci/common.in # kubernetes # msrest @@ -372,8 +373,9 @@ certifi==2023.07.22 # requests certvalidator==0.11.1 # via vcert -cffi==1.15.1 +cffi==1.14.6 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt # -r requirements/static/ci/common.in # azure-datalake-store # bcrypt @@ -381,16 +383,20 @@ cffi==1.15.1 # napalm # pygit2 # pynacl -charset-normalizer==2.0.12 +charset-normalizer==3.2.0 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt # aiohttp # requests cheetah3==3.2.6.post2 # via -r requirements/static/ci/common.in cheroot==8.5.2 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # cherrypy cherrypy==18.6.1 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/linux.in ciscoconfparse==1.5.19 @@ -402,11 +408,14 @@ clustershell==1.8.3 colorama==0.4.3 # via ciscoconfparse contextvars==2.4 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -r requirements/base.txt croniter==0.3.29 ; sys_platform != "win32" # via -r requirements/static/ci/common.in cryptography==41.0.4 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt # -r requirements/static/pkg/linux.in # adal # ansible-core @@ -422,6 +431,7 @@ distlib==0.3.2 # via virtualenv distro==1.5.0 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt # -r requirements/base.txt # pytest-skip-markers dnspython==1.16.0 @@ -461,13 +471,17 @@ hglib==2.6.1 # via -r requirements/static/ci/linux.in idna==2.8 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt # etcd3-py # requests # yarl immutables==0.15 - # via contextvars + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # contextvars importlib-metadata==4.6.4 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt # -r requirements/static/pkg/linux.in # attrs # backports.entry-points-selectable @@ -484,18 +498,26 @@ ipaddress==1.0.22 isodate==0.6.0 # via msrest jaraco.classes==3.2.1 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # jaraco.collections jaraco.collections==3.4.0 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # cherrypy jaraco.functools==2.0 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt # cheroot # jaraco.text # tempora jaraco.text==3.5.1 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # jaraco.collections jinja2==3.1.2 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt # -r requirements/base.txt # ansible-core # junos-eznc @@ -503,6 +525,7 @@ jinja2==3.1.2 # napalm jmespath==1.0.1 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # boto3 @@ -524,7 +547,9 @@ kubernetes==3.0.0 libnacl==1.7.1 ; sys_platform != "win32" and sys_platform != "darwin" # via -r requirements/static/ci/common.in looseversion==1.0.2 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -r requirements/base.txt lxml==4.9.1 # via # junos-eznc @@ -534,6 +559,7 @@ mako==1.2.2 # via -r requirements/static/ci/common.in markupsafe==2.1.2 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt # -r requirements/base.txt # jinja2 # mako @@ -545,6 +571,7 @@ mock==3.0.5 # via -r requirements/pytest.txt more-itertools==5.0.0 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt # cheroot # cherrypy # jaraco.classes @@ -553,6 +580,7 @@ moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt # -r requirements/base.txt # pytest-salt-factories msrest==0.6.14 @@ -665,8 +693,9 @@ oauthlib==3.2.2 # via requests-oauthlib oscrypto==1.2.0 # via certvalidator -packaging==21.3 +packaging==22.0 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt # -r requirements/base.txt # ansible-core # docker @@ -692,9 +721,12 @@ platformdirs==2.2.0 pluggy==0.13.0 # via pytest portend==2.4 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # cherrypy psutil==5.8.0 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt # -r requirements/base.txt # pytest-salt-factories # pytest-shell-utilities @@ -706,9 +738,13 @@ pyasn1==0.4.8 # pyasn1-modules # rsa pycparser==2.17 - # via cffi + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # cffi pycryptodomex==3.9.8 - # via -r requirements/crypto.txt + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -r requirements/crypto.txt pyeapi==0.8.3 # via napalm pygit2==1.0.3 ; python_version <= "3.8" @@ -729,12 +765,11 @@ pynacl==1.5.0 # paramiko pyopenssl==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt # -r requirements/static/pkg/linux.in # etcd3-py pyparsing==3.0.9 - # via - # junos-eznc - # packaging + # via junos-eznc pyrsistent==0.17.3 # via jsonschema pyserial==3.4 @@ -780,6 +815,7 @@ python-consul==1.1.0 # via -r requirements/static/ci/linux.in python-dateutil==2.8.1 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt # -r requirements/static/pkg/linux.in # adal # azure-cosmosdb-table @@ -792,11 +828,14 @@ python-dateutil==2.8.1 python-etcd==0.4.5 # via -r requirements/static/ci/common.in python-gnupg==0.4.8 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -r requirements/static/pkg/linux.in python-telegram-bot==13.7 # via -r requirements/static/ci/linux.in pytz==2022.1 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt # apscheduler # moto # python-telegram-bot @@ -807,6 +846,7 @@ pyvmomi==6.7.1.2018.12 # via -r requirements/static/ci/common.in pyyaml==6.0.1 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt # -r requirements/base.txt # ansible-core # clustershell @@ -818,6 +858,7 @@ pyyaml==6.0.1 # yamlordereddictloader pyzmq==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt # -r requirements/zeromq.txt # pytest-salt-factories redis-py-cluster==2.1.3 @@ -828,6 +869,7 @@ requests-oauthlib==1.3.0 # via msrest requests==2.31.0 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # adal @@ -857,7 +899,9 @@ responses==0.10.6 rfc3987==1.3.8 # via -r requirements/static/ci/common.in rpm-vercmp==0.1.2 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -r requirements/static/pkg/linux.in rsa==4.7.2 # via google-auth s3transfer==0.5.2 @@ -870,9 +914,12 @@ scp==0.13.2 semantic-version==2.9.0 # via etcd3-py setproctitle==1.3.2 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -r requirements/static/pkg/linux.in six==1.16.0 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt # apscheduler # bcrypt # cassandra-driver @@ -910,7 +957,9 @@ sqlparse==0.4.4 strict-rfc3339==0.7 # via -r requirements/static/ci/common.in tempora==4.1.1 - # via portend + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # portend terminal==0.4.0 # via ntc-templates textfsm==1.1.0 @@ -919,7 +968,9 @@ textfsm==1.1.0 # netmiko # ntc-templates timelib==0.2.5 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -r requirements/static/pkg/linux.in toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 @@ -932,6 +983,7 @@ twilio==7.9.2 # via -r requirements/static/ci/linux.in typing-extensions==3.10.0.0 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt # aiohttp # async-timeout # gitpython @@ -943,6 +995,7 @@ tzlocal==2.1 # via apscheduler urllib3==1.26.6 # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt # botocore # docker # kubernetes @@ -975,9 +1028,13 @@ yamlordereddictloader==0.4.0 yarl==1.7.2 # via aiohttp zc.lockfile==1.4 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # cherrypy zipp==3.5.0 - # via importlib-metadata + # via + # -c requirements/static/ci/../pkg/py3.7/linux.txt + # importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/static/ci/py3.7/windows-crypto.txt b/requirements/static/ci/py3.7/windows-crypto.txt index d3c32844914..061b8848bbd 100644 --- a/requirements/static/ci/py3.7/windows-crypto.txt +++ b/requirements/static/ci/py3.7/windows-crypto.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.7/windows-crypto.txt --pip-args='--constraint=requirements/static/ci/py3.7/windows.txt' requirements/static/ci/crypto.in +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.7/windows-crypto.txt requirements/static/ci/crypto.in # m2crypto==0.38.0 # via -r requirements/static/ci/crypto.in diff --git a/requirements/static/ci/py3.7/windows.txt b/requirements/static/ci/py3.7/windows.txt index 024f9a7cfd4..55eeb219df3 100644 --- a/requirements/static/ci/py3.7/windows.txt +++ b/requirements/static/ci/py3.7/windows.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.7/windows.txt --pip-args='--constraint=requirements/static/pkg/py3.7/windows.txt' requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/windows.in requirements/static/pkg/windows.in requirements/windows.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.7/windows.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/windows.in requirements/static/pkg/windows.in requirements/windows.txt # aiohttp==3.8.5 # via etcd3-py @@ -44,42 +44,53 @@ cassandra-driver==3.23.0 # via -r requirements/static/ci/common.in certifi==2023.07.22 # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt # -r requirements/static/ci/common.in # -r requirements/windows.txt # kubernetes # requests -cffi==1.15.1 +cffi==1.14.6 # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt # -r requirements/static/ci/common.in # -r requirements/windows.txt # clr-loader # cryptography # pygit2 # pynacl -charset-normalizer==2.0.12 +charset-normalizer==3.2.0 # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt # aiohttp # requests cheetah3==3.2.6.post2 # via -r requirements/static/ci/common.in cheroot==8.5.2 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt + # cherrypy cherrypy==18.6.1 # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt # -r requirements/static/ci/common.in # -r requirements/windows.txt click==7.1.2 # via geomet clr-loader==0.2.4 - # via pythonnet + # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt + # pythonnet clustershell==1.8.3 # via -r requirements/static/ci/common.in colorama==0.4.1 # via pytest contextvars==2.4 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt + # -r requirements/base.txt cryptography==41.0.4 # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt # -r requirements/windows.txt # etcd3-py # moto @@ -89,6 +100,7 @@ distlib==0.3.2 # via virtualenv distro==1.5.0 # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt # -r requirements/base.txt # pytest-skip-markers dmidecode==0.9.0 @@ -116,22 +128,29 @@ genshi==0.7.5 geomet==0.1.2 # via cassandra-driver gitdb==4.0.7 - # via gitpython + # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt + # gitpython gitpython==3.1.35 # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt # -r requirements/static/ci/common.in # -r requirements/windows.txt google-auth==1.6.3 # via kubernetes idna==2.8 # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt # etcd3-py # requests # yarl immutables==0.15 - # via contextvars + # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt + # contextvars importlib-metadata==4.6.4 # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt # -r requirements/windows.txt # attrs # backports.entry-points-selectable @@ -144,26 +163,37 @@ importlib-metadata==4.6.4 iniconfig==1.0.1 # via pytest ioloop==0.1a0 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt + # -r requirements/windows.txt ipaddress==1.0.22 # via kubernetes jaraco.classes==3.2.1 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt + # jaraco.collections jaraco.collections==3.3.0 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt + # cherrypy jaraco.functools==2.0 # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt # cheroot # jaraco.text # tempora jaraco.text==3.5.0 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt + # jaraco.collections jinja2==3.1.2 # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt # -r requirements/base.txt # moto jmespath==1.0.1 # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # boto3 @@ -175,13 +205,18 @@ keyring==5.7.1 kubernetes==3.0.0 # via -r requirements/static/ci/common.in looseversion==1.0.2 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt + # -r requirements/base.txt lxml==4.9.1 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt + # -r requirements/windows.txt mako==1.2.2 # via -r requirements/static/ci/common.in markupsafe==2.1.2 # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt # -r requirements/base.txt # jinja2 # mako @@ -191,6 +226,7 @@ mock==3.0.5 # via -r requirements/pytest.txt more-itertools==8.2.0 # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt # cheroot # cherrypy # jaraco.classes @@ -199,6 +235,7 @@ moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt # -r requirements/base.txt # pytest-salt-factories multidict==6.0.2 @@ -207,8 +244,9 @@ multidict==6.0.2 # yarl ntlm-auth==1.5.0 # via requests-ntlm -packaging==21.3 +packaging==22.0 # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt # -r requirements/base.txt # docker # pytest @@ -225,9 +263,12 @@ platformdirs==2.2.0 pluggy==0.13.0 # via pytest portend==2.6 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt + # cherrypy psutil==5.8.0 # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt # -r requirements/base.txt # pytest-salt-factories # pytest-shell-utilities @@ -236,29 +277,36 @@ pyasn1-modules==0.2.4 # via google-auth pyasn1==0.4.8 # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt # -r requirements/windows.txt # pyasn1-modules # rsa pycparser==2.21 # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt # -r requirements/windows.txt # cffi pycryptodomex==3.10.1 - # via -r requirements/crypto.txt + # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt + # -r requirements/crypto.txt pygit2==1.9.1 # via -r requirements/static/ci/windows.in pymssql==2.2.1 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt + # -r requirements/windows.txt pymysql==1.0.2 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt + # -r requirements/windows.txt pynacl==1.5.0 # via -r requirements/static/ci/common.in pyopenssl==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt # -r requirements/windows.txt # etcd3-py -pyparsing==3.0.9 - # via packaging pyrsistent==0.17.3 # via jsonschema pytest-custom-exit-code==0.3.0 @@ -298,6 +346,7 @@ pytest==7.2.0 # pytest-timeout python-dateutil==2.8.1 # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt # -r requirements/windows.txt # botocore # kubernetes @@ -305,17 +354,23 @@ python-dateutil==2.8.1 python-etcd==0.4.5 # via -r requirements/static/ci/common.in python-gnupg==0.4.8 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt + # -r requirements/windows.txt pythonnet==3.0.1 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt + # -r requirements/windows.txt pytz==2022.1 # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt # moto # tempora pyvmomi==6.7.1.2018.12 # via -r requirements/static/ci/common.in pywin32==305 # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt # -r requirements/windows.txt # cherrypy # docker @@ -325,6 +380,7 @@ pywinrm==0.4.1 # via -r requirements/static/ci/windows.in pyyaml==6.0.1 # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt # -r requirements/base.txt # clustershell # kubernetes @@ -332,12 +388,14 @@ pyyaml==6.0.1 # yamllint pyzmq==25.0.2 ; sys_platform == "win32" # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt # -r requirements/zeromq.txt # pytest-salt-factories requests-ntlm==1.1.0 # via pywinrm requests==2.31.0 # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # -r requirements/windows.txt @@ -362,9 +420,12 @@ sed==0.3.1 semantic-version==2.9.0 # via etcd3-py setproctitle==1.3.2 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt + # -r requirements/windows.txt six==1.15.0 # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt # cassandra-driver # cheroot # etcd3-py @@ -381,21 +442,28 @@ six==1.15.0 # virtualenv # websocket-client smmap==4.0.0 - # via gitdb + # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt + # gitdb sqlparse==0.4.4 # via -r requirements/static/ci/common.in strict-rfc3339==0.7 # via -r requirements/static/ci/common.in tempora==4.1.1 - # via portend + # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt + # portend timelib==0.2.5 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt + # -r requirements/windows.txt toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest -typing-extensions==4.2.0 +typing-extensions==4.4.0 # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt # aiohttp # async-timeout # gitpython @@ -405,6 +473,7 @@ typing-extensions==4.2.0 # yarl urllib3==1.26.6 # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt # -r requirements/windows.txt # botocore # docker @@ -428,9 +497,13 @@ werkzeug==2.2.3 # moto # pytest-httpserver wheel==0.38.4 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt + # -r requirements/windows.txt wmi==1.5.1 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt + # -r requirements/windows.txt xmltodict==0.12.0 # via # moto @@ -440,9 +513,13 @@ yamllint==1.26.3 yarl==1.7.2 # via aiohttp zc.lockfile==2.0 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt + # cherrypy zipp==3.5.0 - # via importlib-metadata + # via + # -c requirements/static/ci/../pkg/py3.7/windows.txt + # importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/static/ci/py3.8/changelog.txt b/requirements/static/ci/py3.8/changelog.txt index bef4956e855..6b6f20b0654 100644 --- a/requirements/static/ci/py3.8/changelog.txt +++ b/requirements/static/ci/py3.8/changelog.txt @@ -2,26 +2,37 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.8/changelog.txt --pip-args='--constraint=requirements/static/ci/py3.8/linux.txt' requirements/static/ci/changelog.in +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.8/changelog.txt requirements/static/ci/changelog.in # click-default-group==1.2.2 # via towncrier -click==7.1.2 +click==7.1.1 # via + # -c requirements/static/ci/py3.8/linux.txt # click-default-group # towncrier incremental==17.5.0 # via towncrier jinja2==3.1.2 - # via towncrier -looseversion==1.0.3 - # via -r requirements/static/ci/changelog.in -markupsafe==2.0.1 - # via jinja2 -packaging==23.0 - # via -r requirements/static/ci/changelog.in + # via + # -c requirements/static/ci/py3.8/linux.txt + # towncrier +looseversion==1.0.2 + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/changelog.in +markupsafe==2.1.2 + # via + # -c requirements/static/ci/py3.8/linux.txt + # jinja2 +packaging==22.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/changelog.in tomli==2.0.1 - # via towncrier + # via + # -c requirements/static/ci/py3.8/linux.txt + # towncrier towncrier==22.12.0 # via -r requirements/static/ci/changelog.in diff --git a/requirements/static/ci/py3.8/cloud.txt b/requirements/static/ci/py3.8/cloud.txt index 5eaf47783e9..841380eef6a 100644 --- a/requirements/static/ci/py3.8/cloud.txt +++ b/requirements/static/ci/py3.8/cloud.txt @@ -2,28 +2,38 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.8/cloud.txt --pip-args='--constraint=requirements/static/ci/py3.8/linux.txt' requirements/base.txt requirements/pytest.txt requirements/static/ci/cloud.in requirements/static/ci/common.in requirements/static/pkg/linux.in requirements/zeromq.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.8/cloud.txt requirements/base.txt requirements/pytest.txt requirements/static/ci/cloud.in requirements/static/ci/common.in requirements/static/pkg/linux.in requirements/zeromq.txt # -adal==1.2.7 +adal==1.2.3 # via + # -c requirements/static/ci/py3.8/linux.txt # azure-datalake-store # msrestazure aiohttp==3.8.5 - # via etcd3-py + # via + # -c requirements/static/ci/py3.8/linux.txt + # etcd3-py aiosignal==1.2.0 - # via aiohttp + # via + # -c requirements/static/ci/py3.8/linux.txt + # aiohttp apache-libcloud==2.5.0 ; sys_platform != "win32" # via + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/static/ci/cloud.in # -r requirements/static/ci/common.in -asn1crypto==1.4.0 +asn1crypto==1.3.0 # via + # -c requirements/static/ci/py3.8/linux.txt # certvalidator # oscrypto async-timeout==4.0.2 - # via aiohttp + # via + # -c requirements/static/ci/py3.8/linux.txt + # aiohttp attrs==23.1.0 # via + # -c requirements/static/ci/py3.8/linux.txt # aiohttp # jsonschema # pytest @@ -32,11 +42,16 @@ attrs==23.1.0 # pytest-skip-markers # pytest-system-statistics azure-applicationinsights==0.1.0 - # via azure -azure-batch==4.1.3 - # via azure -azure-common==1.1.27 # via + # -c requirements/static/ci/py3.8/linux.txt + # azure +azure-batch==4.1.3 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure +azure-common==1.1.18 + # via + # -c requirements/static/ci/py3.8/linux.txt # azure-applicationinsights # azure-batch # azure-cosmosdb-table @@ -112,107 +127,205 @@ azure-common==1.1.27 # azure-storage-file # azure-storage-queue azure-cosmosdb-nspkg==2.0.2 - # via azure-cosmosdb-table -azure-cosmosdb-table==1.0.6 - # via azure -azure-datalake-store==0.0.52 - # via azure -azure-eventgrid==1.3.0 - # via azure + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-cosmosdb-table +azure-cosmosdb-table==1.0.5 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure +azure-datalake-store==0.0.44 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure +azure-eventgrid==1.2.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure azure-graphrbac==0.40.0 - # via azure + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure azure-keyvault==1.1.0 - # via azure + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure azure-loganalytics==0.1.0 - # via azure + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure azure-mgmt-advisor==1.0.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-applicationinsights==0.1.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-authorization==0.50.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-batch==5.0.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-batchai==2.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-billing==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-cdn==3.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-cognitiveservices==3.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-commerce==1.0.1 - # via azure-mgmt -azure-mgmt-compute==4.6.2 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt +azure-mgmt-compute==4.6.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-consumption==2.0.0 - # via azure-mgmt -azure-mgmt-containerinstance==1.5.0 - # via azure-mgmt -azure-mgmt-containerregistry==2.8.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt +azure-mgmt-containerinstance==1.4.1 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt +azure-mgmt-containerregistry==2.7.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-containerservice==4.4.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-cosmosdb==0.4.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-datafactory==0.6.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-datalake-analytics==0.6.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-datalake-nspkg==3.0.1 # via + # -c requirements/static/ci/py3.8/linux.txt # azure-mgmt-datalake-analytics # azure-mgmt-datalake-store azure-mgmt-datalake-store==0.5.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-datamigration==1.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-devspaces==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-devtestlabs==2.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-dns==2.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-eventgrid==1.0.0 - # via azure-mgmt -azure-mgmt-eventhub==2.6.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt +azure-mgmt-eventhub==2.5.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-hanaonazure==0.1.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-iotcentral==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-iothub==0.5.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-iothubprovisioningservices==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-keyvault==1.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-loganalytics==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-logic==3.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-machinelearningcompute==0.4.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-managementgroups==0.1.0 - # via azure-mgmt -azure-mgmt-managementpartner==0.1.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt +azure-mgmt-managementpartner==0.1.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-maps==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-marketplaceordering==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-media==1.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-monitor==0.5.2 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-msi==0.2.0 - # via azure-mgmt -azure-mgmt-network==2.7.0 - # via azure-mgmt -azure-mgmt-notificationhubs==2.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt +azure-mgmt-network==2.6.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt +azure-mgmt-notificationhubs==2.0.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-nspkg==3.0.2 # via + # -c requirements/static/ci/py3.8/linux.txt # azure-mgmt-advisor # azure-mgmt-applicationinsights # azure-mgmt-authorization @@ -239,10 +352,12 @@ azure-mgmt-nspkg==3.0.2 # azure-mgmt-logic # azure-mgmt-machinelearningcompute # azure-mgmt-managementgroups + # azure-mgmt-managementpartner # azure-mgmt-maps # azure-mgmt-marketplaceordering # azure-mgmt-monitor # azure-mgmt-msi + # azure-mgmt-notificationhubs # azure-mgmt-policyinsights # azure-mgmt-powerbiembedded # azure-mgmt-recoveryservices @@ -251,6 +366,7 @@ azure-mgmt-nspkg==3.0.2 # azure-mgmt-relay # azure-mgmt-reservations # azure-mgmt-scheduler + # azure-mgmt-search # azure-mgmt-servicefabric # azure-mgmt-signalr # azure-mgmt-sql @@ -259,50 +375,92 @@ azure-mgmt-nspkg==3.0.2 # azure-mgmt-trafficmanager # azure-mgmt-web azure-mgmt-policyinsights==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-powerbiembedded==2.0.0 - # via azure-mgmt -azure-mgmt-rdbms==1.9.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt +azure-mgmt-rdbms==1.8.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-recoveryservices==0.3.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-recoveryservicesbackup==0.3.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-redis==5.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-relay==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-reservations==0.2.1 - # via azure-mgmt -azure-mgmt-resource==2.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt +azure-mgmt-resource==2.1.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-scheduler==2.0.0 - # via azure-mgmt -azure-mgmt-search==2.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt +azure-mgmt-search==2.0.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-servicebus==0.5.3 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-servicefabric==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-signalr==0.1.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-sql==0.9.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-storage==2.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-subscription==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-trafficmanager==0.50.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-web==0.35.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt==4.0.0 - # via azure + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure azure-nspkg==3.0.2 # via + # -c requirements/static/ci/py3.8/linux.txt # azure-applicationinsights # azure-batch # azure-cosmosdb-nspkg + # azure-eventgrid # azure-graphrbac # azure-keyvault # azure-loganalytics @@ -311,87 +469,144 @@ azure-nspkg==3.0.2 # azure-servicefabric # azure-servicemanagement-legacy azure-servicebus==0.21.1 - # via azure -azure-servicefabric==6.3.0.0 - # via azure -azure-servicemanagement-legacy==0.20.7 - # via azure -azure-storage-blob==1.5.0 - # via azure -azure-storage-common==1.4.2 # via + # -c requirements/static/ci/py3.8/linux.txt + # azure +azure-servicefabric==6.3.0.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure +azure-servicemanagement-legacy==0.20.6 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure +azure-storage-blob==1.5.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure +azure-storage-common==1.4.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-cosmosdb-table # azure-storage-blob # azure-storage-file # azure-storage-queue azure-storage-file==1.4.0 - # via azure -azure-storage-queue==1.4.0 - # via azure -azure==4.0.0 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in -backports.entry-points-selectable==1.1.0 - # via virtualenv -bcrypt==3.2.0 # via + # -c requirements/static/ci/py3.8/linux.txt + # azure +azure-storage-queue==1.4.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure +azure==4.0.0 ; sys_platform != "win32" + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in +backports.entry-points-selectable==1.1.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # virtualenv +bcrypt==3.1.6 + # via + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/static/ci/common.in # paramiko boto3==1.21.46 # via + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/static/ci/common.in # moto boto==2.49.0 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in botocore==1.24.46 # via + # -c requirements/static/ci/py3.8/linux.txt # boto3 # moto # s3transfer cachetools==4.2.2 - # via google-auth -cassandra-driver==3.25.0 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.8/linux.txt + # google-auth +cassandra-driver==3.23.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in certifi==2023.07.22 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/static/ci/common.in # kubernetes # msrest # requests certvalidator==0.11.1 - # via vcert -cffi==1.15.1 # via + # -c requirements/static/ci/py3.8/linux.txt + # vcert +cffi==1.14.6 + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/static/ci/common.in # azure-datalake-store # bcrypt # cryptography # napalm # pynacl -charset-normalizer==2.0.12 +charset-normalizer==3.2.0 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # aiohttp # requests -cheetah3==3.2.6.post1 - # via -r requirements/static/ci/common.in +cheetah3==3.2.6.post2 + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in cheroot==8.5.2 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # cherrypy cherrypy==18.6.1 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/linux.in -ciscoconfparse==1.5.46 - # via napalm -click==8.0.1 - # via geomet +ciscoconfparse==1.5.19 + # via + # -c requirements/static/ci/py3.8/linux.txt + # napalm +click==7.1.1 + # via + # -c requirements/static/ci/py3.8/linux.txt + # geomet clustershell==1.8.3 - # via -r requirements/static/ci/common.in -colorama==0.4.4 - # via ciscoconfparse + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in +colorama==0.4.3 + # via + # -c requirements/static/ci/py3.8/linux.txt + # ciscoconfparse contextvars==2.4 - # via -r requirements/base.txt -croniter==1.0.15 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/base.txt +croniter==0.3.29 ; sys_platform != "win32" + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in cryptography==41.0.4 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/static/pkg/linux.in # adal # azure-cosmosdb-table @@ -405,133 +620,217 @@ cryptography==41.0.4 # requests-ntlm # smbprotocol # vcert -distlib==0.3.3 - # via virtualenv -distro==1.6.0 +distlib==0.3.2 # via + # -c requirements/static/ci/py3.8/linux.txt + # virtualenv +distro==1.5.0 + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/base.txt # pytest-skip-markers -dnspython==2.1.0 +dnspython==1.16.0 # via + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/static/ci/common.in # ciscoconfparse # python-etcd docker==6.1.3 - # via -r requirements/pytest.txt + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/pytest.txt etcd3-py==0.1.6 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in exceptiongroup==1.0.4 - # via pytest + # via + # -c requirements/static/ci/py3.8/linux.txt + # pytest filelock==3.0.12 - # via virtualenv + # via + # -c requirements/static/ci/py3.8/linux.txt + # virtualenv flaky==3.7.0 - # via -r requirements/pytest.txt + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/pytest.txt frozenlist==1.3.0 # via + # -c requirements/static/ci/py3.8/linux.txt # aiohttp # aiosignal future==0.18.3 # via + # -c requirements/static/ci/py3.8/linux.txt # napalm # textfsm genshi==0.7.5 - # via -r requirements/static/ci/common.in -geomet==0.2.1.post1 - # via cassandra-driver -gitdb==4.0.7 - # via gitpython + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in +geomet==0.1.2 + # via + # -c requirements/static/ci/py3.8/linux.txt + # cassandra-driver +gitdb==4.0.5 + # via + # -c requirements/static/ci/py3.8/linux.txt + # gitpython gitpython==3.1.35 - # via -r requirements/static/ci/common.in -google-auth==2.1.0 - # via kubernetes + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in +google-auth==1.6.3 + # via + # -c requirements/static/ci/py3.8/linux.txt + # kubernetes idna==2.8 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # etcd3-py # requests # yarl -immutables==0.19 - # via contextvars -importlib-metadata==4.8.1 - # via -r requirements/static/pkg/linux.in -iniconfig==1.1.1 - # via pytest -ipaddress==1.0.23 - # via kubernetes -isodate==0.6.0 - # via msrest -jaraco.classes==3.2.1 - # via jaraco.collections -jaraco.collections==3.4.0 - # via cherrypy -jaraco.functools==3.3.0 +immutables==0.15 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # contextvars +importlib-metadata==4.6.4 + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/pkg/linux.in +iniconfig==1.0.1 + # via + # -c requirements/static/ci/py3.8/linux.txt + # pytest +ipaddress==1.0.22 + # via + # -c requirements/static/ci/py3.8/linux.txt + # kubernetes +isodate==0.6.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # msrest +jaraco.classes==3.2.1 + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # jaraco.collections +jaraco.collections==3.4.0 + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # cherrypy +jaraco.functools==2.0 + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # cheroot # jaraco.text # tempora jaraco.text==3.5.1 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # jaraco.collections jinja2==3.1.2 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/base.txt # junos-eznc # moto # napalm -jmespath==0.10.0 +jmespath==1.0.1 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # boto3 # botocore jsonschema==3.2.0 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.10" # via + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/static/ci/common.in # napalm -jxmlease==1.0.3 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in -kazoo==2.8.0 ; sys_platform != "win32" and sys_platform != "darwin" - # via -r requirements/static/ci/common.in +jxmlease==1.0.1 ; sys_platform != "win32" + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in +kazoo==2.6.1 ; sys_platform != "win32" and sys_platform != "darwin" + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in keyring==5.7.1 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in kubernetes==3.0.0 - # via -r requirements/static/ci/common.in -libnacl==1.8.0 ; sys_platform != "win32" and sys_platform != "darwin" - # via -r requirements/static/ci/common.in -loguru==0.6.0 - # via ciscoconfparse + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in +libnacl==1.7.1 ; sys_platform != "win32" and sys_platform != "darwin" + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in looseversion==1.0.2 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/base.txt lxml==4.9.1 # via + # -c requirements/static/ci/py3.8/linux.txt # junos-eznc # napalm # ncclient mako==1.2.2 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in markupsafe==2.1.2 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/base.txt # jinja2 # mako # moto # werkzeug -mock==4.0.3 - # via -r requirements/pytest.txt -more-itertools==8.8.0 +mock==3.0.5 # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/pytest.txt +more-itertools==5.0.0 + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # cheroot # cherrypy # jaraco.classes # jaraco.functools moto==3.0.1 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in msgpack==1.0.2 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/base.txt # pytest-salt-factories -msrest==0.6.21 +msrest==0.6.14 # via + # -c requirements/static/ci/py3.8/linux.txt # azure-applicationinsights # azure-eventgrid # azure-keyvault @@ -544,20 +843,18 @@ msrest==0.6.21 # azure-mgmt-dns # azure-mgmt-eventhub # azure-mgmt-keyvault - # azure-mgmt-managementpartner # azure-mgmt-media # azure-mgmt-network - # azure-mgmt-notificationhubs # azure-mgmt-rdbms # azure-mgmt-resource - # azure-mgmt-search # azure-mgmt-servicebus # azure-mgmt-servicefabric # azure-mgmt-signalr # azure-servicefabric # msrestazure -msrestazure==0.6.4 +msrestazure==0.6.3 # via + # -c requirements/static/ci/py3.8/linux.txt # azure-batch # azure-eventgrid # azure-graphrbac @@ -624,39 +921,52 @@ msrestazure==0.6.4 # azure-mgmt-web multidict==6.0.2 # via + # -c requirements/static/ci/py3.8/linux.txt # aiohttp # yarl -napalm==3.3.1 ; sys_platform != "win32" and python_version < "3.10" - # via -r requirements/static/ci/common.in -ncclient==0.6.12 +napalm==3.1.0 ; sys_platform != "win32" and python_version < "3.10" # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in +ncclient==0.6.4 + # via + # -c requirements/static/ci/py3.8/linux.txt # junos-eznc - # napalm netaddr==0.7.19 # via + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/static/ci/cloud.in # junos-eznc # napalm # pyeapi -netmiko==3.4.0 - # via napalm -ntc-templates==2.3.2 +netmiko==3.2.0 # via + # -c requirements/static/ci/py3.8/linux.txt + # napalm +ntc-templates==1.4.1 + # via + # -c requirements/static/ci/py3.8/linux.txt # junos-eznc - # netmiko ntlm-auth==1.3.0 # via requests-ntlm oauthlib==3.2.2 - # via requests-oauthlib -oscrypto==1.2.1 - # via certvalidator -packaging==21.3 # via + # -c requirements/static/ci/py3.8/linux.txt + # requests-oauthlib +oscrypto==1.2.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # certvalidator +packaging==22.0 + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/base.txt # docker # pytest paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin" # via + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/static/ci/common.in # junos-eznc # napalm @@ -665,56 +975,91 @@ paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin" # scp passlib==1.7.4 # via + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/static/ci/common.in # ciscoconfparse -platformdirs==2.3.0 - # via virtualenv -pluggy==1.0.0 - # via pytest -portend==2.7.1 - # via cherrypy +pathtools==0.1.2 + # via + # -c requirements/static/ci/py3.8/linux.txt + # watchdog +platformdirs==2.2.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # virtualenv +pluggy==0.13.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # pytest +portend==2.4 + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # cherrypy profitbricks==4.1.3 # via -r requirements/static/ci/cloud.in psutil==5.8.0 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/base.txt # pytest-salt-factories # pytest-shell-utilities # pytest-system-statistics -pyasn1-modules==0.2.8 - # via google-auth +pyasn1-modules==0.2.4 + # via + # -c requirements/static/ci/py3.8/linux.txt + # google-auth pyasn1==0.4.8 # via + # -c requirements/static/ci/py3.8/linux.txt # pyasn1-modules # rsa -pycparser==2.19 - # via cffi -pycryptodomex==3.10.1 - # via -r requirements/crypto.txt -pyeapi==0.8.4 - # via napalm +pycparser==2.17 + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # cffi +pycryptodomex==3.9.8 + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/crypto.txt +pyeapi==0.8.3 + # via + # -c requirements/static/ci/py3.8/linux.txt + # napalm pyinotify==0.9.6 ; sys_platform != "win32" and sys_platform != "darwin" and platform_system != "openbsd" - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in pyjwt==2.4.0 - # via adal + # via + # -c requirements/static/ci/py3.8/linux.txt + # adal pynacl==1.5.0 # via + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/static/ci/common.in # paramiko pyopenssl==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/static/pkg/linux.in # etcd3-py pyparsing==3.0.9 # via + # -c requirements/static/ci/py3.8/linux.txt # junos-eznc - # packaging pypsexec==0.1.0 # via -r requirements/static/ci/cloud.in -pyrsistent==0.18.0 - # via jsonschema -pyserial==3.5 +pyrsistent==0.17.3 # via + # -c requirements/static/ci/py3.8/linux.txt + # jsonschema +pyserial==3.4 + # via + # -c requirements/static/ci/py3.8/linux.txt # junos-eznc # netmiko pyspnego==0.8.0 @@ -722,31 +1067,48 @@ pyspnego==0.8.0 # -r requirements/static/ci/cloud.in # smbprotocol pytest-custom-exit-code==0.3.0 - # via -r requirements/pytest.txt + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/pytest.txt pytest-helpers-namespace==2021.4.29 # via + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/pytest.txt # pytest-salt-factories # pytest-shell-utilities pytest-httpserver==1.0.4 - # via -r requirements/pytest.txt + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/pytest.txt pytest-salt-factories==1.0.0rc26 - # via -r requirements/pytest.txt + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/pytest.txt pytest-shell-utilities==1.8.0 - # via pytest-salt-factories + # via + # -c requirements/static/ci/py3.8/linux.txt + # pytest-salt-factories pytest-skip-markers==1.4.1 # via + # -c requirements/static/ci/py3.8/linux.txt # pytest-salt-factories # pytest-shell-utilities # pytest-system-statistics -pytest-subtests==0.5.0 - # via -r requirements/pytest.txt +pytest-subtests==0.4.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/pytest.txt pytest-system-statistics==1.0.2 - # via pytest-salt-factories -pytest-timeout==2.0.2 - # via -r requirements/pytest.txt + # via + # -c requirements/static/ci/py3.8/linux.txt + # pytest-salt-factories +pytest-timeout==1.4.2 + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/pytest.txt pytest==7.2.0 # via + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/pytest.txt # pytest-custom-exit-code # pytest-helpers-namespace @@ -756,8 +1118,10 @@ pytest==7.2.0 # pytest-subtests # pytest-system-statistics # pytest-timeout -python-dateutil==2.8.2 +python-dateutil==2.8.1 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/static/pkg/linux.in # adal # azure-cosmosdb-table @@ -768,19 +1132,30 @@ python-dateutil==2.8.2 # moto # vcert python-etcd==0.4.5 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in python-gnupg==0.4.8 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/pkg/linux.in pytz==2022.1 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # moto # tempora -pyvmomi==7.0.2 - # via -r requirements/static/ci/common.in +pyvmomi==6.7.1.2018.12 + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in pywinrm==0.3.0 # via -r requirements/static/ci/cloud.in pyyaml==6.0.1 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/base.txt # clustershell # junos-eznc @@ -790,14 +1165,20 @@ pyyaml==6.0.1 # yamlordereddictloader pyzmq==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/zeromq.txt # pytest-salt-factories requests-ntlm==1.1.0 # via pywinrm requests-oauthlib==1.3.0 - # via msrest + # via + # -c requirements/static/ci/py3.8/linux.txt + # msrest requests==2.31.0 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # adal @@ -821,39 +1202,60 @@ requests==2.31.0 # requests-oauthlib # responses # vcert -responses==0.14.0 - # via moto -rfc3987==1.3.8 - # via -r requirements/static/ci/common.in -rpm-vercmp==0.1.2 - # via -r requirements/static/pkg/linux.in -rsa==4.7.2 - # via google-auth -s3transfer==0.5.0 - # via boto3 -scp==0.14.1 +responses==0.10.6 # via + # -c requirements/static/ci/py3.8/linux.txt + # moto +rfc3987==1.3.8 + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in +rpm-vercmp==0.1.2 + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/pkg/linux.in +rsa==4.7.2 + # via + # -c requirements/static/ci/py3.8/linux.txt + # google-auth +s3transfer==0.5.2 + # via + # -c requirements/static/ci/py3.8/linux.txt + # boto3 +scp==0.13.2 + # via + # -c requirements/static/ci/py3.8/linux.txt # junos-eznc # napalm # netmiko semantic-version==2.9.0 - # via etcd3-py + # via + # -c requirements/static/ci/py3.8/linux.txt + # etcd3-py setproctitle==1.3.2 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/pkg/linux.in six==1.16.0 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # bcrypt # cassandra-driver # cheroot # etcd3-py # genshi # geomet + # google-auth # isodate # jsonschema # junos-eznc # kazoo # kubernetes - # msrestazure + # mock + # more-itertools # ncclient # paramiko # profitbricks @@ -871,70 +1273,114 @@ smbprotocol==1.10.1 # via # -r requirements/static/ci/cloud.in # pypsexec -smmap==4.0.0 - # via gitdb -sqlparse==0.4.4 - # via -r requirements/static/ci/common.in -strict-rfc3339==0.7 - # via -r requirements/static/ci/common.in -tempora==4.1.1 - # via portend -tenacity==8.0.1 - # via netmiko -textfsm==1.1.2 +smmap==3.0.4 # via + # -c requirements/static/ci/py3.8/linux.txt + # gitdb +sqlparse==0.4.4 + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in +strict-rfc3339==0.7 + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in +tempora==4.1.1 + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # portend +terminal==0.4.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # ntc-templates +textfsm==1.1.0 + # via + # -c requirements/static/ci/py3.8/linux.txt # napalm + # netmiko # ntc-templates timelib==0.2.5 - # via -r requirements/static/pkg/linux.in -toml==0.10.2 - # via -r requirements/static/ci/common.in -tomli==2.0.1 - # via pytest -transitions==0.8.9 - # via junos-eznc -typing-extensions==3.10.0.2 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/pkg/linux.in +toml==0.10.2 + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in +tomli==2.0.1 + # via + # -c requirements/static/ci/py3.8/linux.txt + # pytest +transitions==0.8.1 + # via + # -c requirements/static/ci/py3.8/linux.txt + # junos-eznc +typing-extensions==4.2.0 + # via + # -c requirements/static/ci/py3.8/linux.txt # pytest-shell-utilities # pytest-system-statistics urllib3==1.26.6 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # botocore # docker # kubernetes # python-etcd # requests - # responses vcert==0.7.4 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in -virtualenv==20.8.0 # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in +virtualenv==20.7.2 + # via + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/static/ci/common.in # pytest-salt-factories -watchdog==2.1.5 - # via -r requirements/static/ci/common.in +watchdog==0.10.3 + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in websocket-client==0.40.0 # via + # -c requirements/static/ci/py3.8/linux.txt # docker # kubernetes wempy==0.2.1 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in werkzeug==2.2.3 # via + # -c requirements/static/ci/py3.8/linux.txt # moto # pytest-httpserver xmltodict==0.12.0 # via + # -c requirements/static/ci/py3.8/linux.txt # moto # pywinrm yamlordereddictloader==0.4.0 - # via junos-eznc + # via + # -c requirements/static/ci/py3.8/linux.txt + # junos-eznc yarl==1.7.2 - # via aiohttp -zc.lockfile==2.0 - # via cherrypy + # via + # -c requirements/static/ci/py3.8/linux.txt + # aiohttp +zc.lockfile==1.4 + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # cherrypy zipp==3.5.0 - # via importlib-metadata + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/static/ci/py3.8/docs.txt b/requirements/static/ci/py3.8/docs.txt index da96a0c3bfb..49e09b08f75 100644 --- a/requirements/static/ci/py3.8/docs.txt +++ b/requirements/static/ci/py3.8/docs.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.8/docs.txt requirements/base.txt requirements/static/ci/docs.in requirements/zeromq.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.8/docs.txt requirements/base.txt requirements/static/ci/docs.in requirements/zeromq.txt # alabaster==0.7.12 # via sphinx @@ -12,7 +12,7 @@ certifi==2023.07.22 # via # -c requirements/static/ci/py3.8/linux.txt # requests -charset-normalizer==2.0.12 +charset-normalizer==3.2.0 # via # -c requirements/static/ci/py3.8/linux.txt # requests diff --git a/requirements/static/ci/py3.8/freebsd-crypto.txt b/requirements/static/ci/py3.8/freebsd-crypto.txt index 33138773050..4312bea1384 100644 --- a/requirements/static/ci/py3.8/freebsd-crypto.txt +++ b/requirements/static/ci/py3.8/freebsd-crypto.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.8/freebsd-crypto.txt --pip-args='--constraint=requirements/static/ci/py3.8/freebsd.txt' requirements/static/ci/crypto.in +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.8/freebsd-crypto.txt requirements/static/ci/crypto.in # m2crypto==0.38.0 # via -r requirements/static/ci/crypto.in diff --git a/requirements/static/ci/py3.8/freebsd.txt b/requirements/static/ci/py3.8/freebsd.txt index a50f11cdb13..79e4ded64bf 100644 --- a/requirements/static/ci/py3.8/freebsd.txt +++ b/requirements/static/ci/py3.8/freebsd.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.8/freebsd.txt --pip-args='--constraint=requirements/static/pkg/py3.8/freebsd.txt' requirements/base.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/freebsd.in requirements/static/pkg/freebsd.in requirements/zeromq.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.8/freebsd.txt requirements/base.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/freebsd.in requirements/static/pkg/freebsd.in requirements/zeromq.txt # adal==1.2.5 # via @@ -350,14 +350,16 @@ cassandra-driver==3.24.0 # via -r requirements/static/ci/common.in certifi==2023.07.22 # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt # -r requirements/static/ci/common.in # kubernetes # msrest # requests certvalidator==0.11.1 # via vcert -cffi==1.15.1 +cffi==1.14.6 # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt # -r requirements/static/ci/common.in # azure-datalake-store # bcrypt @@ -365,16 +367,20 @@ cffi==1.15.1 # napalm # pygit2 # pynacl -charset-normalizer==2.0.12 +charset-normalizer==3.2.0 # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt # aiohttp # requests cheetah3==3.2.6.post2 # via -r requirements/static/ci/common.in cheroot==8.5.2 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt + # cherrypy cherrypy==18.6.1 # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/freebsd.in ciscoconfparse==1.5.19 @@ -386,11 +392,14 @@ clustershell==1.8.3 colorama==0.4.3 # via ciscoconfparse contextvars==2.4 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt + # -r requirements/base.txt croniter==0.3.29 ; sys_platform != "win32" # via -r requirements/static/ci/common.in cryptography==41.0.4 # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt # -r requirements/static/pkg/freebsd.in # adal # azure-cosmosdb-table @@ -405,6 +414,7 @@ distlib==0.3.2 # via virtualenv distro==1.5.0 # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt # -r requirements/base.txt # -r requirements/static/pkg/freebsd.in # pytest-skip-markers @@ -445,13 +455,18 @@ hglib==2.6.1 # via -r requirements/static/ci/freebsd.in idna==2.8 # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt # etcd3-py # requests # yarl immutables==0.15 - # via contextvars + # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt + # contextvars importlib-metadata==4.6.4 - # via -r requirements/static/pkg/freebsd.in + # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt + # -r requirements/static/pkg/freebsd.in iniconfig==1.0.1 # via pytest ipaddress==1.0.22 @@ -459,24 +474,33 @@ ipaddress==1.0.22 isodate==0.6.0 # via msrest jaraco.classes==3.2.1 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt + # jaraco.collections jaraco.collections==3.4.0 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt + # cherrypy jaraco.functools==2.0 # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt # cheroot # jaraco.text # tempora jaraco.text==3.5.1 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt + # jaraco.collections jinja2==3.1.2 # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt # -r requirements/base.txt # junos-eznc # moto # napalm jmespath==1.0.1 # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # boto3 @@ -498,7 +522,9 @@ kubernetes==3.0.0 libnacl==1.7.1 ; sys_platform != "win32" and sys_platform != "darwin" # via -r requirements/static/ci/common.in looseversion==1.0.2 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt + # -r requirements/base.txt lxml==4.9.1 # via # junos-eznc @@ -508,6 +534,7 @@ mako==1.2.2 # via -r requirements/static/ci/common.in markupsafe==2.1.2 # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt # -r requirements/base.txt # jinja2 # mako @@ -519,6 +546,7 @@ mock==3.0.5 # via -r requirements/pytest.txt more-itertools==5.0.0 # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt # cheroot # cherrypy # jaraco.classes @@ -527,6 +555,7 @@ moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt # -r requirements/base.txt # pytest-salt-factories msrest==0.6.19 @@ -642,8 +671,9 @@ oauthlib==3.2.2 # via requests-oauthlib oscrypto==1.2.0 # via certvalidator -packaging==21.3 +packaging==22.0 # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt # -r requirements/base.txt # docker # pytest @@ -668,9 +698,12 @@ platformdirs==2.2.0 pluggy==0.13.0 # via pytest portend==2.4 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt + # cherrypy psutil==5.8.0 # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt # -r requirements/base.txt # pytest-salt-factories # pytest-shell-utilities @@ -682,9 +715,13 @@ pyasn1==0.4.8 # pyasn1-modules # rsa pycparser==2.17 - # via cffi + # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt + # cffi pycryptodomex==3.9.8 - # via -r requirements/crypto.txt + # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt + # -r requirements/crypto.txt pyeapi==0.8.3 # via napalm pygit2==1.8.0 @@ -699,12 +736,11 @@ pynacl==1.5.0 # paramiko pyopenssl==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt # -r requirements/static/pkg/freebsd.in # etcd3-py pyparsing==3.0.9 - # via - # junos-eznc - # packaging + # via junos-eznc pyrsistent==0.17.3 # via jsonschema pyserial==3.4 @@ -748,6 +784,7 @@ pytest==7.2.0 # pytest-timeout python-dateutil==2.8.1 # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt # -r requirements/static/pkg/freebsd.in # adal # azure-cosmosdb-table @@ -760,15 +797,19 @@ python-dateutil==2.8.1 python-etcd==0.4.5 # via -r requirements/static/ci/common.in python-gnupg==0.4.8 - # via -r requirements/static/pkg/freebsd.in + # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt + # -r requirements/static/pkg/freebsd.in pytz==2022.1 # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt # moto # tempora pyvmomi==6.7.1.2018.12 # via -r requirements/static/ci/common.in pyyaml==6.0.1 # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt # -r requirements/base.txt # clustershell # junos-eznc @@ -779,12 +820,14 @@ pyyaml==6.0.1 # yamlordereddictloader pyzmq==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt # -r requirements/zeromq.txt # pytest-salt-factories requests-oauthlib==1.3.0 # via msrest requests==2.31.0 # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # adal @@ -821,9 +864,12 @@ scp==0.13.2 semantic-version==2.9.0 # via etcd3-py setproctitle==1.3.2 - # via -r requirements/static/pkg/freebsd.in + # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt + # -r requirements/static/pkg/freebsd.in six==1.16.0 # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt # bcrypt # cassandra-driver # cheroot @@ -856,7 +902,9 @@ sqlparse==0.4.4 strict-rfc3339==0.7 # via -r requirements/static/ci/common.in tempora==4.1.1 - # via portend + # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt + # portend terminal==0.4.0 # via ntc-templates textfsm==1.1.0 @@ -865,7 +913,9 @@ textfsm==1.1.0 # netmiko # ntc-templates timelib==0.2.5 - # via -r requirements/static/pkg/freebsd.in + # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt + # -r requirements/static/pkg/freebsd.in toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 @@ -878,6 +928,7 @@ typing-extensions==4.2.0 # pytest-system-statistics urllib3==1.26.6 # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt # botocore # docker # kubernetes @@ -910,9 +961,13 @@ yamlordereddictloader==0.4.0 yarl==1.7.2 # via aiohttp zc.lockfile==1.4 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt + # cherrypy zipp==3.5.0 - # via importlib-metadata + # via + # -c requirements/static/ci/../pkg/py3.8/freebsd.txt + # importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/static/ci/py3.8/invoke.txt b/requirements/static/ci/py3.8/invoke.txt index d3850c6bde7..11ecca4806f 100644 --- a/requirements/static/ci/py3.8/invoke.txt +++ b/requirements/static/ci/py3.8/invoke.txt @@ -2,13 +2,17 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.8/invoke.txt --pip-args='--constraint=requirements/static/ci/py3.8/linux.txt' requirements/static/ci/invoke.in +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.8/invoke.txt requirements/static/ci/invoke.in # blessings==1.7 # via -r requirements/static/ci/invoke.in invoke==1.4.1 # via -r requirements/static/ci/invoke.in pyyaml==6.0.1 - # via -r requirements/static/ci/invoke.in + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/invoke.in six==1.16.0 - # via blessings + # via + # -c requirements/static/ci/py3.8/linux.txt + # blessings diff --git a/requirements/static/ci/py3.8/lint.txt b/requirements/static/ci/py3.8/lint.txt index 87383d6d105..2142dc4e13f 100644 --- a/requirements/static/ci/py3.8/lint.txt +++ b/requirements/static/ci/py3.8/lint.txt @@ -2,42 +2,64 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.8/lint.txt --pip-args='--constraint=requirements/static/ci/py3.8/linux.txt' requirements/base.txt requirements/static/ci/common.in requirements/static/ci/lint.in requirements/static/ci/linux.in requirements/static/pkg/linux.in requirements/zeromq.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.8/lint.txt requirements/base.txt requirements/static/ci/common.in requirements/static/ci/lint.in requirements/static/ci/linux.in requirements/static/pkg/linux.in requirements/zeromq.txt # -adal==1.2.7 +adal==1.2.3 # via + # -c requirements/static/ci/py3.8/linux.txt # azure-datalake-store # msrestazure aiohttp==3.8.5 - # via etcd3-py -aiosignal==1.2.0 - # via aiohttp -ansible-core==2.11.4 - # via ansible -ansible==4.4.0 ; python_version < "3.9" - # via -r requirements/static/ci/linux.in -apache-libcloud==3.3.1 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in -apscheduler==3.6.3 - # via python-telegram-bot -asn1crypto==1.4.0 # via + # -c requirements/static/ci/py3.8/linux.txt + # etcd3-py +aiosignal==1.2.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # aiohttp +ansible-core==2.11.7 + # via + # -c requirements/static/ci/py3.8/linux.txt + # ansible +ansible==4.4.0 ; python_version < "3.9" + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/linux.in +apache-libcloud==2.5.0 ; sys_platform != "win32" + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in +apscheduler==3.6.3 + # via + # -c requirements/static/ci/py3.8/linux.txt + # python-telegram-bot +asn1crypto==1.3.0 + # via + # -c requirements/static/ci/py3.8/linux.txt # certvalidator # oscrypto astroid==2.3.3 # via pylint async-timeout==4.0.2 - # via aiohttp -attrs==21.2.0 # via + # -c requirements/static/ci/py3.8/linux.txt + # aiohttp +attrs==23.1.0 + # via + # -c requirements/static/ci/py3.8/linux.txt # aiohttp # jsonschema azure-applicationinsights==0.1.0 - # via azure -azure-batch==4.1.3 - # via azure -azure-common==1.1.27 # via + # -c requirements/static/ci/py3.8/linux.txt + # azure +azure-batch==4.1.3 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure +azure-common==1.1.18 + # via + # -c requirements/static/ci/py3.8/linux.txt # azure-applicationinsights # azure-batch # azure-cosmosdb-table @@ -113,107 +135,205 @@ azure-common==1.1.27 # azure-storage-file # azure-storage-queue azure-cosmosdb-nspkg==2.0.2 - # via azure-cosmosdb-table -azure-cosmosdb-table==1.0.6 - # via azure -azure-datalake-store==0.0.52 - # via azure -azure-eventgrid==1.3.0 - # via azure + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-cosmosdb-table +azure-cosmosdb-table==1.0.5 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure +azure-datalake-store==0.0.44 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure +azure-eventgrid==1.2.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure azure-graphrbac==0.40.0 - # via azure + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure azure-keyvault==1.1.0 - # via azure + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure azure-loganalytics==0.1.0 - # via azure + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure azure-mgmt-advisor==1.0.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-applicationinsights==0.1.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-authorization==0.50.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-batch==5.0.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-batchai==2.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-billing==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-cdn==3.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-cognitiveservices==3.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-commerce==1.0.1 - # via azure-mgmt -azure-mgmt-compute==4.6.2 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt +azure-mgmt-compute==4.6.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-consumption==2.0.0 - # via azure-mgmt -azure-mgmt-containerinstance==1.5.0 - # via azure-mgmt -azure-mgmt-containerregistry==2.8.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt +azure-mgmt-containerinstance==1.4.1 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt +azure-mgmt-containerregistry==2.7.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-containerservice==4.4.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-cosmosdb==0.4.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-datafactory==0.6.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-datalake-analytics==0.6.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-datalake-nspkg==3.0.1 # via + # -c requirements/static/ci/py3.8/linux.txt # azure-mgmt-datalake-analytics # azure-mgmt-datalake-store azure-mgmt-datalake-store==0.5.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-datamigration==1.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-devspaces==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-devtestlabs==2.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-dns==2.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-eventgrid==1.0.0 - # via azure-mgmt -azure-mgmt-eventhub==2.6.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt +azure-mgmt-eventhub==2.5.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-hanaonazure==0.1.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-iotcentral==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-iothub==0.5.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-iothubprovisioningservices==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-keyvault==1.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-loganalytics==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-logic==3.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-machinelearningcompute==0.4.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-managementgroups==0.1.0 - # via azure-mgmt -azure-mgmt-managementpartner==0.1.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt +azure-mgmt-managementpartner==0.1.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-maps==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-marketplaceordering==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-media==1.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-monitor==0.5.2 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-msi==0.2.0 - # via azure-mgmt -azure-mgmt-network==2.7.0 - # via azure-mgmt -azure-mgmt-notificationhubs==2.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt +azure-mgmt-network==2.6.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt +azure-mgmt-notificationhubs==2.0.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-nspkg==3.0.2 # via + # -c requirements/static/ci/py3.8/linux.txt # azure-mgmt-advisor # azure-mgmt-applicationinsights # azure-mgmt-authorization @@ -240,10 +360,12 @@ azure-mgmt-nspkg==3.0.2 # azure-mgmt-logic # azure-mgmt-machinelearningcompute # azure-mgmt-managementgroups + # azure-mgmt-managementpartner # azure-mgmt-maps # azure-mgmt-marketplaceordering # azure-mgmt-monitor # azure-mgmt-msi + # azure-mgmt-notificationhubs # azure-mgmt-policyinsights # azure-mgmt-powerbiembedded # azure-mgmt-recoveryservices @@ -252,6 +374,7 @@ azure-mgmt-nspkg==3.0.2 # azure-mgmt-relay # azure-mgmt-reservations # azure-mgmt-scheduler + # azure-mgmt-search # azure-mgmt-servicefabric # azure-mgmt-signalr # azure-mgmt-sql @@ -260,50 +383,92 @@ azure-mgmt-nspkg==3.0.2 # azure-mgmt-trafficmanager # azure-mgmt-web azure-mgmt-policyinsights==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-powerbiembedded==2.0.0 - # via azure-mgmt -azure-mgmt-rdbms==1.9.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt +azure-mgmt-rdbms==1.8.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-recoveryservices==0.3.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-recoveryservicesbackup==0.3.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-redis==5.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-relay==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-reservations==0.2.1 - # via azure-mgmt -azure-mgmt-resource==2.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt +azure-mgmt-resource==2.1.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-scheduler==2.0.0 - # via azure-mgmt -azure-mgmt-search==2.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt +azure-mgmt-search==2.0.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-servicebus==0.5.3 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-servicefabric==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-signalr==0.1.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-sql==0.9.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-storage==2.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-subscription==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-trafficmanager==0.50.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt-web==0.35.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-mgmt azure-mgmt==4.0.0 - # via azure + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure azure-nspkg==3.0.2 # via + # -c requirements/static/ci/py3.8/linux.txt # azure-applicationinsights # azure-batch # azure-cosmosdb-nspkg + # azure-eventgrid # azure-graphrbac # azure-keyvault # azure-loganalytics @@ -312,60 +477,90 @@ azure-nspkg==3.0.2 # azure-servicefabric # azure-servicemanagement-legacy azure-servicebus==0.21.1 - # via azure -azure-servicefabric==6.3.0.0 - # via azure -azure-servicemanagement-legacy==0.20.7 - # via azure -azure-storage-blob==1.5.0 - # via azure -azure-storage-common==1.4.2 # via + # -c requirements/static/ci/py3.8/linux.txt + # azure +azure-servicefabric==6.3.0.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure +azure-servicemanagement-legacy==0.20.6 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure +azure-storage-blob==1.5.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure +azure-storage-common==1.4.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure-cosmosdb-table # azure-storage-blob # azure-storage-file # azure-storage-queue azure-storage-file==1.4.0 - # via azure -azure-storage-queue==1.4.0 - # via azure -azure==4.0.0 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in -backports.entry-points-selectable==1.1.0 - # via virtualenv -backports.zoneinfo==0.2.1 - # via tzlocal -bcrypt==3.2.0 # via + # -c requirements/static/ci/py3.8/linux.txt + # azure +azure-storage-queue==1.4.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # azure +azure==4.0.0 ; sys_platform != "win32" + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in +backports.entry-points-selectable==1.1.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # virtualenv +bcrypt==3.1.6 + # via + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/static/ci/common.in # paramiko boto3==1.21.46 # via + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/static/ci/common.in # moto boto==2.49.0 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in botocore==1.24.46 # via + # -c requirements/static/ci/py3.8/linux.txt # boto3 # moto # s3transfer cachetools==4.2.2 # via + # -c requirements/static/ci/py3.8/linux.txt # google-auth # python-telegram-bot -cassandra-driver==3.25.0 - # via -r requirements/static/ci/common.in +cassandra-driver==3.23.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in certifi==2023.07.22 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/static/ci/common.in # kubernetes # msrest # python-telegram-bot # requests certvalidator==0.11.1 - # via vcert -cffi==1.15.1 # via + # -c requirements/static/ci/py3.8/linux.txt + # vcert +cffi==1.14.6 + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/static/ci/common.in # azure-datalake-store # bcrypt @@ -373,32 +568,56 @@ cffi==1.15.1 # napalm # pygit2 # pynacl -charset-normalizer==2.0.4 +charset-normalizer==3.2.0 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # aiohttp # requests -cheetah3==3.2.6.post1 - # via -r requirements/static/ci/common.in +cheetah3==3.2.6.post2 + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in cheroot==8.5.2 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # cherrypy cherrypy==18.6.1 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/linux.in -ciscoconfparse==1.5.46 - # via napalm -click==8.0.1 - # via geomet +ciscoconfparse==1.5.19 + # via + # -c requirements/static/ci/py3.8/linux.txt + # napalm +click==7.1.1 + # via + # -c requirements/static/ci/py3.8/linux.txt + # geomet clustershell==1.8.3 - # via -r requirements/static/ci/common.in -colorama==0.4.4 - # via ciscoconfparse + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in +colorama==0.4.3 + # via + # -c requirements/static/ci/py3.8/linux.txt + # ciscoconfparse contextvars==2.4 - # via -r requirements/base.txt -croniter==1.0.15 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/base.txt +croniter==0.3.29 ; sys_platform != "win32" + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in cryptography==41.0.4 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/static/pkg/linux.in # adal # ansible-core @@ -411,110 +630,182 @@ cryptography==41.0.4 # pyopenssl # vcert distlib==0.3.2 - # via virtualenv -distro==1.6.0 - # via -r requirements/base.txt -dnspython==2.1.0 # via + # -c requirements/static/ci/py3.8/linux.txt + # virtualenv +distro==1.5.0 + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/base.txt +dnspython==1.16.0 + # via + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/static/ci/common.in # ciscoconfparse # python-etcd docker==6.1.3 - # via -r requirements/static/ci/lint.in + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/lint.in etcd3-py==0.1.6 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in filelock==3.0.12 - # via virtualenv + # via + # -c requirements/static/ci/py3.8/linux.txt + # virtualenv frozenlist==1.3.0 # via + # -c requirements/static/ci/py3.8/linux.txt # aiohttp # aiosignal future==0.18.3 # via + # -c requirements/static/ci/py3.8/linux.txt # napalm # textfsm genshi==0.7.5 - # via -r requirements/static/ci/common.in -geomet==0.2.1.post1 - # via cassandra-driver -gitdb==4.0.7 - # via gitpython -gitpython==3.1.35 - # via -r requirements/static/ci/common.in -google-auth==2.0.1 - # via kubernetes -hglib==2.6.1 - # via -r requirements/static/ci/linux.in -idna==3.2 # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in +geomet==0.1.2 + # via + # -c requirements/static/ci/py3.8/linux.txt + # cassandra-driver +gitdb==4.0.5 + # via + # -c requirements/static/ci/py3.8/linux.txt + # gitpython +gitpython==3.1.35 + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in +google-auth==1.6.3 + # via + # -c requirements/static/ci/py3.8/linux.txt + # kubernetes +hglib==2.6.1 + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/linux.in +idna==2.8 + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # etcd3-py # requests # yarl -immutables==0.19 - # via contextvars +immutables==0.15 + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # contextvars importlib-metadata==4.6.4 - # via -r requirements/static/pkg/linux.in -ipaddress==1.0.23 - # via kubernetes + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/pkg/linux.in +ipaddress==1.0.22 + # via + # -c requirements/static/ci/py3.8/linux.txt + # kubernetes isodate==0.6.0 - # via msrest + # via + # -c requirements/static/ci/py3.8/linux.txt + # msrest isort==4.3.21 # via pylint jaraco.classes==3.2.1 - # via jaraco.collections -jaraco.collections==3.4.0 - # via cherrypy -jaraco.functools==3.3.0 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # jaraco.collections +jaraco.collections==3.4.0 + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # cherrypy +jaraco.functools==2.0 + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # cheroot # jaraco.text # tempora jaraco.text==3.5.1 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # jaraco.collections jinja2==3.1.2 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/base.txt # ansible-core # junos-eznc # moto # napalm -jmespath==0.10.0 +jmespath==1.0.1 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # boto3 # botocore jsonschema==3.2.0 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.10" # via + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/static/ci/common.in # napalm -jxmlease==1.0.3 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in -kazoo==2.8.0 ; sys_platform != "win32" and sys_platform != "darwin" - # via -r requirements/static/ci/common.in +jxmlease==1.0.1 ; sys_platform != "win32" + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in +kazoo==2.6.1 ; sys_platform != "win32" and sys_platform != "darwin" + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in keyring==5.7.1 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in kubernetes==3.0.0 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in lazy-object-proxy==1.4.3 # via astroid -libnacl==1.8.0 ; sys_platform != "win32" and sys_platform != "darwin" - # via -r requirements/static/ci/common.in -loguru==0.6.0 - # via ciscoconfparse +libnacl==1.7.1 ; sys_platform != "win32" and sys_platform != "darwin" + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in looseversion==1.0.2 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/base.txt lxml==4.9.1 # via + # -c requirements/static/ci/py3.8/linux.txt # junos-eznc # napalm # ncclient mako==1.2.2 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in markupsafe==2.1.2 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/base.txt # jinja2 # mako @@ -523,21 +814,31 @@ markupsafe==2.1.2 mccabe==0.6.1 # via pylint mercurial==6.0.1 - # via -r requirements/static/ci/linux.in + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/linux.in modernize==0.5 # via saltpylint -more-itertools==8.8.0 +more-itertools==5.0.0 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # cheroot # cherrypy # jaraco.classes # jaraco.functools moto==3.0.1 - # via -r requirements/static/ci/common.in -msgpack==1.0.2 - # via -r requirements/base.txt -msrest==0.6.21 # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in +msgpack==1.0.2 + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/base.txt +msrest==0.6.14 + # via + # -c requirements/static/ci/py3.8/linux.txt # azure-applicationinsights # azure-eventgrid # azure-keyvault @@ -550,20 +851,18 @@ msrest==0.6.21 # azure-mgmt-dns # azure-mgmt-eventhub # azure-mgmt-keyvault - # azure-mgmt-managementpartner # azure-mgmt-media # azure-mgmt-network - # azure-mgmt-notificationhubs # azure-mgmt-rdbms # azure-mgmt-resource - # azure-mgmt-search # azure-mgmt-servicebus # azure-mgmt-servicefabric # azure-mgmt-signalr # azure-servicefabric # msrestazure -msrestazure==0.6.4 +msrestazure==0.6.3 # via + # -c requirements/static/ci/py3.8/linux.txt # azure-batch # azure-eventgrid # azure-graphrbac @@ -630,36 +929,49 @@ msrestazure==0.6.4 # azure-mgmt-web multidict==6.0.2 # via + # -c requirements/static/ci/py3.8/linux.txt # aiohttp # yarl -napalm==3.3.1 ; sys_platform != "win32" and python_version < "3.10" - # via -r requirements/static/ci/common.in -ncclient==0.6.12 +napalm==3.1.0 ; sys_platform != "win32" and python_version < "3.10" # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in +ncclient==0.6.4 + # via + # -c requirements/static/ci/py3.8/linux.txt # junos-eznc - # napalm -netaddr==0.8.0 +netaddr==0.7.19 # via + # -c requirements/static/ci/py3.8/linux.txt # junos-eznc # napalm # pyeapi -netmiko==3.4.0 - # via napalm -ntc-templates==2.2.2 +netmiko==3.2.0 # via + # -c requirements/static/ci/py3.8/linux.txt + # napalm +ntc-templates==1.4.1 + # via + # -c requirements/static/ci/py3.8/linux.txt # junos-eznc - # netmiko oauthlib==3.2.2 - # via requests-oauthlib -oscrypto==1.2.1 - # via certvalidator -packaging==21.3 # via + # -c requirements/static/ci/py3.8/linux.txt + # requests-oauthlib +oscrypto==1.2.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # certvalidator +packaging==22.0 + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/base.txt # ansible-core # docker paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin" # via + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/static/ci/common.in # junos-eznc # napalm @@ -668,38 +980,71 @@ paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin" # scp passlib==1.7.4 # via + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/static/ci/common.in # ciscoconfparse pathspec==0.9.0 - # via yamllint + # via + # -c requirements/static/ci/py3.8/linux.txt + # yamllint +pathtools==0.1.2 + # via + # -c requirements/static/ci/py3.8/linux.txt + # watchdog platformdirs==2.2.0 - # via virtualenv -portend==2.7.1 - # via cherrypy + # via + # -c requirements/static/ci/py3.8/linux.txt + # virtualenv +portend==2.4 + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # cherrypy psutil==5.8.0 - # via -r requirements/base.txt -pyasn1-modules==0.2.8 - # via google-auth + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/base.txt +pyasn1-modules==0.2.4 + # via + # -c requirements/static/ci/py3.8/linux.txt + # google-auth pyasn1==0.4.8 # via + # -c requirements/static/ci/py3.8/linux.txt # pyasn1-modules # rsa pycodestyle==2.5.0 # via saltpylint -pycparser==2.20 - # via cffi -pycryptodomex==3.10.1 - # via -r requirements/crypto.txt -pyeapi==0.8.4 - # via napalm +pycparser==2.17 + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # cffi +pycryptodomex==3.9.8 + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/crypto.txt +pyeapi==0.8.3 + # via + # -c requirements/static/ci/py3.8/linux.txt + # napalm pygit2==1.0.3 ; python_version <= "3.8" - # via -r requirements/static/ci/linux.in + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/linux.in pyiface==0.0.11 - # via -r requirements/static/ci/linux.in + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/linux.in pyinotify==0.9.6 ; sys_platform != "win32" and sys_platform != "darwin" and platform_system != "openbsd" - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in pyjwt==2.4.0 # via + # -c requirements/static/ci/py3.8/linux.txt # adal # twilio pylint==2.4.4 @@ -707,29 +1052,41 @@ pylint==2.4.4 # -r requirements/static/ci/lint.in # saltpylint pymysql==1.0.2 - # via -r requirements/static/ci/linux.in + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/linux.in pynacl==1.5.0 # via + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/static/ci/common.in # paramiko pyopenssl==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/static/pkg/linux.in # etcd3-py pyparsing==3.0.9 # via + # -c requirements/static/ci/py3.8/linux.txt # junos-eznc - # packaging -pyrsistent==0.18.0 - # via jsonschema -pyserial==3.5 +pyrsistent==0.17.3 # via + # -c requirements/static/ci/py3.8/linux.txt + # jsonschema +pyserial==3.4 + # via + # -c requirements/static/ci/py3.8/linux.txt # junos-eznc # netmiko python-consul==1.1.0 - # via -r requirements/static/ci/linux.in -python-dateutil==2.8.2 # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/linux.in +python-dateutil==2.8.1 + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/static/pkg/linux.in # adal # azure-cosmosdb-table @@ -740,22 +1097,36 @@ python-dateutil==2.8.2 # moto # vcert python-etcd==0.4.5 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in python-gnupg==0.4.8 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/pkg/linux.in python-telegram-bot==13.7 - # via -r requirements/static/ci/linux.in + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/linux.in pytz==2022.1 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # apscheduler # moto # python-telegram-bot # tempora # twilio -pyvmomi==7.0.2 - # via -r requirements/static/ci/common.in + # tzlocal +pyvmomi==6.7.1.2018.12 + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in pyyaml==6.0.1 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/base.txt # ansible-core # clustershell @@ -765,15 +1136,26 @@ pyyaml==6.0.1 # yamllint # yamlordereddictloader pyzmq==23.2.0 - # via -r requirements/zeromq.txt + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/zeromq.txt redis-py-cluster==2.1.3 - # via -r requirements/static/ci/linux.in + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/linux.in redis==3.5.3 - # via redis-py-cluster + # via + # -c requirements/static/ci/py3.8/linux.txt + # redis-py-cluster requests-oauthlib==1.3.0 - # via msrest + # via + # -c requirements/static/ci/py3.8/linux.txt + # msrest requests==2.31.0 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # adal @@ -797,30 +1179,51 @@ requests==2.31.0 # twilio # vcert resolvelib==0.5.4 - # via ansible-core -responses==0.13.4 - # via moto + # via + # -c requirements/static/ci/py3.8/linux.txt + # ansible-core +responses==0.10.6 + # via + # -c requirements/static/ci/py3.8/linux.txt + # moto rfc3987==1.3.8 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in rpm-vercmp==0.1.2 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/pkg/linux.in rsa==4.7.2 - # via google-auth -s3transfer==0.5.0 - # via boto3 + # via + # -c requirements/static/ci/py3.8/linux.txt + # google-auth +s3transfer==0.5.2 + # via + # -c requirements/static/ci/py3.8/linux.txt + # boto3 saltpylint==2023.8.3 # via -r requirements/static/ci/lint.in -scp==0.13.6 +scp==0.13.2 # via + # -c requirements/static/ci/py3.8/linux.txt # junos-eznc # napalm # netmiko semantic-version==2.9.0 - # via etcd3-py + # via + # -c requirements/static/ci/py3.8/linux.txt + # etcd3-py setproctitle==1.3.2 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/pkg/linux.in six==1.16.0 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # apscheduler # astroid # bcrypt @@ -829,12 +1232,13 @@ six==1.16.0 # etcd3-py # genshi # geomet + # google-auth # isodate # jsonschema # junos-eznc # kazoo # kubernetes - # msrestazure + # more-itertools # ncclient # paramiko # python-consul @@ -847,73 +1251,128 @@ six==1.16.0 # virtualenv # websocket-client slack-bolt==1.15.5 - # via -r requirements/static/ci/linux.in -slack-sdk==3.19.5 - # via slack-bolt -smmap==4.0.0 - # via gitdb -sqlparse==0.4.4 - # via -r requirements/static/ci/common.in -strict-rfc3339==0.7 - # via -r requirements/static/ci/common.in -tempora==4.1.1 - # via portend -tenacity==8.0.1 - # via netmiko -textfsm==1.1.2 # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/linux.in +slack-sdk==3.19.5 + # via + # -c requirements/static/ci/py3.8/linux.txt + # slack-bolt +smmap==3.0.4 + # via + # -c requirements/static/ci/py3.8/linux.txt + # gitdb +sqlparse==0.4.4 + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in +strict-rfc3339==0.7 + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in +tempora==4.1.1 + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # portend +terminal==0.4.0 + # via + # -c requirements/static/ci/py3.8/linux.txt + # ntc-templates +textfsm==1.1.0 + # via + # -c requirements/static/ci/py3.8/linux.txt # napalm + # netmiko # ntc-templates timelib==0.2.5 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/pkg/linux.in toml==0.10.2 # via + # -c requirements/static/ci/py3.8/linux.txt # -r requirements/static/ci/common.in # -r requirements/static/ci/lint.in tornado==6.1 - # via python-telegram-bot -transitions==0.8.8 - # via junos-eznc + # via + # -c requirements/static/ci/py3.8/linux.txt + # python-telegram-bot +transitions==0.8.1 + # via + # -c requirements/static/ci/py3.8/linux.txt + # junos-eznc twilio==7.9.2 - # via -r requirements/static/ci/linux.in -tzlocal==3.0 - # via apscheduler + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/linux.in +tzlocal==2.1 + # via + # -c requirements/static/ci/py3.8/linux.txt + # apscheduler urllib3==1.26.6 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt # botocore # docker # kubernetes # python-etcd # requests - # responses vcert==0.7.4 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in virtualenv==20.7.2 - # via -r requirements/static/ci/common.in -watchdog==2.1.5 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in +watchdog==0.10.3 + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in websocket-client==0.40.0 # via + # -c requirements/static/ci/py3.8/linux.txt # docker # kubernetes wempy==0.2.1 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/common.in werkzeug==2.2.3 - # via moto + # via + # -c requirements/static/ci/py3.8/linux.txt + # moto wrapt==1.11.1 # via astroid xmltodict==0.12.0 - # via moto + # via + # -c requirements/static/ci/py3.8/linux.txt + # moto yamllint==1.26.3 - # via -r requirements/static/ci/linux.in + # via + # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/static/ci/linux.in yamlordereddictloader==0.4.0 - # via junos-eznc + # via + # -c requirements/static/ci/py3.8/linux.txt + # junos-eznc yarl==1.7.2 - # via aiohttp -zc.lockfile==2.0 - # via cherrypy + # via + # -c requirements/static/ci/py3.8/linux.txt + # aiohttp +zc.lockfile==1.4 + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # cherrypy zipp==3.5.0 - # via importlib-metadata + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -c requirements/static/ci/py3.8/linux.txt + # importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/static/ci/py3.8/linux-crypto.txt b/requirements/static/ci/py3.8/linux-crypto.txt index 18165a062ba..064707bf3c2 100644 --- a/requirements/static/ci/py3.8/linux-crypto.txt +++ b/requirements/static/ci/py3.8/linux-crypto.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.8/linux-crypto.txt --pip-args='--constraint=requirements/static/ci/py3.8/linux.txt' requirements/static/ci/crypto.in +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.8/linux-crypto.txt requirements/static/ci/crypto.in # m2crypto==0.38.0 # via -r requirements/static/ci/crypto.in diff --git a/requirements/static/ci/py3.8/linux.txt b/requirements/static/ci/py3.8/linux.txt index bed68632b20..8c17c7005ca 100644 --- a/requirements/static/ci/py3.8/linux.txt +++ b/requirements/static/ci/py3.8/linux.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.8/linux.txt --pip-args='--constraint=requirements/static/pkg/py3.8/linux.txt' requirements/base.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/linux.in requirements/static/pkg/linux.in requirements/zeromq.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.8/linux.txt requirements/base.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/linux.in requirements/static/pkg/linux.in requirements/zeromq.txt # adal==1.2.3 # via @@ -363,6 +363,7 @@ cassandra-driver==3.23.0 # via -r requirements/static/ci/common.in certifi==2023.07.22 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt # -r requirements/static/ci/common.in # kubernetes # msrest @@ -370,8 +371,9 @@ certifi==2023.07.22 # requests certvalidator==0.11.1 # via vcert -cffi==1.15.1 +cffi==1.14.6 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt # -r requirements/static/ci/common.in # azure-datalake-store # bcrypt @@ -379,16 +381,20 @@ cffi==1.15.1 # napalm # pygit2 # pynacl -charset-normalizer==2.0.12 +charset-normalizer==3.2.0 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt # aiohttp # requests cheetah3==3.2.6.post2 # via -r requirements/static/ci/common.in cheroot==8.5.2 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # cherrypy cherrypy==18.6.1 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/linux.in ciscoconfparse==1.5.19 @@ -400,11 +406,14 @@ clustershell==1.8.3 colorama==0.4.3 # via ciscoconfparse contextvars==2.4 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -r requirements/base.txt croniter==0.3.29 ; sys_platform != "win32" # via -r requirements/static/ci/common.in cryptography==41.0.4 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt # -r requirements/static/pkg/linux.in # adal # ansible-core @@ -420,6 +429,7 @@ distlib==0.3.2 # via virtualenv distro==1.5.0 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt # -r requirements/base.txt # pytest-skip-markers dnspython==1.16.0 @@ -459,13 +469,18 @@ hglib==2.6.1 # via -r requirements/static/ci/linux.in idna==2.8 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt # etcd3-py # requests # yarl immutables==0.15 - # via contextvars + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # contextvars importlib-metadata==4.6.4 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -r requirements/static/pkg/linux.in iniconfig==1.0.1 # via pytest ipaddress==1.0.22 @@ -473,18 +488,26 @@ ipaddress==1.0.22 isodate==0.6.0 # via msrest jaraco.classes==3.2.1 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # jaraco.collections jaraco.collections==3.4.0 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # cherrypy jaraco.functools==2.0 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt # cheroot # jaraco.text # tempora jaraco.text==3.5.1 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # jaraco.collections jinja2==3.1.2 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt # -r requirements/base.txt # ansible-core # junos-eznc @@ -492,6 +515,7 @@ jinja2==3.1.2 # napalm jmespath==1.0.1 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # boto3 @@ -513,7 +537,9 @@ kubernetes==3.0.0 libnacl==1.7.1 ; sys_platform != "win32" and sys_platform != "darwin" # via -r requirements/static/ci/common.in looseversion==1.0.2 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -r requirements/base.txt lxml==4.9.1 # via # junos-eznc @@ -523,6 +549,7 @@ mako==1.2.2 # via -r requirements/static/ci/common.in markupsafe==2.1.2 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt # -r requirements/base.txt # jinja2 # mako @@ -534,6 +561,7 @@ mock==3.0.5 # via -r requirements/pytest.txt more-itertools==5.0.0 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt # cheroot # cherrypy # jaraco.classes @@ -542,6 +570,7 @@ moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt # -r requirements/base.txt # pytest-salt-factories msrest==0.6.14 @@ -656,6 +685,7 @@ oscrypto==1.2.0 # via certvalidator packaging==22.0 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt # -r requirements/base.txt # ansible-core # docker @@ -681,9 +711,12 @@ platformdirs==2.2.0 pluggy==0.13.0 # via pytest portend==2.4 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # cherrypy psutil==5.8.0 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt # -r requirements/base.txt # pytest-salt-factories # pytest-shell-utilities @@ -695,9 +728,13 @@ pyasn1==0.4.8 # pyasn1-modules # rsa pycparser==2.17 - # via cffi + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # cffi pycryptodomex==3.9.8 - # via -r requirements/crypto.txt + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -r requirements/crypto.txt pyeapi==0.8.3 # via napalm pygit2==1.0.3 ; python_version <= "3.8" @@ -718,6 +755,7 @@ pynacl==1.5.0 # paramiko pyopenssl==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt # -r requirements/static/pkg/linux.in # etcd3-py pyparsing==3.0.9 @@ -767,6 +805,7 @@ python-consul==1.1.0 # via -r requirements/static/ci/linux.in python-dateutil==2.8.1 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt # -r requirements/static/pkg/linux.in # adal # azure-cosmosdb-table @@ -779,11 +818,14 @@ python-dateutil==2.8.1 python-etcd==0.4.5 # via -r requirements/static/ci/common.in python-gnupg==0.4.8 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -r requirements/static/pkg/linux.in python-telegram-bot==13.7 # via -r requirements/static/ci/linux.in pytz==2022.1 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt # apscheduler # moto # python-telegram-bot @@ -794,6 +836,7 @@ pyvmomi==6.7.1.2018.12 # via -r requirements/static/ci/common.in pyyaml==6.0.1 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt # -r requirements/base.txt # ansible-core # clustershell @@ -805,6 +848,7 @@ pyyaml==6.0.1 # yamlordereddictloader pyzmq==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt # -r requirements/zeromq.txt # pytest-salt-factories redis-py-cluster==2.1.3 @@ -815,6 +859,7 @@ requests-oauthlib==1.3.0 # via msrest requests==2.31.0 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # adal @@ -844,7 +889,9 @@ responses==0.10.6 rfc3987==1.3.8 # via -r requirements/static/ci/common.in rpm-vercmp==0.1.2 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -r requirements/static/pkg/linux.in rsa==4.7.2 # via google-auth s3transfer==0.5.2 @@ -857,9 +904,12 @@ scp==0.13.2 semantic-version==2.9.0 # via etcd3-py setproctitle==1.3.2 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -r requirements/static/pkg/linux.in six==1.16.0 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt # apscheduler # bcrypt # cassandra-driver @@ -897,7 +947,9 @@ sqlparse==0.4.4 strict-rfc3339==0.7 # via -r requirements/static/ci/common.in tempora==4.1.1 - # via portend + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # portend terminal==0.4.0 # via ntc-templates textfsm==1.1.0 @@ -906,7 +958,9 @@ textfsm==1.1.0 # netmiko # ntc-templates timelib==0.2.5 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -r requirements/static/pkg/linux.in toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 @@ -925,6 +979,7 @@ tzlocal==2.1 # via apscheduler urllib3==1.26.6 # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt # botocore # docker # kubernetes @@ -957,9 +1012,13 @@ yamlordereddictloader==0.4.0 yarl==1.7.2 # via aiohttp zc.lockfile==1.4 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # cherrypy zipp==3.5.0 - # via importlib-metadata + # via + # -c requirements/static/ci/../pkg/py3.8/linux.txt + # importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/static/ci/py3.8/windows-crypto.txt b/requirements/static/ci/py3.8/windows-crypto.txt index 53af09c41b2..17fbd42c3d9 100644 --- a/requirements/static/ci/py3.8/windows-crypto.txt +++ b/requirements/static/ci/py3.8/windows-crypto.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.8/windows-crypto.txt --pip-args='--constraint=requirements/static/ci/py3.8/windows.txt' requirements/static/ci/crypto.in +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.8/windows-crypto.txt requirements/static/ci/crypto.in # m2crypto==0.38.0 # via -r requirements/static/ci/crypto.in diff --git a/requirements/static/ci/py3.8/windows.txt b/requirements/static/ci/py3.8/windows.txt index 24bc9c52c71..d14d501e1b9 100644 --- a/requirements/static/ci/py3.8/windows.txt +++ b/requirements/static/ci/py3.8/windows.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.8/windows.txt --pip-args='--constraint=requirements/static/pkg/py3.8/windows.txt' requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/windows.in requirements/static/pkg/windows.in requirements/windows.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.8/windows.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/windows.in requirements/static/pkg/windows.in requirements/windows.txt # aiohttp==3.8.5 # via etcd3-py @@ -40,42 +40,53 @@ cassandra-driver==3.23.0 # via -r requirements/static/ci/common.in certifi==2023.07.22 # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt # -r requirements/static/ci/common.in # -r requirements/windows.txt # kubernetes # requests -cffi==1.15.1 +cffi==1.14.6 # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt # -r requirements/static/ci/common.in # -r requirements/windows.txt # clr-loader # cryptography # pygit2 # pynacl -charset-normalizer==2.0.12 +charset-normalizer==3.2.0 # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt # aiohttp # requests cheetah3==3.2.6.post2 # via -r requirements/static/ci/common.in cheroot==8.5.2 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt + # cherrypy cherrypy==18.6.1 # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt # -r requirements/static/ci/common.in # -r requirements/windows.txt click==7.1.2 # via geomet clr-loader==0.2.4 - # via pythonnet + # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt + # pythonnet clustershell==1.8.3 # via -r requirements/static/ci/common.in colorama==0.4.1 # via pytest contextvars==2.4 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt + # -r requirements/base.txt cryptography==41.0.4 # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt # -r requirements/windows.txt # etcd3-py # moto @@ -85,6 +96,7 @@ distlib==0.3.2 # via virtualenv distro==1.5.0 # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt # -r requirements/base.txt # pytest-skip-markers dmidecode==0.9.0 @@ -112,45 +124,64 @@ genshi==0.7.5 geomet==0.1.2 # via cassandra-driver gitdb==4.0.7 - # via gitpython + # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt + # gitpython gitpython==3.1.35 # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt # -r requirements/static/ci/common.in # -r requirements/windows.txt google-auth==1.6.3 # via kubernetes idna==2.8 # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt # etcd3-py # requests # yarl immutables==0.15 - # via contextvars + # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt + # contextvars importlib-metadata==4.6.4 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt + # -r requirements/windows.txt iniconfig==1.0.1 # via pytest ioloop==0.1a0 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt + # -r requirements/windows.txt ipaddress==1.0.22 # via kubernetes jaraco.classes==3.2.1 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt + # jaraco.collections jaraco.collections==3.3.0 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt + # cherrypy jaraco.functools==2.0 # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt # cheroot # jaraco.text # tempora jaraco.text==3.5.0 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt + # jaraco.collections jinja2==3.1.2 # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt # -r requirements/base.txt # moto jmespath==1.0.1 # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # boto3 @@ -162,13 +193,18 @@ keyring==5.7.1 kubernetes==3.0.0 # via -r requirements/static/ci/common.in looseversion==1.0.2 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt + # -r requirements/base.txt lxml==4.9.1 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt + # -r requirements/windows.txt mako==1.2.2 # via -r requirements/static/ci/common.in markupsafe==2.1.2 # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt # -r requirements/base.txt # jinja2 # mako @@ -178,6 +214,7 @@ mock==3.0.5 # via -r requirements/pytest.txt more-itertools==8.2.0 # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt # cheroot # cherrypy # jaraco.classes @@ -186,6 +223,7 @@ moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt # -r requirements/base.txt # pytest-salt-factories multidict==6.0.2 @@ -194,8 +232,9 @@ multidict==6.0.2 # yarl ntlm-auth==1.5.0 # via requests-ntlm -packaging==21.3 +packaging==22.0 # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt # -r requirements/base.txt # docker # pytest @@ -212,9 +251,12 @@ platformdirs==2.2.0 pluggy==0.13.0 # via pytest portend==2.6 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt + # cherrypy psutil==5.8.0 # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt # -r requirements/base.txt # pytest-salt-factories # pytest-shell-utilities @@ -223,29 +265,36 @@ pyasn1-modules==0.2.4 # via google-auth pyasn1==0.4.8 # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt # -r requirements/windows.txt # pyasn1-modules # rsa pycparser==2.21 # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt # -r requirements/windows.txt # cffi pycryptodomex==3.10.1 - # via -r requirements/crypto.txt + # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt + # -r requirements/crypto.txt pygit2==1.9.1 # via -r requirements/static/ci/windows.in pymssql==2.2.1 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt + # -r requirements/windows.txt pymysql==1.0.2 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt + # -r requirements/windows.txt pynacl==1.5.0 # via -r requirements/static/ci/common.in pyopenssl==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt # -r requirements/windows.txt # etcd3-py -pyparsing==3.0.9 - # via packaging pyrsistent==0.17.3 # via jsonschema pytest-custom-exit-code==0.3.0 @@ -285,6 +334,7 @@ pytest==7.2.0 # pytest-timeout python-dateutil==2.8.1 # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt # -r requirements/windows.txt # botocore # kubernetes @@ -292,17 +342,23 @@ python-dateutil==2.8.1 python-etcd==0.4.5 # via -r requirements/static/ci/common.in python-gnupg==0.4.8 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt + # -r requirements/windows.txt pythonnet==3.0.1 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt + # -r requirements/windows.txt pytz==2022.1 # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt # moto # tempora pyvmomi==6.7.1.2018.12 # via -r requirements/static/ci/common.in pywin32==305 # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt # -r requirements/windows.txt # cherrypy # docker @@ -312,6 +368,7 @@ pywinrm==0.4.1 # via -r requirements/static/ci/windows.in pyyaml==6.0.1 # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt # -r requirements/base.txt # clustershell # kubernetes @@ -319,12 +376,14 @@ pyyaml==6.0.1 # yamllint pyzmq==25.0.2 ; sys_platform == "win32" # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt # -r requirements/zeromq.txt # pytest-salt-factories requests-ntlm==1.1.0 # via pywinrm requests==2.31.0 # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # -r requirements/windows.txt @@ -349,9 +408,12 @@ sed==0.3.1 semantic-version==2.9.0 # via etcd3-py setproctitle==1.3.2 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt + # -r requirements/windows.txt six==1.15.0 # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt # cassandra-driver # cheroot # etcd3-py @@ -368,15 +430,21 @@ six==1.15.0 # virtualenv # websocket-client smmap==4.0.0 - # via gitdb + # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt + # gitdb sqlparse==0.4.4 # via -r requirements/static/ci/common.in strict-rfc3339==0.7 # via -r requirements/static/ci/common.in tempora==4.1.1 - # via portend + # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt + # portend timelib==0.2.5 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt + # -r requirements/windows.txt toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 @@ -387,6 +455,7 @@ typing-extensions==4.2.0 # pytest-system-statistics urllib3==1.26.6 # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt # -r requirements/windows.txt # botocore # docker @@ -410,9 +479,13 @@ werkzeug==2.2.3 # moto # pytest-httpserver wheel==0.38.4 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt + # -r requirements/windows.txt wmi==1.5.1 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt + # -r requirements/windows.txt xmltodict==0.12.0 # via # moto @@ -422,9 +495,13 @@ yamllint==1.26.3 yarl==1.7.2 # via aiohttp zc.lockfile==2.0 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt + # cherrypy zipp==3.5.0 - # via importlib-metadata + # via + # -c requirements/static/ci/../pkg/py3.8/windows.txt + # importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/static/ci/py3.9/changelog.txt b/requirements/static/ci/py3.9/changelog.txt index 43b8ccc8406..92c670f312e 100644 --- a/requirements/static/ci/py3.9/changelog.txt +++ b/requirements/static/ci/py3.9/changelog.txt @@ -2,26 +2,37 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.9/changelog.txt --pip-args='--constraint=requirements/static/ci/py3.9/linux.txt' requirements/static/ci/changelog.in +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.9/changelog.txt requirements/static/ci/changelog.in # click-default-group==1.2.2 # via towncrier -click==7.1.2 +click==7.1.1 # via + # -c requirements/static/ci/py3.9/linux.txt # click-default-group # towncrier incremental==17.5.0 # via towncrier jinja2==3.1.2 - # via towncrier -looseversion==1.0.3 - # via -r requirements/static/ci/changelog.in -markupsafe==2.0.1 - # via jinja2 -packaging==23.0 - # via -r requirements/static/ci/changelog.in + # via + # -c requirements/static/ci/py3.9/linux.txt + # towncrier +looseversion==1.0.2 + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/changelog.in +markupsafe==2.1.2 + # via + # -c requirements/static/ci/py3.9/linux.txt + # jinja2 +packaging==22.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/changelog.in tomli==2.0.1 - # via towncrier + # via + # -c requirements/static/ci/py3.9/linux.txt + # towncrier towncrier==22.12.0 # via -r requirements/static/ci/changelog.in diff --git a/requirements/static/ci/py3.9/cloud.txt b/requirements/static/ci/py3.9/cloud.txt index 94f57e7a770..e92f9ca45d7 100644 --- a/requirements/static/ci/py3.9/cloud.txt +++ b/requirements/static/ci/py3.9/cloud.txt @@ -2,28 +2,38 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.9/cloud.txt --pip-args='--constraint=requirements/static/ci/py3.9/linux.txt' requirements/base.txt requirements/pytest.txt requirements/static/ci/cloud.in requirements/static/ci/common.in requirements/static/pkg/linux.in requirements/zeromq.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.9/cloud.txt requirements/base.txt requirements/pytest.txt requirements/static/ci/cloud.in requirements/static/ci/common.in requirements/static/pkg/linux.in requirements/zeromq.txt # -adal==1.2.7 +adal==1.2.3 # via + # -c requirements/static/ci/py3.9/linux.txt # azure-datalake-store # msrestazure aiohttp==3.8.5 - # via etcd3-py + # via + # -c requirements/static/ci/py3.9/linux.txt + # etcd3-py aiosignal==1.2.0 - # via aiohttp + # via + # -c requirements/static/ci/py3.9/linux.txt + # aiohttp apache-libcloud==2.5.0 ; sys_platform != "win32" # via + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/cloud.in # -r requirements/static/ci/common.in -asn1crypto==1.4.0 +asn1crypto==1.3.0 # via + # -c requirements/static/ci/py3.9/linux.txt # certvalidator # oscrypto async-timeout==4.0.2 - # via aiohttp + # via + # -c requirements/static/ci/py3.9/linux.txt + # aiohttp attrs==23.1.0 # via + # -c requirements/static/ci/py3.9/linux.txt # aiohttp # jsonschema # pytest @@ -32,11 +42,16 @@ attrs==23.1.0 # pytest-skip-markers # pytest-system-statistics azure-applicationinsights==0.1.0 - # via azure -azure-batch==4.1.3 - # via azure -azure-common==1.1.27 # via + # -c requirements/static/ci/py3.9/linux.txt + # azure +azure-batch==4.1.3 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure +azure-common==1.1.18 + # via + # -c requirements/static/ci/py3.9/linux.txt # azure-applicationinsights # azure-batch # azure-cosmosdb-table @@ -112,107 +127,205 @@ azure-common==1.1.27 # azure-storage-file # azure-storage-queue azure-cosmosdb-nspkg==2.0.2 - # via azure-cosmosdb-table -azure-cosmosdb-table==1.0.6 - # via azure -azure-datalake-store==0.0.52 - # via azure -azure-eventgrid==1.3.0 - # via azure + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-cosmosdb-table +azure-cosmosdb-table==1.0.5 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure +azure-datalake-store==0.0.44 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure +azure-eventgrid==1.2.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure azure-graphrbac==0.40.0 - # via azure + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure azure-keyvault==1.1.0 - # via azure + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure azure-loganalytics==0.1.0 - # via azure + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure azure-mgmt-advisor==1.0.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-applicationinsights==0.1.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-authorization==0.50.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-batch==5.0.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-batchai==2.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-billing==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-cdn==3.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-cognitiveservices==3.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-commerce==1.0.1 - # via azure-mgmt -azure-mgmt-compute==4.6.2 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt +azure-mgmt-compute==4.6.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-consumption==2.0.0 - # via azure-mgmt -azure-mgmt-containerinstance==1.5.0 - # via azure-mgmt -azure-mgmt-containerregistry==2.8.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt +azure-mgmt-containerinstance==1.4.1 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt +azure-mgmt-containerregistry==2.7.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-containerservice==4.4.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-cosmosdb==0.4.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-datafactory==0.6.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-datalake-analytics==0.6.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-datalake-nspkg==3.0.1 # via + # -c requirements/static/ci/py3.9/linux.txt # azure-mgmt-datalake-analytics # azure-mgmt-datalake-store azure-mgmt-datalake-store==0.5.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-datamigration==1.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-devspaces==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-devtestlabs==2.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-dns==2.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-eventgrid==1.0.0 - # via azure-mgmt -azure-mgmt-eventhub==2.6.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt +azure-mgmt-eventhub==2.5.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-hanaonazure==0.1.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-iotcentral==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-iothub==0.5.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-iothubprovisioningservices==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-keyvault==1.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-loganalytics==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-logic==3.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-machinelearningcompute==0.4.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-managementgroups==0.1.0 - # via azure-mgmt -azure-mgmt-managementpartner==0.1.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt +azure-mgmt-managementpartner==0.1.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-maps==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-marketplaceordering==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-media==1.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-monitor==0.5.2 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-msi==0.2.0 - # via azure-mgmt -azure-mgmt-network==2.7.0 - # via azure-mgmt -azure-mgmt-notificationhubs==2.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt +azure-mgmt-network==2.6.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt +azure-mgmt-notificationhubs==2.0.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-nspkg==3.0.2 # via + # -c requirements/static/ci/py3.9/linux.txt # azure-mgmt-advisor # azure-mgmt-applicationinsights # azure-mgmt-authorization @@ -239,10 +352,12 @@ azure-mgmt-nspkg==3.0.2 # azure-mgmt-logic # azure-mgmt-machinelearningcompute # azure-mgmt-managementgroups + # azure-mgmt-managementpartner # azure-mgmt-maps # azure-mgmt-marketplaceordering # azure-mgmt-monitor # azure-mgmt-msi + # azure-mgmt-notificationhubs # azure-mgmt-policyinsights # azure-mgmt-powerbiembedded # azure-mgmt-recoveryservices @@ -251,6 +366,7 @@ azure-mgmt-nspkg==3.0.2 # azure-mgmt-relay # azure-mgmt-reservations # azure-mgmt-scheduler + # azure-mgmt-search # azure-mgmt-servicefabric # azure-mgmt-signalr # azure-mgmt-sql @@ -259,50 +375,92 @@ azure-mgmt-nspkg==3.0.2 # azure-mgmt-trafficmanager # azure-mgmt-web azure-mgmt-policyinsights==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-powerbiembedded==2.0.0 - # via azure-mgmt -azure-mgmt-rdbms==1.9.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt +azure-mgmt-rdbms==1.8.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-recoveryservices==0.3.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-recoveryservicesbackup==0.3.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-redis==5.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-relay==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-reservations==0.2.1 - # via azure-mgmt -azure-mgmt-resource==2.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt +azure-mgmt-resource==2.1.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-scheduler==2.0.0 - # via azure-mgmt -azure-mgmt-search==2.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt +azure-mgmt-search==2.0.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-servicebus==0.5.3 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-servicefabric==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-signalr==0.1.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-sql==0.9.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-storage==2.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-subscription==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-trafficmanager==0.50.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-web==0.35.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt==4.0.0 - # via azure + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure azure-nspkg==3.0.2 # via + # -c requirements/static/ci/py3.9/linux.txt # azure-applicationinsights # azure-batch # azure-cosmosdb-nspkg + # azure-eventgrid # azure-graphrbac # azure-keyvault # azure-loganalytics @@ -311,87 +469,144 @@ azure-nspkg==3.0.2 # azure-servicefabric # azure-servicemanagement-legacy azure-servicebus==0.21.1 - # via azure -azure-servicefabric==6.3.0.0 - # via azure -azure-servicemanagement-legacy==0.20.7 - # via azure -azure-storage-blob==1.5.0 - # via azure -azure-storage-common==1.4.2 # via + # -c requirements/static/ci/py3.9/linux.txt + # azure +azure-servicefabric==6.3.0.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure +azure-servicemanagement-legacy==0.20.6 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure +azure-storage-blob==1.5.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure +azure-storage-common==1.4.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-cosmosdb-table # azure-storage-blob # azure-storage-file # azure-storage-queue azure-storage-file==1.4.0 - # via azure -azure-storage-queue==1.4.0 - # via azure -azure==4.0.0 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in -backports.entry-points-selectable==1.1.0 - # via virtualenv -bcrypt==3.2.0 # via + # -c requirements/static/ci/py3.9/linux.txt + # azure +azure-storage-queue==1.4.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure +azure==4.0.0 ; sys_platform != "win32" + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in +backports.entry-points-selectable==1.1.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # virtualenv +bcrypt==3.1.6 + # via + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in # paramiko boto3==1.21.46 # via + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in # moto boto==2.49.0 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in botocore==1.24.46 # via + # -c requirements/static/ci/py3.9/linux.txt # boto3 # moto # s3transfer cachetools==4.2.2 - # via google-auth -cassandra-driver==3.25.0 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.9/linux.txt + # google-auth +cassandra-driver==3.23.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in certifi==2023.07.22 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in # kubernetes # msrest # requests certvalidator==0.11.1 - # via vcert -cffi==1.15.1 # via + # -c requirements/static/ci/py3.9/linux.txt + # vcert +cffi==1.14.6 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in # azure-datalake-store # bcrypt # cryptography # napalm # pynacl -charset-normalizer==2.0.12 +charset-normalizer==3.2.0 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # aiohttp # requests -cheetah3==3.2.6.post1 - # via -r requirements/static/ci/common.in +cheetah3==3.2.6.post2 + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in cheroot==8.5.2 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # cherrypy cherrypy==18.6.1 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/linux.in -ciscoconfparse==1.5.46 - # via napalm -click==8.0.1 - # via geomet +ciscoconfparse==1.5.19 + # via + # -c requirements/static/ci/py3.9/linux.txt + # napalm +click==7.1.1 + # via + # -c requirements/static/ci/py3.9/linux.txt + # geomet clustershell==1.8.3 - # via -r requirements/static/ci/common.in -colorama==0.4.4 - # via ciscoconfparse + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in +colorama==0.4.3 + # via + # -c requirements/static/ci/py3.9/linux.txt + # ciscoconfparse contextvars==2.4 - # via -r requirements/base.txt -croniter==1.0.15 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/base.txt +croniter==0.3.29 ; sys_platform != "win32" + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in cryptography==41.0.4 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/pkg/linux.in # adal # azure-cosmosdb-table @@ -405,133 +620,217 @@ cryptography==41.0.4 # requests-ntlm # smbprotocol # vcert -distlib==0.3.3 - # via virtualenv -distro==1.6.0 +distlib==0.3.2 # via + # -c requirements/static/ci/py3.9/linux.txt + # virtualenv +distro==1.5.0 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/base.txt # pytest-skip-markers -dnspython==2.1.0 +dnspython==1.16.0 # via + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in # ciscoconfparse # python-etcd docker==6.1.3 - # via -r requirements/pytest.txt + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/pytest.txt etcd3-py==0.1.6 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in exceptiongroup==1.0.4 - # via pytest + # via + # -c requirements/static/ci/py3.9/linux.txt + # pytest filelock==3.0.12 - # via virtualenv + # via + # -c requirements/static/ci/py3.9/linux.txt + # virtualenv flaky==3.7.0 - # via -r requirements/pytest.txt + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/pytest.txt frozenlist==1.3.0 # via + # -c requirements/static/ci/py3.9/linux.txt # aiohttp # aiosignal future==0.18.3 # via + # -c requirements/static/ci/py3.9/linux.txt # napalm # textfsm genshi==0.7.5 - # via -r requirements/static/ci/common.in -geomet==0.2.1.post1 - # via cassandra-driver -gitdb==4.0.7 - # via gitpython + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in +geomet==0.1.2 + # via + # -c requirements/static/ci/py3.9/linux.txt + # cassandra-driver +gitdb==4.0.5 + # via + # -c requirements/static/ci/py3.9/linux.txt + # gitpython gitpython==3.1.35 - # via -r requirements/static/ci/common.in -google-auth==2.1.0 - # via kubernetes + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in +google-auth==1.6.3 + # via + # -c requirements/static/ci/py3.9/linux.txt + # kubernetes idna==2.8 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # etcd3-py # requests # yarl -immutables==0.19 - # via contextvars -importlib-metadata==6.0.0 - # via -r requirements/static/pkg/linux.in -iniconfig==1.1.1 - # via pytest -ipaddress==1.0.23 - # via kubernetes -isodate==0.6.0 - # via msrest -jaraco.classes==3.2.1 - # via jaraco.collections -jaraco.collections==3.4.0 - # via cherrypy -jaraco.functools==3.3.0 +immutables==0.15 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # contextvars +importlib-metadata==6.0.0 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/pkg/linux.in +iniconfig==1.0.1 + # via + # -c requirements/static/ci/py3.9/linux.txt + # pytest +ipaddress==1.0.22 + # via + # -c requirements/static/ci/py3.9/linux.txt + # kubernetes +isodate==0.6.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # msrest +jaraco.classes==3.2.1 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # jaraco.collections +jaraco.collections==3.4.0 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # cherrypy +jaraco.functools==2.0 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # cheroot # jaraco.text # tempora jaraco.text==3.5.1 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # jaraco.collections jinja2==3.1.2 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/base.txt # junos-eznc # moto # napalm -jmespath==0.10.0 +jmespath==1.0.1 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # boto3 # botocore jsonschema==3.2.0 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.10" # via + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in # napalm -jxmlease==1.0.3 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in -kazoo==2.8.0 ; sys_platform != "win32" and sys_platform != "darwin" - # via -r requirements/static/ci/common.in +jxmlease==1.0.1 ; sys_platform != "win32" + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in +kazoo==2.6.1 ; sys_platform != "win32" and sys_platform != "darwin" + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in keyring==5.7.1 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in kubernetes==3.0.0 - # via -r requirements/static/ci/common.in -libnacl==1.8.0 ; sys_platform != "win32" and sys_platform != "darwin" - # via -r requirements/static/ci/common.in -loguru==0.6.0 - # via ciscoconfparse + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in +libnacl==1.7.1 ; sys_platform != "win32" and sys_platform != "darwin" + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in looseversion==1.0.2 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/base.txt lxml==4.9.1 # via + # -c requirements/static/ci/py3.9/linux.txt # junos-eznc # napalm # ncclient mako==1.2.2 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in markupsafe==2.1.2 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/base.txt # jinja2 # mako # moto # werkzeug -mock==4.0.3 - # via -r requirements/pytest.txt -more-itertools==8.8.0 +mock==3.0.5 # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/pytest.txt +more-itertools==5.0.0 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # cheroot # cherrypy # jaraco.classes # jaraco.functools moto==3.0.1 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in msgpack==1.0.2 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/base.txt # pytest-salt-factories -msrest==0.6.21 +msrest==0.6.14 # via + # -c requirements/static/ci/py3.9/linux.txt # azure-applicationinsights # azure-eventgrid # azure-keyvault @@ -544,20 +843,18 @@ msrest==0.6.21 # azure-mgmt-dns # azure-mgmt-eventhub # azure-mgmt-keyvault - # azure-mgmt-managementpartner # azure-mgmt-media # azure-mgmt-network - # azure-mgmt-notificationhubs # azure-mgmt-rdbms # azure-mgmt-resource - # azure-mgmt-search # azure-mgmt-servicebus # azure-mgmt-servicefabric # azure-mgmt-signalr # azure-servicefabric # msrestazure -msrestazure==0.6.4 +msrestazure==0.6.3 # via + # -c requirements/static/ci/py3.9/linux.txt # azure-batch # azure-eventgrid # azure-graphrbac @@ -624,39 +921,52 @@ msrestazure==0.6.4 # azure-mgmt-web multidict==6.0.2 # via + # -c requirements/static/ci/py3.9/linux.txt # aiohttp # yarl -napalm==3.3.1 ; sys_platform != "win32" and python_version < "3.10" - # via -r requirements/static/ci/common.in -ncclient==0.6.12 +napalm==3.1.0 ; sys_platform != "win32" and python_version < "3.10" # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in +ncclient==0.6.4 + # via + # -c requirements/static/ci/py3.9/linux.txt # junos-eznc - # napalm netaddr==0.7.19 # via + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/cloud.in # junos-eznc # napalm # pyeapi -netmiko==3.4.0 - # via napalm -ntc-templates==2.3.2 +netmiko==3.2.0 # via + # -c requirements/static/ci/py3.9/linux.txt + # napalm +ntc-templates==1.4.1 + # via + # -c requirements/static/ci/py3.9/linux.txt # junos-eznc - # netmiko ntlm-auth==1.3.0 # via requests-ntlm oauthlib==3.2.2 - # via requests-oauthlib -oscrypto==1.2.1 - # via certvalidator -packaging==21.3 # via + # -c requirements/static/ci/py3.9/linux.txt + # requests-oauthlib +oscrypto==1.2.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # certvalidator +packaging==22.0 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/base.txt # docker # pytest paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin" # via + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in # junos-eznc # napalm @@ -665,59 +975,93 @@ paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin" # scp passlib==1.7.4 # via + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in # ciscoconfparse -platformdirs==2.3.0 - # via virtualenv -pluggy==1.0.0 - # via pytest -portend==2.7.1 - # via cherrypy +pathtools==0.1.2 + # via + # -c requirements/static/ci/py3.9/linux.txt + # watchdog +platformdirs==2.2.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # virtualenv +pluggy==0.13.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # pytest +portend==2.4 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # cherrypy profitbricks==4.1.3 # via -r requirements/static/ci/cloud.in psutil==5.8.0 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/base.txt # pytest-salt-factories # pytest-shell-utilities # pytest-system-statistics -pyasn1-modules==0.2.8 - # via google-auth +pyasn1-modules==0.2.4 + # via + # -c requirements/static/ci/py3.9/linux.txt + # google-auth pyasn1==0.4.8 # via + # -c requirements/static/ci/py3.9/linux.txt # pyasn1-modules # rsa pycparser==2.21 ; python_version >= "3.9" # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/linux.in # cffi -pycryptodomex==3.10.1 - # via -r requirements/crypto.txt -pyeapi==0.8.4 - # via napalm +pycryptodomex==3.9.8 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/crypto.txt +pyeapi==0.8.3 + # via + # -c requirements/static/ci/py3.9/linux.txt + # napalm pyinotify==0.9.6 ; sys_platform != "win32" and sys_platform != "darwin" and platform_system != "openbsd" - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in pyjwt==2.4.0 - # via adal + # via + # -c requirements/static/ci/py3.9/linux.txt + # adal pynacl==1.5.0 # via + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in # paramiko pyopenssl==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/pkg/linux.in # etcd3-py pyparsing==3.0.9 # via + # -c requirements/static/ci/py3.9/linux.txt # junos-eznc - # packaging pypsexec==0.1.0 # via -r requirements/static/ci/cloud.in -pyrsistent==0.18.0 - # via jsonschema -pyserial==3.5 +pyrsistent==0.17.3 # via + # -c requirements/static/ci/py3.9/linux.txt + # jsonschema +pyserial==3.4 + # via + # -c requirements/static/ci/py3.9/linux.txt # junos-eznc # netmiko pyspnego==0.8.0 @@ -725,31 +1069,48 @@ pyspnego==0.8.0 # -r requirements/static/ci/cloud.in # smbprotocol pytest-custom-exit-code==0.3.0 - # via -r requirements/pytest.txt + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/pytest.txt pytest-helpers-namespace==2021.4.29 # via + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/pytest.txt # pytest-salt-factories # pytest-shell-utilities pytest-httpserver==1.0.4 - # via -r requirements/pytest.txt + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/pytest.txt pytest-salt-factories==1.0.0rc26 - # via -r requirements/pytest.txt + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/pytest.txt pytest-shell-utilities==1.8.0 - # via pytest-salt-factories + # via + # -c requirements/static/ci/py3.9/linux.txt + # pytest-salt-factories pytest-skip-markers==1.4.1 # via + # -c requirements/static/ci/py3.9/linux.txt # pytest-salt-factories # pytest-shell-utilities # pytest-system-statistics -pytest-subtests==0.5.0 - # via -r requirements/pytest.txt +pytest-subtests==0.4.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/pytest.txt pytest-system-statistics==1.0.2 - # via pytest-salt-factories -pytest-timeout==2.0.2 - # via -r requirements/pytest.txt + # via + # -c requirements/static/ci/py3.9/linux.txt + # pytest-salt-factories +pytest-timeout==1.4.2 + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/pytest.txt pytest==7.2.0 # via + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/pytest.txt # pytest-custom-exit-code # pytest-helpers-namespace @@ -759,8 +1120,10 @@ pytest==7.2.0 # pytest-subtests # pytest-system-statistics # pytest-timeout -python-dateutil==2.8.2 +python-dateutil==2.8.1 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/pkg/linux.in # adal # azure-cosmosdb-table @@ -771,19 +1134,30 @@ python-dateutil==2.8.2 # moto # vcert python-etcd==0.4.5 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in python-gnupg==0.4.8 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/pkg/linux.in pytz==2022.1 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # moto # tempora -pyvmomi==7.0.2 - # via -r requirements/static/ci/common.in +pyvmomi==6.7.1.2018.12 + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in pywinrm==0.3.0 # via -r requirements/static/ci/cloud.in pyyaml==6.0.1 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/base.txt # clustershell # junos-eznc @@ -793,14 +1167,20 @@ pyyaml==6.0.1 # yamlordereddictloader pyzmq==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/zeromq.txt # pytest-salt-factories requests-ntlm==1.1.0 # via pywinrm requests-oauthlib==1.3.0 - # via msrest + # via + # -c requirements/static/ci/py3.9/linux.txt + # msrest requests==2.31.0 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # adal @@ -824,39 +1204,60 @@ requests==2.31.0 # requests-oauthlib # responses # vcert -responses==0.14.0 - # via moto -rfc3987==1.3.8 - # via -r requirements/static/ci/common.in -rpm-vercmp==0.1.2 - # via -r requirements/static/pkg/linux.in -rsa==4.7.2 - # via google-auth -s3transfer==0.5.0 - # via boto3 -scp==0.14.1 +responses==0.10.6 # via + # -c requirements/static/ci/py3.9/linux.txt + # moto +rfc3987==1.3.8 + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in +rpm-vercmp==0.1.2 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/pkg/linux.in +rsa==4.7.2 + # via + # -c requirements/static/ci/py3.9/linux.txt + # google-auth +s3transfer==0.5.2 + # via + # -c requirements/static/ci/py3.9/linux.txt + # boto3 +scp==0.13.2 + # via + # -c requirements/static/ci/py3.9/linux.txt # junos-eznc # napalm # netmiko semantic-version==2.9.0 - # via etcd3-py + # via + # -c requirements/static/ci/py3.9/linux.txt + # etcd3-py setproctitle==1.3.2 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/pkg/linux.in six==1.16.0 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # bcrypt # cassandra-driver # cheroot # etcd3-py # genshi # geomet + # google-auth # isodate # jsonschema # junos-eznc # kazoo # kubernetes - # msrestazure + # mock + # more-itertools # ncclient # paramiko # profitbricks @@ -874,70 +1275,114 @@ smbprotocol==1.10.1 # via # -r requirements/static/ci/cloud.in # pypsexec -smmap==4.0.0 - # via gitdb -sqlparse==0.4.4 - # via -r requirements/static/ci/common.in -strict-rfc3339==0.7 - # via -r requirements/static/ci/common.in -tempora==4.1.1 - # via portend -tenacity==8.0.1 - # via netmiko -textfsm==1.1.2 +smmap==3.0.4 # via + # -c requirements/static/ci/py3.9/linux.txt + # gitdb +sqlparse==0.4.4 + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in +strict-rfc3339==0.7 + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in +tempora==4.1.1 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # portend +terminal==0.4.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # ntc-templates +textfsm==1.1.0 + # via + # -c requirements/static/ci/py3.9/linux.txt # napalm + # netmiko # ntc-templates timelib==0.2.5 - # via -r requirements/static/pkg/linux.in -toml==0.10.2 - # via -r requirements/static/ci/common.in -tomli==2.0.1 - # via pytest -transitions==0.8.9 - # via junos-eznc -typing-extensions==3.10.0.2 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/pkg/linux.in +toml==0.10.2 + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in +tomli==2.0.1 + # via + # -c requirements/static/ci/py3.9/linux.txt + # pytest +transitions==0.8.1 + # via + # -c requirements/static/ci/py3.9/linux.txt + # junos-eznc +typing-extensions==4.2.0 + # via + # -c requirements/static/ci/py3.9/linux.txt # pytest-shell-utilities # pytest-system-statistics urllib3==1.26.6 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # botocore # docker # kubernetes # python-etcd # requests - # responses vcert==0.7.4 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in -virtualenv==20.8.0 # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in +virtualenv==20.7.2 + # via + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in # pytest-salt-factories -watchdog==2.1.5 - # via -r requirements/static/ci/common.in +watchdog==0.10.3 + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in websocket-client==0.40.0 # via + # -c requirements/static/ci/py3.9/linux.txt # docker # kubernetes wempy==0.2.1 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in werkzeug==2.2.3 # via + # -c requirements/static/ci/py3.9/linux.txt # moto # pytest-httpserver xmltodict==0.12.0 # via + # -c requirements/static/ci/py3.9/linux.txt # moto # pywinrm yamlordereddictloader==0.4.0 - # via junos-eznc + # via + # -c requirements/static/ci/py3.9/linux.txt + # junos-eznc yarl==1.7.2 - # via aiohttp -zc.lockfile==2.0 - # via cherrypy + # via + # -c requirements/static/ci/py3.9/linux.txt + # aiohttp +zc.lockfile==1.4 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # cherrypy zipp==3.5.0 - # via importlib-metadata + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/static/ci/py3.9/darwin-crypto.txt b/requirements/static/ci/py3.9/darwin-crypto.txt index cccccdbbd3d..677e1c6cdf3 100644 --- a/requirements/static/ci/py3.9/darwin-crypto.txt +++ b/requirements/static/ci/py3.9/darwin-crypto.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.9/darwin-crypto.txt --pip-args='--constraint=requirements/static/ci/py3.9/darwin.txt' requirements/static/ci/crypto.in +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.9/darwin-crypto.txt requirements/static/ci/crypto.in # m2crypto==0.38.0 # via -r requirements/static/ci/crypto.in diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index 3769ad1e3c5..989fbf4afaf 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.9/darwin.txt --pip-args='--constraint=requirements/static/pkg/py3.9/darwin.txt' requirements/darwin.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/darwin.in requirements/static/pkg/darwin.in +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.9/darwin.txt requirements/darwin.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/darwin.in requirements/static/pkg/darwin.in # adal==1.2.5 # via @@ -14,6 +14,7 @@ aiosignal==1.2.0 # via aiohttp apache-libcloud==2.5.0 ; sys_platform != "win32" # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt # -r requirements/darwin.txt # -r requirements/static/ci/common.in asn1crypto==1.3.0 @@ -352,14 +353,16 @@ cassandra-driver==3.23.0 # via -r requirements/static/ci/common.in certifi==2023.07.22 # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt # -r requirements/static/ci/common.in # kubernetes # msrest # requests certvalidator==0.11.1 # via vcert -cffi==1.15.1 +cffi==1.14.6 # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt # -r requirements/static/ci/common.in # azure-datalake-store # bcrypt @@ -367,16 +370,20 @@ cffi==1.15.1 # napalm # pygit2 # pynacl -charset-normalizer==2.0.12 +charset-normalizer==3.2.0 # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt # aiohttp # requests cheetah3==3.2.6.post2 # via -r requirements/static/ci/common.in cheroot==8.5.2 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # cherrypy cherrypy==18.6.1 # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt # -r requirements/darwin.txt # -r requirements/static/ci/common.in ciscoconfparse==1.5.19 @@ -388,11 +395,14 @@ clustershell==1.8.1 colorama==0.4.3 # via ciscoconfparse contextvars==2.4 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # -r requirements/base.txt croniter==0.3.29 ; sys_platform != "win32" # via -r requirements/static/ci/common.in cryptography==41.0.4 # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt # -r requirements/darwin.txt # adal # azure-cosmosdb-table @@ -407,6 +417,7 @@ distlib==0.3.2 # via virtualenv distro==1.5.0 # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt # -r requirements/base.txt # pytest-skip-markers dnspython==1.16.0 @@ -437,9 +448,12 @@ genshi==0.7.5 geomet==0.1.2 # via cassandra-driver gitdb==4.0.5 - # via gitpython + # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # gitpython gitpython==3.1.35 # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt # -r requirements/darwin.txt # -r requirements/static/ci/common.in google-auth==1.6.3 @@ -448,14 +462,19 @@ hglib==2.6.1 # via -r requirements/static/ci/darwin.in idna==2.8 # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt # -r requirements/darwin.txt # etcd3-py # requests # yarl immutables==0.15 - # via contextvars + # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # contextvars importlib-metadata==6.0.0 - # via -r requirements/darwin.txt + # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # -r requirements/darwin.txt iniconfig==1.0.1 # via pytest ipaddress==1.0.22 @@ -463,24 +482,33 @@ ipaddress==1.0.22 isodate==0.6.0 # via msrest jaraco.classes==3.2.1 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # jaraco.collections jaraco.collections==3.4.0 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # cherrypy jaraco.functools==2.0 # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt # cheroot # jaraco.text # tempora jaraco.text==3.5.1 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # jaraco.collections jinja2==3.1.2 # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt # -r requirements/base.txt # junos-eznc # moto # napalm jmespath==1.0.1 # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # boto3 @@ -498,9 +526,13 @@ keyring==5.7.1 kubernetes==3.0.0 # via -r requirements/static/ci/common.in linode-python==1.1.1 - # via -r requirements/darwin.txt + # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # -r requirements/darwin.txt looseversion==1.0.2 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # -r requirements/base.txt lxml==4.9.1 # via # junos-eznc @@ -510,6 +542,7 @@ mako==1.2.2 # via -r requirements/static/ci/common.in markupsafe==2.1.2 # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt # -r requirements/base.txt # jinja2 # mako @@ -521,6 +554,7 @@ mock==3.0.5 # via -r requirements/pytest.txt more-itertools==8.2.0 # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt # cheroot # cherrypy # jaraco.classes @@ -529,6 +563,7 @@ moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt # -r requirements/base.txt # pytest-salt-factories msrest==0.6.19 @@ -644,8 +679,9 @@ oauthlib==3.2.2 # via requests-oauthlib oscrypto==1.2.0 # via certvalidator -packaging==21.3 +packaging==22.0 # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt # -r requirements/base.txt # docker # pytest @@ -669,9 +705,12 @@ platformdirs==2.2.0 pluggy==0.13.1 # via pytest portend==2.6 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # cherrypy psutil==5.8.0 # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt # -r requirements/base.txt # pytest-salt-factories # pytest-shell-utilities @@ -680,16 +719,20 @@ pyasn1-modules==0.2.4 # via google-auth pyasn1==0.4.8 # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt # -r requirements/darwin.txt # pyasn1-modules # rsa pycparser==2.21 ; python_version >= "3.9" # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt # -r requirements/darwin.txt # -r requirements/static/ci/common.in # cffi pycryptodomex==3.9.8 - # via -r requirements/crypto.txt + # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # -r requirements/crypto.txt pyeapi==0.8.3 # via napalm pygit2==1.9.1 @@ -702,12 +745,11 @@ pynacl==1.5.0 # paramiko pyopenssl==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt # -r requirements/darwin.txt # etcd3-py pyparsing==3.0.9 - # via - # junos-eznc - # packaging + # via junos-eznc pyrsistent==0.17.3 # via jsonschema pyserial==3.4 @@ -751,6 +793,7 @@ pytest==7.2.0 # pytest-timeout python-dateutil==2.8.0 # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt # -r requirements/darwin.txt # adal # azure-cosmosdb-table @@ -763,15 +806,19 @@ python-dateutil==2.8.0 python-etcd==0.4.5 # via -r requirements/static/ci/common.in python-gnupg==0.4.8 - # via -r requirements/darwin.txt + # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # -r requirements/darwin.txt pytz==2022.1 # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt # moto # tempora pyvmomi==6.7.1.2018.12 # via -r requirements/static/ci/common.in pyyaml==6.0.1 # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt # -r requirements/base.txt # clustershell # junos-eznc @@ -782,12 +829,14 @@ pyyaml==6.0.1 # yamlordereddictloader pyzmq==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt # -r requirements/zeromq.txt # pytest-salt-factories requests-oauthlib==1.3.0 # via msrest requests==2.31.0 # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # adal @@ -825,9 +874,12 @@ scp==0.13.2 semantic-version==2.9.0 # via etcd3-py setproctitle==1.3.2 - # via -r requirements/darwin.txt + # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # -r requirements/darwin.txt six==1.16.0 # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt # bcrypt # cassandra-driver # cheroot @@ -852,13 +904,17 @@ six==1.16.0 # virtualenv # websocket-client smmap==3.0.2 - # via gitdb + # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # gitdb sqlparse==0.4.4 # via -r requirements/static/ci/common.in strict-rfc3339==0.7 # via -r requirements/static/ci/common.in tempora==4.1.1 - # via portend + # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # portend terminal==0.4.0 # via ntc-templates textfsm==1.1.0 @@ -867,7 +923,9 @@ textfsm==1.1.0 # netmiko # ntc-templates timelib==0.2.5 - # via -r requirements/darwin.txt + # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # -r requirements/darwin.txt toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 @@ -880,6 +938,7 @@ typing-extensions==4.2.0 # pytest-system-statistics urllib3==1.26.6 # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt # botocore # docker # kubernetes @@ -892,7 +951,9 @@ virtualenv==20.7.2 # -r requirements/static/ci/common.in # pytest-salt-factories vultr==1.0.1 - # via -r requirements/darwin.txt + # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # -r requirements/darwin.txt watchdog==0.10.3 # via -r requirements/static/ci/common.in websocket-client==0.40.0 @@ -916,9 +977,13 @@ yamlordereddictloader==0.4.0 yarl==1.7.2 # via aiohttp zc.lockfile==2.0 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # cherrypy zipp==3.5.0 - # via importlib-metadata + # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/static/ci/py3.9/docs.txt b/requirements/static/ci/py3.9/docs.txt index 772a37c357a..c503a9d3ba0 100644 --- a/requirements/static/ci/py3.9/docs.txt +++ b/requirements/static/ci/py3.9/docs.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.9/docs.txt requirements/base.txt requirements/static/ci/docs.in requirements/zeromq.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.9/docs.txt requirements/base.txt requirements/static/ci/docs.in requirements/zeromq.txt # alabaster==0.7.12 # via sphinx @@ -12,7 +12,7 @@ certifi==2023.07.22 # via # -c requirements/static/ci/py3.9/linux.txt # requests -charset-normalizer==2.0.12 +charset-normalizer==3.2.0 # via # -c requirements/static/ci/py3.9/linux.txt # requests diff --git a/requirements/static/ci/py3.9/freebsd-crypto.txt b/requirements/static/ci/py3.9/freebsd-crypto.txt index 401b46c330f..01b34b6978d 100644 --- a/requirements/static/ci/py3.9/freebsd-crypto.txt +++ b/requirements/static/ci/py3.9/freebsd-crypto.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.9/freebsd-crypto.txt --pip-args='--constraint=requirements/static/ci/py3.9/freebsd.txt' requirements/static/ci/crypto.in +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.9/freebsd-crypto.txt requirements/static/ci/crypto.in # m2crypto==0.38.0 # via -r requirements/static/ci/crypto.in diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index a21898680c3..85447a1997c 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.9/freebsd.txt --pip-args='--constraint=requirements/static/pkg/py3.9/freebsd.txt' requirements/base.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/freebsd.in requirements/static/pkg/freebsd.in requirements/zeromq.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.9/freebsd.txt requirements/base.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/freebsd.in requirements/static/pkg/freebsd.in requirements/zeromq.txt # adal==1.2.5 # via @@ -350,14 +350,16 @@ cassandra-driver==3.24.0 # via -r requirements/static/ci/common.in certifi==2023.07.22 # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # -r requirements/static/ci/common.in # kubernetes # msrest # requests certvalidator==0.11.1 # via vcert -cffi==1.15.1 +cffi==1.14.6 # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # -r requirements/static/ci/common.in # azure-datalake-store # bcrypt @@ -365,16 +367,20 @@ cffi==1.15.1 # napalm # pygit2 # pynacl -charset-normalizer==2.0.12 +charset-normalizer==3.2.0 # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # aiohttp # requests cheetah3==3.2.6.post2 # via -r requirements/static/ci/common.in cheroot==8.5.2 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt + # cherrypy cherrypy==18.6.1 # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/freebsd.in ciscoconfparse==1.5.19 @@ -386,11 +392,14 @@ clustershell==1.8.3 colorama==0.4.3 # via ciscoconfparse contextvars==2.4 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt + # -r requirements/base.txt croniter==0.3.29 ; sys_platform != "win32" # via -r requirements/static/ci/common.in cryptography==41.0.4 # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # -r requirements/static/pkg/freebsd.in # adal # azure-cosmosdb-table @@ -405,6 +414,7 @@ distlib==0.3.2 # via virtualenv distro==1.5.0 # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # -r requirements/base.txt # -r requirements/static/pkg/freebsd.in # pytest-skip-markers @@ -445,13 +455,18 @@ hglib==2.6.1 # via -r requirements/static/ci/freebsd.in idna==2.8 # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # etcd3-py # requests # yarl immutables==0.15 - # via contextvars + # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt + # contextvars importlib-metadata==6.0.0 - # via -r requirements/static/pkg/freebsd.in + # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt + # -r requirements/static/pkg/freebsd.in iniconfig==1.0.1 # via pytest ipaddress==1.0.22 @@ -459,24 +474,33 @@ ipaddress==1.0.22 isodate==0.6.0 # via msrest jaraco.classes==3.2.1 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt + # jaraco.collections jaraco.collections==3.4.0 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt + # cherrypy jaraco.functools==2.0 # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # cheroot # jaraco.text # tempora jaraco.text==3.5.1 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt + # jaraco.collections jinja2==3.1.2 # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # -r requirements/base.txt # junos-eznc # moto # napalm jmespath==1.0.1 # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # boto3 @@ -498,7 +522,9 @@ kubernetes==3.0.0 libnacl==1.7.1 ; sys_platform != "win32" and sys_platform != "darwin" # via -r requirements/static/ci/common.in looseversion==1.0.2 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt + # -r requirements/base.txt lxml==4.9.1 # via # junos-eznc @@ -508,6 +534,7 @@ mako==1.2.2 # via -r requirements/static/ci/common.in markupsafe==2.1.2 # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # -r requirements/base.txt # jinja2 # mako @@ -519,6 +546,7 @@ mock==3.0.5 # via -r requirements/pytest.txt more-itertools==5.0.0 # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # cheroot # cherrypy # jaraco.classes @@ -527,6 +555,7 @@ moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # -r requirements/base.txt # pytest-salt-factories msrest==0.6.19 @@ -642,8 +671,9 @@ oauthlib==3.2.2 # via requests-oauthlib oscrypto==1.2.0 # via certvalidator -packaging==21.3 +packaging==22.0 # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # -r requirements/base.txt # docker # pytest @@ -668,9 +698,12 @@ platformdirs==2.2.0 pluggy==0.13.0 # via pytest portend==2.4 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt + # cherrypy psutil==5.8.0 # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # -r requirements/base.txt # pytest-salt-factories # pytest-shell-utilities @@ -683,11 +716,14 @@ pyasn1==0.4.8 # rsa pycparser==2.21 ; python_version >= "3.9" # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/freebsd.in # cffi pycryptodomex==3.9.8 - # via -r requirements/crypto.txt + # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt + # -r requirements/crypto.txt pyeapi==0.8.3 # via napalm pygit2==1.8.0 @@ -702,12 +738,11 @@ pynacl==1.5.0 # paramiko pyopenssl==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # -r requirements/static/pkg/freebsd.in # etcd3-py pyparsing==3.0.9 - # via - # junos-eznc - # packaging + # via junos-eznc pyrsistent==0.17.3 # via jsonschema pyserial==3.4 @@ -751,6 +786,7 @@ pytest==7.2.0 # pytest-timeout python-dateutil==2.8.1 # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # -r requirements/static/pkg/freebsd.in # adal # azure-cosmosdb-table @@ -763,15 +799,19 @@ python-dateutil==2.8.1 python-etcd==0.4.5 # via -r requirements/static/ci/common.in python-gnupg==0.4.8 - # via -r requirements/static/pkg/freebsd.in + # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt + # -r requirements/static/pkg/freebsd.in pytz==2022.1 # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # moto # tempora pyvmomi==6.7.1.2018.12 # via -r requirements/static/ci/common.in pyyaml==6.0.1 # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # -r requirements/base.txt # clustershell # junos-eznc @@ -782,12 +822,14 @@ pyyaml==6.0.1 # yamlordereddictloader pyzmq==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # -r requirements/zeromq.txt # pytest-salt-factories requests-oauthlib==1.3.0 # via msrest requests==2.31.0 # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # adal @@ -824,9 +866,12 @@ scp==0.13.2 semantic-version==2.9.0 # via etcd3-py setproctitle==1.3.2 - # via -r requirements/static/pkg/freebsd.in + # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt + # -r requirements/static/pkg/freebsd.in six==1.16.0 # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # bcrypt # cassandra-driver # cheroot @@ -859,7 +904,9 @@ sqlparse==0.4.4 strict-rfc3339==0.7 # via -r requirements/static/ci/common.in tempora==4.1.1 - # via portend + # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt + # portend terminal==0.4.0 # via ntc-templates textfsm==1.1.0 @@ -868,7 +915,9 @@ textfsm==1.1.0 # netmiko # ntc-templates timelib==0.2.5 - # via -r requirements/static/pkg/freebsd.in + # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt + # -r requirements/static/pkg/freebsd.in toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 @@ -881,6 +930,7 @@ typing-extensions==4.2.0 # pytest-system-statistics urllib3==1.26.6 # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # botocore # docker # kubernetes @@ -913,9 +963,13 @@ yamlordereddictloader==0.4.0 yarl==1.7.2 # via aiohttp zc.lockfile==1.4 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt + # cherrypy zipp==3.5.0 - # via importlib-metadata + # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt + # importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/static/ci/py3.9/invoke.txt b/requirements/static/ci/py3.9/invoke.txt index e9e8bf56b12..aeb0bdab1c5 100644 --- a/requirements/static/ci/py3.9/invoke.txt +++ b/requirements/static/ci/py3.9/invoke.txt @@ -2,13 +2,17 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.9/invoke.txt --pip-args='--constraint=requirements/static/ci/py3.9/linux.txt' requirements/static/ci/invoke.in +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.9/invoke.txt requirements/static/ci/invoke.in # blessings==1.7 # via -r requirements/static/ci/invoke.in invoke==1.4.1 # via -r requirements/static/ci/invoke.in pyyaml==6.0.1 - # via -r requirements/static/ci/invoke.in + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/invoke.in six==1.16.0 - # via blessings + # via + # -c requirements/static/ci/py3.9/linux.txt + # blessings diff --git a/requirements/static/ci/py3.9/lint.txt b/requirements/static/ci/py3.9/lint.txt index 9877accbe89..13db8d9d2f5 100644 --- a/requirements/static/ci/py3.9/lint.txt +++ b/requirements/static/ci/py3.9/lint.txt @@ -2,42 +2,64 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.9/lint.txt --pip-args='--constraint=requirements/static/ci/py3.9/linux.txt' requirements/base.txt requirements/static/ci/common.in requirements/static/ci/lint.in requirements/static/ci/linux.in requirements/static/pkg/linux.in requirements/zeromq.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.9/lint.txt requirements/base.txt requirements/static/ci/common.in requirements/static/ci/lint.in requirements/static/ci/linux.in requirements/static/pkg/linux.in requirements/zeromq.txt # -adal==1.2.7 +adal==1.2.3 # via + # -c requirements/static/ci/py3.9/linux.txt # azure-datalake-store # msrestazure aiohttp==3.8.5 - # via etcd3-py -aiosignal==1.2.0 - # via aiohttp -ansible-core==2.14.1 - # via ansible -ansible==7.1.0 ; python_version >= "3.9" - # via -r requirements/static/ci/linux.in -apache-libcloud==3.3.1 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in -apscheduler==3.6.3 - # via python-telegram-bot -asn1crypto==1.4.0 # via + # -c requirements/static/ci/py3.9/linux.txt + # etcd3-py +aiosignal==1.2.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # aiohttp +ansible-core==2.14.1 + # via + # -c requirements/static/ci/py3.9/linux.txt + # ansible +ansible==7.1.0 ; python_version >= "3.9" + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/linux.in +apache-libcloud==2.5.0 ; sys_platform != "win32" + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in +apscheduler==3.6.3 + # via + # -c requirements/static/ci/py3.9/linux.txt + # python-telegram-bot +asn1crypto==1.3.0 + # via + # -c requirements/static/ci/py3.9/linux.txt # certvalidator # oscrypto astroid==2.3.3 # via pylint async-timeout==4.0.2 - # via aiohttp -attrs==21.2.0 # via + # -c requirements/static/ci/py3.9/linux.txt + # aiohttp +attrs==23.1.0 + # via + # -c requirements/static/ci/py3.9/linux.txt # aiohttp # jsonschema azure-applicationinsights==0.1.0 - # via azure -azure-batch==4.1.3 - # via azure -azure-common==1.1.27 # via + # -c requirements/static/ci/py3.9/linux.txt + # azure +azure-batch==4.1.3 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure +azure-common==1.1.18 + # via + # -c requirements/static/ci/py3.9/linux.txt # azure-applicationinsights # azure-batch # azure-cosmosdb-table @@ -113,107 +135,205 @@ azure-common==1.1.27 # azure-storage-file # azure-storage-queue azure-cosmosdb-nspkg==2.0.2 - # via azure-cosmosdb-table -azure-cosmosdb-table==1.0.6 - # via azure -azure-datalake-store==0.0.52 - # via azure -azure-eventgrid==1.3.0 - # via azure + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-cosmosdb-table +azure-cosmosdb-table==1.0.5 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure +azure-datalake-store==0.0.44 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure +azure-eventgrid==1.2.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure azure-graphrbac==0.40.0 - # via azure + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure azure-keyvault==1.1.0 - # via azure + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure azure-loganalytics==0.1.0 - # via azure + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure azure-mgmt-advisor==1.0.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-applicationinsights==0.1.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-authorization==0.50.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-batch==5.0.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-batchai==2.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-billing==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-cdn==3.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-cognitiveservices==3.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-commerce==1.0.1 - # via azure-mgmt -azure-mgmt-compute==4.6.2 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt +azure-mgmt-compute==4.6.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-consumption==2.0.0 - # via azure-mgmt -azure-mgmt-containerinstance==1.5.0 - # via azure-mgmt -azure-mgmt-containerregistry==2.8.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt +azure-mgmt-containerinstance==1.4.1 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt +azure-mgmt-containerregistry==2.7.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-containerservice==4.4.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-cosmosdb==0.4.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-datafactory==0.6.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-datalake-analytics==0.6.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-datalake-nspkg==3.0.1 # via + # -c requirements/static/ci/py3.9/linux.txt # azure-mgmt-datalake-analytics # azure-mgmt-datalake-store azure-mgmt-datalake-store==0.5.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-datamigration==1.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-devspaces==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-devtestlabs==2.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-dns==2.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-eventgrid==1.0.0 - # via azure-mgmt -azure-mgmt-eventhub==2.6.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt +azure-mgmt-eventhub==2.5.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-hanaonazure==0.1.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-iotcentral==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-iothub==0.5.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-iothubprovisioningservices==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-keyvault==1.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-loganalytics==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-logic==3.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-machinelearningcompute==0.4.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-managementgroups==0.1.0 - # via azure-mgmt -azure-mgmt-managementpartner==0.1.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt +azure-mgmt-managementpartner==0.1.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-maps==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-marketplaceordering==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-media==1.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-monitor==0.5.2 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-msi==0.2.0 - # via azure-mgmt -azure-mgmt-network==2.7.0 - # via azure-mgmt -azure-mgmt-notificationhubs==2.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt +azure-mgmt-network==2.6.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt +azure-mgmt-notificationhubs==2.0.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-nspkg==3.0.2 # via + # -c requirements/static/ci/py3.9/linux.txt # azure-mgmt-advisor # azure-mgmt-applicationinsights # azure-mgmt-authorization @@ -240,10 +360,12 @@ azure-mgmt-nspkg==3.0.2 # azure-mgmt-logic # azure-mgmt-machinelearningcompute # azure-mgmt-managementgroups + # azure-mgmt-managementpartner # azure-mgmt-maps # azure-mgmt-marketplaceordering # azure-mgmt-monitor # azure-mgmt-msi + # azure-mgmt-notificationhubs # azure-mgmt-policyinsights # azure-mgmt-powerbiembedded # azure-mgmt-recoveryservices @@ -252,6 +374,7 @@ azure-mgmt-nspkg==3.0.2 # azure-mgmt-relay # azure-mgmt-reservations # azure-mgmt-scheduler + # azure-mgmt-search # azure-mgmt-servicefabric # azure-mgmt-signalr # azure-mgmt-sql @@ -260,50 +383,92 @@ azure-mgmt-nspkg==3.0.2 # azure-mgmt-trafficmanager # azure-mgmt-web azure-mgmt-policyinsights==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-powerbiembedded==2.0.0 - # via azure-mgmt -azure-mgmt-rdbms==1.9.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt +azure-mgmt-rdbms==1.8.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-recoveryservices==0.3.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-recoveryservicesbackup==0.3.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-redis==5.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-relay==0.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-reservations==0.2.1 - # via azure-mgmt -azure-mgmt-resource==2.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt +azure-mgmt-resource==2.1.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-scheduler==2.0.0 - # via azure-mgmt -azure-mgmt-search==2.1.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt +azure-mgmt-search==2.0.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-servicebus==0.5.3 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-servicefabric==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-signalr==0.1.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-sql==0.9.1 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-storage==2.0.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-subscription==0.2.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-trafficmanager==0.50.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt-web==0.35.0 - # via azure-mgmt + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-mgmt azure-mgmt==4.0.0 - # via azure + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure azure-nspkg==3.0.2 # via + # -c requirements/static/ci/py3.9/linux.txt # azure-applicationinsights # azure-batch # azure-cosmosdb-nspkg + # azure-eventgrid # azure-graphrbac # azure-keyvault # azure-loganalytics @@ -312,58 +477,94 @@ azure-nspkg==3.0.2 # azure-servicefabric # azure-servicemanagement-legacy azure-servicebus==0.21.1 - # via azure -azure-servicefabric==6.3.0.0 - # via azure -azure-servicemanagement-legacy==0.20.7 - # via azure -azure-storage-blob==1.5.0 - # via azure -azure-storage-common==1.4.2 # via + # -c requirements/static/ci/py3.9/linux.txt + # azure +azure-servicefabric==6.3.0.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure +azure-servicemanagement-legacy==0.20.6 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure +azure-storage-blob==1.5.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure +azure-storage-common==1.4.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure-cosmosdb-table # azure-storage-blob # azure-storage-file # azure-storage-queue azure-storage-file==1.4.0 - # via azure -azure-storage-queue==1.4.0 - # via azure -azure==4.0.0 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in -backports.entry-points-selectable==1.1.0 - # via virtualenv -bcrypt==3.2.0 # via + # -c requirements/static/ci/py3.9/linux.txt + # azure +azure-storage-queue==1.4.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # azure +azure==4.0.0 ; sys_platform != "win32" + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in +backports.entry-points-selectable==1.1.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # virtualenv +bcrypt==3.1.6 + # via + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in # paramiko boto3==1.21.46 # via + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in # moto boto==2.49.0 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in botocore==1.24.46 # via + # -c requirements/static/ci/py3.9/linux.txt # boto3 # moto # s3transfer +cached-property==1.5.2 + # via + # -c requirements/static/ci/py3.9/linux.txt + # pygit2 cachetools==4.2.2 # via + # -c requirements/static/ci/py3.9/linux.txt # google-auth # python-telegram-bot -cassandra-driver==3.25.0 - # via -r requirements/static/ci/common.in +cassandra-driver==3.23.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in certifi==2023.07.22 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in # kubernetes # msrest # python-telegram-bot # requests certvalidator==0.11.1 - # via vcert -cffi==1.15.1 # via + # -c requirements/static/ci/py3.9/linux.txt + # vcert +cffi==1.14.6 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in # azure-datalake-store # bcrypt @@ -371,32 +572,56 @@ cffi==1.15.1 # napalm # pygit2 # pynacl -charset-normalizer==2.0.4 +charset-normalizer==3.2.0 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # aiohttp # requests -cheetah3==3.2.6.post1 - # via -r requirements/static/ci/common.in +cheetah3==3.2.6.post2 + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in cheroot==8.5.2 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # cherrypy cherrypy==18.6.1 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/linux.in -ciscoconfparse==1.5.46 - # via napalm -click==8.0.1 - # via geomet +ciscoconfparse==1.5.19 + # via + # -c requirements/static/ci/py3.9/linux.txt + # napalm +click==7.1.1 + # via + # -c requirements/static/ci/py3.9/linux.txt + # geomet clustershell==1.8.3 - # via -r requirements/static/ci/common.in -colorama==0.4.4 - # via ciscoconfparse + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in +colorama==0.4.3 + # via + # -c requirements/static/ci/py3.9/linux.txt + # ciscoconfparse contextvars==2.4 - # via -r requirements/base.txt -croniter==1.0.15 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/base.txt +croniter==0.3.29 ; sys_platform != "win32" + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in cryptography==41.0.4 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/pkg/linux.in # adal # ansible-core @@ -409,110 +634,182 @@ cryptography==41.0.4 # pyopenssl # vcert distlib==0.3.2 - # via virtualenv -distro==1.6.0 - # via -r requirements/base.txt -dnspython==2.1.0 # via + # -c requirements/static/ci/py3.9/linux.txt + # virtualenv +distro==1.5.0 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/base.txt +dnspython==1.16.0 + # via + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in # ciscoconfparse # python-etcd docker==6.1.3 - # via -r requirements/static/ci/lint.in + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/lint.in etcd3-py==0.1.6 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in filelock==3.0.12 - # via virtualenv + # via + # -c requirements/static/ci/py3.9/linux.txt + # virtualenv frozenlist==1.3.0 # via + # -c requirements/static/ci/py3.9/linux.txt # aiohttp # aiosignal future==0.18.3 # via + # -c requirements/static/ci/py3.9/linux.txt # napalm # textfsm genshi==0.7.5 - # via -r requirements/static/ci/common.in -geomet==0.2.1.post1 - # via cassandra-driver -gitdb==4.0.7 - # via gitpython -gitpython==3.1.35 - # via -r requirements/static/ci/common.in -google-auth==2.0.1 - # via kubernetes -hglib==2.6.1 - # via -r requirements/static/ci/linux.in -idna==3.2 # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in +geomet==0.1.2 + # via + # -c requirements/static/ci/py3.9/linux.txt + # cassandra-driver +gitdb==4.0.5 + # via + # -c requirements/static/ci/py3.9/linux.txt + # gitpython +gitpython==3.1.35 + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in +google-auth==1.6.3 + # via + # -c requirements/static/ci/py3.9/linux.txt + # kubernetes +hglib==2.6.1 + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/linux.in +idna==2.8 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # etcd3-py # requests # yarl -immutables==0.19 - # via contextvars +immutables==0.15 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # contextvars importlib-metadata==6.0.0 - # via -r requirements/static/pkg/linux.in -ipaddress==1.0.23 - # via kubernetes + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/pkg/linux.in +ipaddress==1.0.22 + # via + # -c requirements/static/ci/py3.9/linux.txt + # kubernetes isodate==0.6.0 - # via msrest + # via + # -c requirements/static/ci/py3.9/linux.txt + # msrest isort==4.3.21 # via pylint jaraco.classes==3.2.1 - # via jaraco.collections -jaraco.collections==3.4.0 - # via cherrypy -jaraco.functools==3.3.0 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # jaraco.collections +jaraco.collections==3.4.0 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # cherrypy +jaraco.functools==2.0 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # cheroot # jaraco.text # tempora jaraco.text==3.5.1 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # jaraco.collections jinja2==3.1.2 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/base.txt # ansible-core # junos-eznc # moto # napalm -jmespath==0.10.0 +jmespath==1.0.1 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # boto3 # botocore jsonschema==3.2.0 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.10" # via + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in # napalm -jxmlease==1.0.3 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in -kazoo==2.8.0 ; sys_platform != "win32" and sys_platform != "darwin" - # via -r requirements/static/ci/common.in +jxmlease==1.0.1 ; sys_platform != "win32" + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in +kazoo==2.6.1 ; sys_platform != "win32" and sys_platform != "darwin" + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in keyring==5.7.1 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in kubernetes==3.0.0 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in lazy-object-proxy==1.4.3 # via astroid -libnacl==1.8.0 ; sys_platform != "win32" and sys_platform != "darwin" - # via -r requirements/static/ci/common.in -loguru==0.6.0 - # via ciscoconfparse +libnacl==1.7.1 ; sys_platform != "win32" and sys_platform != "darwin" + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in looseversion==1.0.2 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/base.txt lxml==4.9.1 # via + # -c requirements/static/ci/py3.9/linux.txt # junos-eznc # napalm # ncclient mako==1.2.2 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in markupsafe==2.1.2 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/base.txt # jinja2 # mako @@ -521,21 +818,31 @@ markupsafe==2.1.2 mccabe==0.6.1 # via pylint mercurial==6.0.1 - # via -r requirements/static/ci/linux.in + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/linux.in modernize==0.5 # via saltpylint -more-itertools==8.8.0 +more-itertools==5.0.0 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # cheroot # cherrypy # jaraco.classes # jaraco.functools moto==3.0.1 - # via -r requirements/static/ci/common.in -msgpack==1.0.2 - # via -r requirements/base.txt -msrest==0.6.21 # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in +msgpack==1.0.2 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/base.txt +msrest==0.6.14 + # via + # -c requirements/static/ci/py3.9/linux.txt # azure-applicationinsights # azure-eventgrid # azure-keyvault @@ -548,20 +855,18 @@ msrest==0.6.21 # azure-mgmt-dns # azure-mgmt-eventhub # azure-mgmt-keyvault - # azure-mgmt-managementpartner # azure-mgmt-media # azure-mgmt-network - # azure-mgmt-notificationhubs # azure-mgmt-rdbms # azure-mgmt-resource - # azure-mgmt-search # azure-mgmt-servicebus # azure-mgmt-servicefabric # azure-mgmt-signalr # azure-servicefabric # msrestazure -msrestazure==0.6.4 +msrestazure==0.6.3 # via + # -c requirements/static/ci/py3.9/linux.txt # azure-batch # azure-eventgrid # azure-graphrbac @@ -628,36 +933,49 @@ msrestazure==0.6.4 # azure-mgmt-web multidict==6.0.2 # via + # -c requirements/static/ci/py3.9/linux.txt # aiohttp # yarl -napalm==3.3.1 ; sys_platform != "win32" and python_version < "3.10" - # via -r requirements/static/ci/common.in -ncclient==0.6.12 +napalm==3.1.0 ; sys_platform != "win32" and python_version < "3.10" # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in +ncclient==0.6.4 + # via + # -c requirements/static/ci/py3.9/linux.txt # junos-eznc - # napalm -netaddr==0.8.0 +netaddr==0.7.19 # via + # -c requirements/static/ci/py3.9/linux.txt # junos-eznc # napalm # pyeapi -netmiko==3.4.0 - # via napalm -ntc-templates==2.2.2 +netmiko==3.2.0 # via + # -c requirements/static/ci/py3.9/linux.txt + # napalm +ntc-templates==1.4.1 + # via + # -c requirements/static/ci/py3.9/linux.txt # junos-eznc - # netmiko oauthlib==3.2.2 - # via requests-oauthlib -oscrypto==1.2.1 - # via certvalidator -packaging==21.3 # via + # -c requirements/static/ci/py3.9/linux.txt + # requests-oauthlib +oscrypto==1.2.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # certvalidator +packaging==22.0 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/base.txt # ansible-core # docker paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin" # via + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in # junos-eznc # napalm @@ -666,41 +984,73 @@ paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin" # scp passlib==1.7.4 # via + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in # ciscoconfparse pathspec==0.9.0 - # via yamllint + # via + # -c requirements/static/ci/py3.9/linux.txt + # yamllint +pathtools==0.1.2 + # via + # -c requirements/static/ci/py3.9/linux.txt + # watchdog platformdirs==2.2.0 - # via virtualenv -portend==2.7.1 - # via cherrypy + # via + # -c requirements/static/ci/py3.9/linux.txt + # virtualenv +portend==2.4 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # cherrypy psutil==5.8.0 - # via -r requirements/base.txt -pyasn1-modules==0.2.8 - # via google-auth + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/base.txt +pyasn1-modules==0.2.4 + # via + # -c requirements/static/ci/py3.9/linux.txt + # google-auth pyasn1==0.4.8 # via + # -c requirements/static/ci/py3.9/linux.txt # pyasn1-modules # rsa pycodestyle==2.5.0 # via saltpylint pycparser==2.21 ; python_version >= "3.9" # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/linux.in # cffi -pycryptodomex==3.10.1 - # via -r requirements/crypto.txt -pyeapi==0.8.4 - # via napalm -pygit2==1.6.1 ; python_version > "3.8" - # via -r requirements/static/ci/linux.in +pycryptodomex==3.9.8 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/crypto.txt +pyeapi==0.8.3 + # via + # -c requirements/static/ci/py3.9/linux.txt + # napalm +pygit2==1.5.0 ; python_version > "3.8" + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/linux.in pyiface==0.0.11 - # via -r requirements/static/ci/linux.in + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/linux.in pyinotify==0.9.6 ; sys_platform != "win32" and sys_platform != "darwin" and platform_system != "openbsd" - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in pyjwt==2.4.0 # via + # -c requirements/static/ci/py3.9/linux.txt # adal # twilio pylint==2.4.4 @@ -708,29 +1058,41 @@ pylint==2.4.4 # -r requirements/static/ci/lint.in # saltpylint pymysql==1.0.2 - # via -r requirements/static/ci/linux.in + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/linux.in pynacl==1.5.0 # via + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in # paramiko pyopenssl==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/pkg/linux.in # etcd3-py pyparsing==3.0.9 # via + # -c requirements/static/ci/py3.9/linux.txt # junos-eznc - # packaging -pyrsistent==0.18.0 - # via jsonschema -pyserial==3.5 +pyrsistent==0.17.3 # via + # -c requirements/static/ci/py3.9/linux.txt + # jsonschema +pyserial==3.4 + # via + # -c requirements/static/ci/py3.9/linux.txt # junos-eznc # netmiko python-consul==1.1.0 - # via -r requirements/static/ci/linux.in -python-dateutil==2.8.2 # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/linux.in +python-dateutil==2.8.1 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/pkg/linux.in # adal # azure-cosmosdb-table @@ -741,22 +1103,36 @@ python-dateutil==2.8.2 # moto # vcert python-etcd==0.4.5 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in python-gnupg==0.4.8 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/pkg/linux.in python-telegram-bot==13.7 - # via -r requirements/static/ci/linux.in + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/linux.in pytz==2022.1 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # apscheduler # moto # python-telegram-bot # tempora # twilio -pyvmomi==7.0.2 - # via -r requirements/static/ci/common.in + # tzlocal +pyvmomi==6.7.1.2018.12 + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in pyyaml==6.0.1 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/base.txt # ansible-core # clustershell @@ -766,15 +1142,26 @@ pyyaml==6.0.1 # yamllint # yamlordereddictloader pyzmq==23.2.0 - # via -r requirements/zeromq.txt + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/zeromq.txt redis-py-cluster==2.1.3 - # via -r requirements/static/ci/linux.in + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/linux.in redis==3.5.3 - # via redis-py-cluster + # via + # -c requirements/static/ci/py3.9/linux.txt + # redis-py-cluster requests-oauthlib==1.3.0 - # via msrest + # via + # -c requirements/static/ci/py3.9/linux.txt + # msrest requests==2.31.0 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # adal @@ -798,30 +1185,51 @@ requests==2.31.0 # twilio # vcert resolvelib==0.5.4 - # via ansible-core -responses==0.13.4 - # via moto + # via + # -c requirements/static/ci/py3.9/linux.txt + # ansible-core +responses==0.10.6 + # via + # -c requirements/static/ci/py3.9/linux.txt + # moto rfc3987==1.3.8 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in rpm-vercmp==0.1.2 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/pkg/linux.in rsa==4.7.2 - # via google-auth -s3transfer==0.5.0 - # via boto3 + # via + # -c requirements/static/ci/py3.9/linux.txt + # google-auth +s3transfer==0.5.2 + # via + # -c requirements/static/ci/py3.9/linux.txt + # boto3 saltpylint==2023.8.3 # via -r requirements/static/ci/lint.in -scp==0.13.6 +scp==0.13.2 # via + # -c requirements/static/ci/py3.9/linux.txt # junos-eznc # napalm # netmiko semantic-version==2.9.0 - # via etcd3-py + # via + # -c requirements/static/ci/py3.9/linux.txt + # etcd3-py setproctitle==1.3.2 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/pkg/linux.in six==1.16.0 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # apscheduler # astroid # bcrypt @@ -830,12 +1238,13 @@ six==1.16.0 # etcd3-py # genshi # geomet + # google-auth # isodate # jsonschema # junos-eznc # kazoo # kubernetes - # msrestazure + # more-itertools # ncclient # paramiko # python-consul @@ -848,73 +1257,128 @@ six==1.16.0 # virtualenv # websocket-client slack-bolt==1.15.5 - # via -r requirements/static/ci/linux.in -slack-sdk==3.19.5 - # via slack-bolt -smmap==4.0.0 - # via gitdb -sqlparse==0.4.4 - # via -r requirements/static/ci/common.in -strict-rfc3339==0.7 - # via -r requirements/static/ci/common.in -tempora==4.1.1 - # via portend -tenacity==8.0.1 - # via netmiko -textfsm==1.1.2 # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/linux.in +slack-sdk==3.19.5 + # via + # -c requirements/static/ci/py3.9/linux.txt + # slack-bolt +smmap==3.0.4 + # via + # -c requirements/static/ci/py3.9/linux.txt + # gitdb +sqlparse==0.4.4 + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in +strict-rfc3339==0.7 + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in +tempora==4.1.1 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # portend +terminal==0.4.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # ntc-templates +textfsm==1.1.0 + # via + # -c requirements/static/ci/py3.9/linux.txt # napalm + # netmiko # ntc-templates timelib==0.2.5 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/pkg/linux.in toml==0.10.2 # via + # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in # -r requirements/static/ci/lint.in tornado==6.1 - # via python-telegram-bot -transitions==0.8.8 - # via junos-eznc + # via + # -c requirements/static/ci/py3.9/linux.txt + # python-telegram-bot +transitions==0.8.1 + # via + # -c requirements/static/ci/py3.9/linux.txt + # junos-eznc twilio==7.9.2 - # via -r requirements/static/ci/linux.in -tzlocal==3.0 - # via apscheduler + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/linux.in +tzlocal==2.1 + # via + # -c requirements/static/ci/py3.9/linux.txt + # apscheduler urllib3==1.26.6 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt # botocore # docker # kubernetes # python-etcd # requests - # responses vcert==0.7.4 ; sys_platform != "win32" - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in virtualenv==20.7.2 - # via -r requirements/static/ci/common.in -watchdog==2.1.5 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in +watchdog==0.10.3 + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in websocket-client==0.40.0 # via + # -c requirements/static/ci/py3.9/linux.txt # docker # kubernetes wempy==0.2.1 - # via -r requirements/static/ci/common.in + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in werkzeug==2.2.3 - # via moto + # via + # -c requirements/static/ci/py3.9/linux.txt + # moto wrapt==1.11.1 # via astroid xmltodict==0.12.0 - # via moto + # via + # -c requirements/static/ci/py3.9/linux.txt + # moto yamllint==1.26.3 - # via -r requirements/static/ci/linux.in + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/linux.in yamlordereddictloader==0.4.0 - # via junos-eznc + # via + # -c requirements/static/ci/py3.9/linux.txt + # junos-eznc yarl==1.7.2 - # via aiohttp -zc.lockfile==2.0 - # via cherrypy + # via + # -c requirements/static/ci/py3.9/linux.txt + # aiohttp +zc.lockfile==1.4 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # cherrypy zipp==3.5.0 - # via importlib-metadata + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/static/ci/py3.9/linux-crypto.txt b/requirements/static/ci/py3.9/linux-crypto.txt index 443368d9ad1..32c40b41ec8 100644 --- a/requirements/static/ci/py3.9/linux-crypto.txt +++ b/requirements/static/ci/py3.9/linux-crypto.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.9/linux-crypto.txt --pip-args='--constraint=requirements/static/ci/py3.9/linux.txt' requirements/static/ci/crypto.in +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.9/linux-crypto.txt requirements/static/ci/crypto.in # m2crypto==0.38.0 # via -r requirements/static/ci/crypto.in diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index f05e3539995..53d854d5175 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.9/linux.txt --pip-args='--constraint=requirements/static/pkg/py3.9/linux.txt' requirements/base.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/linux.in requirements/static/pkg/linux.in requirements/zeromq.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.9/linux.txt requirements/base.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/linux.in requirements/static/pkg/linux.in requirements/zeromq.txt # adal==1.2.3 # via @@ -365,6 +365,7 @@ cassandra-driver==3.23.0 # via -r requirements/static/ci/common.in certifi==2023.07.22 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt # -r requirements/static/ci/common.in # kubernetes # msrest @@ -372,8 +373,9 @@ certifi==2023.07.22 # requests certvalidator==0.11.1 # via vcert -cffi==1.15.1 +cffi==1.14.6 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt # -r requirements/static/ci/common.in # azure-datalake-store # bcrypt @@ -381,16 +383,20 @@ cffi==1.15.1 # napalm # pygit2 # pynacl -charset-normalizer==2.0.12 +charset-normalizer==3.2.0 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt # aiohttp # requests cheetah3==3.2.6.post2 # via -r requirements/static/ci/common.in cheroot==8.5.2 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # cherrypy cherrypy==18.6.1 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/linux.in ciscoconfparse==1.5.19 @@ -402,11 +408,14 @@ clustershell==1.8.3 colorama==0.4.3 # via ciscoconfparse contextvars==2.4 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -r requirements/base.txt croniter==0.3.29 ; sys_platform != "win32" # via -r requirements/static/ci/common.in cryptography==41.0.4 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt # -r requirements/static/pkg/linux.in # adal # ansible-core @@ -422,6 +431,7 @@ distlib==0.3.2 # via virtualenv distro==1.5.0 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt # -r requirements/base.txt # pytest-skip-markers dnspython==1.16.0 @@ -461,13 +471,18 @@ hglib==2.6.1 # via -r requirements/static/ci/linux.in idna==2.8 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt # etcd3-py # requests # yarl immutables==0.15 - # via contextvars + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # contextvars importlib-metadata==6.0.0 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -r requirements/static/pkg/linux.in iniconfig==1.0.1 # via pytest ipaddress==1.0.22 @@ -475,18 +490,26 @@ ipaddress==1.0.22 isodate==0.6.0 # via msrest jaraco.classes==3.2.1 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # jaraco.collections jaraco.collections==3.4.0 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # cherrypy jaraco.functools==2.0 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt # cheroot # jaraco.text # tempora jaraco.text==3.5.1 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # jaraco.collections jinja2==3.1.2 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt # -r requirements/base.txt # ansible-core # junos-eznc @@ -494,6 +517,7 @@ jinja2==3.1.2 # napalm jmespath==1.0.1 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # boto3 @@ -515,7 +539,9 @@ kubernetes==3.0.0 libnacl==1.7.1 ; sys_platform != "win32" and sys_platform != "darwin" # via -r requirements/static/ci/common.in looseversion==1.0.2 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -r requirements/base.txt lxml==4.9.1 # via # junos-eznc @@ -525,6 +551,7 @@ mako==1.2.2 # via -r requirements/static/ci/common.in markupsafe==2.1.2 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt # -r requirements/base.txt # jinja2 # mako @@ -536,6 +563,7 @@ mock==3.0.5 # via -r requirements/pytest.txt more-itertools==5.0.0 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt # cheroot # cherrypy # jaraco.classes @@ -544,6 +572,7 @@ moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt # -r requirements/base.txt # pytest-salt-factories msrest==0.6.14 @@ -658,6 +687,7 @@ oscrypto==1.2.0 # via certvalidator packaging==22.0 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt # -r requirements/base.txt # ansible-core # docker @@ -683,9 +713,12 @@ platformdirs==2.2.0 pluggy==0.13.0 # via pytest portend==2.4 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # cherrypy psutil==5.8.0 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt # -r requirements/base.txt # pytest-salt-factories # pytest-shell-utilities @@ -698,11 +731,14 @@ pyasn1==0.4.8 # rsa pycparser==2.21 ; python_version >= "3.9" # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/linux.in # cffi pycryptodomex==3.9.8 - # via -r requirements/crypto.txt + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -r requirements/crypto.txt pyeapi==0.8.3 # via napalm pygit2==1.5.0 ; python_version > "3.8" @@ -723,6 +759,7 @@ pynacl==1.5.0 # paramiko pyopenssl==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt # -r requirements/static/pkg/linux.in # etcd3-py pyparsing==3.0.9 @@ -772,6 +809,7 @@ python-consul==1.1.0 # via -r requirements/static/ci/linux.in python-dateutil==2.8.1 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt # -r requirements/static/pkg/linux.in # adal # azure-cosmosdb-table @@ -784,11 +822,14 @@ python-dateutil==2.8.1 python-etcd==0.4.5 # via -r requirements/static/ci/common.in python-gnupg==0.4.8 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -r requirements/static/pkg/linux.in python-telegram-bot==13.7 # via -r requirements/static/ci/linux.in pytz==2022.1 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt # apscheduler # moto # python-telegram-bot @@ -799,6 +840,7 @@ pyvmomi==6.7.1.2018.12 # via -r requirements/static/ci/common.in pyyaml==6.0.1 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt # -r requirements/base.txt # ansible-core # clustershell @@ -810,6 +852,7 @@ pyyaml==6.0.1 # yamlordereddictloader pyzmq==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt # -r requirements/zeromq.txt # pytest-salt-factories redis-py-cluster==2.1.3 @@ -820,6 +863,7 @@ requests-oauthlib==1.3.0 # via msrest requests==2.31.0 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # adal @@ -849,7 +893,9 @@ responses==0.10.6 rfc3987==1.3.8 # via -r requirements/static/ci/common.in rpm-vercmp==0.1.2 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -r requirements/static/pkg/linux.in rsa==4.7.2 # via google-auth s3transfer==0.5.2 @@ -862,9 +908,12 @@ scp==0.13.2 semantic-version==2.9.0 # via etcd3-py setproctitle==1.3.2 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -r requirements/static/pkg/linux.in six==1.16.0 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt # apscheduler # bcrypt # cassandra-driver @@ -902,7 +951,9 @@ sqlparse==0.4.4 strict-rfc3339==0.7 # via -r requirements/static/ci/common.in tempora==4.1.1 - # via portend + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # portend terminal==0.4.0 # via ntc-templates textfsm==1.1.0 @@ -911,7 +962,9 @@ textfsm==1.1.0 # netmiko # ntc-templates timelib==0.2.5 - # via -r requirements/static/pkg/linux.in + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -r requirements/static/pkg/linux.in toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 @@ -930,6 +983,7 @@ tzlocal==2.1 # via apscheduler urllib3==1.26.6 # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt # botocore # docker # kubernetes @@ -962,9 +1016,13 @@ yamlordereddictloader==0.4.0 yarl==1.7.2 # via aiohttp zc.lockfile==1.4 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # cherrypy zipp==3.5.0 - # via importlib-metadata + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/static/ci/py3.9/tools.txt b/requirements/static/ci/py3.9/tools.txt index cd973f2c546..29aa4edc2d9 100644 --- a/requirements/static/ci/py3.9/tools.txt +++ b/requirements/static/ci/py3.9/tools.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.9/tools.txt --pip-args='--constraint=requirements/static/ci/py3.9/linux.txt' requirements/static/ci/tools.in +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.9/tools.txt requirements/static/ci/tools.in # attrs==22.1.0 # via diff --git a/requirements/static/ci/py3.9/windows-crypto.txt b/requirements/static/ci/py3.9/windows-crypto.txt index 1fcc84af5ae..c0ef4e1ec6c 100644 --- a/requirements/static/ci/py3.9/windows-crypto.txt +++ b/requirements/static/ci/py3.9/windows-crypto.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.9/windows-crypto.txt --pip-args='--constraint=requirements/static/ci/py3.9/windows.txt' requirements/static/ci/crypto.in +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.9/windows-crypto.txt requirements/static/ci/crypto.in # m2crypto==0.38.0 # via -r requirements/static/ci/crypto.in diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index 385d16be952..71b4b660bd8 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/ci/py3.9/windows.txt --pip-args='--constraint=requirements/static/pkg/py3.9/windows.txt' requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/windows.in requirements/static/pkg/windows.in requirements/windows.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.9/windows.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/windows.in requirements/static/pkg/windows.in requirements/windows.txt # aiohttp==3.8.5 # via etcd3-py @@ -40,42 +40,53 @@ cassandra-driver==3.23.0 # via -r requirements/static/ci/common.in certifi==2023.07.22 # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt # -r requirements/static/ci/common.in # -r requirements/windows.txt # kubernetes # requests -cffi==1.15.1 +cffi==1.14.6 # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt # -r requirements/static/ci/common.in # -r requirements/windows.txt # clr-loader # cryptography # pygit2 # pynacl -charset-normalizer==2.0.12 +charset-normalizer==3.2.0 # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt # aiohttp # requests cheetah3==3.2.6.post2 # via -r requirements/static/ci/common.in cheroot==8.5.2 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt + # cherrypy cherrypy==18.6.1 # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt # -r requirements/static/ci/common.in # -r requirements/windows.txt click==7.1.2 # via geomet clr-loader==0.2.4 - # via pythonnet + # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt + # pythonnet clustershell==1.8.3 # via -r requirements/static/ci/common.in colorama==0.4.1 # via pytest contextvars==2.4 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt + # -r requirements/base.txt cryptography==41.0.4 # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt # -r requirements/windows.txt # etcd3-py # moto @@ -85,6 +96,7 @@ distlib==0.3.2 # via virtualenv distro==1.5.0 # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt # -r requirements/base.txt # pytest-skip-markers dmidecode==0.9.0 @@ -112,45 +124,64 @@ genshi==0.7.5 geomet==0.1.2 # via cassandra-driver gitdb==4.0.7 - # via gitpython + # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt + # gitpython gitpython==3.1.35 # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt # -r requirements/static/ci/common.in # -r requirements/windows.txt google-auth==1.6.3 # via kubernetes idna==2.8 # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt # etcd3-py # requests # yarl immutables==0.15 - # via contextvars + # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt + # contextvars importlib-metadata==6.0.0 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt + # -r requirements/windows.txt iniconfig==1.0.1 # via pytest ioloop==0.1a0 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt + # -r requirements/windows.txt ipaddress==1.0.22 # via kubernetes jaraco.classes==3.2.1 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt + # jaraco.collections jaraco.collections==3.3.0 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt + # cherrypy jaraco.functools==2.0 # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt # cheroot # jaraco.text # tempora jaraco.text==3.5.0 - # via jaraco.collections + # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt + # jaraco.collections jinja2==3.1.2 # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt # -r requirements/base.txt # moto jmespath==1.0.1 # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # boto3 @@ -162,13 +193,18 @@ keyring==5.7.1 kubernetes==3.0.0 # via -r requirements/static/ci/common.in looseversion==1.0.2 - # via -r requirements/base.txt + # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt + # -r requirements/base.txt lxml==4.9.1 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt + # -r requirements/windows.txt mako==1.2.2 # via -r requirements/static/ci/common.in markupsafe==2.1.2 # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt # -r requirements/base.txt # jinja2 # mako @@ -178,6 +214,7 @@ mock==3.0.5 # via -r requirements/pytest.txt more-itertools==8.2.0 # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt # cheroot # cherrypy # jaraco.classes @@ -186,6 +223,7 @@ moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt # -r requirements/base.txt # pytest-salt-factories multidict==6.0.2 @@ -194,8 +232,9 @@ multidict==6.0.2 # yarl ntlm-auth==1.5.0 # via requests-ntlm -packaging==21.3 +packaging==22.0 # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt # -r requirements/base.txt # docker # pytest @@ -212,9 +251,12 @@ platformdirs==2.2.0 pluggy==0.13.0 # via pytest portend==2.6 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt + # cherrypy psutil==5.8.0 # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt # -r requirements/base.txt # pytest-salt-factories # pytest-shell-utilities @@ -223,30 +265,37 @@ pyasn1-modules==0.2.4 # via google-auth pyasn1==0.4.8 # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt # -r requirements/windows.txt # pyasn1-modules # rsa pycparser==2.21 ; python_version >= "3.9" # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt # -r requirements/static/ci/common.in # -r requirements/windows.txt # cffi pycryptodomex==3.10.1 - # via -r requirements/crypto.txt + # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt + # -r requirements/crypto.txt pygit2==1.9.1 # via -r requirements/static/ci/windows.in pymssql==2.2.1 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt + # -r requirements/windows.txt pymysql==1.0.2 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt + # -r requirements/windows.txt pynacl==1.5.0 # via -r requirements/static/ci/common.in pyopenssl==23.2.0 # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt # -r requirements/windows.txt # etcd3-py -pyparsing==3.0.9 - # via packaging pyrsistent==0.17.3 # via jsonschema pytest-custom-exit-code==0.3.0 @@ -286,6 +335,7 @@ pytest==7.2.0 # pytest-timeout python-dateutil==2.8.1 # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt # -r requirements/windows.txt # botocore # kubernetes @@ -293,17 +343,23 @@ python-dateutil==2.8.1 python-etcd==0.4.5 # via -r requirements/static/ci/common.in python-gnupg==0.4.8 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt + # -r requirements/windows.txt pythonnet==3.0.1 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt + # -r requirements/windows.txt pytz==2022.1 # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt # moto # tempora pyvmomi==6.7.1.2018.12 # via -r requirements/static/ci/common.in pywin32==305 # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt # -r requirements/windows.txt # cherrypy # docker @@ -313,6 +369,7 @@ pywinrm==0.4.1 # via -r requirements/static/ci/windows.in pyyaml==6.0.1 # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt # -r requirements/base.txt # clustershell # kubernetes @@ -320,12 +377,14 @@ pyyaml==6.0.1 # yamllint pyzmq==25.0.2 ; sys_platform == "win32" # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt # -r requirements/zeromq.txt # pytest-salt-factories requests-ntlm==1.1.0 # via pywinrm requests==2.31.0 # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt # -r requirements/base.txt # -r requirements/static/ci/common.in # -r requirements/windows.txt @@ -350,9 +409,12 @@ sed==0.3.1 semantic-version==2.9.0 # via etcd3-py setproctitle==1.3.2 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt + # -r requirements/windows.txt six==1.15.0 # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt # cassandra-driver # cheroot # etcd3-py @@ -369,15 +431,21 @@ six==1.15.0 # virtualenv # websocket-client smmap==4.0.0 - # via gitdb + # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt + # gitdb sqlparse==0.4.4 # via -r requirements/static/ci/common.in strict-rfc3339==0.7 # via -r requirements/static/ci/common.in tempora==4.1.1 - # via portend + # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt + # portend timelib==0.2.5 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt + # -r requirements/windows.txt toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 @@ -388,6 +456,7 @@ typing-extensions==4.2.0 # pytest-system-statistics urllib3==1.26.6 # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt # -r requirements/windows.txt # botocore # docker @@ -411,9 +480,13 @@ werkzeug==2.2.3 # moto # pytest-httpserver wheel==0.38.4 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt + # -r requirements/windows.txt wmi==1.5.1 - # via -r requirements/windows.txt + # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt + # -r requirements/windows.txt xmltodict==0.12.0 # via # moto @@ -423,9 +496,13 @@ yamllint==1.26.3 yarl==1.7.2 # via aiohttp zc.lockfile==2.0 - # via cherrypy + # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt + # cherrypy zipp==3.5.0 - # via importlib-metadata + # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt + # importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/static/ci/windows.in b/requirements/static/ci/windows.in index 38fc3fd2e08..f17f2b738a6 100644 --- a/requirements/static/ci/windows.in +++ b/requirements/static/ci/windows.in @@ -1,4 +1,6 @@ # This is a compilation of requirements installed on salt-jenkins git.salt state run +--constraint=../pkg/py{py_version}/{platform}.txt + dmidecode patch pygit2>=1.2.0 diff --git a/requirements/static/pkg/py3.10/darwin.txt b/requirements/static/pkg/py3.10/darwin.txt index 4bee194057e..3076cbdbfcc 100644 --- a/requirements/static/pkg/py3.10/darwin.txt +++ b/requirements/static/pkg/py3.10/darwin.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/pkg/py3.10/darwin.txt requirements/darwin.txt requirements/static/pkg/darwin.in +# pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.10/darwin.txt requirements/darwin.txt requirements/static/pkg/darwin.in # apache-libcloud==2.5.0 # via -r requirements/darwin.txt diff --git a/requirements/static/pkg/py3.10/freebsd.txt b/requirements/static/pkg/py3.10/freebsd.txt index c874a498b9f..cbed6472f2b 100644 --- a/requirements/static/pkg/py3.10/freebsd.txt +++ b/requirements/static/pkg/py3.10/freebsd.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/pkg/py3.10/freebsd.txt requirements/base.txt requirements/static/pkg/freebsd.in requirements/zeromq.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.10/freebsd.txt requirements/base.txt requirements/static/pkg/freebsd.in requirements/zeromq.txt # certifi==2023.07.22 # via requests diff --git a/requirements/static/pkg/py3.10/linux.txt b/requirements/static/pkg/py3.10/linux.txt index 576625229ed..aee7931820c 100644 --- a/requirements/static/pkg/py3.10/linux.txt +++ b/requirements/static/pkg/py3.10/linux.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/pkg/py3.10/linux.txt requirements/base.txt requirements/static/pkg/linux.in requirements/zeromq.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.10/linux.txt requirements/base.txt requirements/static/pkg/linux.in requirements/zeromq.txt # certifi==2023.07.22 # via requests diff --git a/requirements/static/pkg/py3.10/windows.txt b/requirements/static/pkg/py3.10/windows.txt index 59b57dab0a8..02f7797641a 100644 --- a/requirements/static/pkg/py3.10/windows.txt +++ b/requirements/static/pkg/py3.10/windows.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/pkg/py3.10/windows.txt requirements/static/pkg/windows.in requirements/windows.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.10/windows.txt requirements/static/pkg/windows.in requirements/windows.txt # certifi==2023.07.22 # via diff --git a/requirements/static/pkg/py3.7/freebsd.txt b/requirements/static/pkg/py3.7/freebsd.txt index 392d78aab83..ee0cc09f834 100644 --- a/requirements/static/pkg/py3.7/freebsd.txt +++ b/requirements/static/pkg/py3.7/freebsd.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/pkg/py3.7/freebsd.txt requirements/base.txt requirements/static/pkg/freebsd.in requirements/zeromq.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.7/freebsd.txt requirements/base.txt requirements/static/pkg/freebsd.in requirements/zeromq.txt # certifi==2023.07.22 # via requests diff --git a/requirements/static/pkg/py3.7/linux.txt b/requirements/static/pkg/py3.7/linux.txt index 476f570aea0..d7bd46db498 100644 --- a/requirements/static/pkg/py3.7/linux.txt +++ b/requirements/static/pkg/py3.7/linux.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/pkg/py3.7/linux.txt requirements/base.txt requirements/static/pkg/linux.in requirements/zeromq.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.7/linux.txt requirements/base.txt requirements/static/pkg/linux.in requirements/zeromq.txt # certifi==2023.07.22 # via requests diff --git a/requirements/static/pkg/py3.7/windows.txt b/requirements/static/pkg/py3.7/windows.txt index 1a570a4602a..eb90d0282bb 100644 --- a/requirements/static/pkg/py3.7/windows.txt +++ b/requirements/static/pkg/py3.7/windows.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/pkg/py3.7/windows.txt requirements/static/pkg/windows.in requirements/windows.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.7/windows.txt requirements/static/pkg/windows.in requirements/windows.txt # certifi==2023.07.22 # via diff --git a/requirements/static/pkg/py3.8/freebsd.txt b/requirements/static/pkg/py3.8/freebsd.txt index 725e7580c70..0c72f6cc4e6 100644 --- a/requirements/static/pkg/py3.8/freebsd.txt +++ b/requirements/static/pkg/py3.8/freebsd.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/pkg/py3.8/freebsd.txt requirements/base.txt requirements/static/pkg/freebsd.in requirements/zeromq.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.8/freebsd.txt requirements/base.txt requirements/static/pkg/freebsd.in requirements/zeromq.txt # certifi==2023.07.22 # via requests diff --git a/requirements/static/pkg/py3.8/linux.txt b/requirements/static/pkg/py3.8/linux.txt index e2bcef47b55..0b2e23b6248 100644 --- a/requirements/static/pkg/py3.8/linux.txt +++ b/requirements/static/pkg/py3.8/linux.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/pkg/py3.8/linux.txt requirements/base.txt requirements/static/pkg/linux.in requirements/zeromq.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.8/linux.txt requirements/base.txt requirements/static/pkg/linux.in requirements/zeromq.txt # certifi==2023.07.22 # via requests diff --git a/requirements/static/pkg/py3.8/windows.txt b/requirements/static/pkg/py3.8/windows.txt index 7a5669c534e..94da1a862b5 100644 --- a/requirements/static/pkg/py3.8/windows.txt +++ b/requirements/static/pkg/py3.8/windows.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/pkg/py3.8/windows.txt requirements/static/pkg/windows.in requirements/windows.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.8/windows.txt requirements/static/pkg/windows.in requirements/windows.txt # certifi==2023.07.22 # via diff --git a/requirements/static/pkg/py3.9/darwin.txt b/requirements/static/pkg/py3.9/darwin.txt index f8b866e2b62..e19bf45f403 100644 --- a/requirements/static/pkg/py3.9/darwin.txt +++ b/requirements/static/pkg/py3.9/darwin.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/pkg/py3.9/darwin.txt requirements/darwin.txt requirements/static/pkg/darwin.in +# pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.9/darwin.txt requirements/darwin.txt requirements/static/pkg/darwin.in # apache-libcloud==2.5.0 # via -r requirements/darwin.txt diff --git a/requirements/static/pkg/py3.9/freebsd.txt b/requirements/static/pkg/py3.9/freebsd.txt index 6f53c93dc14..18ed71ef45c 100644 --- a/requirements/static/pkg/py3.9/freebsd.txt +++ b/requirements/static/pkg/py3.9/freebsd.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/pkg/py3.9/freebsd.txt requirements/base.txt requirements/static/pkg/freebsd.in requirements/zeromq.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.9/freebsd.txt requirements/base.txt requirements/static/pkg/freebsd.in requirements/zeromq.txt # certifi==2023.07.22 # via requests diff --git a/requirements/static/pkg/py3.9/linux.txt b/requirements/static/pkg/py3.9/linux.txt index 314e4b7c6cd..300f1c8d9fe 100644 --- a/requirements/static/pkg/py3.9/linux.txt +++ b/requirements/static/pkg/py3.9/linux.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/pkg/py3.9/linux.txt requirements/base.txt requirements/static/pkg/linux.in requirements/zeromq.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.9/linux.txt requirements/base.txt requirements/static/pkg/linux.in requirements/zeromq.txt # certifi==2023.07.22 # via requests diff --git a/requirements/static/pkg/py3.9/windows.txt b/requirements/static/pkg/py3.9/windows.txt index c243742d9ea..a389c7471d8 100644 --- a/requirements/static/pkg/py3.9/windows.txt +++ b/requirements/static/pkg/py3.9/windows.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file=requirements/static/pkg/py3.9/windows.txt requirements/static/pkg/windows.in requirements/windows.txt +# pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.9/windows.txt requirements/static/pkg/windows.in requirements/windows.txt # certifi==2023.07.22 # via From 88073e1331d9d9eb5c91eeacbe59705daf49897c Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 26 Sep 2023 12:27:28 +0100 Subject: [PATCH 016/147] Reduce the number of cached artifacts in a CI run Signed-off-by: Pedro Algarvio --- .github/workflows/test-action-macos.yml | 115 +++++++----------------- .github/workflows/test-action.yml | 115 +++++++----------------- noxfile.py | 60 ++++--------- tools/ci.py | 27 ------ 4 files changed, 79 insertions(+), 238 deletions(-) diff --git a/.github/workflows/test-action-macos.yml b/.github/workflows/test-action-macos.yml index eabbcddac51..6b34ccc2683 100644 --- a/.github/workflows/test-action-macos.yml +++ b/.github/workflows/test-action-macos.yml @@ -70,7 +70,6 @@ jobs: runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "x86_64"]') || 'ubuntu-latest' }} outputs: matrix-include: ${{ steps.generate-matrix.outputs.matrix }} - transport-matrix-include: ${{ steps.generate-transport-matrix.outputs.matrix }} steps: - name: Checkout Source Code uses: actions/checkout@v3 @@ -85,23 +84,10 @@ jobs: echo "$TEST_MATRIX" echo "matrix=$TEST_MATRIX" >> "$GITHUB_OUTPUT" - - name: Generate Transport Matrix - id: generate-transport-matrix - run: | - TRANSPORT_MATRIX=$(tools ci transport-matrix ${{ inputs.distro-slug }}) - echo "$TRANSPORT_MATRIX" - echo "matrix=$TRANSPORT_MATRIX" >> "$GITHUB_OUTPUT" - dependencies: name: Setup Test Dependencies runs-on: ${{ inputs.distro-slug }} timeout-minutes: 90 - needs: - - generate-matrix - strategy: - fail-fast: false - matrix: - include: ${{ fromJSON(needs.generate-matrix.outputs.transport-matrix-include) }} steps: - name: Checkout Source Code uses: actions/checkout@v3 @@ -111,7 +97,7 @@ jobs: uses: actions/cache@v3 with: path: nox.${{ inputs.distro-slug }}.tar.* - key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ matrix.transport }}|${{ inputs.python-version }}|${{ hashFiles('requirements/**/*.txt', 'noxfile.py') }} + key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ hashFiles('requirements/**/*.txt', 'noxfile.py') }} - name: Download Onedir Tarball as an Artifact if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' @@ -144,17 +130,6 @@ jobs: run: | python3 -m pip install 'nox==${{ inputs.nox-version }}' - - name: Define Nox Session - id: define-nox-session - run: | - if [ "${{ matrix.transport }}" != "tcp" ]; then - echo NOX_SESSION=${{ inputs.nox-session}} >> "$GITHUB_ENV" - echo "nox-session=${{ inputs.nox-session}}" >> "$GITHUB_OUTPUT" - else - echo NOX_SESSION=${{ inputs.nox-session}}-tcp >> "$GITHUB_ENV" - echo "nox-session=${{ inputs.nox-session}}-tcp" >> "$GITHUB_OUTPUT" - fi - - name: Install Dependencies if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' env: @@ -165,7 +140,7 @@ jobs: export LDFLAGS="-L/usr/local/opt/openssl@3/lib" export CPPFLAGS="-I/usr/local/opt/openssl@3/include" export PKG_CONFIG_PATH="/usr/local/opt/openssl@3/lib/pkgconfig" - nox --install-only -e ${{ env.NOX_SESSION }} + nox --install-only -e ${{ inputs.nox-session }} - name: Cleanup .nox Directory if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' @@ -180,7 +155,7 @@ jobs: - name: Upload Nox Requirements Tarball uses: actions/upload-artifact@v3 with: - name: nox-${{ inputs.distro-slug }}-${{ steps.define-nox-session.outputs.nox-session }} + name: nox-${{ inputs.distro-slug }}-${{ inputs.nox-session }} path: nox.${{ inputs.distro-slug }}.tar.* test: @@ -194,6 +169,8 @@ jobs: fail-fast: false matrix: include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include) }} + env: + SALT_TRANSPORT: ${{ matrix.transport }} steps: - name: Checkout Source Code @@ -224,7 +201,7 @@ jobs: uses: actions/cache@v3 with: path: nox.${{ inputs.distro-slug }}.tar.* - key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ matrix.transport }}|${{ inputs.python-version }}|${{ hashFiles('requirements/**/*.txt', 'noxfile.py') }} + key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ hashFiles('requirements/**/*.txt', 'noxfile.py') }} # If we get a cache miss here it means the dependencies step failed to save the cache fail-on-cache-miss: true @@ -241,14 +218,6 @@ jobs: run: | nox -e decompress-dependencies -- ${{ inputs.distro-slug }} - - name: Define Nox Session - run: | - if [ "${{ matrix.transport }}" != "tcp" ]; then - echo NOX_SESSION=${{ inputs.nox-session}} >> "$GITHUB_ENV" - else - echo NOX_SESSION=${{ inputs.nox-session}}-tcp >> "$GITHUB_ENV" - fi - - name: Download testrun-changed-files.txt if: ${{ fromJSON(inputs.testrun)['type'] != 'full' }} uses: actions/download-artifact@v3 @@ -265,7 +234,7 @@ jobs: SKIP_INITIAL_GH_ACTIONS_FAILURES: "1" SKIP_CODE_COVERAGE: "1" run: | - sudo -E nox -e ${{ env.NOX_SESSION }} -- ${{ matrix.tests-chunk }} -- -k "mac or darwin" + sudo -E nox -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- -k "mac or darwin" - name: Run Fast/Changed Tests id: run-fast-changed-tests @@ -281,7 +250,7 @@ jobs: SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" COVERAGE_CONTEXT: ${{ inputs.distro-slug }} run: | - sudo -E nox -e ${{ env.NOX_SESSION }} -- ${{ matrix.tests-chunk }} -- \ + sudo -E nox -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \ -k "mac or darwin" --suppress-no-test-exit-code \ --from-filenames=testrun-changed-files.txt @@ -299,7 +268,7 @@ jobs: SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" COVERAGE_CONTEXT: ${{ inputs.distro-slug }} run: | - sudo -E nox -e ${{ env.NOX_SESSION }} -- ${{ matrix.tests-chunk }} -- \ + sudo -E nox -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \ -k "mac or darwin" --suppress-no-test-exit-code --no-fast-tests --slow-tests \ --from-filenames=testrun-changed-files.txt @@ -317,7 +286,7 @@ jobs: SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" COVERAGE_CONTEXT: ${{ inputs.distro-slug }} run: | - sudo -E nox -e ${{ env.NOX_SESSION }} -- ${{ matrix.tests-chunk }} -- \ + sudo -E nox -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \ -k "mac or darwin" --suppress-no-test-exit-code --no-fast-tests --core-tests \ --from-filenames=testrun-changed-files.txt @@ -335,7 +304,7 @@ jobs: SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" COVERAGE_CONTEXT: ${{ inputs.distro-slug }} run: | - sudo -E nox -e ${{ env.NOX_SESSION }} -- ${{ matrix.tests-chunk }} -- \ + sudo -E nox -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \ -k "mac or darwin" --suppress-no-test-exit-code - name: Run Slow Tests @@ -352,7 +321,7 @@ jobs: SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" COVERAGE_CONTEXT: ${{ inputs.distro-slug }} run: | - sudo -E nox -e ${{ env.NOX_SESSION }} -- ${{ matrix.tests-chunk }} -- \ + sudo -E nox -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \ -k "mac or darwin" --suppress-no-test-exit-code --no-fast-tests --slow-tests - name: Run Core Tests @@ -369,7 +338,7 @@ jobs: SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" COVERAGE_CONTEXT: ${{ inputs.distro-slug }} run: | - sudo -E nox -e ${{ env.NOX_SESSION }} -- ${{ matrix.tests-chunk }} -- \ + sudo -E nox -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \ -k "mac or darwin" --suppress-no-test-exit-code --no-fast-tests --core-tests - name: Run Flaky Tests @@ -386,7 +355,7 @@ jobs: SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" COVERAGE_CONTEXT: ${{ inputs.distro-slug }} run: | - sudo -E nox -e ${{ env.NOX_SESSION }} -- ${{ matrix.tests-chunk }} -- \ + sudo -E nox -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \ -k "mac or darwin" --suppress-no-test-exit-code --no-fast-tests --flaky-jail - name: Run Full Tests @@ -403,7 +372,7 @@ jobs: SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" COVERAGE_CONTEXT: ${{ inputs.distro-slug }} run: | - sudo -E nox -e ${{ env.NOX_SESSION }} -- ${{ matrix.tests-chunk }} -- \ + sudo -E nox -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \ --slow-tests --core-tests -k "mac or darwin" - name: Fix file ownership @@ -429,15 +398,15 @@ jobs: rm -rf artifacts/salt* tree -a artifacts if [ "${{ inputs.skip-code-coverage }}" != "true" ]; then - mv artifacts/coverage/.coverage artifacts/coverage/.coverage.${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} - echo "COVERAGE_FILE=artifacts/coverage/.coverage.${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }}" >> GITHUB_ENV + mv artifacts/coverage/.coverage artifacts/coverage/.coverage.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.${{ matrix.transport }}.${{ matrix.tests-chunk }} + echo "COVERAGE_FILE=artifacts/coverage/.coverage.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.${{ matrix.transport }}.${{ matrix.tests-chunk }}" >> GITHUB_ENV fi - name: Upload Code Coverage Test Run Artifacts if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' uses: actions/upload-artifact@v3 with: - name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ env.NOX_SESSION }} + name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }} path: | artifacts/coverage/ @@ -453,7 +422,7 @@ jobs: if: always() && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' uses: actions/upload-artifact@v3 with: - name: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ env.NOX_SESSION }} + name: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-${{ matrix.transport }} path: | artifacts/xml-unittests-output/ @@ -461,50 +430,39 @@ jobs: if: always() && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' uses: actions/upload-artifact@v3 with: - name: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ env.NOX_SESSION }} + name: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-${{ matrix.transport }} path: | artifacts/logs + - name: Publish Test Report + uses: mikepenz/action-junit-report@v3 + # always run even if the previous steps fails + if: always() && inputs.skip-junit-reports == false + with: + check_name: Test Results(${{ inputs.distro-slug }}, transport=${{ matrix.transport }}, tests-chunk=${{ matrix.tests-chunk }}) + report_paths: 'artifacts/xml-unittests-output/*.xml' + annotate_only: true + report: - name: Reports for ${{ inputs.distro-slug }}(${{ matrix.transport }}) - if: always() && (inputs.skip-code-coverage == false || inputs.skip-junit-reports == false) && needs.test.result != 'cancelled' && needs.test.result != 'skipped' + name: Reports for ${{ inputs.distro-slug }} + if: always() && inputs.skip-code-coverage == false && needs.test.result != 'cancelled' && needs.test.result != 'skipped' runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "x86_64"]') || 'ubuntu-latest' }} needs: - - generate-matrix - test - strategy: - fail-fast: false - matrix: - include: ${{ fromJSON(needs.generate-matrix.outputs.transport-matrix-include) }} steps: - name: Checkout Source Code uses: actions/checkout@v3 - - name: Define Nox Session - run: | - if [ "${{ matrix.transport }}" != "tcp" ]; then - echo NOX_SESSION=${{ inputs.nox-session }} >> "$GITHUB_ENV" - else - echo NOX_SESSION=${{ inputs.nox-session }}-tcp >> "$GITHUB_ENV" - fi - - name: Download Code Coverage Test Run Artifacts uses: actions/download-artifact@v3 if: ${{ inputs.skip-code-coverage == false }} id: download-coverage-artifacts with: - name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ env.NOX_SESSION }} + name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }} path: artifacts/coverage/ - - name: Download JUnit XML Test Run Artifacts - uses: actions/download-artifact@v3 - id: download-junit-artifacts - with: - name: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ env.NOX_SESSION }} - path: artifacts/xml-unittests-output/ - - name: Show Downloaded Test Run Artifacts run: | tree -a artifacts @@ -548,12 +506,3 @@ jobs: continue-on-error: true run: | nox --force-color -e report-coverage - - - name: Publish Test Report - uses: mikepenz/action-junit-report@v3 - # always run even if the previous steps fails - if: always() && inputs.skip-junit-reports == false && steps.download-junit-artifacts.outcome == 'success' - with: - check_name: Test Results(${{ inputs.distro-slug }}) - report_paths: 'artifacts/xml-unittests-output/*.xml' - annotate_only: true diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index aedb60612a3..ae20aa38c97 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -70,7 +70,6 @@ jobs: - x86_64 outputs: matrix-include: ${{ steps.generate-matrix.outputs.matrix }} - transport-matrix-include: ${{ steps.generate-transport-matrix.outputs.matrix }} steps: - name: Checkout Source Code uses: actions/checkout@v3 @@ -85,26 +84,13 @@ jobs: echo "$TEST_MATRIX" echo "matrix=$TEST_MATRIX" >> "$GITHUB_OUTPUT" - - name: Generate Transport Matrix - id: generate-transport-matrix - run: | - TRANSPORT_MATRIX=$(tools ci transport-matrix ${{ inputs.distro-slug }}) - echo "$TRANSPORT_MATRIX" - echo "matrix=$TRANSPORT_MATRIX" >> "$GITHUB_OUTPUT" - dependencies: name: Setup Test Dependencies - needs: - - generate-matrix runs-on: - self-hosted - linux - bastion timeout-minutes: 90 - strategy: - fail-fast: false - matrix: - include: ${{ fromJSON(needs.generate-matrix.outputs.transport-matrix-include) }} steps: - name: Checkout Source Code uses: actions/checkout@v3 @@ -114,7 +100,7 @@ jobs: uses: actions/cache@v3 with: path: nox.${{ inputs.distro-slug }}.tar.* - key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ matrix.transport }}|${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') }} + key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.distro-slug }}|${{ inputs.nox-session }}${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') }} - name: Download Onedir Tarball as an Artifact if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' @@ -140,17 +126,6 @@ jobs: if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' uses: ./.github/actions/setup-python-tools-scripts - - name: Define Nox Session - id: define-nox-session - run: | - if [ "${{ matrix.transport }}" != "tcp" ]; then - echo NOX_SESSION=${{ inputs.nox-session}} >> "$GITHUB_ENV" - echo "nox-session=${{ inputs.nox-session}}" >> "$GITHUB_OUTPUT" - else - echo NOX_SESSION=${{ inputs.nox-session}}-tcp >> "$GITHUB_ENV" - echo "nox-session=${{ inputs.nox-session}}-tcp" >> "$GITHUB_OUTPUT" - fi - - name: Get Salt Project GitHub Actions Bot Environment if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' run: | @@ -177,7 +152,7 @@ jobs: - name: Install Dependencies if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' run: | - tools --timestamps vm install-dependencies --nox-session=${{ env.NOX_SESSION }} ${{ inputs.distro-slug }} + tools --timestamps vm install-dependencies --nox-session=${{ inputs.nox-session }} ${{ inputs.distro-slug }} - name: Cleanup .nox Directory if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' @@ -202,7 +177,7 @@ jobs: - name: Upload Nox Requirements Tarball uses: actions/upload-artifact@v3 with: - name: nox-${{ inputs.distro-slug }}-${{ steps.define-nox-session.outputs.nox-session }} + name: nox-${{ inputs.distro-slug }}-${{ inputs.nox-session }} path: nox.${{ inputs.distro-slug }}.tar.* test: @@ -219,6 +194,8 @@ jobs: fail-fast: false matrix: include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include) }} + env: + SALT_TRANSPORT: ${{ matrix.transport }} steps: - name: Checkout Source Code @@ -245,7 +222,7 @@ jobs: uses: actions/cache@v3 with: path: nox.${{ inputs.distro-slug }}.tar.* - key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ matrix.transport }}|${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') }} + key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.distro-slug }}|${{ inputs.nox-session }}${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') }} # If we get a cache miss here it means the dependencies step failed to save the cache fail-on-cache-miss: true @@ -256,14 +233,6 @@ jobs: - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts - - name: Define Nox Session - run: | - if [ "${{ matrix.transport }}" != "tcp" ]; then - echo NOX_SESSION=${{ inputs.nox-session }} >> "$GITHUB_ENV" - else - echo NOX_SESSION=${{ inputs.nox-session }}-tcp >> "$GITHUB_ENV" - fi - - name: Download testrun-changed-files.txt if: ${{ fromJSON(inputs.testrun)['type'] != 'full' }} uses: actions/download-artifact@v3 @@ -298,7 +267,7 @@ jobs: - name: Show System Info & Test Plan run: | tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ - --nox-session=${{ env.NOX_SESSION }} ${{ inputs.distro-slug }} \ + --nox-session=${{ inputs.nox-session }} ${{ inputs.distro-slug }} \ ${{ matrix.tests-chunk }} - name: Run Fast/Changed Tests @@ -306,7 +275,7 @@ jobs: if: ${{ fromJSON(inputs.testrun)['type'] != 'full' && fromJSON(inputs.testrun)['selected_tests']['fast'] == false }} run: | tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ - --nox-session=${{ env.NOX_SESSION }} --rerun-failures ${{ inputs.distro-slug }} \ + --nox-session=${{ inputs.nox-session }} --rerun-failures -E SALT_TRANSPORT ${{ inputs.distro-slug }} \ ${{ matrix.tests-chunk }} -- --suppress-no-test-exit-code \ --from-filenames=testrun-changed-files.txt @@ -315,7 +284,7 @@ jobs: if: ${{ fromJSON(inputs.testrun)['type'] != 'full' && fromJSON(inputs.testrun)['selected_tests']['slow'] == false }} run: | tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ - --nox-session=${{ env.NOX_SESSION }} --rerun-failures ${{ inputs.distro-slug }} \ + --nox-session=${{ inputs.nox-session }} --rerun-failures -E SALT_TRANSPORT ${{ inputs.distro-slug }} \ ${{ matrix.tests-chunk }} -- --no-fast-tests --slow-tests --suppress-no-test-exit-code \ --from-filenames=testrun-changed-files.txt @@ -324,7 +293,7 @@ jobs: if: ${{ fromJSON(inputs.testrun)['type'] != 'full' && fromJSON(inputs.testrun)['selected_tests']['core'] == false }} run: | tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ - --nox-session=${{ env.NOX_SESSION }} --rerun-failures ${{ inputs.distro-slug }} \ + --nox-session=${{ inputs.nox-session }} --rerun-failures -E SALT_TRANSPORT ${{ inputs.distro-slug }} \ ${{ matrix.tests-chunk }} -- --no-fast-tests --core-tests --suppress-no-test-exit-code \ --from-filenames=testrun-changed-files.txt @@ -333,7 +302,7 @@ jobs: if: ${{ fromJSON(inputs.testrun)['type'] != 'full' && fromJSON(inputs.testrun)['selected_tests']['fast'] }} run: | tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ - --nox-session=${{ env.NOX_SESSION }} --rerun-failures ${{ (inputs.skip-code-coverage && matrix.tests-chunk != 'unit') && '--skip-code-coverage' || '' }} \ + --nox-session=${{ inputs.nox-session }} --rerun-failures -E SALT_TRANSPORT ${{ (inputs.skip-code-coverage && matrix.tests-chunk != 'unit') && '--skip-code-coverage' || '' }} \ ${{ inputs.distro-slug }} ${{ matrix.tests-chunk }} - name: Run Slow Tests @@ -341,7 +310,7 @@ jobs: if: ${{ fromJSON(inputs.testrun)['type'] != 'full' && fromJSON(inputs.testrun)['selected_tests']['slow'] }} run: | tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ - --nox-session=${{ env.NOX_SESSION }} --rerun-failures ${{ inputs.distro-slug }} \ + --nox-session=${{ inputs.nox-session }} --rerun-failures -E SALT_TRANSPORT ${{ inputs.distro-slug }} \ ${{ matrix.tests-chunk }} -- --no-fast-tests --slow-tests - name: Run Core Tests @@ -349,7 +318,7 @@ jobs: if: ${{ fromJSON(inputs.testrun)['type'] != 'full' && fromJSON(inputs.testrun)['selected_tests']['core'] }} run: | tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ - --nox-session=${{ env.NOX_SESSION }} --rerun-failures ${{ inputs.distro-slug }} \ + --nox-session=${{ inputs.nox-session }} --rerun-failures -E SALT_TRANSPORT ${{ inputs.distro-slug }} \ ${{ matrix.tests-chunk }} -- --no-fast-tests --core-tests - name: Run Flaky Tests @@ -357,7 +326,7 @@ jobs: if: ${{ fromJSON(inputs.testrun)['selected_tests']['flaky'] }} run: | tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ - --nox-session=${{ env.NOX_SESSION }} --rerun-failures ${{ inputs.distro-slug }} \ + --nox-session=${{ inputs.nox-session }} --rerun-failures -E SALT_TRANSPORT ${{ inputs.distro-slug }} \ ${{ matrix.tests-chunk }} -- --no-fast-tests --flaky-jail - name: Run Full Tests @@ -365,7 +334,7 @@ jobs: if: ${{ fromJSON(inputs.testrun)['type'] == 'full' }} run: | tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ - --nox-session=${{ env.NOX_SESSION }} --rerun-failures ${{ (inputs.skip-code-coverage && matrix.tests-chunk != 'unit') && '--skip-code-coverage' || '' }} \ + --nox-session=${{ inputs.nox-session }} --rerun-failures -E SALT_TRANSPORT ${{ (inputs.skip-code-coverage && matrix.tests-chunk != 'unit') && '--skip-code-coverage' || '' }} \ ${{ inputs.distro-slug }} ${{ matrix.tests-chunk }} -- --slow-tests --core-tests - name: Combine Coverage Reports @@ -388,8 +357,8 @@ jobs: rm -rf artifacts/salt* tree -a artifacts if [ "${{ inputs.skip-code-coverage }}" != "true" ]; then - mv artifacts/coverage/.coverage artifacts/coverage/.coverage.${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} - echo "COVERAGE_FILE=artifacts/coverage/.coverage.${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }}" >> GITHUB_ENV + mv artifacts/coverage/.coverage artifacts/coverage/.coverage.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.${{ matrix.transport }}.${{ matrix.tests-chunk }} + echo "COVERAGE_FILE=artifacts/coverage/.coverage.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.${{ matrix.transport }}.${{ matrix.tests-chunk }}" >> GITHUB_ENV fi - name: Destroy VM @@ -401,7 +370,7 @@ jobs: if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' uses: actions/upload-artifact@v3 with: - name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ env.NOX_SESSION }} + name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }} path: | artifacts/coverage/ @@ -417,7 +386,7 @@ jobs: if: always() && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' uses: actions/upload-artifact@v3 with: - name: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ env.NOX_SESSION }} + name: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-${{ matrix.transport }} path: | artifacts/xml-unittests-output/ @@ -425,53 +394,42 @@ jobs: if: always() && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' uses: actions/upload-artifact@v3 with: - name: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ env.NOX_SESSION }} + name: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-${{ matrix.transport }} path: | artifacts/logs + - name: Publish Test Report + uses: mikepenz/action-junit-report@v3 + # always run even if the previous steps fails + if: always() && inputs.skip-junit-reports == false + with: + check_name: Test Results(${{ inputs.distro-slug }}, transport=${{ matrix.transport }}, tests-chunk=${{ matrix.tests-chunk }}) + report_paths: 'artifacts/xml-unittests-output/*.xml' + annotate_only: true + report: - name: Reports for ${{ inputs.distro-slug }}(${{ matrix.transport }}) - if: always() && (inputs.skip-code-coverage == false || inputs.skip-junit-reports == false) && needs.test.result != 'cancelled' && needs.test.result != 'skipped' + name: Reports for ${{ inputs.distro-slug }} + if: always() && inputs.skip-code-coverage == false && needs.test.result != 'cancelled' && needs.test.result != 'skipped' runs-on: - self-hosted - linux - x86_64 needs: - - generate-matrix - test - strategy: - fail-fast: false - matrix: - include: ${{ fromJSON(needs.generate-matrix.outputs.transport-matrix-include) }} steps: - name: Checkout Source Code uses: actions/checkout@v3 - - name: Define Nox Session - run: | - if [ "${{ matrix.transport }}" != "tcp" ]; then - echo NOX_SESSION=${{ inputs.nox-session }} >> "$GITHUB_ENV" - else - echo NOX_SESSION=${{ inputs.nox-session }}-tcp >> "$GITHUB_ENV" - fi - - name: Download Code Coverage Test Run Artifacts uses: actions/download-artifact@v3 if: ${{ inputs.skip-code-coverage == false }} id: download-coverage-artifacts with: - name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ env.NOX_SESSION }} + name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }} path: artifacts/coverage/ - - name: Download JUnit XML Test Run Artifacts - uses: actions/download-artifact@v3 - id: download-junit-artifacts - with: - name: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ env.NOX_SESSION }} - path: artifacts/xml-unittests-output/ - - name: Show Downloaded Test Run Artifacts run: | tree -a artifacts @@ -510,12 +468,3 @@ jobs: continue-on-error: true run: | nox --force-color -e report-coverage - - - name: Publish Test Report - uses: mikepenz/action-junit-report@v3 - # always run even if the previous steps fails - if: always() && inputs.skip-junit-reports == false && steps.download-junit-artifacts.outcome == 'success' - with: - check_name: Test Results(${{ inputs.distro-slug }}) - report_paths: 'artifacts/xml-unittests-output/*.xml' - annotate_only: true diff --git a/noxfile.py b/noxfile.py index 6bf890a0ffd..be36d102054 100644 --- a/noxfile.py +++ b/noxfile.py @@ -192,21 +192,12 @@ def _get_pydir(session): return "py{}.{}".format(*version_info) -def _get_pip_requirements_file(session, transport, crypto=None, requirements_type="ci"): +def _get_pip_requirements_file(session, crypto=None, requirements_type="ci"): assert requirements_type in ("ci", "pkg") pydir = _get_pydir(session) if IS_WINDOWS: if crypto is None: - _requirements_file = os.path.join( - "requirements", - "static", - requirements_type, - pydir, - "{}-windows.txt".format(transport), - ) - if os.path.exists(_requirements_file): - return _requirements_file _requirements_file = os.path.join( "requirements", "static", requirements_type, pydir, "windows.txt" ) @@ -220,15 +211,6 @@ def _get_pip_requirements_file(session, transport, crypto=None, requirements_typ session.error("Could not find a windows requirements file for {}".format(pydir)) elif IS_DARWIN: if crypto is None: - _requirements_file = os.path.join( - "requirements", - "static", - requirements_type, - pydir, - "{}-darwin.txt".format(transport), - ) - if os.path.exists(_requirements_file): - return _requirements_file _requirements_file = os.path.join( "requirements", "static", requirements_type, pydir, "darwin.txt" ) @@ -242,15 +224,6 @@ def _get_pip_requirements_file(session, transport, crypto=None, requirements_typ session.error("Could not find a darwin requirements file for {}".format(pydir)) elif IS_FREEBSD: if crypto is None: - _requirements_file = os.path.join( - "requirements", - "static", - requirements_type, - pydir, - "{}-freebsd.txt".format(transport), - ) - if os.path.exists(_requirements_file): - return _requirements_file _requirements_file = os.path.join( "requirements", "static", requirements_type, pydir, "freebsd.txt" ) @@ -264,15 +237,6 @@ def _get_pip_requirements_file(session, transport, crypto=None, requirements_typ session.error("Could not find a freebsd requirements file for {}".format(pydir)) else: if crypto is None: - _requirements_file = os.path.join( - "requirements", - "static", - requirements_type, - pydir, - "{}-linux.txt".format(transport), - ) - if os.path.exists(_requirements_file): - return _requirements_file _requirements_file = os.path.join( "requirements", "static", requirements_type, pydir, "linux.txt" ) @@ -321,7 +285,6 @@ def _upgrade_pip_setuptools_and_wheel(session, upgrade=True, onedir=False): def _install_requirements( session, - transport, *extra_requirements, requirements_type="ci", onedir=False, @@ -334,7 +297,7 @@ def _install_requirements( # Install requirements requirements_file = _get_pip_requirements_file( - session, transport, requirements_type=requirements_type + session, requirements_type=requirements_type ) install_command = ["--progress-bar=off", "-r", requirements_file] session.install(*install_command, silent=PIP_INSTALL_SILENT) @@ -569,7 +532,7 @@ def test_parametrized(session, coverage, transport, crypto): DO NOT CALL THIS NOX SESSION DIRECTLY """ # Install requirements - if _install_requirements(session, transport): + if _install_requirements(session): if crypto: session_run_always( @@ -586,7 +549,7 @@ def test_parametrized(session, coverage, transport, crypto): install_command = [ "--progress-bar=off", "--constraint", - _get_pip_requirements_file(session, transport, crypto=True), + _get_pip_requirements_file(session, crypto=True), ] install_command.append(crypto) session.install(*install_command, silent=PIP_INSTALL_SILENT) @@ -985,7 +948,7 @@ def test_tornado(session, coverage): """ # Install requirements if _upgrade_pip_setuptools_and_wheel(session): - _install_requirements(session, "zeromq") + _install_requirements(session) session.install( "--progress-bar=off", "tornado==5.0.2", silent=PIP_INSTALL_SILENT ) @@ -1076,7 +1039,7 @@ def _pytest(session, coverage, cmd_args, env=None, on_rerun=False): def _ci_test(session, transport, onedir=False): # Install requirements - _install_requirements(session, transport, onedir=onedir) + _install_requirements(session, onedir=onedir) env = {} if onedir: env["ONEDIR_TESTRUN"] = "1" @@ -1172,7 +1135,14 @@ def _ci_test(session, transport, onedir=False): @nox.session(python=_PYTHON_VERSIONS, name="ci-test") def ci_test(session): - _ci_test(session, "zeromq") + transport = os.environ.get("SALT_TRANSPORT") or "zeromq" + valid_transports = ("zeromq", "tcp") + if transport not in valid_transports: + session.error( + "The value for the SALT_TRANSPORT environment variable can only be " + f"one of: {', '.join(valid_transports)}" + ) + _ci_test(session, transport) @nox.session(python=_PYTHON_VERSIONS, name="ci-test-tcp") @@ -1656,7 +1626,7 @@ def invoke(session): Run invoke tasks """ if _upgrade_pip_setuptools_and_wheel(session): - _install_requirements(session, "zeromq") + _install_requirements(session) requirements_file = os.path.join( "requirements", "static", "ci", _get_pydir(session), "invoke.txt" ) diff --git a/tools/ci.py b/tools/ci.py index a002e2589cc..f72910bb21d 100644 --- a/tools/ci.py +++ b/tools/ci.py @@ -637,33 +637,6 @@ def matrix(ctx: Context, distro_slug: str): ctx.exit(0) -@ci.command( - name="transport-matrix", - arguments={ - "distro_slug": { - "help": "The distribution slug to generate the matrix for", - }, - }, -) -def transport_matrix(ctx: Context, distro_slug: str): - """ - Generate the test matrix. - """ - _matrix = [] - for transport in ("zeromq", "tcp"): - if transport == "tcp": - if distro_slug not in ( - "centosstream-9", - "ubuntu-22.04", - "ubuntu-22.04-arm64", - ): - # Only run TCP transport tests on these distributions - continue - _matrix.append({"transport": transport}) - print(json.dumps(_matrix)) - ctx.exit(0) - - @ci.command( name="pkg-matrix", arguments={ From 9da38c3898313269426e83014c9885e15fa8ab94 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 26 Sep 2023 16:00:00 +0100 Subject: [PATCH 017/147] Show which salt transport is being tested Signed-off-by: Pedro Algarvio --- tests/conftest.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 45b3005918c..ff35313df7f 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -396,9 +396,10 @@ def set_max_open_files_limits(min_soft=3072, min_hard=4096): return soft, hard -def pytest_report_header(): +def pytest_report_header(config): soft, hard = set_max_open_files_limits() - return "max open files; soft: {}; hard: {}".format(soft, hard) + transport = config.getoption("--transport") + return f"max open files: soft={soft}; hard={hard}\nsalt-transport: {transport}" def pytest_itemcollected(item): From 313264bbe0da7ac057db1237242e90ecca9018dd Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 27 Sep 2023 20:02:36 +0100 Subject: [PATCH 018/147] Disable password authentication Signed-off-by: Pedro Algarvio --- tools/vm.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/vm.py b/tools/vm.py index 08fcb28b44f..628b7bdc128 100644 --- a/tools/vm.py +++ b/tools/vm.py @@ -860,6 +860,7 @@ class VM: StrictHostKeyChecking=no UserKnownHostsFile=/dev/null ForwardAgent={forward_agent} + PasswordAuthentication no """ ) self.ssh_config_file.write_text(ssh_config) From 19712b22f2b0448911b40c3f5e5ab66b405992e5 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 27 Sep 2023 19:17:50 +0100 Subject: [PATCH 019/147] Bump to `pytest-salt-factories==1.0.0rc27` Signed-off-by: Pedro Algarvio --- requirements/pytest.txt | 2 +- requirements/static/ci/py3.10/cloud.txt | 2 +- requirements/static/ci/py3.10/darwin.txt | 2 +- requirements/static/ci/py3.10/freebsd.txt | 2 +- requirements/static/ci/py3.10/linux.txt | 2 +- requirements/static/ci/py3.10/windows.txt | 2 +- requirements/static/ci/py3.7/cloud.txt | 2 +- requirements/static/ci/py3.7/freebsd.txt | 2 +- requirements/static/ci/py3.7/linux.txt | 2 +- requirements/static/ci/py3.7/windows.txt | 2 +- requirements/static/ci/py3.8/cloud.txt | 2 +- requirements/static/ci/py3.8/freebsd.txt | 2 +- requirements/static/ci/py3.8/linux.txt | 2 +- requirements/static/ci/py3.8/windows.txt | 2 +- requirements/static/ci/py3.9/cloud.txt | 2 +- requirements/static/ci/py3.9/darwin.txt | 2 +- requirements/static/ci/py3.9/freebsd.txt | 2 +- requirements/static/ci/py3.9/linux.txt | 2 +- requirements/static/ci/py3.9/windows.txt | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/requirements/pytest.txt b/requirements/pytest.txt index 3e6d2f198c7..8573ca8a9e8 100644 --- a/requirements/pytest.txt +++ b/requirements/pytest.txt @@ -2,7 +2,7 @@ mock >= 3.0.0 # PyTest docker pytest >= 7.2.0 -pytest-salt-factories >= 1.0.0rc26 +pytest-salt-factories >= 1.0.0rc27 pytest-helpers-namespace >= 2019.1.8 pytest-subtests pytest-timeout diff --git a/requirements/static/ci/py3.10/cloud.txt b/requirements/static/ci/py3.10/cloud.txt index e48350786cf..8191c938ac1 100644 --- a/requirements/static/ci/py3.10/cloud.txt +++ b/requirements/static/ci/py3.10/cloud.txt @@ -1042,7 +1042,7 @@ pytest-httpserver==1.0.4 # via # -c requirements/static/ci/py3.10/linux.txt # -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc26 +pytest-salt-factories==1.0.0rc27 # via # -c requirements/static/ci/py3.10/linux.txt # -r requirements/pytest.txt diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index 67cfd61cefc..47b122502d4 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -734,7 +734,7 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc26 +pytest-salt-factories==1.0.0rc27 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index 2c5d4e8d71a..693b0fa2bc0 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -727,7 +727,7 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc26 +pytest-salt-factories==1.0.0rc27 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index b2bf1178754..2caf2e6fd3a 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -746,7 +746,7 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc26 +pytest-salt-factories==1.0.0rc27 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index ef036d7c20f..d7c65b7e59c 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -305,7 +305,7 @@ pytest-helpers-namespace==2021.12.29 # pytest-shell-utilities pytest-httpserver==1.0.6 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc26 +pytest-salt-factories==1.0.0rc27 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories diff --git a/requirements/static/ci/py3.7/cloud.txt b/requirements/static/ci/py3.7/cloud.txt index 95b3302d68f..3f64dfca7d5 100644 --- a/requirements/static/ci/py3.7/cloud.txt +++ b/requirements/static/ci/py3.7/cloud.txt @@ -1092,7 +1092,7 @@ pytest-httpserver==1.0.4 # via # -c requirements/static/ci/py3.7/linux.txt # -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc26 +pytest-salt-factories==1.0.0rc27 # via # -c requirements/static/ci/py3.7/linux.txt # -r requirements/pytest.txt diff --git a/requirements/static/ci/py3.7/freebsd.txt b/requirements/static/ci/py3.7/freebsd.txt index 55d42803c77..9d27b43d5b2 100644 --- a/requirements/static/ci/py3.7/freebsd.txt +++ b/requirements/static/ci/py3.7/freebsd.txt @@ -766,7 +766,7 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc26 +pytest-salt-factories==1.0.0rc27 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories diff --git a/requirements/static/ci/py3.7/linux.txt b/requirements/static/ci/py3.7/linux.txt index 811dd6e72af..c9f7362187e 100644 --- a/requirements/static/ci/py3.7/linux.txt +++ b/requirements/static/ci/py3.7/linux.txt @@ -785,7 +785,7 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc26 +pytest-salt-factories==1.0.0rc27 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories diff --git a/requirements/static/ci/py3.7/windows.txt b/requirements/static/ci/py3.7/windows.txt index 55eeb219df3..b240ba476ad 100644 --- a/requirements/static/ci/py3.7/windows.txt +++ b/requirements/static/ci/py3.7/windows.txt @@ -318,7 +318,7 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc26 +pytest-salt-factories==1.0.0rc27 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories diff --git a/requirements/static/ci/py3.8/cloud.txt b/requirements/static/ci/py3.8/cloud.txt index 841380eef6a..0d2631e1fcc 100644 --- a/requirements/static/ci/py3.8/cloud.txt +++ b/requirements/static/ci/py3.8/cloud.txt @@ -1080,7 +1080,7 @@ pytest-httpserver==1.0.4 # via # -c requirements/static/ci/py3.8/linux.txt # -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc26 +pytest-salt-factories==1.0.0rc27 # via # -c requirements/static/ci/py3.8/linux.txt # -r requirements/pytest.txt diff --git a/requirements/static/ci/py3.8/freebsd.txt b/requirements/static/ci/py3.8/freebsd.txt index 79e4ded64bf..c6d484ac22f 100644 --- a/requirements/static/ci/py3.8/freebsd.txt +++ b/requirements/static/ci/py3.8/freebsd.txt @@ -756,7 +756,7 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc26 +pytest-salt-factories==1.0.0rc27 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories diff --git a/requirements/static/ci/py3.8/linux.txt b/requirements/static/ci/py3.8/linux.txt index 8c17c7005ca..bc1caeeba8c 100644 --- a/requirements/static/ci/py3.8/linux.txt +++ b/requirements/static/ci/py3.8/linux.txt @@ -775,7 +775,7 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc26 +pytest-salt-factories==1.0.0rc27 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories diff --git a/requirements/static/ci/py3.8/windows.txt b/requirements/static/ci/py3.8/windows.txt index d14d501e1b9..ff143d4fcff 100644 --- a/requirements/static/ci/py3.8/windows.txt +++ b/requirements/static/ci/py3.8/windows.txt @@ -306,7 +306,7 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc26 +pytest-salt-factories==1.0.0rc27 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories diff --git a/requirements/static/ci/py3.9/cloud.txt b/requirements/static/ci/py3.9/cloud.txt index e92f9ca45d7..97ed2d28172 100644 --- a/requirements/static/ci/py3.9/cloud.txt +++ b/requirements/static/ci/py3.9/cloud.txt @@ -1082,7 +1082,7 @@ pytest-httpserver==1.0.4 # via # -c requirements/static/ci/py3.9/linux.txt # -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc26 +pytest-salt-factories==1.0.0rc27 # via # -c requirements/static/ci/py3.9/linux.txt # -r requirements/pytest.txt diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index 989fbf4afaf..bd6610b93ef 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -765,7 +765,7 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc26 +pytest-salt-factories==1.0.0rc27 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index 85447a1997c..5b2e19b1359 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -758,7 +758,7 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc26 +pytest-salt-factories==1.0.0rc27 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index 53d854d5175..f8c2acc2047 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -779,7 +779,7 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc26 +pytest-salt-factories==1.0.0rc27 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index 71b4b660bd8..d749dd23ae4 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -307,7 +307,7 @@ pytest-helpers-namespace==2021.4.29 # pytest-shell-utilities pytest-httpserver==1.0.4 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.0rc26 +pytest-salt-factories==1.0.0rc27 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 # via pytest-salt-factories From 4d4ae4d3ced7053d26732f63285f7531892db274 Mon Sep 17 00:00:00 2001 From: MKLeb Date: Wed, 27 Sep 2023 17:59:27 -0400 Subject: [PATCH 020/147] Separate out source package builds from onedir package builds so our package tests start sooner --- .github/workflows/build-deb-packages.yml | 11 +- .github/workflows/build-macos-packages.yml | 11 +- .github/workflows/build-rpm-packages.yml | 11 +- .github/workflows/build-windows-packages.yml | 11 +- .github/workflows/ci.yml | 114 ++++++++++++---- .github/workflows/nightly.yml | 128 +++++++++++++----- .github/workflows/scheduled.yml | 114 ++++++++++++---- .github/workflows/staging.yml | 128 +++++++++++++----- .../templates/build-packages.yml.jinja | 7 +- .../workflows/templates/build-repos.yml.jinja | 2 +- .../templates/test-salt-pkg.yml.jinja | 6 +- 11 files changed, 393 insertions(+), 150 deletions(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index 42f7f4eb6e7..3c759f76fee 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -16,6 +16,10 @@ on: required: true type: string description: The version of python to use with relenv + source: + required: true + type: string + description: The backend to build the packages with jobs: build: @@ -30,9 +34,6 @@ jobs: arch: - x86_64 - aarch64 - source: - - onedir - - src container: image: ghcr.io/saltstack/salt-ci-containers/packaging:debian-12 @@ -89,7 +90,7 @@ jobs: working-directory: pkgs/checkout/ run: | tools pkg build deb --relenv-version=${{ inputs.relenv-version }} --python-version=${{ inputs.python-version }} ${{ - matrix.source == 'onedir' && + inputs.source == 'onedir' && format('--onedir=salt-{0}-onedir-linux-{1}.tar.xz', inputs.salt-version, matrix.arch) || format('--arch={0}', matrix.arch) @@ -102,7 +103,7 @@ jobs: - name: Set Artifact Name id: set-artifact-name run: | - if [ "${{ matrix.source }}" != "src" ]; then + if [ "${{ inputs.source }}" != "src" ]; then echo "artifact-name=salt-${{ inputs.salt-version }}-${{ matrix.arch }}-deb" >> "$GITHUB_OUTPUT" else echo "artifact-name=salt-${{ inputs.salt-version }}-${{ matrix.arch }}-deb-from-src" >> "$GITHUB_OUTPUT" diff --git a/.github/workflows/build-macos-packages.yml b/.github/workflows/build-macos-packages.yml index 25442f665f6..22c0684a398 100644 --- a/.github/workflows/build-macos-packages.yml +++ b/.github/workflows/build-macos-packages.yml @@ -24,6 +24,10 @@ on: type: string description: The GitHub Environment where this workflow should run default: ci + source: + required: true + type: string + description: The backend to build the packages with jobs: @@ -35,9 +39,6 @@ jobs: matrix: arch: - x86_64 - source: - - onedir - - src runs-on: - macos-12 @@ -114,7 +115,7 @@ jobs: APP_SPEC_PWD: "${{ secrets.MAC_SIGN_APP_SPEC_PWD }}" run: | tools pkg build macos --relenv-version=${{ inputs.relenv-version }} --python-version=${{ inputs.python-version }} ${{ - matrix.source == 'onedir' && + inputs.source == 'onedir' && format( '--onedir salt-{0}-onedir-darwin-{1}.tar.xz --salt-version {0} {2}', inputs.salt-version, @@ -128,7 +129,7 @@ jobs: - name: Set Artifact Name id: set-artifact-name run: | - if [ "${{ matrix.source }}" != "src" ]; then + if [ "${{ inputs.source }}" != "src" ]; then echo "artifact-name=salt-${{ inputs.salt-version }}-${{ matrix.arch }}-macos" >> "$GITHUB_OUTPUT" else echo "artifact-name=salt-${{ inputs.salt-version }}-${{ matrix.arch }}-macos-from-src" >> "$GITHUB_OUTPUT" diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index c9ef9cc8abe..f91a7cacd4e 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -16,6 +16,10 @@ on: required: true type: string description: The version of python to use with relenv + source: + required: true + type: string + description: The backend to build the packages with env: COLUMNS: 190 @@ -33,9 +37,6 @@ jobs: arch: - x86_64 - aarch64 - source: - - onedir - - src container: image: ghcr.io/saltstack/salt-ci-containers/packaging:centosstream-9 @@ -77,7 +78,7 @@ jobs: - name: Build RPM run: | tools pkg build rpm --relenv-version=${{ inputs.relenv-version }} --python-version=${{ inputs.python-version }} ${{ - matrix.source == 'onedir' && + inputs.source == 'onedir' && format('--onedir=salt-{0}-onedir-linux-{1}.tar.xz', inputs.salt-version, matrix.arch) || format('--arch={0}', matrix.arch) @@ -86,7 +87,7 @@ jobs: - name: Set Artifact Name id: set-artifact-name run: | - if [ "${{ matrix.source }}" != "src" ]; then + if [ "${{ inputs.source }}" != "src" ]; then echo "artifact-name=salt-${{ inputs.salt-version }}-${{ matrix.arch }}-rpm" >> "$GITHUB_OUTPUT" else echo "artifact-name=salt-${{ inputs.salt-version }}-${{ matrix.arch }}-rpm-from-src" >> "$GITHUB_OUTPUT" diff --git a/.github/workflows/build-windows-packages.yml b/.github/workflows/build-windows-packages.yml index 8b3173fe415..522966a6b4d 100644 --- a/.github/workflows/build-windows-packages.yml +++ b/.github/workflows/build-windows-packages.yml @@ -24,6 +24,10 @@ on: type: string description: The GitHub Environment where this workflow should run default: ci + source: + required: true + type: string + description: The backend to build the packages with jobs: @@ -37,9 +41,6 @@ jobs: arch: - x86 - amd64 - source: - - onedir - - src runs-on: - windows-latest @@ -108,7 +109,7 @@ jobs: - name: Build Windows Packages run: | tools pkg build windows --relenv-version=${{ inputs.relenv-version }} --python-version=${{ inputs.python-version }} ${{ - matrix.source == 'onedir' && + inputs.source == 'onedir' && format( '--onedir salt-{0}-onedir-windows-{1}.zip --salt-version {0} --arch {1} {2}', inputs.salt-version, @@ -123,7 +124,7 @@ jobs: id: set-artifact-name shell: bash run: | - if [ "${{ matrix.source }}" != "src" ]; then + if [ "${{ inputs.source }}" != "src" ]; then echo "artifact-name-nsis=salt-${{ inputs.salt-version }}-${{ matrix.arch }}-NSIS" >> "$GITHUB_OUTPUT" echo "artifact-name-msi=salt-${{ inputs.salt-version }}-${{ matrix.arch }}-MSI" >> "$GITHUB_OUTPUT" else diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0cea99f036d..5b7c2c399f1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -461,8 +461,8 @@ jobs: relenv-version: "0.13.11" python-version: "3.10.13" - build-rpm-pkgs: - name: Build RPM Packages + build-rpm-pkgs-onedir: + name: Build RPM Packages (onedir) if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -472,9 +472,23 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" relenv-version: "0.13.11" python-version: "3.10.13" + source: "onedir" - build-deb-pkgs: - name: Build DEB Packages + build-rpm-pkgs-src: + name: Build RPM Packages (src) + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-rpm-packages.yml + with: + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + relenv-version: "0.13.11" + python-version: "3.10.13" + source: "src" + + build-deb-pkgs-onedir: + name: Build DEB Packages (onedir) if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -484,9 +498,23 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" relenv-version: "0.13.11" python-version: "3.10.13" + source: "onedir" - build-windows-pkgs: - name: Build Windows Packages + build-deb-pkgs-src: + name: Build DEB Packages (src) + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deb-packages.yml + with: + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + relenv-version: "0.13.11" + python-version: "3.10.13" + source: "src" + + build-windows-pkgs-onedir: + name: Build Windows Packages (onedir) if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -496,9 +524,23 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" relenv-version: "0.13.11" python-version: "3.10.13" + source: "onedir" - build-macos-pkgs: - name: Build macOS Packages + build-windows-pkgs-src: + name: Build Windows Packages (src) + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-windows-packages.yml + with: + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + relenv-version: "0.13.11" + python-version: "3.10.13" + source: "src" + + build-macos-pkgs-onedir: + name: Build macOS Packages (onedir) if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -508,13 +550,27 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" relenv-version: "0.13.11" python-version: "3.10.13" + source: "onedir" + + build-macos-pkgs-src: + name: Build macOS Packages (src) + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-macos-packages.yml + with: + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + relenv-version: "0.13.11" + python-version: "3.10.13" + source: "src" amazonlinux-2-pkg-tests: name: Amazon Linux 2 Package Tests if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-rpm-pkgs + - build-rpm-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: amazonlinux-2 @@ -534,7 +590,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-rpm-pkgs + - build-rpm-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centos-7 @@ -554,7 +610,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-rpm-pkgs + - build-rpm-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centosstream-8 @@ -574,7 +630,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-rpm-pkgs + - build-rpm-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centosstream-9 @@ -594,7 +650,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-deb-pkgs + - build-deb-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-10 @@ -614,7 +670,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-deb-pkgs + - build-deb-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-11 @@ -634,7 +690,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-deb-pkgs + - build-deb-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-11-arm64 @@ -654,7 +710,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-rpm-pkgs + - build-rpm-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-3 @@ -674,7 +730,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-rpm-pkgs + - build-rpm-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-4 @@ -694,7 +750,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-rpm-pkgs + - build-rpm-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-4-arm64 @@ -714,7 +770,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-deb-pkgs + - build-deb-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-20.04 @@ -734,7 +790,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-deb-pkgs + - build-deb-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-20.04-arm64 @@ -754,7 +810,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-deb-pkgs + - build-deb-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-22.04 @@ -774,7 +830,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-deb-pkgs + - build-deb-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-22.04-arm64 @@ -794,7 +850,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - - build-macos-pkgs + - build-macos-pkgs-onedir uses: ./.github/workflows/test-packages-action-macos.yml with: distro-slug: macos-12 @@ -814,7 +870,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-windows-pkgs + - build-windows-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2016 @@ -834,7 +890,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-windows-pkgs + - build-windows-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2016 @@ -854,7 +910,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-windows-pkgs + - build-windows-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2019 @@ -874,7 +930,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-windows-pkgs + - build-windows-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2019 @@ -894,7 +950,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-windows-pkgs + - build-windows-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2022 @@ -914,7 +970,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-windows-pkgs + - build-windows-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2022 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 439bcb1a74b..fa17282a6c1 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -510,8 +510,8 @@ jobs: relenv-version: "0.13.11" python-version: "3.10.13" - build-rpm-pkgs: - name: Build RPM Packages + build-rpm-pkgs-onedir: + name: Build RPM Packages (onedir) if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -521,9 +521,23 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" relenv-version: "0.13.11" python-version: "3.10.13" + source: "onedir" - build-deb-pkgs: - name: Build DEB Packages + build-rpm-pkgs-src: + name: Build RPM Packages (src) + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-rpm-packages.yml + with: + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + relenv-version: "0.13.11" + python-version: "3.10.13" + source: "src" + + build-deb-pkgs-onedir: + name: Build DEB Packages (onedir) if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -533,9 +547,23 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" relenv-version: "0.13.11" python-version: "3.10.13" + source: "onedir" - build-windows-pkgs: - name: Build Windows Packages + build-deb-pkgs-src: + name: Build DEB Packages (src) + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deb-packages.yml + with: + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + relenv-version: "0.13.11" + python-version: "3.10.13" + source: "src" + + build-windows-pkgs-onedir: + name: Build Windows Packages (onedir) if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -545,12 +573,29 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" relenv-version: "0.13.11" python-version: "3.10.13" + source: "onedir" environment: nightly sign-packages: false secrets: inherit - build-macos-pkgs: - name: Build macOS Packages + build-windows-pkgs-src: + name: Build Windows Packages (src) + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-windows-packages.yml + with: + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + relenv-version: "0.13.11" + python-version: "3.10.13" + source: "src" + environment: nightly + sign-packages: false + secrets: inherit + + build-macos-pkgs-onedir: + name: Build macOS Packages (onedir) if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -560,6 +605,23 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" relenv-version: "0.13.11" python-version: "3.10.13" + source: "onedir" + environment: nightly + sign-packages: true + secrets: inherit + + build-macos-pkgs-src: + name: Build macOS Packages (src) + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-macos-packages.yml + with: + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + relenv-version: "0.13.11" + python-version: "3.10.13" + source: "src" environment: nightly sign-packages: true secrets: inherit @@ -569,7 +631,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-rpm-pkgs + - build-rpm-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: amazonlinux-2 @@ -589,7 +651,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-rpm-pkgs + - build-rpm-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centos-7 @@ -609,7 +671,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-rpm-pkgs + - build-rpm-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centosstream-8 @@ -629,7 +691,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-rpm-pkgs + - build-rpm-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centosstream-9 @@ -649,7 +711,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-deb-pkgs + - build-deb-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-10 @@ -669,7 +731,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-deb-pkgs + - build-deb-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-11 @@ -689,7 +751,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-deb-pkgs + - build-deb-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-11-arm64 @@ -709,7 +771,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-rpm-pkgs + - build-rpm-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-3 @@ -729,7 +791,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-rpm-pkgs + - build-rpm-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-4 @@ -749,7 +811,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-rpm-pkgs + - build-rpm-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-4-arm64 @@ -769,7 +831,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-deb-pkgs + - build-deb-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-20.04 @@ -789,7 +851,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-deb-pkgs + - build-deb-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-20.04-arm64 @@ -809,7 +871,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-deb-pkgs + - build-deb-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-22.04 @@ -829,7 +891,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-deb-pkgs + - build-deb-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-22.04-arm64 @@ -849,7 +911,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - - build-macos-pkgs + - build-macos-pkgs-onedir uses: ./.github/workflows/test-packages-action-macos.yml with: distro-slug: macos-12 @@ -869,7 +931,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-windows-pkgs + - build-windows-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2016 @@ -889,7 +951,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-windows-pkgs + - build-windows-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2016 @@ -909,7 +971,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-windows-pkgs + - build-windows-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2019 @@ -929,7 +991,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-windows-pkgs + - build-windows-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2019 @@ -949,7 +1011,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-windows-pkgs + - build-windows-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2022 @@ -969,7 +1031,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-windows-pkgs + - build-windows-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2022 @@ -1610,7 +1672,7 @@ jobs: - repo-nightly needs: - prepare-workflow - - build-deb-pkgs + - build-deb-pkgs-onedir strategy: fail-fast: false matrix: @@ -1721,7 +1783,7 @@ jobs: - repo-nightly needs: - prepare-workflow - - build-rpm-pkgs + - build-rpm-pkgs-onedir strategy: fail-fast: false matrix: @@ -1865,7 +1927,7 @@ jobs: - repo-nightly needs: - prepare-workflow - - build-windows-pkgs + - build-windows-pkgs-onedir steps: - uses: actions/checkout@v3 @@ -1959,7 +2021,7 @@ jobs: - repo-nightly needs: - prepare-workflow - - build-macos-pkgs + - build-macos-pkgs-onedir steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 02863403cfe..0dda9405bd7 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -495,8 +495,8 @@ jobs: relenv-version: "0.13.11" python-version: "3.10.13" - build-rpm-pkgs: - name: Build RPM Packages + build-rpm-pkgs-onedir: + name: Build RPM Packages (onedir) if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -506,9 +506,23 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" relenv-version: "0.13.11" python-version: "3.10.13" + source: "onedir" - build-deb-pkgs: - name: Build DEB Packages + build-rpm-pkgs-src: + name: Build RPM Packages (src) + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-rpm-packages.yml + with: + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + relenv-version: "0.13.11" + python-version: "3.10.13" + source: "src" + + build-deb-pkgs-onedir: + name: Build DEB Packages (onedir) if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -518,9 +532,23 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" relenv-version: "0.13.11" python-version: "3.10.13" + source: "onedir" - build-windows-pkgs: - name: Build Windows Packages + build-deb-pkgs-src: + name: Build DEB Packages (src) + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deb-packages.yml + with: + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + relenv-version: "0.13.11" + python-version: "3.10.13" + source: "src" + + build-windows-pkgs-onedir: + name: Build Windows Packages (onedir) if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -530,9 +558,23 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" relenv-version: "0.13.11" python-version: "3.10.13" + source: "onedir" - build-macos-pkgs: - name: Build macOS Packages + build-windows-pkgs-src: + name: Build Windows Packages (src) + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-windows-packages.yml + with: + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + relenv-version: "0.13.11" + python-version: "3.10.13" + source: "src" + + build-macos-pkgs-onedir: + name: Build macOS Packages (onedir) if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -542,13 +584,27 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" relenv-version: "0.13.11" python-version: "3.10.13" + source: "onedir" + + build-macos-pkgs-src: + name: Build macOS Packages (src) + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-macos-packages.yml + with: + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + relenv-version: "0.13.11" + python-version: "3.10.13" + source: "src" amazonlinux-2-pkg-tests: name: Amazon Linux 2 Package Tests if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-rpm-pkgs + - build-rpm-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: amazonlinux-2 @@ -568,7 +624,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-rpm-pkgs + - build-rpm-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centos-7 @@ -588,7 +644,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-rpm-pkgs + - build-rpm-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centosstream-8 @@ -608,7 +664,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-rpm-pkgs + - build-rpm-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centosstream-9 @@ -628,7 +684,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-deb-pkgs + - build-deb-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-10 @@ -648,7 +704,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-deb-pkgs + - build-deb-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-11 @@ -668,7 +724,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-deb-pkgs + - build-deb-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-11-arm64 @@ -688,7 +744,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-rpm-pkgs + - build-rpm-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-3 @@ -708,7 +764,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-rpm-pkgs + - build-rpm-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-4 @@ -728,7 +784,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-rpm-pkgs + - build-rpm-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-4-arm64 @@ -748,7 +804,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-deb-pkgs + - build-deb-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-20.04 @@ -768,7 +824,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-deb-pkgs + - build-deb-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-20.04-arm64 @@ -788,7 +844,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-deb-pkgs + - build-deb-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-22.04 @@ -808,7 +864,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-deb-pkgs + - build-deb-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-22.04-arm64 @@ -828,7 +884,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - - build-macos-pkgs + - build-macos-pkgs-onedir uses: ./.github/workflows/test-packages-action-macos.yml with: distro-slug: macos-12 @@ -848,7 +904,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-windows-pkgs + - build-windows-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2016 @@ -868,7 +924,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-windows-pkgs + - build-windows-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2016 @@ -888,7 +944,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-windows-pkgs + - build-windows-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2019 @@ -908,7 +964,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-windows-pkgs + - build-windows-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2019 @@ -928,7 +984,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-windows-pkgs + - build-windows-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2022 @@ -948,7 +1004,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-windows-pkgs + - build-windows-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2022 diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index d1c4ff26ca4..3d8dd855c3a 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -505,8 +505,8 @@ jobs: relenv-version: "0.13.11" python-version: "3.10.13" - build-rpm-pkgs: - name: Build RPM Packages + build-rpm-pkgs-onedir: + name: Build RPM Packages (onedir) if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -516,9 +516,23 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" relenv-version: "0.13.11" python-version: "3.10.13" + source: "onedir" - build-deb-pkgs: - name: Build DEB Packages + build-rpm-pkgs-src: + name: Build RPM Packages (src) + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-rpm-packages.yml + with: + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + relenv-version: "0.13.11" + python-version: "3.10.13" + source: "src" + + build-deb-pkgs-onedir: + name: Build DEB Packages (onedir) if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -528,9 +542,23 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" relenv-version: "0.13.11" python-version: "3.10.13" + source: "onedir" - build-windows-pkgs: - name: Build Windows Packages + build-deb-pkgs-src: + name: Build DEB Packages (src) + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deb-packages.yml + with: + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + relenv-version: "0.13.11" + python-version: "3.10.13" + source: "src" + + build-windows-pkgs-onedir: + name: Build Windows Packages (onedir) if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -540,12 +568,29 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" relenv-version: "0.13.11" python-version: "3.10.13" + source: "onedir" environment: staging sign-packages: ${{ inputs.sign-windows-packages }} secrets: inherit - build-macos-pkgs: - name: Build macOS Packages + build-windows-pkgs-src: + name: Build Windows Packages (src) + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-windows-packages.yml + with: + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + relenv-version: "0.13.11" + python-version: "3.10.13" + source: "src" + environment: staging + sign-packages: ${{ inputs.sign-windows-packages }} + secrets: inherit + + build-macos-pkgs-onedir: + name: Build macOS Packages (onedir) if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -555,6 +600,23 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" relenv-version: "0.13.11" python-version: "3.10.13" + source: "onedir" + environment: staging + sign-packages: true + secrets: inherit + + build-macos-pkgs-src: + name: Build macOS Packages (src) + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-macos-packages.yml + with: + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + relenv-version: "0.13.11" + python-version: "3.10.13" + source: "src" environment: staging sign-packages: true secrets: inherit @@ -564,7 +626,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-rpm-pkgs + - build-rpm-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: amazonlinux-2 @@ -584,7 +646,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-rpm-pkgs + - build-rpm-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centos-7 @@ -604,7 +666,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-rpm-pkgs + - build-rpm-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centosstream-8 @@ -624,7 +686,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-rpm-pkgs + - build-rpm-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centosstream-9 @@ -644,7 +706,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-deb-pkgs + - build-deb-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-10 @@ -664,7 +726,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-deb-pkgs + - build-deb-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-11 @@ -684,7 +746,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-deb-pkgs + - build-deb-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-11-arm64 @@ -704,7 +766,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-rpm-pkgs + - build-rpm-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-3 @@ -724,7 +786,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-rpm-pkgs + - build-rpm-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-4 @@ -744,7 +806,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-rpm-pkgs + - build-rpm-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-4-arm64 @@ -764,7 +826,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-deb-pkgs + - build-deb-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-20.04 @@ -784,7 +846,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-deb-pkgs + - build-deb-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-20.04-arm64 @@ -804,7 +866,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-deb-pkgs + - build-deb-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-22.04 @@ -824,7 +886,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-deb-pkgs + - build-deb-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-22.04-arm64 @@ -844,7 +906,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - - build-macos-pkgs + - build-macos-pkgs-onedir uses: ./.github/workflows/test-packages-action-macos.yml with: distro-slug: macos-12 @@ -864,7 +926,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-windows-pkgs + - build-windows-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2016 @@ -884,7 +946,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-windows-pkgs + - build-windows-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2016 @@ -904,7 +966,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-windows-pkgs + - build-windows-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2019 @@ -924,7 +986,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-windows-pkgs + - build-windows-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2019 @@ -944,7 +1006,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-windows-pkgs + - build-windows-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2022 @@ -964,7 +1026,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-windows-pkgs + - build-windows-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2022 @@ -1536,7 +1598,7 @@ jobs: - repo-staging needs: - prepare-workflow - - build-deb-pkgs + - build-deb-pkgs-onedir strategy: fail-fast: false matrix: @@ -1647,7 +1709,7 @@ jobs: - repo-staging needs: - prepare-workflow - - build-rpm-pkgs + - build-rpm-pkgs-onedir strategy: fail-fast: false matrix: @@ -1793,7 +1855,7 @@ jobs: - repo-staging needs: - prepare-workflow - - build-windows-pkgs + - build-windows-pkgs-onedir steps: - uses: actions/checkout@v3 @@ -1887,7 +1949,7 @@ jobs: - repo-staging needs: - prepare-workflow - - build-macos-pkgs + - build-macos-pkgs-onedir steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/templates/build-packages.yml.jinja b/.github/workflows/templates/build-packages.yml.jinja index eb0df9b14de..7c33f9e217f 100644 --- a/.github/workflows/templates/build-packages.yml.jinja +++ b/.github/workflows/templates/build-packages.yml.jinja @@ -5,10 +5,11 @@ ("macos", "macOS", "github-hosted"), ) %> - <%- set job_name = "build-{}-pkgs".format(pkg_type) %> + <%- for backend in ("onedir", "src") %> + <%- set job_name = "build-{}-pkgs-{}".format(pkg_type, backend) %> <{ job_name }>: - name: Build <{ display_name }> Packages + name: Build <{ display_name }> Packages (<{ backend }>) if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['<{ runner_type }>'] }} needs: - prepare-workflow @@ -18,6 +19,7 @@ salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" relenv-version: "<{ relenv_version }>" python-version: "<{ python_version }>" + source: "<{ backend }>" <%- if pkg_type in ("macos", "windows") and gh_environment %> environment: <{ gh_environment }> <%- if pkg_type == "macos" %> @@ -28,4 +30,5 @@ secrets: inherit <%- endif %> + <%- endfor %> <%- endfor %> diff --git a/.github/workflows/templates/build-repos.yml.jinja b/.github/workflows/templates/build-repos.yml.jinja index 85cea3e38db..de984ed75de 100644 --- a/.github/workflows/templates/build-repos.yml.jinja +++ b/.github/workflows/templates/build-repos.yml.jinja @@ -20,7 +20,7 @@ needs: - prepare-workflow <%- if needs_pkg %> - - build-<{ type }>-pkgs + - build-<{ type }>-pkgs-onedir <%- else %> - build-salt-onedir <%- endif %> diff --git a/.github/workflows/templates/test-salt-pkg.yml.jinja b/.github/workflows/templates/test-salt-pkg.yml.jinja index b1f446c7e2f..4393f954c34 100644 --- a/.github/workflows/templates/test-salt-pkg.yml.jinja +++ b/.github/workflows/templates/test-salt-pkg.yml.jinja @@ -43,7 +43,7 @@ if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-<{ pkg_type }>-pkgs + - build-<{ pkg_type }>-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: <{ slug }> @@ -71,7 +71,7 @@ if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - - build-macos-pkgs + - build-macos-pkgs-onedir uses: ./.github/workflows/test-packages-action-macos.yml with: distro-slug: <{ slug }> @@ -101,7 +101,7 @@ if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-windows-pkgs + - build-windows-pkgs-onedir uses: ./.github/workflows/test-packages-action.yml with: distro-slug: <{ slug }> From e7612b23d72f23cbdf9d65fc84d7ddf1e9eb4a54 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 28 Sep 2023 11:01:47 +0100 Subject: [PATCH 021/147] Build CI dependencies on separate jobs Signed-off-by: Pedro Algarvio --- .github/workflows/build-deb-packages.yml | 4 +- .../workflows/build-deps-ci-action-macos.yml | 128 +++ .github/workflows/build-deps-ci-action.yml | 152 ++++ .github/workflows/build-macos-packages.yml | 2 + .github/workflows/build-rpm-packages.yml | 2 + .github/workflows/build-windows-packages.yml | 2 + .github/workflows/ci.yml | 784 +++++++++++++++-- .github/workflows/nightly.yml | 784 +++++++++++++++-- .github/workflows/release.yml | 33 + .github/workflows/scheduled.yml | 784 +++++++++++++++-- .github/workflows/staging.yml | 785 ++++++++++++++++-- .../templates/build-ci-deps.yml.jinja | 95 +++ .../templates/build-packages.yml.jinja | 5 +- .github/workflows/templates/ci.yml.jinja | 11 +- .github/workflows/templates/layout.yml.jinja | 1 + .../test-pkg-repo-downloads.yml.jinja | 3 + .../templates/test-salt-pkg.yml.jinja | 12 +- .../workflows/templates/test-salt.yml.jinja | 9 +- .github/workflows/test-action-macos.yml | 83 +- .github/workflows/test-action.yml | 110 +-- .../test-package-downloads-action-linux.yml | 99 +-- .../test-package-downloads-action-macos.yml | 78 +- .../test-package-downloads-action-windows.yml | 99 +-- .../workflows/test-packages-action-macos.yml | 81 +- .github/workflows/test-packages-action.yml | 103 +-- tools/ci.py | 2 + 26 files changed, 3431 insertions(+), 820 deletions(-) create mode 100644 .github/workflows/build-deps-ci-action-macos.yml create mode 100644 .github/workflows/build-deps-ci-action.yml create mode 100644 .github/workflows/templates/build-ci-deps.yml.jinja diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index 3c759f76fee..7a015939da1 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -1,5 +1,5 @@ --- -name: Build Debian Packages +name: Build DEB Packages on: workflow_call: @@ -34,6 +34,8 @@ jobs: arch: - x86_64 - aarch64 + source: + - ${{ inputs.source }} container: image: ghcr.io/saltstack/salt-ci-containers/packaging:debian-12 diff --git a/.github/workflows/build-deps-ci-action-macos.yml b/.github/workflows/build-deps-ci-action-macos.yml new file mode 100644 index 00000000000..4c943db659f --- /dev/null +++ b/.github/workflows/build-deps-ci-action-macos.yml @@ -0,0 +1,128 @@ +--- +name: Test Dependencies + +on: + workflow_call: + inputs: + distro-slug: + required: true + type: string + description: The OS slug to run tests against + nox-session: + required: true + type: string + description: The nox session to run + salt-version: + type: string + required: true + description: The Salt version to set prior to running tests. + cache-prefix: + required: true + type: string + description: Seed used to invalidate caches + platform: + required: true + type: string + description: The platform being tested + arch: + required: true + type: string + description: The platform arch being tested + nox-version: + required: true + type: string + description: The nox version to install + python-version: + required: false + type: string + description: The python version to run tests with + default: "3.10" + package-name: + required: false + type: string + description: The onedir package name to use + default: salt + + +env: + COLUMNS: 190 + PIP_INDEX_URL: "https://pypi-proxy.saltstack.net/root/local/+simple/" + PIP_EXTRA_INDEX_URL: "https://pypi.org/simple" + +jobs: + + dependencies: + name: Test Dependencies + runs-on: ${{ inputs.distro-slug }} + timeout-minutes: 90 + steps: + - name: Checkout Source Code + uses: actions/checkout@v3 + + - name: Cache nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }} + id: nox-dependencies-cache + uses: actions/cache@v3 + with: + path: nox.${{ inputs.distro-slug }}.tar.* + key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ + hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') + }} + + - name: Download Onedir Tarball as an Artifact + if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' + uses: actions/download-artifact@v3 + with: + name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz + path: artifacts/ + + - name: Decompress Onedir Tarball + if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' + shell: bash + run: | + python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" + cd artifacts + tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz + + - name: Set up Python ${{ inputs.python-version }} + if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' + uses: actions/setup-python@v4 + with: + python-version: "${{ inputs.python-version }}" + + - name: Install System Dependencies + if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' + run: | + brew install openssl@3 + + - name: Install Nox + if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' + run: | + python3 -m pip install 'nox==${{ inputs.nox-version }}' + + - name: Install Dependencies + if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' + env: + PRINT_TEST_SELECTION: "0" + PRINT_SYSTEM_INFO: "0" + run: | + export PYCURL_SSL_LIBRARY=openssl + export LDFLAGS="-L/usr/local/opt/openssl@3/lib" + export CPPFLAGS="-I/usr/local/opt/openssl@3/include" + export PKG_CONFIG_PATH="/usr/local/opt/openssl@3/lib/pkgconfig" + nox --install-only -e ${{ inputs.nox-session }} + + - name: Cleanup .nox Directory + if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' + run: | + nox -e "pre-archive-cleanup(pkg=False)" + + - name: Compress .nox Directory + if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' + run: | + nox -e compress-dependencies -- ${{ inputs.distro-slug }} + + - name: Upload Nox Requirements Tarball + uses: actions/upload-artifact@v3 + with: + name: nox-${{ inputs.distro-slug }}-${{ inputs.nox-session }} + path: nox.${{ inputs.distro-slug }}.tar.* diff --git a/.github/workflows/build-deps-ci-action.yml b/.github/workflows/build-deps-ci-action.yml new file mode 100644 index 00000000000..d5de71968c4 --- /dev/null +++ b/.github/workflows/build-deps-ci-action.yml @@ -0,0 +1,152 @@ +--- +name: Test Dependencies + +on: + workflow_call: + inputs: + distro-slug: + required: true + type: string + description: The OS slug to run tests against + nox-session: + required: true + type: string + description: The nox session to run + salt-version: + type: string + required: true + description: The Salt version to set prior to running tests. + cache-prefix: + required: true + type: string + description: Seed used to invalidate caches + platform: + required: true + type: string + description: The platform being tested + arch: + required: true + type: string + description: The platform arch being tested + nox-version: + required: true + type: string + description: The nox version to install + python-version: + required: false + type: string + description: The python version to run tests with + default: "3.10" + package-name: + required: false + type: string + description: The onedir package name to use + default: salt + + +env: + COLUMNS: 190 + AWS_MAX_ATTEMPTS: "10" + AWS_RETRY_MODE: "adaptive" + PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ + PIP_EXTRA_INDEX_URL: https://pypi.org/simple + +jobs: + + dependencies: + name: Test Dependencies + runs-on: + - self-hosted + - linux + - bastion + timeout-minutes: 90 + steps: + - name: Checkout Source Code + uses: actions/checkout@v3 + + - name: Cache nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }} + id: nox-dependencies-cache + uses: actions/cache@v3 + with: + path: nox.${{ inputs.distro-slug }}.tar.* + key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ + hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') + }} + + - name: Download Onedir Tarball as an Artifact + if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' + uses: actions/download-artifact@v3 + with: + name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz + path: artifacts/ + + - name: Decompress Onedir Tarball + if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' + shell: bash + run: | + python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" + cd artifacts + tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz + + - name: PyPi Proxy + if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' + run: | + sed -i '7s;^;--index-url=https://pypi-proxy.saltstack.net/root/local/+simple/ --extra-index-url=https://pypi.org/simple\n;' requirements/static/ci/*/*.txt + + - name: Setup Python Tools Scripts + if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' + uses: ./.github/actions/setup-python-tools-scripts + + - name: Get Salt Project GitHub Actions Bot Environment + if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' + run: | + TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") + SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) + echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" + + - name: Start VM + if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' + id: spin-up-vm + run: | + tools --timestamps vm create --environment "${SPB_ENVIRONMENT}" --retries=2 ${{ inputs.distro-slug }} + + - name: List Free Space + if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' + run: | + tools --timestamps vm ssh ${{ inputs.distro-slug }} -- df -h || true + + - name: Upload Checkout To VM + if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' + run: | + tools --timestamps vm rsync ${{ inputs.distro-slug }} + + - name: Install Dependencies + if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' + run: | + tools --timestamps vm install-dependencies --nox-session=${{ inputs.nox-session }} ${{ inputs.distro-slug }} + + - name: Cleanup .nox Directory + if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' + run: | + tools --timestamps vm pre-archive-cleanup ${{ inputs.distro-slug }} + + - name: Compress .nox Directory + if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' + run: | + tools --timestamps vm compress-dependencies ${{ inputs.distro-slug }} + + - name: Download Compressed .nox Directory + if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' + run: | + tools --timestamps vm download-dependencies ${{ inputs.distro-slug }} + + - name: Destroy VM + if: always() && steps.nox-dependencies-cache.outputs.cache-hit != 'true' + run: | + tools --timestamps vm destroy --no-wait ${{ inputs.distro-slug }} + + - name: Upload Nox Requirements Tarball + uses: actions/upload-artifact@v3 + with: + name: nox-${{ inputs.distro-slug }}-${{ inputs.nox-session }} + path: nox.${{ inputs.distro-slug }}.tar.* diff --git a/.github/workflows/build-macos-packages.yml b/.github/workflows/build-macos-packages.yml index 22c0684a398..9502286bf56 100644 --- a/.github/workflows/build-macos-packages.yml +++ b/.github/workflows/build-macos-packages.yml @@ -39,6 +39,8 @@ jobs: matrix: arch: - x86_64 + source: + - ${{ inputs.source }} runs-on: - macos-12 diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index f91a7cacd4e..0d838740cea 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -37,6 +37,8 @@ jobs: arch: - x86_64 - aarch64 + source: + - ${{ inputs.source }} container: image: ghcr.io/saltstack/salt-ci-containers/packaging:centosstream-9 diff --git a/.github/workflows/build-windows-packages.yml b/.github/workflows/build-windows-packages.yml index 522966a6b4d..ec2d70dce03 100644 --- a/.github/workflows/build-windows-packages.yml +++ b/.github/workflows/build-windows-packages.yml @@ -41,6 +41,8 @@ jobs: arch: - x86 - amd64 + source: + - ${{ inputs.source }} runs-on: - windows-latest diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5b7c2c399f1..f9af175715d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -462,7 +462,7 @@ jobs: python-version: "3.10.13" build-rpm-pkgs-onedir: - name: Build RPM Packages (onedir) + name: Build Packages if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -475,7 +475,7 @@ jobs: source: "onedir" build-rpm-pkgs-src: - name: Build RPM Packages (src) + name: Build Packages if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -488,7 +488,7 @@ jobs: source: "src" build-deb-pkgs-onedir: - name: Build DEB Packages (onedir) + name: Build Packages if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -501,7 +501,7 @@ jobs: source: "onedir" build-deb-pkgs-src: - name: Build DEB Packages (src) + name: Build Packages if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -514,7 +514,7 @@ jobs: source: "src" build-windows-pkgs-onedir: - name: Build Windows Packages (onedir) + name: Build Packages if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -527,7 +527,7 @@ jobs: source: "onedir" build-windows-pkgs-src: - name: Build Windows Packages (src) + name: Build Packages if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -540,7 +540,7 @@ jobs: source: "src" build-macos-pkgs-onedir: - name: Build macOS Packages (onedir) + name: Build Packages if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -553,7 +553,7 @@ jobs: source: "onedir" build-macos-pkgs-src: - name: Build macOS Packages (src) + name: Build Packages if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -565,12 +565,557 @@ jobs: python-version: "3.10.13" source: "src" + windows-2016-ci-deps: + name: Windows 2016 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: windows-2016 + nox-session: ci-test-onedir + platform: windows + arch: amd64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + windows-2019-ci-deps: + name: Windows 2019 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: windows-2019 + nox-session: ci-test-onedir + platform: windows + arch: amd64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + windows-2022-ci-deps: + name: Windows 2022 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: windows-2022 + nox-session: ci-test-onedir + platform: windows + arch: amd64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + macos-12-ci-deps: + name: macOS 12 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action-macos.yml + with: + distro-slug: macos-12 + nox-session: ci-test-onedir + platform: darwin + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + almalinux-8-ci-deps: + name: Alma Linux 8 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: almalinux-8 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + almalinux-8-arm64-ci-deps: + name: Alma Linux 8 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: almalinux-8-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + almalinux-9-ci-deps: + name: Alma Linux 9 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: almalinux-9 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + almalinux-9-arm64-ci-deps: + name: Alma Linux 9 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: almalinux-9-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + amazonlinux-2-ci-deps: + name: Amazon Linux 2 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: amazonlinux-2 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + amazonlinux-2-arm64-ci-deps: + name: Amazon Linux 2 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: amazonlinux-2-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + archlinux-lts-ci-deps: + name: Arch Linux LTS + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: archlinux-lts + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centos-7-ci-deps: + name: CentOS 7 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centos-7 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centos-7-arm64-ci-deps: + name: CentOS 7 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centos-7-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centosstream-8-ci-deps: + name: CentOS Stream 8 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centosstream-8 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centosstream-8-arm64-ci-deps: + name: CentOS Stream 8 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centosstream-8-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centosstream-9-ci-deps: + name: CentOS Stream 9 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centosstream-9 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centosstream-9-arm64-ci-deps: + name: CentOS Stream 9 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centosstream-9-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + debian-10-ci-deps: + name: Debian 10 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: debian-10 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + debian-11-ci-deps: + name: Debian 11 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: debian-11 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + debian-11-arm64-ci-deps: + name: Debian 11 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: debian-11-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + fedora-37-ci-deps: + name: Fedora 37 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: fedora-37 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + fedora-37-arm64-ci-deps: + name: Fedora 37 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: fedora-37-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + fedora-38-ci-deps: + name: Fedora 38 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: fedora-38 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + fedora-38-arm64-ci-deps: + name: Fedora 38 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: fedora-38-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + opensuse-15-ci-deps: + name: Opensuse 15 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: opensuse-15 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + photonos-3-ci-deps: + name: Photon OS 3 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: photonos-3 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + photonos-4-ci-deps: + name: Photon OS 4 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: photonos-4 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + photonos-4-arm64-ci-deps: + name: Photon OS 4 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: photonos-4-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + ubuntu-2004-ci-deps: + name: Ubuntu 20.04 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: ubuntu-20.04 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + ubuntu-2004-arm64-ci-deps: + name: Ubuntu 20.04 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: ubuntu-20.04-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + ubuntu-2204-ci-deps: + name: Ubuntu 22.04 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: ubuntu-22.04 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + ubuntu-2204-arm64-ci-deps: + name: Ubuntu 22.04 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: ubuntu-22.04-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + amazonlinux-2-pkg-tests: - name: Amazon Linux 2 Package Tests + name: Amazon Linux 2 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-rpm-pkgs-onedir + - amazonlinux-2-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: amazonlinux-2 @@ -580,17 +1125,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centos-7-pkg-tests: - name: CentOS 7 Package Tests + name: CentOS 7 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-rpm-pkgs-onedir + - centos-7-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centos-7 @@ -600,17 +1147,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-8-pkg-tests: - name: CentOS Stream 8 Package Tests + name: CentOS Stream 8 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-rpm-pkgs-onedir + - centosstream-8-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centosstream-8 @@ -620,17 +1169,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-9-pkg-tests: - name: CentOS Stream 9 Package Tests + name: CentOS Stream 9 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-rpm-pkgs-onedir + - centosstream-9-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centosstream-9 @@ -640,17 +1191,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-10-pkg-tests: - name: Debian 10 Package Tests + name: Debian 10 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-deb-pkgs-onedir + - debian-10-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-10 @@ -660,17 +1213,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-pkg-tests: - name: Debian 11 Package Tests + name: Debian 11 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-deb-pkgs-onedir + - debian-11-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-11 @@ -680,17 +1235,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-arm64-pkg-tests: - name: Debian 11 Arm64 Package Tests + name: Debian 11 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-deb-pkgs-onedir + - debian-11-arm64-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-11-arm64 @@ -700,17 +1257,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-3-pkg-tests: - name: Photon OS 3 Package Tests + name: Photon OS 3 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-rpm-pkgs-onedir + - photonos-3-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-3 @@ -720,17 +1279,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-pkg-tests: - name: Photon OS 4 Package Tests + name: Photon OS 4 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-rpm-pkgs-onedir + - photonos-4-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-4 @@ -740,17 +1301,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-arm64-pkg-tests: - name: Photon OS 4 Arm64 Package Tests + name: Photon OS 4 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-rpm-pkgs-onedir + - photonos-4-arm64-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-4-arm64 @@ -760,17 +1323,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-pkg-tests: - name: Ubuntu 20.04 Package Tests + name: Ubuntu 20.04 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-deb-pkgs-onedir + - ubuntu-2004-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-20.04 @@ -780,17 +1345,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-arm64-pkg-tests: - name: Ubuntu 20.04 Arm64 Package Tests + name: Ubuntu 20.04 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-deb-pkgs-onedir + - ubuntu-2004-arm64-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-20.04-arm64 @@ -800,17 +1367,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-pkg-tests: - name: Ubuntu 22.04 Package Tests + name: Ubuntu 22.04 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-deb-pkgs-onedir + - ubuntu-2204-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-22.04 @@ -820,17 +1389,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-arm64-pkg-tests: - name: Ubuntu 22.04 Arm64 Package Tests + name: Ubuntu 22.04 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-deb-pkgs-onedir + - ubuntu-2204-arm64-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-22.04-arm64 @@ -840,17 +1411,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} macos-12-pkg-tests: - name: macOS 12 Package Tests + name: macOS 12 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - build-macos-pkgs-onedir + - macos-12-ci-deps uses: ./.github/workflows/test-packages-action-macos.yml with: distro-slug: macos-12 @@ -860,17 +1433,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: macos nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-nsis-pkg-tests: - name: Windows 2016 NSIS Package Tests + name: Windows 2016 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-windows-pkgs-onedir + - windows-2016-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2016 @@ -880,17 +1455,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: NSIS nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-msi-pkg-tests: - name: Windows 2016 MSI Package Tests + name: Windows 2016 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-windows-pkgs-onedir + - windows-2016-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2016 @@ -900,17 +1477,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: MSI nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-nsis-pkg-tests: - name: Windows 2019 NSIS Package Tests + name: Windows 2019 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-windows-pkgs-onedir + - windows-2019-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2019 @@ -920,17 +1499,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: NSIS nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-msi-pkg-tests: - name: Windows 2019 MSI Package Tests + name: Windows 2019 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-windows-pkgs-onedir + - windows-2019-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2019 @@ -940,17 +1521,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: MSI nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-nsis-pkg-tests: - name: Windows 2022 NSIS Package Tests + name: Windows 2022 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-windows-pkgs-onedir + - windows-2022-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2022 @@ -960,17 +1543,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: NSIS nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-msi-pkg-tests: - name: Windows 2022 MSI Package Tests + name: Windows 2022 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-windows-pkgs-onedir + - windows-2022-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2022 @@ -980,6 +1565,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: MSI nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -990,7 +1576,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - windows-2016-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: windows-2016 @@ -998,6 +1584,7 @@ jobs: platform: windows arch: amd64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1009,7 +1596,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - windows-2019-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: windows-2019 @@ -1017,6 +1604,7 @@ jobs: platform: windows arch: amd64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1028,7 +1616,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - windows-2022-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: windows-2022 @@ -1036,6 +1624,7 @@ jobs: platform: windows arch: amd64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1047,7 +1636,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - macos-12-ci-deps uses: ./.github/workflows/test-action-macos.yml with: distro-slug: macos-12 @@ -1055,6 +1644,7 @@ jobs: platform: darwin arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1066,7 +1656,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - almalinux-8-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: almalinux-8 @@ -1074,6 +1664,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1085,7 +1676,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - almalinux-9-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: almalinux-9 @@ -1093,6 +1684,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1104,7 +1696,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - amazonlinux-2-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: amazonlinux-2 @@ -1112,6 +1704,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1123,7 +1716,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - archlinux-lts-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: archlinux-lts @@ -1131,6 +1724,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1142,7 +1736,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - centos-7-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: centos-7 @@ -1150,6 +1744,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1161,7 +1756,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - centosstream-8-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: centosstream-8 @@ -1169,6 +1764,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1180,7 +1776,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - centosstream-9-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: centosstream-9 @@ -1188,6 +1784,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1199,7 +1796,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - debian-10-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: debian-10 @@ -1207,6 +1804,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1218,7 +1816,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - debian-11-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: debian-11 @@ -1226,6 +1824,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1237,7 +1836,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - debian-11-arm64-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: debian-11-arm64 @@ -1245,6 +1844,7 @@ jobs: platform: linux arch: aarch64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1256,7 +1856,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - fedora-37-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: fedora-37 @@ -1264,6 +1864,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1275,7 +1876,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - fedora-38-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: fedora-38 @@ -1283,6 +1884,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1294,7 +1896,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - opensuse-15-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: opensuse-15 @@ -1302,6 +1904,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1313,7 +1916,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - photonos-3-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: photonos-3 @@ -1321,6 +1924,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1332,7 +1936,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - photonos-4-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: photonos-4 @@ -1340,6 +1944,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1351,7 +1956,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - photonos-4-arm64-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: photonos-4-arm64 @@ -1359,6 +1964,7 @@ jobs: platform: linux arch: aarch64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1370,7 +1976,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - ubuntu-2004-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: ubuntu-20.04 @@ -1378,6 +1984,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1389,7 +1996,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - ubuntu-2004-arm64-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: ubuntu-20.04-arm64 @@ -1397,6 +2004,7 @@ jobs: platform: linux arch: aarch64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1408,7 +2016,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - ubuntu-2204-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: ubuntu-22.04 @@ -1416,6 +2024,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1427,7 +2036,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - ubuntu-2204-arm64-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: ubuntu-22.04-arm64 @@ -1435,6 +2044,7 @@ jobs: platform: linux arch: aarch64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1447,6 +2057,38 @@ jobs: runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "x86_64"]') || 'ubuntu-latest' }} needs: - prepare-workflow + - windows-2016-ci-deps + - windows-2019-ci-deps + - windows-2022-ci-deps + - macos-12-ci-deps + - almalinux-8-ci-deps + - almalinux-8-arm64-ci-deps + - almalinux-9-ci-deps + - almalinux-9-arm64-ci-deps + - amazonlinux-2-ci-deps + - amazonlinux-2-arm64-ci-deps + - archlinux-lts-ci-deps + - centos-7-ci-deps + - centos-7-arm64-ci-deps + - centosstream-8-ci-deps + - centosstream-8-arm64-ci-deps + - centosstream-9-ci-deps + - centosstream-9-arm64-ci-deps + - debian-10-ci-deps + - debian-11-ci-deps + - debian-11-arm64-ci-deps + - fedora-37-ci-deps + - fedora-37-arm64-ci-deps + - fedora-38-ci-deps + - fedora-38-arm64-ci-deps + - opensuse-15-ci-deps + - photonos-3-ci-deps + - photonos-4-ci-deps + - photonos-4-arm64-ci-deps + - ubuntu-2004-ci-deps + - ubuntu-2004-arm64-ci-deps + - ubuntu-2204-ci-deps + - ubuntu-2204-arm64-ci-deps - windows-2016 - windows-2019 - windows-2022 @@ -1523,7 +2165,43 @@ jobs: - build-docs - build-deps-onedir - build-salt-onedir + - build-rpm-pkgs-src + - build-deb-pkgs-src + - build-windows-pkgs-src + - build-macos-pkgs-src - combine-all-code-coverage + - windows-2016-ci-deps + - windows-2019-ci-deps + - windows-2022-ci-deps + - macos-12-ci-deps + - almalinux-8-ci-deps + - almalinux-8-arm64-ci-deps + - almalinux-9-ci-deps + - almalinux-9-arm64-ci-deps + - amazonlinux-2-ci-deps + - amazonlinux-2-arm64-ci-deps + - archlinux-lts-ci-deps + - centos-7-ci-deps + - centos-7-arm64-ci-deps + - centosstream-8-ci-deps + - centosstream-8-arm64-ci-deps + - centosstream-9-ci-deps + - centosstream-9-arm64-ci-deps + - debian-10-ci-deps + - debian-11-ci-deps + - debian-11-arm64-ci-deps + - fedora-37-ci-deps + - fedora-37-arm64-ci-deps + - fedora-38-ci-deps + - fedora-38-arm64-ci-deps + - opensuse-15-ci-deps + - photonos-3-ci-deps + - photonos-4-ci-deps + - photonos-4-arm64-ci-deps + - ubuntu-2004-ci-deps + - ubuntu-2004-arm64-ci-deps + - ubuntu-2204-ci-deps + - ubuntu-2204-arm64-ci-deps - windows-2016 - windows-2019 - windows-2022 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index fa17282a6c1..1df5b0fd696 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -511,7 +511,7 @@ jobs: python-version: "3.10.13" build-rpm-pkgs-onedir: - name: Build RPM Packages (onedir) + name: Build Packages if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -524,7 +524,7 @@ jobs: source: "onedir" build-rpm-pkgs-src: - name: Build RPM Packages (src) + name: Build Packages if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -537,7 +537,7 @@ jobs: source: "src" build-deb-pkgs-onedir: - name: Build DEB Packages (onedir) + name: Build Packages if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -550,7 +550,7 @@ jobs: source: "onedir" build-deb-pkgs-src: - name: Build DEB Packages (src) + name: Build Packages if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -563,7 +563,7 @@ jobs: source: "src" build-windows-pkgs-onedir: - name: Build Windows Packages (onedir) + name: Build Packages if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -579,7 +579,7 @@ jobs: secrets: inherit build-windows-pkgs-src: - name: Build Windows Packages (src) + name: Build Packages if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -595,7 +595,7 @@ jobs: secrets: inherit build-macos-pkgs-onedir: - name: Build macOS Packages (onedir) + name: Build Packages if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -611,7 +611,7 @@ jobs: secrets: inherit build-macos-pkgs-src: - name: Build macOS Packages (src) + name: Build Packages if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -626,12 +626,557 @@ jobs: sign-packages: true secrets: inherit + windows-2016-ci-deps: + name: Windows 2016 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: windows-2016 + nox-session: ci-test-onedir + platform: windows + arch: amd64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + windows-2019-ci-deps: + name: Windows 2019 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: windows-2019 + nox-session: ci-test-onedir + platform: windows + arch: amd64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + windows-2022-ci-deps: + name: Windows 2022 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: windows-2022 + nox-session: ci-test-onedir + platform: windows + arch: amd64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + macos-12-ci-deps: + name: macOS 12 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action-macos.yml + with: + distro-slug: macos-12 + nox-session: ci-test-onedir + platform: darwin + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + almalinux-8-ci-deps: + name: Alma Linux 8 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: almalinux-8 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + almalinux-8-arm64-ci-deps: + name: Alma Linux 8 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: almalinux-8-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + almalinux-9-ci-deps: + name: Alma Linux 9 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: almalinux-9 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + almalinux-9-arm64-ci-deps: + name: Alma Linux 9 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: almalinux-9-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + amazonlinux-2-ci-deps: + name: Amazon Linux 2 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: amazonlinux-2 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + amazonlinux-2-arm64-ci-deps: + name: Amazon Linux 2 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: amazonlinux-2-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + archlinux-lts-ci-deps: + name: Arch Linux LTS + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: archlinux-lts + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centos-7-ci-deps: + name: CentOS 7 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centos-7 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centos-7-arm64-ci-deps: + name: CentOS 7 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centos-7-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centosstream-8-ci-deps: + name: CentOS Stream 8 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centosstream-8 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centosstream-8-arm64-ci-deps: + name: CentOS Stream 8 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centosstream-8-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centosstream-9-ci-deps: + name: CentOS Stream 9 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centosstream-9 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centosstream-9-arm64-ci-deps: + name: CentOS Stream 9 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centosstream-9-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + debian-10-ci-deps: + name: Debian 10 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: debian-10 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + debian-11-ci-deps: + name: Debian 11 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: debian-11 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + debian-11-arm64-ci-deps: + name: Debian 11 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: debian-11-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + fedora-37-ci-deps: + name: Fedora 37 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: fedora-37 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + fedora-37-arm64-ci-deps: + name: Fedora 37 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: fedora-37-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + fedora-38-ci-deps: + name: Fedora 38 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: fedora-38 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + fedora-38-arm64-ci-deps: + name: Fedora 38 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: fedora-38-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + opensuse-15-ci-deps: + name: Opensuse 15 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: opensuse-15 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + photonos-3-ci-deps: + name: Photon OS 3 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: photonos-3 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + photonos-4-ci-deps: + name: Photon OS 4 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: photonos-4 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + photonos-4-arm64-ci-deps: + name: Photon OS 4 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: photonos-4-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + ubuntu-2004-ci-deps: + name: Ubuntu 20.04 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: ubuntu-20.04 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + ubuntu-2004-arm64-ci-deps: + name: Ubuntu 20.04 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: ubuntu-20.04-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + ubuntu-2204-ci-deps: + name: Ubuntu 22.04 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: ubuntu-22.04 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + ubuntu-2204-arm64-ci-deps: + name: Ubuntu 22.04 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: ubuntu-22.04-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + amazonlinux-2-pkg-tests: - name: Amazon Linux 2 Package Tests + name: Amazon Linux 2 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-rpm-pkgs-onedir + - amazonlinux-2-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: amazonlinux-2 @@ -641,17 +1186,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centos-7-pkg-tests: - name: CentOS 7 Package Tests + name: CentOS 7 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-rpm-pkgs-onedir + - centos-7-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centos-7 @@ -661,17 +1208,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-8-pkg-tests: - name: CentOS Stream 8 Package Tests + name: CentOS Stream 8 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-rpm-pkgs-onedir + - centosstream-8-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centosstream-8 @@ -681,17 +1230,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-9-pkg-tests: - name: CentOS Stream 9 Package Tests + name: CentOS Stream 9 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-rpm-pkgs-onedir + - centosstream-9-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centosstream-9 @@ -701,17 +1252,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-10-pkg-tests: - name: Debian 10 Package Tests + name: Debian 10 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-deb-pkgs-onedir + - debian-10-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-10 @@ -721,17 +1274,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-pkg-tests: - name: Debian 11 Package Tests + name: Debian 11 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-deb-pkgs-onedir + - debian-11-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-11 @@ -741,17 +1296,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-arm64-pkg-tests: - name: Debian 11 Arm64 Package Tests + name: Debian 11 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-deb-pkgs-onedir + - debian-11-arm64-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-11-arm64 @@ -761,17 +1318,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-3-pkg-tests: - name: Photon OS 3 Package Tests + name: Photon OS 3 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-rpm-pkgs-onedir + - photonos-3-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-3 @@ -781,17 +1340,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-pkg-tests: - name: Photon OS 4 Package Tests + name: Photon OS 4 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-rpm-pkgs-onedir + - photonos-4-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-4 @@ -801,17 +1362,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-arm64-pkg-tests: - name: Photon OS 4 Arm64 Package Tests + name: Photon OS 4 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-rpm-pkgs-onedir + - photonos-4-arm64-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-4-arm64 @@ -821,17 +1384,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-pkg-tests: - name: Ubuntu 20.04 Package Tests + name: Ubuntu 20.04 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-deb-pkgs-onedir + - ubuntu-2004-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-20.04 @@ -841,17 +1406,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-arm64-pkg-tests: - name: Ubuntu 20.04 Arm64 Package Tests + name: Ubuntu 20.04 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-deb-pkgs-onedir + - ubuntu-2004-arm64-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-20.04-arm64 @@ -861,17 +1428,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-pkg-tests: - name: Ubuntu 22.04 Package Tests + name: Ubuntu 22.04 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-deb-pkgs-onedir + - ubuntu-2204-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-22.04 @@ -881,17 +1450,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-arm64-pkg-tests: - name: Ubuntu 22.04 Arm64 Package Tests + name: Ubuntu 22.04 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-deb-pkgs-onedir + - ubuntu-2204-arm64-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-22.04-arm64 @@ -901,17 +1472,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} macos-12-pkg-tests: - name: macOS 12 Package Tests + name: macOS 12 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - build-macos-pkgs-onedir + - macos-12-ci-deps uses: ./.github/workflows/test-packages-action-macos.yml with: distro-slug: macos-12 @@ -921,17 +1494,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: macos nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-nsis-pkg-tests: - name: Windows 2016 NSIS Package Tests + name: Windows 2016 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-windows-pkgs-onedir + - windows-2016-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2016 @@ -941,17 +1516,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: NSIS nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-msi-pkg-tests: - name: Windows 2016 MSI Package Tests + name: Windows 2016 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-windows-pkgs-onedir + - windows-2016-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2016 @@ -961,17 +1538,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: MSI nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-nsis-pkg-tests: - name: Windows 2019 NSIS Package Tests + name: Windows 2019 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-windows-pkgs-onedir + - windows-2019-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2019 @@ -981,17 +1560,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: NSIS nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-msi-pkg-tests: - name: Windows 2019 MSI Package Tests + name: Windows 2019 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-windows-pkgs-onedir + - windows-2019-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2019 @@ -1001,17 +1582,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: MSI nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-nsis-pkg-tests: - name: Windows 2022 NSIS Package Tests + name: Windows 2022 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-windows-pkgs-onedir + - windows-2022-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2022 @@ -1021,17 +1604,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: NSIS nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-msi-pkg-tests: - name: Windows 2022 MSI Package Tests + name: Windows 2022 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-windows-pkgs-onedir + - windows-2022-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2022 @@ -1041,6 +1626,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: MSI nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false @@ -1051,7 +1637,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - windows-2016-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: windows-2016 @@ -1059,6 +1645,7 @@ jobs: platform: windows arch: amd64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1070,7 +1657,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - windows-2019-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: windows-2019 @@ -1078,6 +1665,7 @@ jobs: platform: windows arch: amd64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1089,7 +1677,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - windows-2022-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: windows-2022 @@ -1097,6 +1685,7 @@ jobs: platform: windows arch: amd64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1108,7 +1697,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - macos-12-ci-deps uses: ./.github/workflows/test-action-macos.yml with: distro-slug: macos-12 @@ -1116,6 +1705,7 @@ jobs: platform: darwin arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1127,7 +1717,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - almalinux-8-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: almalinux-8 @@ -1135,6 +1725,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1146,7 +1737,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - almalinux-9-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: almalinux-9 @@ -1154,6 +1745,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1165,7 +1757,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - amazonlinux-2-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: amazonlinux-2 @@ -1173,6 +1765,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1184,7 +1777,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - archlinux-lts-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: archlinux-lts @@ -1192,6 +1785,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1203,7 +1797,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - centos-7-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: centos-7 @@ -1211,6 +1805,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1222,7 +1817,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - centosstream-8-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: centosstream-8 @@ -1230,6 +1825,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1241,7 +1837,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - centosstream-9-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: centosstream-9 @@ -1249,6 +1845,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1260,7 +1857,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - debian-10-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: debian-10 @@ -1268,6 +1865,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1279,7 +1877,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - debian-11-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: debian-11 @@ -1287,6 +1885,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1298,7 +1897,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - debian-11-arm64-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: debian-11-arm64 @@ -1306,6 +1905,7 @@ jobs: platform: linux arch: aarch64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1317,7 +1917,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - fedora-37-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: fedora-37 @@ -1325,6 +1925,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1336,7 +1937,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - fedora-38-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: fedora-38 @@ -1344,6 +1945,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1355,7 +1957,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - opensuse-15-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: opensuse-15 @@ -1363,6 +1965,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1374,7 +1977,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - photonos-3-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: photonos-3 @@ -1382,6 +1985,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1393,7 +1997,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - photonos-4-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: photonos-4 @@ -1401,6 +2005,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1412,7 +2017,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - photonos-4-arm64-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: photonos-4-arm64 @@ -1420,6 +2025,7 @@ jobs: platform: linux arch: aarch64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1431,7 +2037,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - ubuntu-2004-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: ubuntu-20.04 @@ -1439,6 +2045,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1450,7 +2057,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - ubuntu-2004-arm64-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: ubuntu-20.04-arm64 @@ -1458,6 +2065,7 @@ jobs: platform: linux arch: aarch64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1469,7 +2077,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - ubuntu-2204-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: ubuntu-22.04 @@ -1477,6 +2085,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1488,7 +2097,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - ubuntu-2204-arm64-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: ubuntu-22.04-arm64 @@ -1496,6 +2105,7 @@ jobs: platform: linux arch: aarch64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1508,6 +2118,38 @@ jobs: runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "x86_64"]') || 'ubuntu-latest' }} needs: - prepare-workflow + - windows-2016-ci-deps + - windows-2019-ci-deps + - windows-2022-ci-deps + - macos-12-ci-deps + - almalinux-8-ci-deps + - almalinux-8-arm64-ci-deps + - almalinux-9-ci-deps + - almalinux-9-arm64-ci-deps + - amazonlinux-2-ci-deps + - amazonlinux-2-arm64-ci-deps + - archlinux-lts-ci-deps + - centos-7-ci-deps + - centos-7-arm64-ci-deps + - centosstream-8-ci-deps + - centosstream-8-arm64-ci-deps + - centosstream-9-ci-deps + - centosstream-9-arm64-ci-deps + - debian-10-ci-deps + - debian-11-ci-deps + - debian-11-arm64-ci-deps + - fedora-37-ci-deps + - fedora-37-arm64-ci-deps + - fedora-38-ci-deps + - fedora-38-arm64-ci-deps + - opensuse-15-ci-deps + - photonos-3-ci-deps + - photonos-4-ci-deps + - photonos-4-arm64-ci-deps + - ubuntu-2004-ci-deps + - ubuntu-2004-arm64-ci-deps + - ubuntu-2204-ci-deps + - ubuntu-2204-arm64-ci-deps - windows-2016 - windows-2019 - windows-2022 @@ -2216,6 +2858,38 @@ jobs: - build-windows-repo - build-macos-repo - build-onedir-repo + - windows-2016-ci-deps + - windows-2019-ci-deps + - windows-2022-ci-deps + - macos-12-ci-deps + - almalinux-8-ci-deps + - almalinux-8-arm64-ci-deps + - almalinux-9-ci-deps + - almalinux-9-arm64-ci-deps + - amazonlinux-2-ci-deps + - amazonlinux-2-arm64-ci-deps + - archlinux-lts-ci-deps + - centos-7-ci-deps + - centos-7-arm64-ci-deps + - centosstream-8-ci-deps + - centosstream-8-arm64-ci-deps + - centosstream-9-ci-deps + - centosstream-9-arm64-ci-deps + - debian-10-ci-deps + - debian-11-ci-deps + - debian-11-arm64-ci-deps + - fedora-37-ci-deps + - fedora-37-arm64-ci-deps + - fedora-38-ci-deps + - fedora-38-arm64-ci-deps + - opensuse-15-ci-deps + - photonos-3-ci-deps + - photonos-4-ci-deps + - photonos-4-arm64-ci-deps + - ubuntu-2004-ci-deps + - ubuntu-2004-arm64-ci-deps + - ubuntu-2204-ci-deps + - ubuntu-2204-arm64-ci-deps - windows-2016 - windows-2019 - windows-2022 @@ -2291,6 +2965,10 @@ jobs: - build-docs - build-deps-onedir - build-salt-onedir + - build-rpm-pkgs-src + - build-deb-pkgs-src + - build-windows-pkgs-src + - build-macos-pkgs-src - combine-all-code-coverage - publish-repositories - amazonlinux-2-pkg-tests diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fdfc6123999..4465c05cd46 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -240,6 +240,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -262,6 +263,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -284,6 +286,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -306,6 +309,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -328,6 +332,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -350,6 +355,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -372,6 +378,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -394,6 +401,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -416,6 +424,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -438,6 +447,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -460,6 +470,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -482,6 +493,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -504,6 +516,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -526,6 +539,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -548,6 +562,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -570,6 +585,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -592,6 +608,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -614,6 +631,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -636,6 +654,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -658,6 +677,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -680,6 +700,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -702,6 +723,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -724,6 +746,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -746,6 +769,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -768,6 +792,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -790,6 +815,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -812,6 +838,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: onedir @@ -834,6 +861,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: onedir @@ -857,6 +885,7 @@ jobs: environment: release skip-code-coverage: true nox-version: 2022.8.7 + python-version: "3.10" latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package secrets: inherit @@ -879,6 +908,7 @@ jobs: environment: release skip-code-coverage: true nox-version: 2022.8.7 + python-version: "3.10" latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: onedir secrets: inherit @@ -902,6 +932,7 @@ jobs: environment: release skip-code-coverage: true nox-version: 2022.8.7 + python-version: "3.10" latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" secrets: inherit @@ -924,6 +955,7 @@ jobs: environment: release skip-code-coverage: true nox-version: 2022.8.7 + python-version: "3.10" latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" secrets: inherit @@ -946,6 +978,7 @@ jobs: environment: release skip-code-coverage: true nox-version: 2022.8.7 + python-version: "3.10" latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" secrets: inherit diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 0dda9405bd7..461325d6122 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -496,7 +496,7 @@ jobs: python-version: "3.10.13" build-rpm-pkgs-onedir: - name: Build RPM Packages (onedir) + name: Build Packages if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -509,7 +509,7 @@ jobs: source: "onedir" build-rpm-pkgs-src: - name: Build RPM Packages (src) + name: Build Packages if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -522,7 +522,7 @@ jobs: source: "src" build-deb-pkgs-onedir: - name: Build DEB Packages (onedir) + name: Build Packages if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -535,7 +535,7 @@ jobs: source: "onedir" build-deb-pkgs-src: - name: Build DEB Packages (src) + name: Build Packages if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -548,7 +548,7 @@ jobs: source: "src" build-windows-pkgs-onedir: - name: Build Windows Packages (onedir) + name: Build Packages if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -561,7 +561,7 @@ jobs: source: "onedir" build-windows-pkgs-src: - name: Build Windows Packages (src) + name: Build Packages if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -574,7 +574,7 @@ jobs: source: "src" build-macos-pkgs-onedir: - name: Build macOS Packages (onedir) + name: Build Packages if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -587,7 +587,7 @@ jobs: source: "onedir" build-macos-pkgs-src: - name: Build macOS Packages (src) + name: Build Packages if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -599,12 +599,557 @@ jobs: python-version: "3.10.13" source: "src" + windows-2016-ci-deps: + name: Windows 2016 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: windows-2016 + nox-session: ci-test-onedir + platform: windows + arch: amd64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + windows-2019-ci-deps: + name: Windows 2019 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: windows-2019 + nox-session: ci-test-onedir + platform: windows + arch: amd64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + windows-2022-ci-deps: + name: Windows 2022 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: windows-2022 + nox-session: ci-test-onedir + platform: windows + arch: amd64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + macos-12-ci-deps: + name: macOS 12 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action-macos.yml + with: + distro-slug: macos-12 + nox-session: ci-test-onedir + platform: darwin + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + almalinux-8-ci-deps: + name: Alma Linux 8 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: almalinux-8 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + almalinux-8-arm64-ci-deps: + name: Alma Linux 8 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: almalinux-8-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + almalinux-9-ci-deps: + name: Alma Linux 9 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: almalinux-9 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + almalinux-9-arm64-ci-deps: + name: Alma Linux 9 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: almalinux-9-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + amazonlinux-2-ci-deps: + name: Amazon Linux 2 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: amazonlinux-2 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + amazonlinux-2-arm64-ci-deps: + name: Amazon Linux 2 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: amazonlinux-2-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + archlinux-lts-ci-deps: + name: Arch Linux LTS + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: archlinux-lts + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centos-7-ci-deps: + name: CentOS 7 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centos-7 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centos-7-arm64-ci-deps: + name: CentOS 7 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centos-7-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centosstream-8-ci-deps: + name: CentOS Stream 8 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centosstream-8 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centosstream-8-arm64-ci-deps: + name: CentOS Stream 8 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centosstream-8-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centosstream-9-ci-deps: + name: CentOS Stream 9 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centosstream-9 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centosstream-9-arm64-ci-deps: + name: CentOS Stream 9 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centosstream-9-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + debian-10-ci-deps: + name: Debian 10 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: debian-10 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + debian-11-ci-deps: + name: Debian 11 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: debian-11 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + debian-11-arm64-ci-deps: + name: Debian 11 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: debian-11-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + fedora-37-ci-deps: + name: Fedora 37 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: fedora-37 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + fedora-37-arm64-ci-deps: + name: Fedora 37 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: fedora-37-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + fedora-38-ci-deps: + name: Fedora 38 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: fedora-38 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + fedora-38-arm64-ci-deps: + name: Fedora 38 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: fedora-38-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + opensuse-15-ci-deps: + name: Opensuse 15 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: opensuse-15 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + photonos-3-ci-deps: + name: Photon OS 3 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: photonos-3 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + photonos-4-ci-deps: + name: Photon OS 4 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: photonos-4 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + photonos-4-arm64-ci-deps: + name: Photon OS 4 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: photonos-4-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + ubuntu-2004-ci-deps: + name: Ubuntu 20.04 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: ubuntu-20.04 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + ubuntu-2004-arm64-ci-deps: + name: Ubuntu 20.04 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: ubuntu-20.04-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + ubuntu-2204-ci-deps: + name: Ubuntu 22.04 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: ubuntu-22.04 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + ubuntu-2204-arm64-ci-deps: + name: Ubuntu 22.04 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: ubuntu-22.04-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + amazonlinux-2-pkg-tests: - name: Amazon Linux 2 Package Tests + name: Amazon Linux 2 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-rpm-pkgs-onedir + - amazonlinux-2-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: amazonlinux-2 @@ -614,17 +1159,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centos-7-pkg-tests: - name: CentOS 7 Package Tests + name: CentOS 7 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-rpm-pkgs-onedir + - centos-7-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centos-7 @@ -634,17 +1181,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-8-pkg-tests: - name: CentOS Stream 8 Package Tests + name: CentOS Stream 8 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-rpm-pkgs-onedir + - centosstream-8-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centosstream-8 @@ -654,17 +1203,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-9-pkg-tests: - name: CentOS Stream 9 Package Tests + name: CentOS Stream 9 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-rpm-pkgs-onedir + - centosstream-9-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centosstream-9 @@ -674,17 +1225,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-10-pkg-tests: - name: Debian 10 Package Tests + name: Debian 10 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-deb-pkgs-onedir + - debian-10-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-10 @@ -694,17 +1247,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-pkg-tests: - name: Debian 11 Package Tests + name: Debian 11 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-deb-pkgs-onedir + - debian-11-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-11 @@ -714,17 +1269,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-arm64-pkg-tests: - name: Debian 11 Arm64 Package Tests + name: Debian 11 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-deb-pkgs-onedir + - debian-11-arm64-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-11-arm64 @@ -734,17 +1291,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-3-pkg-tests: - name: Photon OS 3 Package Tests + name: Photon OS 3 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-rpm-pkgs-onedir + - photonos-3-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-3 @@ -754,17 +1313,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-pkg-tests: - name: Photon OS 4 Package Tests + name: Photon OS 4 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-rpm-pkgs-onedir + - photonos-4-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-4 @@ -774,17 +1335,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-arm64-pkg-tests: - name: Photon OS 4 Arm64 Package Tests + name: Photon OS 4 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-rpm-pkgs-onedir + - photonos-4-arm64-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-4-arm64 @@ -794,17 +1357,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-pkg-tests: - name: Ubuntu 20.04 Package Tests + name: Ubuntu 20.04 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-deb-pkgs-onedir + - ubuntu-2004-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-20.04 @@ -814,17 +1379,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-arm64-pkg-tests: - name: Ubuntu 20.04 Arm64 Package Tests + name: Ubuntu 20.04 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-deb-pkgs-onedir + - ubuntu-2004-arm64-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-20.04-arm64 @@ -834,17 +1401,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-pkg-tests: - name: Ubuntu 22.04 Package Tests + name: Ubuntu 22.04 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-deb-pkgs-onedir + - ubuntu-2204-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-22.04 @@ -854,17 +1423,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-arm64-pkg-tests: - name: Ubuntu 22.04 Arm64 Package Tests + name: Ubuntu 22.04 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-deb-pkgs-onedir + - ubuntu-2204-arm64-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-22.04-arm64 @@ -874,17 +1445,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} macos-12-pkg-tests: - name: macOS 12 Package Tests + name: macOS 12 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - build-macos-pkgs-onedir + - macos-12-ci-deps uses: ./.github/workflows/test-packages-action-macos.yml with: distro-slug: macos-12 @@ -894,17 +1467,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: macos nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-nsis-pkg-tests: - name: Windows 2016 NSIS Package Tests + name: Windows 2016 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-windows-pkgs-onedir + - windows-2016-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2016 @@ -914,17 +1489,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: NSIS nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-msi-pkg-tests: - name: Windows 2016 MSI Package Tests + name: Windows 2016 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-windows-pkgs-onedir + - windows-2016-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2016 @@ -934,17 +1511,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: MSI nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-nsis-pkg-tests: - name: Windows 2019 NSIS Package Tests + name: Windows 2019 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-windows-pkgs-onedir + - windows-2019-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2019 @@ -954,17 +1533,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: NSIS nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-msi-pkg-tests: - name: Windows 2019 MSI Package Tests + name: Windows 2019 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-windows-pkgs-onedir + - windows-2019-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2019 @@ -974,17 +1555,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: MSI nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-nsis-pkg-tests: - name: Windows 2022 NSIS Package Tests + name: Windows 2022 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-windows-pkgs-onedir + - windows-2022-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2022 @@ -994,17 +1577,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: NSIS nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-msi-pkg-tests: - name: Windows 2022 MSI Package Tests + name: Windows 2022 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-windows-pkgs-onedir + - windows-2022-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2022 @@ -1014,6 +1599,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: MSI nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false @@ -1024,7 +1610,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - windows-2016-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: windows-2016 @@ -1032,6 +1618,7 @@ jobs: platform: windows arch: amd64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1043,7 +1630,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - windows-2019-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: windows-2019 @@ -1051,6 +1638,7 @@ jobs: platform: windows arch: amd64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1062,7 +1650,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - windows-2022-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: windows-2022 @@ -1070,6 +1658,7 @@ jobs: platform: windows arch: amd64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1081,7 +1670,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - macos-12-ci-deps uses: ./.github/workflows/test-action-macos.yml with: distro-slug: macos-12 @@ -1089,6 +1678,7 @@ jobs: platform: darwin arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1100,7 +1690,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - almalinux-8-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: almalinux-8 @@ -1108,6 +1698,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1119,7 +1710,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - almalinux-9-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: almalinux-9 @@ -1127,6 +1718,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1138,7 +1730,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - amazonlinux-2-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: amazonlinux-2 @@ -1146,6 +1738,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1157,7 +1750,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - archlinux-lts-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: archlinux-lts @@ -1165,6 +1758,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1176,7 +1770,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - centos-7-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: centos-7 @@ -1184,6 +1778,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1195,7 +1790,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - centosstream-8-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: centosstream-8 @@ -1203,6 +1798,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1214,7 +1810,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - centosstream-9-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: centosstream-9 @@ -1222,6 +1818,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1233,7 +1830,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - debian-10-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: debian-10 @@ -1241,6 +1838,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1252,7 +1850,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - debian-11-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: debian-11 @@ -1260,6 +1858,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1271,7 +1870,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - debian-11-arm64-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: debian-11-arm64 @@ -1279,6 +1878,7 @@ jobs: platform: linux arch: aarch64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1290,7 +1890,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - fedora-37-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: fedora-37 @@ -1298,6 +1898,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1309,7 +1910,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - fedora-38-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: fedora-38 @@ -1317,6 +1918,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1328,7 +1930,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - opensuse-15-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: opensuse-15 @@ -1336,6 +1938,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1347,7 +1950,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - photonos-3-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: photonos-3 @@ -1355,6 +1958,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1366,7 +1970,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - photonos-4-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: photonos-4 @@ -1374,6 +1978,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1385,7 +1990,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - photonos-4-arm64-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: photonos-4-arm64 @@ -1393,6 +1998,7 @@ jobs: platform: linux arch: aarch64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1404,7 +2010,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - ubuntu-2004-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: ubuntu-20.04 @@ -1412,6 +2018,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1423,7 +2030,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - ubuntu-2004-arm64-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: ubuntu-20.04-arm64 @@ -1431,6 +2038,7 @@ jobs: platform: linux arch: aarch64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1442,7 +2050,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - ubuntu-2204-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: ubuntu-22.04 @@ -1450,6 +2058,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1461,7 +2070,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - ubuntu-2204-arm64-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: ubuntu-22.04-arm64 @@ -1469,6 +2078,7 @@ jobs: platform: linux arch: aarch64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1481,6 +2091,38 @@ jobs: runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "x86_64"]') || 'ubuntu-latest' }} needs: - prepare-workflow + - windows-2016-ci-deps + - windows-2019-ci-deps + - windows-2022-ci-deps + - macos-12-ci-deps + - almalinux-8-ci-deps + - almalinux-8-arm64-ci-deps + - almalinux-9-ci-deps + - almalinux-9-arm64-ci-deps + - amazonlinux-2-ci-deps + - amazonlinux-2-arm64-ci-deps + - archlinux-lts-ci-deps + - centos-7-ci-deps + - centos-7-arm64-ci-deps + - centosstream-8-ci-deps + - centosstream-8-arm64-ci-deps + - centosstream-9-ci-deps + - centosstream-9-arm64-ci-deps + - debian-10-ci-deps + - debian-11-ci-deps + - debian-11-arm64-ci-deps + - fedora-37-ci-deps + - fedora-37-arm64-ci-deps + - fedora-38-ci-deps + - fedora-38-arm64-ci-deps + - opensuse-15-ci-deps + - photonos-3-ci-deps + - photonos-4-ci-deps + - photonos-4-arm64-ci-deps + - ubuntu-2004-ci-deps + - ubuntu-2004-arm64-ci-deps + - ubuntu-2204-ci-deps + - ubuntu-2204-arm64-ci-deps - windows-2016 - windows-2019 - windows-2022 @@ -1559,7 +2201,43 @@ jobs: - build-docs - build-deps-onedir - build-salt-onedir + - build-rpm-pkgs-src + - build-deb-pkgs-src + - build-windows-pkgs-src + - build-macos-pkgs-src - combine-all-code-coverage + - windows-2016-ci-deps + - windows-2019-ci-deps + - windows-2022-ci-deps + - macos-12-ci-deps + - almalinux-8-ci-deps + - almalinux-8-arm64-ci-deps + - almalinux-9-ci-deps + - almalinux-9-arm64-ci-deps + - amazonlinux-2-ci-deps + - amazonlinux-2-arm64-ci-deps + - archlinux-lts-ci-deps + - centos-7-ci-deps + - centos-7-arm64-ci-deps + - centosstream-8-ci-deps + - centosstream-8-arm64-ci-deps + - centosstream-9-ci-deps + - centosstream-9-arm64-ci-deps + - debian-10-ci-deps + - debian-11-ci-deps + - debian-11-arm64-ci-deps + - fedora-37-ci-deps + - fedora-37-arm64-ci-deps + - fedora-38-ci-deps + - fedora-38-arm64-ci-deps + - opensuse-15-ci-deps + - photonos-3-ci-deps + - photonos-4-ci-deps + - photonos-4-arm64-ci-deps + - ubuntu-2004-ci-deps + - ubuntu-2004-arm64-ci-deps + - ubuntu-2204-ci-deps + - ubuntu-2204-arm64-ci-deps - windows-2016 - windows-2019 - windows-2022 diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 3d8dd855c3a..78cc3c03c10 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -506,7 +506,7 @@ jobs: python-version: "3.10.13" build-rpm-pkgs-onedir: - name: Build RPM Packages (onedir) + name: Build Packages if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -519,7 +519,7 @@ jobs: source: "onedir" build-rpm-pkgs-src: - name: Build RPM Packages (src) + name: Build Packages if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -532,7 +532,7 @@ jobs: source: "src" build-deb-pkgs-onedir: - name: Build DEB Packages (onedir) + name: Build Packages if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -545,7 +545,7 @@ jobs: source: "onedir" build-deb-pkgs-src: - name: Build DEB Packages (src) + name: Build Packages if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -558,7 +558,7 @@ jobs: source: "src" build-windows-pkgs-onedir: - name: Build Windows Packages (onedir) + name: Build Packages if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -574,7 +574,7 @@ jobs: secrets: inherit build-windows-pkgs-src: - name: Build Windows Packages (src) + name: Build Packages if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -590,7 +590,7 @@ jobs: secrets: inherit build-macos-pkgs-onedir: - name: Build macOS Packages (onedir) + name: Build Packages if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -606,7 +606,7 @@ jobs: secrets: inherit build-macos-pkgs-src: - name: Build macOS Packages (src) + name: Build Packages if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -621,12 +621,557 @@ jobs: sign-packages: true secrets: inherit + windows-2016-ci-deps: + name: Windows 2016 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: windows-2016 + nox-session: ci-test-onedir + platform: windows + arch: amd64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + windows-2019-ci-deps: + name: Windows 2019 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: windows-2019 + nox-session: ci-test-onedir + platform: windows + arch: amd64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + windows-2022-ci-deps: + name: Windows 2022 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: windows-2022 + nox-session: ci-test-onedir + platform: windows + arch: amd64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + macos-12-ci-deps: + name: macOS 12 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action-macos.yml + with: + distro-slug: macos-12 + nox-session: ci-test-onedir + platform: darwin + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + almalinux-8-ci-deps: + name: Alma Linux 8 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: almalinux-8 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + almalinux-8-arm64-ci-deps: + name: Alma Linux 8 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: almalinux-8-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + almalinux-9-ci-deps: + name: Alma Linux 9 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: almalinux-9 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + almalinux-9-arm64-ci-deps: + name: Alma Linux 9 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: almalinux-9-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + amazonlinux-2-ci-deps: + name: Amazon Linux 2 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: amazonlinux-2 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + amazonlinux-2-arm64-ci-deps: + name: Amazon Linux 2 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: amazonlinux-2-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + archlinux-lts-ci-deps: + name: Arch Linux LTS + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: archlinux-lts + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centos-7-ci-deps: + name: CentOS 7 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centos-7 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centos-7-arm64-ci-deps: + name: CentOS 7 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centos-7-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centosstream-8-ci-deps: + name: CentOS Stream 8 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centosstream-8 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centosstream-8-arm64-ci-deps: + name: CentOS Stream 8 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centosstream-8-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centosstream-9-ci-deps: + name: CentOS Stream 9 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centosstream-9 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centosstream-9-arm64-ci-deps: + name: CentOS Stream 9 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centosstream-9-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + debian-10-ci-deps: + name: Debian 10 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: debian-10 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + debian-11-ci-deps: + name: Debian 11 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: debian-11 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + debian-11-arm64-ci-deps: + name: Debian 11 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: debian-11-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + fedora-37-ci-deps: + name: Fedora 37 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: fedora-37 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + fedora-37-arm64-ci-deps: + name: Fedora 37 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: fedora-37-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + fedora-38-ci-deps: + name: Fedora 38 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: fedora-38 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + fedora-38-arm64-ci-deps: + name: Fedora 38 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: fedora-38-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + opensuse-15-ci-deps: + name: Opensuse 15 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: opensuse-15 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + photonos-3-ci-deps: + name: Photon OS 3 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: photonos-3 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + photonos-4-ci-deps: + name: Photon OS 4 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: photonos-4 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + photonos-4-arm64-ci-deps: + name: Photon OS 4 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: photonos-4-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + ubuntu-2004-ci-deps: + name: Ubuntu 20.04 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: ubuntu-20.04 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + ubuntu-2004-arm64-ci-deps: + name: Ubuntu 20.04 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: ubuntu-20.04-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + ubuntu-2204-ci-deps: + name: Ubuntu 22.04 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: ubuntu-22.04 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + ubuntu-2204-arm64-ci-deps: + name: Ubuntu 22.04 Arm64 + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: ubuntu-22.04-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + amazonlinux-2-pkg-tests: - name: Amazon Linux 2 Package Tests + name: Amazon Linux 2 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-rpm-pkgs-onedir + - amazonlinux-2-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: amazonlinux-2 @@ -636,17 +1181,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centos-7-pkg-tests: - name: CentOS 7 Package Tests + name: CentOS 7 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-rpm-pkgs-onedir + - centos-7-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centos-7 @@ -656,17 +1203,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-8-pkg-tests: - name: CentOS Stream 8 Package Tests + name: CentOS Stream 8 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-rpm-pkgs-onedir + - centosstream-8-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centosstream-8 @@ -676,17 +1225,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-9-pkg-tests: - name: CentOS Stream 9 Package Tests + name: CentOS Stream 9 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-rpm-pkgs-onedir + - centosstream-9-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: centosstream-9 @@ -696,17 +1247,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-10-pkg-tests: - name: Debian 10 Package Tests + name: Debian 10 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-deb-pkgs-onedir + - debian-10-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-10 @@ -716,17 +1269,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-pkg-tests: - name: Debian 11 Package Tests + name: Debian 11 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-deb-pkgs-onedir + - debian-11-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-11 @@ -736,17 +1291,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-arm64-pkg-tests: - name: Debian 11 Arm64 Package Tests + name: Debian 11 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-deb-pkgs-onedir + - debian-11-arm64-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: debian-11-arm64 @@ -756,17 +1313,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-3-pkg-tests: - name: Photon OS 3 Package Tests + name: Photon OS 3 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-rpm-pkgs-onedir + - photonos-3-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-3 @@ -776,17 +1335,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-pkg-tests: - name: Photon OS 4 Package Tests + name: Photon OS 4 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-rpm-pkgs-onedir + - photonos-4-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-4 @@ -796,17 +1357,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-arm64-pkg-tests: - name: Photon OS 4 Arm64 Package Tests + name: Photon OS 4 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-rpm-pkgs-onedir + - photonos-4-arm64-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: photonos-4-arm64 @@ -816,17 +1379,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-pkg-tests: - name: Ubuntu 20.04 Package Tests + name: Ubuntu 20.04 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-deb-pkgs-onedir + - ubuntu-2004-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-20.04 @@ -836,17 +1401,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-arm64-pkg-tests: - name: Ubuntu 20.04 Arm64 Package Tests + name: Ubuntu 20.04 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-deb-pkgs-onedir + - ubuntu-2004-arm64-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-20.04-arm64 @@ -856,17 +1423,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-pkg-tests: - name: Ubuntu 22.04 Package Tests + name: Ubuntu 22.04 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-deb-pkgs-onedir + - ubuntu-2204-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-22.04 @@ -876,17 +1445,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-arm64-pkg-tests: - name: Ubuntu 22.04 Arm64 Package Tests + name: Ubuntu 22.04 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-deb-pkgs-onedir + - ubuntu-2204-arm64-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: ubuntu-22.04-arm64 @@ -896,17 +1467,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} macos-12-pkg-tests: - name: macOS 12 Package Tests + name: macOS 12 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - build-macos-pkgs-onedir + - macos-12-ci-deps uses: ./.github/workflows/test-packages-action-macos.yml with: distro-slug: macos-12 @@ -916,17 +1489,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: macos nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-nsis-pkg-tests: - name: Windows 2016 NSIS Package Tests + name: Windows 2016 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-windows-pkgs-onedir + - windows-2016-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2016 @@ -936,17 +1511,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: NSIS nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-msi-pkg-tests: - name: Windows 2016 MSI Package Tests + name: Windows 2016 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-windows-pkgs-onedir + - windows-2016-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2016 @@ -956,17 +1533,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: MSI nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-nsis-pkg-tests: - name: Windows 2019 NSIS Package Tests + name: Windows 2019 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-windows-pkgs-onedir + - windows-2019-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2019 @@ -976,17 +1555,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: NSIS nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-msi-pkg-tests: - name: Windows 2019 MSI Package Tests + name: Windows 2019 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-windows-pkgs-onedir + - windows-2019-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2019 @@ -996,17 +1577,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: MSI nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-nsis-pkg-tests: - name: Windows 2022 NSIS Package Tests + name: Windows 2022 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-windows-pkgs-onedir + - windows-2022-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2022 @@ -1016,17 +1599,19 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: NSIS nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-msi-pkg-tests: - name: Windows 2022 MSI Package Tests + name: Windows 2022 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-windows-pkgs-onedir + - windows-2022-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: windows-2022 @@ -1036,6 +1621,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: MSI nox-version: 2022.8.7 + python-version: "3.10" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true @@ -1046,7 +1632,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - windows-2016-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: windows-2016 @@ -1054,6 +1640,7 @@ jobs: platform: windows arch: amd64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1065,7 +1652,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - windows-2019-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: windows-2019 @@ -1073,6 +1660,7 @@ jobs: platform: windows arch: amd64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1084,7 +1672,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - windows-2022-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: windows-2022 @@ -1092,6 +1680,7 @@ jobs: platform: windows arch: amd64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1103,7 +1692,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - macos-12-ci-deps uses: ./.github/workflows/test-action-macos.yml with: distro-slug: macos-12 @@ -1111,6 +1700,7 @@ jobs: platform: darwin arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1122,7 +1712,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - almalinux-8-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: almalinux-8 @@ -1130,6 +1720,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1141,7 +1732,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - almalinux-9-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: almalinux-9 @@ -1149,6 +1740,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1160,7 +1752,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - amazonlinux-2-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: amazonlinux-2 @@ -1168,6 +1760,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1179,7 +1772,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - archlinux-lts-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: archlinux-lts @@ -1187,6 +1780,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1198,7 +1792,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - centos-7-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: centos-7 @@ -1206,6 +1800,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1217,7 +1812,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - centosstream-8-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: centosstream-8 @@ -1225,6 +1820,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1236,7 +1832,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - centosstream-9-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: centosstream-9 @@ -1244,6 +1840,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1255,7 +1852,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - debian-10-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: debian-10 @@ -1263,6 +1860,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1274,7 +1872,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - debian-11-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: debian-11 @@ -1282,6 +1880,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1293,7 +1892,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - debian-11-arm64-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: debian-11-arm64 @@ -1301,6 +1900,7 @@ jobs: platform: linux arch: aarch64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1312,7 +1912,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - fedora-37-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: fedora-37 @@ -1320,6 +1920,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1331,7 +1932,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - fedora-38-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: fedora-38 @@ -1339,6 +1940,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1350,7 +1952,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - opensuse-15-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: opensuse-15 @@ -1358,6 +1960,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1369,7 +1972,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - photonos-3-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: photonos-3 @@ -1377,6 +1980,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1388,7 +1992,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - photonos-4-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: photonos-4 @@ -1396,6 +2000,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1407,7 +2012,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - photonos-4-arm64-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: photonos-4-arm64 @@ -1415,6 +2020,7 @@ jobs: platform: linux arch: aarch64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1426,7 +2032,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - ubuntu-2004-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: ubuntu-20.04 @@ -1434,6 +2040,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1445,7 +2052,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - ubuntu-2004-arm64-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: ubuntu-20.04-arm64 @@ -1453,6 +2060,7 @@ jobs: platform: linux arch: aarch64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1464,7 +2072,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - ubuntu-2204-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: ubuntu-22.04 @@ -1472,6 +2080,7 @@ jobs: platform: linux arch: x86_64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -1483,7 +2092,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - ubuntu-2204-arm64-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: ubuntu-22.04-arm64 @@ -1491,6 +2100,7 @@ jobs: platform: linux arch: aarch64 nox-version: 2022.8.7 + python-version: "3.10" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 @@ -2260,6 +2870,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -2281,6 +2892,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -2302,6 +2914,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -2323,6 +2936,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -2344,6 +2958,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -2365,6 +2980,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -2386,6 +3002,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -2407,6 +3024,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -2428,6 +3046,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -2449,6 +3068,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -2470,6 +3090,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -2491,6 +3112,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -2512,6 +3134,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -2533,6 +3156,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -2554,6 +3178,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -2575,6 +3200,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -2596,6 +3222,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -2617,6 +3244,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -2638,6 +3266,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -2659,6 +3288,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -2680,6 +3310,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -2701,6 +3332,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -2722,6 +3354,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -2743,6 +3376,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -2764,6 +3398,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -2785,6 +3420,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package @@ -2806,6 +3442,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: onedir @@ -2827,6 +3464,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging nox-version: 2022.8.7 + python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: onedir @@ -2849,6 +3487,7 @@ jobs: environment: staging skip-code-coverage: true nox-version: 2022.8.7 + python-version: "3.10" latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: package secrets: inherit @@ -2870,6 +3509,7 @@ jobs: environment: staging skip-code-coverage: true nox-version: 2022.8.7 + python-version: "3.10" latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: onedir secrets: inherit @@ -2892,6 +3532,7 @@ jobs: environment: staging skip-code-coverage: true nox-version: 2022.8.7 + python-version: "3.10" latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" secrets: inherit @@ -2913,6 +3554,7 @@ jobs: environment: staging skip-code-coverage: true nox-version: 2022.8.7 + python-version: "3.10" latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" secrets: inherit @@ -2934,6 +3576,7 @@ jobs: environment: staging skip-code-coverage: true nox-version: 2022.8.7 + python-version: "3.10" latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" secrets: inherit @@ -2943,6 +3586,38 @@ jobs: needs: - prepare-workflow - upload-release-artifacts + - windows-2016-ci-deps + - windows-2019-ci-deps + - windows-2022-ci-deps + - macos-12-ci-deps + - almalinux-8-ci-deps + - almalinux-8-arm64-ci-deps + - almalinux-9-ci-deps + - almalinux-9-arm64-ci-deps + - amazonlinux-2-ci-deps + - amazonlinux-2-arm64-ci-deps + - archlinux-lts-ci-deps + - centos-7-ci-deps + - centos-7-arm64-ci-deps + - centosstream-8-ci-deps + - centosstream-8-arm64-ci-deps + - centosstream-9-ci-deps + - centosstream-9-arm64-ci-deps + - debian-10-ci-deps + - debian-11-ci-deps + - debian-11-arm64-ci-deps + - fedora-37-ci-deps + - fedora-37-arm64-ci-deps + - fedora-38-ci-deps + - fedora-38-arm64-ci-deps + - opensuse-15-ci-deps + - photonos-3-ci-deps + - photonos-4-ci-deps + - photonos-4-arm64-ci-deps + - ubuntu-2004-ci-deps + - ubuntu-2004-arm64-ci-deps + - ubuntu-2204-ci-deps + - ubuntu-2204-arm64-ci-deps - windows-2016 - windows-2019 - windows-2022 @@ -3082,6 +3757,10 @@ jobs: - build-docs - build-deps-onedir - build-salt-onedir + - build-rpm-pkgs-src + - build-deb-pkgs-src + - build-windows-pkgs-src + - build-macos-pkgs-src - publish-repositories - upload-release-artifacts - publish-pypi diff --git a/.github/workflows/templates/build-ci-deps.yml.jinja b/.github/workflows/templates/build-ci-deps.yml.jinja new file mode 100644 index 00000000000..928128140a5 --- /dev/null +++ b/.github/workflows/templates/build-ci-deps.yml.jinja @@ -0,0 +1,95 @@ + + <%- for slug, display_name, arch in (("windows-2016", "Windows 2016", "amd64"), + ("windows-2019", "Windows 2019", "amd64"), + ("windows-2022", "Windows 2022", "amd64")) %> + + <{ slug.replace(".", "") }>-ci-deps: + <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> + name: <{ display_name }> + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: <{ slug }> + nox-session: ci-test-onedir + platform: windows + arch: amd64 + nox-version: <{ nox_version }> + python-version: "<{ gh_actions_workflows_python_version }>" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }> + + <%- endfor %> + + <%- for slug, display_name, arch in (("macos-12", "macOS 12", "x86_64"),) %> + + <{ slug.replace(".", "") }>-ci-deps: + <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> + name: <{ display_name }> + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action-macos.yml + with: + distro-slug: <{ slug }> + nox-session: ci-test-onedir + platform: darwin + arch: x86_64 + nox-version: <{ nox_version }> + python-version: "<{ gh_actions_workflows_python_version }>" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }> + + <%- endfor %> + + <%- for slug, display_name, arch in (("almalinux-8", "Alma Linux 8", "x86_64"), + ("almalinux-8-arm64", "Alma Linux 8 Arm64", "aarch64"), + ("almalinux-9", "Alma Linux 9", "x86_64"), + ("almalinux-9-arm64", "Alma Linux 9 Arm64", "aarch64"), + ("amazonlinux-2", "Amazon Linux 2", "x86_64"), + ("amazonlinux-2-arm64", "Amazon Linux 2 Arm64", "aarch64"), + ("archlinux-lts", "Arch Linux LTS", "x86_64"), + ("centos-7", "CentOS 7", "x86_64"), + ("centos-7-arm64", "CentOS 7 Arm64", "aarch64"), + ("centosstream-8", "CentOS Stream 8", "x86_64"), + ("centosstream-8-arm64", "CentOS Stream 8 Arm64", "aarch64"), + ("centosstream-9", "CentOS Stream 9", "x86_64"), + ("centosstream-9-arm64", "CentOS Stream 9 Arm64", "aarch64"), + ("debian-10", "Debian 10", "x86_64"), + ("debian-11", "Debian 11", "x86_64"), + ("debian-11-arm64", "Debian 11 Arm64", "aarch64"), + ("fedora-37", "Fedora 37", "x86_64"), + ("fedora-37-arm64", "Fedora 37 Arm64", "aarch64"), + ("fedora-38", "Fedora 38", "x86_64"), + ("fedora-38-arm64", "Fedora 38 Arm64", "aarch64"), + ("opensuse-15", "Opensuse 15", "x86_64"), + ("photonos-3", "Photon OS 3", "x86_64"), + ("photonos-4", "Photon OS 4", "x86_64"), + ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64"), + ("ubuntu-20.04", "Ubuntu 20.04", "x86_64"), + ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64"), + ("ubuntu-22.04", "Ubuntu 22.04", "x86_64"), + ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64")) %> + + <{ slug.replace(".", "") }>-ci-deps: + <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> + name: <{ display_name }> + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: <{ slug }> + nox-session: ci-test-onedir + platform: linux + arch: <{ arch }> + nox-version: <{ nox_version }> + python-version: "<{ gh_actions_workflows_python_version }>" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }> + + <%- endfor %> diff --git a/.github/workflows/templates/build-packages.yml.jinja b/.github/workflows/templates/build-packages.yml.jinja index 7c33f9e217f..929bac1109b 100644 --- a/.github/workflows/templates/build-packages.yml.jinja +++ b/.github/workflows/templates/build-packages.yml.jinja @@ -7,9 +7,12 @@ <%- for backend in ("onedir", "src") %> <%- set job_name = "build-{}-pkgs-{}".format(pkg_type, backend) %> + <%- if backend == "src" %> + <%- do conclusion_needs.append(job_name) %> + <%- endif %> <{ job_name }>: - name: Build <{ display_name }> Packages (<{ backend }>) + name: Build Packages if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['<{ runner_type }>'] }} needs: - prepare-workflow diff --git a/.github/workflows/templates/ci.yml.jinja b/.github/workflows/templates/ci.yml.jinja index 3730cccd333..c5d5facd6d5 100644 --- a/.github/workflows/templates/ci.yml.jinja +++ b/.github/workflows/templates/ci.yml.jinja @@ -301,15 +301,18 @@ <%- include "build-packages.yml.jinja" %> <%- endif %> + <%- set pkg_tests_job_name = "pkg-tests" %> + <%- set salt_tests_job_name = "salt-tests" %> + <%- if includes.get(pkg_tests_job_name, True) or includes.get(salt_tests_job_name, True) %> + <%- include "build-ci-deps.yml.jinja" %> + <%- endif %> - <%- set job_name = "pkg-tests" %> - <%- if includes.get(job_name, True) %> + <%- if includes.get(pkg_tests_job_name, True) %> <%- include "test-salt-pkg.yml.jinja" %> <%- endif %> - <%- set job_name = "salt-tests" %> - <%- if includes.get(job_name, True) %> + <%- if includes.get(salt_tests_job_name, True) %> <%- include "test-salt.yml.jinja" %> <%- endif %> diff --git a/.github/workflows/templates/layout.yml.jinja b/.github/workflows/templates/layout.yml.jinja index ca208437990..773ebeb6227 100644 --- a/.github/workflows/templates/layout.yml.jinja +++ b/.github/workflows/templates/layout.yml.jinja @@ -9,6 +9,7 @@ <%- set skip_junit_reports_check = skip_junit_reports_check|default("${{ github.event_name == 'pull_request' }}") %> <%- set gpg_key_id = "64CBBC8173D76B3F" %> <%- set prepare_actual_release = prepare_actual_release | default(False) %> +<%- set gh_actions_workflows_python_version = "3.10" %> --- <%- block name %> name: <{ workflow_name }> diff --git a/.github/workflows/templates/test-pkg-repo-downloads.yml.jinja b/.github/workflows/templates/test-pkg-repo-downloads.yml.jinja index 83bcce62f80..3fbc063d4eb 100644 --- a/.github/workflows/templates/test-pkg-repo-downloads.yml.jinja +++ b/.github/workflows/templates/test-pkg-repo-downloads.yml.jinja @@ -58,6 +58,7 @@ salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: <{ gh_environment }> nox-version: <{ nox_version }> + python-version: "<{ gh_actions_workflows_python_version }>" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: <{ pkg_type.lower() }> @@ -97,6 +98,7 @@ environment: <{ gh_environment }> skip-code-coverage: true nox-version: <{ nox_version }> + python-version: "<{ gh_actions_workflows_python_version }>" latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" pkg-type: <{ pkg_type.lower() }> secrets: inherit @@ -135,6 +137,7 @@ environment: <{ gh_environment }> skip-code-coverage: true nox-version: <{ nox_version }> + python-version: "<{ gh_actions_workflows_python_version }>" latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" secrets: inherit <%- endfor %> diff --git a/.github/workflows/templates/test-salt-pkg.yml.jinja b/.github/workflows/templates/test-salt-pkg.yml.jinja index 4393f954c34..ee29c420b4f 100644 --- a/.github/workflows/templates/test-salt-pkg.yml.jinja +++ b/.github/workflows/templates/test-salt-pkg.yml.jinja @@ -39,11 +39,12 @@ <{ job_name }>: <%- do test_salt_pkg_needs.append(job_name) %> - name: <{ display_name }> Package Tests + name: <{ display_name }> if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-<{ pkg_type }>-pkgs-onedir + - <{ slug.replace(".", "") }>-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: <{ slug }> @@ -53,6 +54,7 @@ salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: <{ pkg_type }> nox-version: <{ nox_version }> + python-version: "<{ gh_actions_workflows_python_version }>" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }> skip-code-coverage: <{ skip_test_coverage_check }> skip-junit-reports: <{ skip_junit_reports_check }> @@ -67,11 +69,12 @@ <{ job_name }>: <%- do test_salt_pkg_needs.append(job_name) %> - name: <{ display_name }> Package Tests + name: <{ display_name }> if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - build-macos-pkgs-onedir + - <{ slug.replace(".", "") }>-ci-deps uses: ./.github/workflows/test-packages-action-macos.yml with: distro-slug: <{ slug }> @@ -81,6 +84,7 @@ salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: macos nox-version: <{ nox_version }> + python-version: "<{ gh_actions_workflows_python_version }>" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }> skip-code-coverage: <{ skip_test_coverage_check }> skip-junit-reports: <{ skip_junit_reports_check }> @@ -97,11 +101,12 @@ <{ job_name }>: <%- do test_salt_pkg_needs.append(job_name) %> - name: <{ display_name }> <{ pkg_type }> Package Tests + name: <{ display_name }> if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-windows-pkgs-onedir + - <{ slug.replace(".", "") }>-ci-deps uses: ./.github/workflows/test-packages-action.yml with: distro-slug: <{ slug }> @@ -111,6 +116,7 @@ salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: <{ pkg_type }> nox-version: <{ nox_version }> + python-version: "<{ gh_actions_workflows_python_version }>" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }> skip-code-coverage: <{ skip_test_coverage_check }> skip-junit-reports: <{ skip_junit_reports_check }> diff --git a/.github/workflows/templates/test-salt.yml.jinja b/.github/workflows/templates/test-salt.yml.jinja index c21058caafb..688d9df5263 100644 --- a/.github/workflows/templates/test-salt.yml.jinja +++ b/.github/workflows/templates/test-salt.yml.jinja @@ -9,7 +9,7 @@ if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - <{ slug.replace(".", "") }>-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: <{ slug }> @@ -17,6 +17,7 @@ platform: windows arch: amd64 nox-version: <{ nox_version }> + python-version: "<{ gh_actions_workflows_python_version }>" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }> @@ -33,7 +34,7 @@ if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - <{ slug.replace(".", "") }>-ci-deps uses: ./.github/workflows/test-action-macos.yml with: distro-slug: <{ slug }> @@ -41,6 +42,7 @@ platform: darwin arch: x86_64 nox-version: <{ nox_version }> + python-version: "<{ gh_actions_workflows_python_version }>" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }> @@ -76,7 +78,7 @@ if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - <{ slug.replace(".", "") }>-ci-deps uses: ./.github/workflows/test-action.yml with: distro-slug: <{ slug }> @@ -84,6 +86,7 @@ platform: linux arch: <{ arch }> nox-version: <{ nox_version }> + python-version: "<{ gh_actions_workflows_python_version }>" testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }> diff --git a/.github/workflows/test-action-macos.yml b/.github/workflows/test-action-macos.yml index 6b34ccc2683..6f1da47f7f8 100644 --- a/.github/workflows/test-action-macos.yml +++ b/.github/workflows/test-action-macos.yml @@ -66,7 +66,7 @@ env: jobs: generate-matrix: - name: Generate Test Matrix + name: Test Matrix runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "x86_64"]') || 'ubuntu-latest' }} outputs: matrix-include: ${{ steps.generate-matrix.outputs.matrix }} @@ -84,87 +84,12 @@ jobs: echo "$TEST_MATRIX" echo "matrix=$TEST_MATRIX" >> "$GITHUB_OUTPUT" - dependencies: - name: Setup Test Dependencies - runs-on: ${{ inputs.distro-slug }} - timeout-minutes: 90 - steps: - - name: Checkout Source Code - uses: actions/checkout@v3 - - - name: Cache nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }} - id: nox-dependencies-cache - uses: actions/cache@v3 - with: - path: nox.${{ inputs.distro-slug }}.tar.* - key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ hashFiles('requirements/**/*.txt', 'noxfile.py') }} - - - name: Download Onedir Tarball as an Artifact - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - uses: actions/download-artifact@v3 - with: - name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz - path: artifacts/ - - - name: Decompress Onedir Tarball - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - shell: bash - run: | - python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" - cd artifacts - tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz - - - name: Set up Python ${{ inputs.python-version }} - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - uses: actions/setup-python@v4 - with: - python-version: "${{ inputs.python-version }}" - - - name: Install System Dependencies - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - brew install openssl@3 - - - name: Install Nox - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - python3 -m pip install 'nox==${{ inputs.nox-version }}' - - - name: Install Dependencies - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - env: - PRINT_TEST_SELECTION: "0" - PRINT_SYSTEM_INFO: "0" - run: | - export PYCURL_SSL_LIBRARY=openssl - export LDFLAGS="-L/usr/local/opt/openssl@3/lib" - export CPPFLAGS="-I/usr/local/opt/openssl@3/include" - export PKG_CONFIG_PATH="/usr/local/opt/openssl@3/lib/pkgconfig" - nox --install-only -e ${{ inputs.nox-session }} - - - name: Cleanup .nox Directory - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - nox -e "pre-archive-cleanup(pkg=False)" - - - name: Compress .nox Directory - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - nox -e compress-dependencies -- ${{ inputs.distro-slug }} - - - name: Upload Nox Requirements Tarball - uses: actions/upload-artifact@v3 - with: - name: nox-${{ inputs.distro-slug }}-${{ inputs.nox-session }} - path: nox.${{ inputs.distro-slug }}.tar.* - test: name: Test runs-on: ${{ inputs.distro-slug }} timeout-minutes: 360 # 6 Hours needs: - generate-matrix - - dependencies strategy: fail-fast: false matrix: @@ -201,7 +126,9 @@ jobs: uses: actions/cache@v3 with: path: nox.${{ inputs.distro-slug }}.tar.* - key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ hashFiles('requirements/**/*.txt', 'noxfile.py') }} + key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ + hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') + }} # If we get a cache miss here it means the dependencies step failed to save the cache fail-on-cache-miss: true @@ -445,7 +372,7 @@ jobs: report: - name: Reports for ${{ inputs.distro-slug }} + name: Test Reports if: always() && inputs.skip-code-coverage == false && needs.test.result != 'cancelled' && needs.test.result != 'skipped' runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "x86_64"]') || 'ubuntu-latest' }} needs: diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index ae20aa38c97..60c56faea63 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -36,6 +36,11 @@ on: required: true type: string description: The nox version to install + python-version: + required: false + type: string + description: The python version to run tests with + default: "3.10" package-name: required: false type: string @@ -63,7 +68,7 @@ env: jobs: generate-matrix: - name: Generate Test Matrix + name: Test Matrix runs-on: - self-hosted - linux @@ -84,102 +89,6 @@ jobs: echo "$TEST_MATRIX" echo "matrix=$TEST_MATRIX" >> "$GITHUB_OUTPUT" - dependencies: - name: Setup Test Dependencies - runs-on: - - self-hosted - - linux - - bastion - timeout-minutes: 90 - steps: - - name: Checkout Source Code - uses: actions/checkout@v3 - - - name: Cache nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }} - id: nox-dependencies-cache - uses: actions/cache@v3 - with: - path: nox.${{ inputs.distro-slug }}.tar.* - key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.distro-slug }}|${{ inputs.nox-session }}${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') }} - - - name: Download Onedir Tarball as an Artifact - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - uses: actions/download-artifact@v3 - with: - name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz - path: artifacts/ - - - name: Decompress Onedir Tarball - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - shell: bash - run: | - python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" - cd artifacts - tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz - - - name: PyPi Proxy - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - sed -i '7s;^;--index-url=https://pypi-proxy.saltstack.net/root/local/+simple/ --extra-index-url=https://pypi.org/simple\n;' requirements/static/ci/*/*.txt - - - name: Setup Python Tools Scripts - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - uses: ./.github/actions/setup-python-tools-scripts - - - name: Get Salt Project GitHub Actions Bot Environment - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") - SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) - echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" - - - name: Start VM - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - id: spin-up-vm - run: | - tools --timestamps vm create --environment "${SPB_ENVIRONMENT}" --retries=2 ${{ inputs.distro-slug }} - - - name: List Free Space - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - tools --timestamps vm ssh ${{ inputs.distro-slug }} -- df -h || true - - - name: Upload Checkout To VM - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - tools --timestamps vm rsync ${{ inputs.distro-slug }} - - - name: Install Dependencies - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - tools --timestamps vm install-dependencies --nox-session=${{ inputs.nox-session }} ${{ inputs.distro-slug }} - - - name: Cleanup .nox Directory - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - tools --timestamps vm pre-archive-cleanup ${{ inputs.distro-slug }} - - - name: Compress .nox Directory - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - tools --timestamps vm compress-dependencies ${{ inputs.distro-slug }} - - - name: Download Compressed .nox Directory - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - tools --timestamps vm download-dependencies ${{ inputs.distro-slug }} - - - name: Destroy VM - if: always() && steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - tools --timestamps vm destroy --no-wait ${{ inputs.distro-slug }} - - - name: Upload Nox Requirements Tarball - uses: actions/upload-artifact@v3 - with: - name: nox-${{ inputs.distro-slug }}-${{ inputs.nox-session }} - path: nox.${{ inputs.distro-slug }}.tar.* - test: name: Test runs-on: @@ -188,7 +97,6 @@ jobs: - bastion timeout-minutes: 300 # 5 Hours - More than this and something is wrong needs: - - dependencies - generate-matrix strategy: fail-fast: false @@ -222,7 +130,9 @@ jobs: uses: actions/cache@v3 with: path: nox.${{ inputs.distro-slug }}.tar.* - key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.distro-slug }}|${{ inputs.nox-session }}${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') }} + key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ + hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') + }} # If we get a cache miss here it means the dependencies step failed to save the cache fail-on-cache-miss: true @@ -409,7 +319,7 @@ jobs: report: - name: Reports for ${{ inputs.distro-slug }} + name: Test Reports if: always() && inputs.skip-code-coverage == false && needs.test.result != 'cancelled' && needs.test.result != 'skipped' runs-on: - self-hosted diff --git a/.github/workflows/test-package-downloads-action-linux.yml b/.github/workflows/test-package-downloads-action-linux.yml index 3674111e8ee..70ed1153be8 100644 --- a/.github/workflows/test-package-downloads-action-linux.yml +++ b/.github/workflows/test-package-downloads-action-linux.yml @@ -39,6 +39,11 @@ on: required: true type: string description: The nox version to install + python-version: + required: false + type: string + description: The python version to run tests with + default: "3.10" package-name: required: false type: string @@ -65,100 +70,14 @@ env: jobs: - dependencies: - name: Setup Test Dependencies - runs-on: - - self-hosted - - linux - - bastion - timeout-minutes: 90 - steps: - - name: Checkout Source Code - uses: actions/checkout@v3 - - - name: Cache nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }} - id: nox-dependencies-cache - uses: actions/cache@v3 - with: - path: nox.${{ inputs.distro-slug }}.tar.* - key: ${{ inputs.cache-prefix }}|test-pkg-download-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') }} - - - name: Download Onedir Tarball as an Artifact - uses: actions/download-artifact@v3 - with: - name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz - path: artifacts/ - - - name: Decompress Onedir Tarball - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - shell: bash - run: | - python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" - cd artifacts - tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz - - - name: Setup Python Tools Scripts - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - uses: ./.github/actions/setup-python-tools-scripts - - - name: Get Salt Project GitHub Actions Bot Environment - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") - SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) - echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" - - - name: Start VM - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - id: spin-up-vm - run: | - tools --timestamps vm create --environment "${SPB_ENVIRONMENT}" --retries=2 ${{ inputs.distro-slug }} - - - name: List Free Space - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - tools --timestamps vm ssh ${{ inputs.distro-slug }} -- df -h || true - - - name: Upload Checkout To VM - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - tools --timestamps vm rsync ${{ inputs.distro-slug }} - - - name: Install Dependencies - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - tools --timestamps vm install-dependencies --nox-session=${{ inputs.nox-session }} ${{ inputs.distro-slug }} - - - name: Cleanup .nox Directory - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - tools --timestamps vm pre-archive-cleanup ${{ inputs.distro-slug }} - - - name: Compress .nox Directory - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - tools --timestamps vm compress-dependencies ${{ inputs.distro-slug }} - - - name: Download Compressed .nox Directory - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - tools --timestamps vm download-dependencies ${{ inputs.distro-slug }} - - - name: Destroy VM - if: always() && steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - tools --timestamps vm destroy --no-wait ${{ inputs.distro-slug }} - test: - name: Test + name: Test Pkg Download runs-on: - self-hosted - linux - bastion environment: ${{ inputs.environment }} timeout-minutes: 120 # 2 Hours - More than this and something is wrong - needs: - - dependencies steps: - name: Checkout Source Code @@ -181,7 +100,9 @@ jobs: uses: actions/cache@v3 with: path: nox.${{ inputs.distro-slug }}.tar.* - key: ${{ inputs.cache-prefix }}|test-pkg-download-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') }} + key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ + hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') + }} # If we get a cache miss here it means the dependencies step failed to save the cache fail-on-cache-miss: true @@ -287,7 +208,7 @@ jobs: !artifacts/salt-*.tar.* report: - name: Reports for ${{ inputs.distro-slug }}(${{ inputs.arch }}) + name: Test Pkg Download Reports runs-on: - self-hosted - linux diff --git a/.github/workflows/test-package-downloads-action-macos.yml b/.github/workflows/test-package-downloads-action-macos.yml index afe0f51ca9f..7a9e0e0dd65 100644 --- a/.github/workflows/test-package-downloads-action-macos.yml +++ b/.github/workflows/test-package-downloads-action-macos.yml @@ -70,81 +70,11 @@ env: jobs: - dependencies: - name: Setup Test Dependencies - runs-on: ${{ inputs.distro-slug }} - timeout-minutes: 90 - steps: - - name: Checkout Source Code - uses: actions/checkout@v3 - - - name: Cache nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }} - id: nox-dependencies-cache - uses: actions/cache@v3 - with: - path: nox.${{ inputs.distro-slug }}.tar.* - key: ${{ inputs.cache-prefix }}|test-pkg-download-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') }} - - - name: Download Onedir Tarball as an Artifact - uses: actions/download-artifact@v3 - with: - name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz - path: artifacts/ - - - name: Decompress Onedir Tarball - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - shell: bash - run: | - python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" - cd artifacts - tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz - - - name: Set up Python ${{ inputs.python-version }} - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - uses: actions/setup-python@v4 - with: - python-version: "${{ inputs.python-version }}" - update-environment: true - - - name: Install System Dependencies - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - brew install openssl@3 - - - name: Install Nox - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - python3 -m pip install 'nox==${{ inputs.nox-version }}' - - - name: Install Dependencies - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - env: - PRINT_TEST_SELECTION: "0" - PRINT_SYSTEM_INFO: "0" - run: | - export PYCURL_SSL_LIBRARY=openssl - export LDFLAGS="-L/usr/local/opt/openssl@3/lib" - export CPPFLAGS="-I/usr/local/opt/openssl@3/include" - export PKG_CONFIG_PATH="/usr/local/opt/openssl@3/lib/pkgconfig" - nox --force-color --install-only -e ${{ inputs.nox-session }} - - - name: Cleanup .nox Directory - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - nox --force-color -e "pre-archive-cleanup(pkg=False)" - - - name: Compress .nox Directory - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - nox --force-color -e compress-dependencies -- ${{ inputs.distro-slug }} - test: - name: Test + name: Test Pkg Download runs-on: ${{ inputs.distro-slug }} environment: ${{ inputs.environment }} timeout-minutes: 120 # 2 Hours - More than this and something is wrong - needs: - - dependencies steps: - name: Checkout Source Code @@ -181,7 +111,9 @@ jobs: uses: actions/cache@v3 with: path: nox.${{ inputs.distro-slug }}.tar.* - key: ${{ inputs.cache-prefix }}|test-pkg-download-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') }} + key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ + hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') + }} # If we get a cache miss here it means the dependencies step failed to save the cache fail-on-cache-miss: true @@ -261,7 +193,7 @@ jobs: !artifacts/salt-*.tar.* report: - name: Reports for ${{ inputs.distro-slug }}(${{ inputs.arch }}) + name: Test Pkg Download Reports runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "x86_64"]') || 'ubuntu-latest' }} environment: ${{ inputs.environment }} if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped' diff --git a/.github/workflows/test-package-downloads-action-windows.yml b/.github/workflows/test-package-downloads-action-windows.yml index e297d5922da..e4ad2233114 100644 --- a/.github/workflows/test-package-downloads-action-windows.yml +++ b/.github/workflows/test-package-downloads-action-windows.yml @@ -39,6 +39,11 @@ on: required: true type: string description: The nox version to install + python-version: + required: false + type: string + description: The python version to run tests with + default: "3.10" package-name: required: false type: string @@ -70,100 +75,14 @@ env: jobs: - dependencies: - name: Setup Test Dependencies - runs-on: - - self-hosted - - linux - - bastion - timeout-minutes: 90 - steps: - - name: Checkout Source Code - uses: actions/checkout@v3 - - - name: Cache nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }} - id: nox-dependencies-cache - uses: actions/cache@v3 - with: - path: nox.${{ inputs.distro-slug }}.tar.* - key: ${{ inputs.cache-prefix }}|test-pkg-download-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') }} - - - name: Download Onedir Tarball as an Artifact - uses: actions/download-artifact@v3 - with: - name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz - path: artifacts/ - - - name: Decompress Onedir Tarball - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - shell: bash - run: | - python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" - cd artifacts - tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz - - - name: Setup Python Tools Scripts - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - uses: ./.github/actions/setup-python-tools-scripts - - - name: Get Salt Project GitHub Actions Bot Environment - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") - SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) - echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" - - - name: Start VM - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - id: spin-up-vm - run: | - tools --timestamps vm create --environment "${SPB_ENVIRONMENT}" --retries=2 ${{ inputs.distro-slug }} - - - name: List Free Space - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - tools --timestamps vm ssh ${{ inputs.distro-slug }} -- df -h || true - - - name: Upload Checkout To VM - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - tools --timestamps vm rsync ${{ inputs.distro-slug }} - - - name: Install Dependencies - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - tools --timestamps vm install-dependencies --nox-session=${{ inputs.nox-session }} ${{ inputs.distro-slug }} - - - name: Cleanup .nox Directory - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - tools --timestamps vm pre-archive-cleanup ${{ inputs.distro-slug }} - - - name: Compress .nox Directory - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - tools --timestamps vm compress-dependencies ${{ inputs.distro-slug }} - - - name: Download Compressed .nox Directory - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - tools --timestamps vm download-dependencies ${{ inputs.distro-slug }} - - - name: Destroy VM - if: always() && steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - tools --timestamps vm destroy --no-wait ${{ inputs.distro-slug }} - test: - name: Test + name: Test Pkg Download runs-on: - self-hosted - linux - bastion environment: ${{ inputs.environment }} timeout-minutes: 120 # 2 Hours - More than this and something is wrong - needs: - - dependencies steps: - name: Checkout Source Code @@ -186,7 +105,9 @@ jobs: uses: actions/cache@v3 with: path: nox.${{ inputs.distro-slug }}.tar.* - key: ${{ inputs.cache-prefix }}|test-pkg-download-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') }} + key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ + hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') + }} # If we get a cache miss here it means the dependencies step failed to save the cache fail-on-cache-miss: true @@ -292,7 +213,7 @@ jobs: !artifacts/salt-*.tar.* report: - name: Reports for ${{ inputs.distro-slug }}(${{ inputs.arch }}) + name: Test Pkg Download Reports runs-on: - self-hosted - linux diff --git a/.github/workflows/test-packages-action-macos.yml b/.github/workflows/test-packages-action-macos.yml index 9f963b09ba0..5bee32e55ed 100644 --- a/.github/workflows/test-packages-action-macos.yml +++ b/.github/workflows/test-packages-action-macos.yml @@ -72,7 +72,7 @@ env: jobs: generate-matrix: - name: Generate Package Test Matrix + name: Test Pkg Matrix runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "x86_64"]') || 'ubuntu-latest' }} outputs: pkg-matrix-include: ${{ steps.generate-pkg-matrix.outputs.matrix }} @@ -88,83 +88,12 @@ jobs: run: | tools ci pkg-matrix ${{ inputs.distro-slug }} ${{ inputs.pkg-type }} --testing-releases ${{ join(fromJSON(inputs.testing-releases), ' ') }} - dependencies: - name: Setup Test Dependencies - needs: - - generate-matrix - runs-on: ${{ inputs.distro-slug }} - timeout-minutes: 90 - steps: - - name: Checkout Source Code - uses: actions/checkout@v3 - - - name: Cache nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }} - id: nox-dependencies-cache - uses: actions/cache@v3 - with: - path: nox.${{ inputs.distro-slug }}.tar.* - key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') }} - - - name: Download Onedir Tarball as an Artifact - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - uses: actions/download-artifact@v3 - with: - name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz - path: artifacts/ - - - name: Decompress Onedir Tarball - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - shell: bash - run: | - python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" - cd artifacts - tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz - - - name: Set up Python ${{ inputs.python-version }} - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - uses: actions/setup-python@v4 - with: - python-version: "${{ inputs.python-version }}" - - - name: Install System Dependencies - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - brew install openssl@3 - - - name: Install Nox - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - python3 -m pip install 'nox==${{ inputs.nox-version }}' - - - name: Install Dependencies - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - env: - PRINT_TEST_SELECTION: "0" - PRINT_SYSTEM_INFO: "0" - run: | - export PYCURL_SSL_LIBRARY=openssl - export LDFLAGS="-L/usr/local/opt/openssl@3/lib" - export CPPFLAGS="-I/usr/local/opt/openssl@3/include" - export PKG_CONFIG_PATH="/usr/local/opt/openssl@3/lib/pkgconfig" - nox --force-color --install-only -e ${{ inputs.nox-session }} - - - name: Cleanup .nox Directory - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - nox --force-color -e "pre-archive-cleanup(pkg=False)" - - - name: Compress .nox Directory - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - nox --force-color -e compress-dependencies -- ${{ inputs.distro-slug }} - test: - name: Test + name: Test Pkg runs-on: ${{ inputs.distro-slug }} timeout-minutes: 120 # 2 Hours - More than this and something is wrong needs: - - dependencies - generate-matrix strategy: fail-fast: false @@ -215,7 +144,9 @@ jobs: uses: actions/cache@v3 with: path: nox.${{ inputs.distro-slug }}.tar.* - key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') }} + key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ + hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') + }} # If we get a cache miss here it means the dependencies step failed to save the cache fail-on-cache-miss: true @@ -273,7 +204,7 @@ jobs: !artifacts/salt-*.tar.* report: - name: Reports for ${{ inputs.distro-slug }}(${{ matrix.test-chunk }}) + name: Test Pkg Reports runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "x86_64"]') || 'ubuntu-latest' }} if: always() && (inputs.skip-code-coverage == false || inputs.skip-junit-reports == false) && needs.test.result != 'cancelled' && needs.test.result != 'skipped' needs: diff --git a/.github/workflows/test-packages-action.yml b/.github/workflows/test-packages-action.yml index bf60d0c5032..91a9e4e855f 100644 --- a/.github/workflows/test-packages-action.yml +++ b/.github/workflows/test-packages-action.yml @@ -35,6 +35,11 @@ on: required: true type: string description: The nox version to install + python-version: + required: false + type: string + description: The python version to run tests with + default: "3.10" package-name: required: false type: string @@ -67,7 +72,7 @@ env: jobs: generate-matrix: - name: Generate Package Test Matrix + name: Test ${{ inputs.pkg-type }} Pkg Matrix runs-on: - self-hosted - linux @@ -86,96 +91,9 @@ jobs: run: | tools ci pkg-matrix ${{ inputs.distro-slug }} ${{ inputs.pkg-type }} --testing-releases ${{ join(fromJSON(inputs.testing-releases), ' ') }} - dependencies: - name: Setup Test Dependencies - needs: - - generate-matrix - runs-on: - - self-hosted - - linux - - bastion - timeout-minutes: 90 - steps: - - name: Checkout Source Code - uses: actions/checkout@v3 - - - name: Cache nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }} - id: nox-dependencies-cache - uses: actions/cache@v3 - with: - path: nox.${{ inputs.distro-slug }}.tar.* - key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') }} - - - name: Download Onedir Tarball as an Artifact - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - uses: actions/download-artifact@v3 - with: - name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz - path: artifacts/ - - - name: Decompress Onedir Tarball - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - shell: bash - run: | - python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" - cd artifacts - tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz - - - name: Setup Python Tools Scripts - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - uses: ./.github/actions/setup-python-tools-scripts - - - name: Get Salt Project GitHub Actions Bot Environment - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") - SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) - echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" - - - name: Start VM - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - id: spin-up-vm - run: | - tools --timestamps vm create --environment "${SPB_ENVIRONMENT}" --retries=2 ${{ inputs.distro-slug }} - - - name: List Free Space - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - tools --timestamps vm ssh ${{ inputs.distro-slug }} -- df -h || true - - - name: Upload Checkout To VM - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - tools --timestamps vm rsync ${{ inputs.distro-slug }} - - - name: Install Dependencies - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - tools --timestamps vm install-dependencies --nox-session=${{ inputs.nox-session }} ${{ inputs.distro-slug }} - - - name: Cleanup .nox Directory - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - tools --timestamps vm pre-archive-cleanup ${{ inputs.distro-slug }} - - - name: Compress .nox Directory - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - tools --timestamps vm compress-dependencies ${{ inputs.distro-slug }} - - - name: Download Compressed .nox Directory - if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - tools --timestamps vm download-dependencies ${{ inputs.distro-slug }} - - - name: Destroy VM - if: always() && steps.nox-dependencies-cache.outputs.cache-hit != 'true' - run: | - tools --timestamps vm destroy --no-wait ${{ inputs.distro-slug }} - test: - name: Test + name: Test Pkg runs-on: - self-hosted - linux @@ -183,7 +101,6 @@ jobs: timeout-minutes: 120 # 2 Hours - More than this and something is wrong needs: - generate-matrix - - dependencies strategy: fail-fast: false matrix: @@ -220,7 +137,9 @@ jobs: uses: actions/cache@v3 with: path: nox.${{ inputs.distro-slug }}.tar.* - key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') }} + key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ + hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') + }} # If we get a cache miss here it means the dependencies step failed to save the cache fail-on-cache-miss: true @@ -288,7 +207,7 @@ jobs: !artifacts/salt-*.tar.* report: - name: Reports for ${{ inputs.distro-slug }}(${{ matrix.test-chunk }}) + name: Test Pkg Reports runs-on: - self-hosted - linux diff --git a/tools/ci.py b/tools/ci.py index f72910bb21d..81a18c2d4e9 100644 --- a/tools/ci.py +++ b/tools/ci.py @@ -739,6 +739,8 @@ def pkg_matrix( "version": version, } ) + if distro_slug.startswith("windows"): + matrix[-1]["pkg-type"] = pkg_type.upper() ctx.info("Generated matrix:") ctx.print(matrix, soft_wrap=True) From fcb3df5e46aa85efa89e4a06616ce17ca36e70ec Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 27 Sep 2023 21:17:58 +0100 Subject: [PATCH 022/147] Throttle concurrency Signed-off-by: Pedro Algarvio --- .../workflows/build-deps-ci-action-macos.yml | 6 ++++++ .github/workflows/build-deps-ci-action.yml | 6 ++++++ .github/workflows/build-deps-onedir.yml | 19 +++++++++++++++++++ .github/workflows/build-salt-onedir.yml | 19 +++++++++++++++++++ .github/workflows/test-action-macos.yml | 6 ++++++ .github/workflows/test-action.yml | 6 ++++++ .../test-package-downloads-action-linux.yml | 6 ++++++ .../test-package-downloads-action-macos.yml | 6 ++++++ .../workflows/test-packages-action-macos.yml | 6 ++++++ .github/workflows/test-packages-action.yml | 6 ++++++ 10 files changed, 86 insertions(+) diff --git a/.github/workflows/build-deps-ci-action-macos.yml b/.github/workflows/build-deps-ci-action-macos.yml index 4c943db659f..4f613bf18cb 100644 --- a/.github/workflows/build-deps-ci-action-macos.yml +++ b/.github/workflows/build-deps-ci-action-macos.yml @@ -56,6 +56,12 @@ jobs: runs-on: ${{ inputs.distro-slug }} timeout-minutes: 90 steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" + - name: Checkout Source Code uses: actions/checkout@v3 diff --git a/.github/workflows/build-deps-ci-action.yml b/.github/workflows/build-deps-ci-action.yml index d5de71968c4..6fa79ac5ff0 100644 --- a/.github/workflows/build-deps-ci-action.yml +++ b/.github/workflows/build-deps-ci-action.yml @@ -61,6 +61,12 @@ jobs: - bastion timeout-minutes: 90 steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t" + - name: Checkout Source Code uses: actions/checkout@v3 diff --git a/.github/workflows/build-deps-onedir.yml b/.github/workflows/build-deps-onedir.yml index c872265aed9..e95b40974b7 100644 --- a/.github/workflows/build-deps-onedir.yml +++ b/.github/workflows/build-deps-onedir.yml @@ -46,7 +46,14 @@ jobs: - linux - ${{ matrix.arch }} steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" + - uses: actions/checkout@v3 + - name: Setup Relenv id: setup-relenv uses: ./.github/actions/setup-relenv @@ -81,6 +88,12 @@ jobs: - amd64 runs-on: windows-latest steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" + - uses: actions/checkout@v3 - name: Set up Python 3.10 @@ -121,6 +134,12 @@ jobs: - x86_64 runs-on: macos-12 steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" + - uses: actions/checkout@v3 - name: Set up Python 3.10 diff --git a/.github/workflows/build-salt-onedir.yml b/.github/workflows/build-salt-onedir.yml index da60edd438a..f9dd28c1959 100644 --- a/.github/workflows/build-salt-onedir.yml +++ b/.github/workflows/build-salt-onedir.yml @@ -46,6 +46,12 @@ jobs: - linux - ${{ matrix.arch }} steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" + - uses: actions/checkout@v3 - name: Setup Python Tools Scripts @@ -89,7 +95,14 @@ jobs: - amd64 runs-on: windows-latest steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" + - uses: actions/checkout@v3 + - name: Set up Python 3.10 uses: actions/setup-python@v4 with: @@ -135,6 +148,12 @@ jobs: - x86_64 runs-on: macos-12 steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" + - uses: actions/checkout@v3 - name: Set up Python 3.10 uses: actions/setup-python@v4 diff --git a/.github/workflows/test-action-macos.yml b/.github/workflows/test-action-macos.yml index 6f1da47f7f8..211e81c47b1 100644 --- a/.github/workflows/test-action-macos.yml +++ b/.github/workflows/test-action-macos.yml @@ -71,6 +71,12 @@ jobs: outputs: matrix-include: ${{ steps.generate-matrix.outputs.matrix }} steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t" + - name: Checkout Source Code uses: actions/checkout@v3 diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index 60c56faea63..432b1b80b7a 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -76,6 +76,12 @@ jobs: outputs: matrix-include: ${{ steps.generate-matrix.outputs.matrix }} steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t" + - name: Checkout Source Code uses: actions/checkout@v3 diff --git a/.github/workflows/test-package-downloads-action-linux.yml b/.github/workflows/test-package-downloads-action-linux.yml index 70ed1153be8..6518a826dfc 100644 --- a/.github/workflows/test-package-downloads-action-linux.yml +++ b/.github/workflows/test-package-downloads-action-linux.yml @@ -80,6 +80,12 @@ jobs: timeout-minutes: 120 # 2 Hours - More than this and something is wrong steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t" + - name: Checkout Source Code uses: actions/checkout@v3 diff --git a/.github/workflows/test-package-downloads-action-macos.yml b/.github/workflows/test-package-downloads-action-macos.yml index 7a9e0e0dd65..2763f85f33b 100644 --- a/.github/workflows/test-package-downloads-action-macos.yml +++ b/.github/workflows/test-package-downloads-action-macos.yml @@ -77,6 +77,12 @@ jobs: timeout-minutes: 120 # 2 Hours - More than this and something is wrong steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" + - name: Checkout Source Code uses: actions/checkout@v3 diff --git a/.github/workflows/test-packages-action-macos.yml b/.github/workflows/test-packages-action-macos.yml index 5bee32e55ed..7ccc1c1dc03 100644 --- a/.github/workflows/test-packages-action-macos.yml +++ b/.github/workflows/test-packages-action-macos.yml @@ -77,6 +77,12 @@ jobs: outputs: pkg-matrix-include: ${{ steps.generate-pkg-matrix.outputs.matrix }} steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" + - name: Checkout Source Code uses: actions/checkout@v3 diff --git a/.github/workflows/test-packages-action.yml b/.github/workflows/test-packages-action.yml index 91a9e4e855f..8fff0af1f74 100644 --- a/.github/workflows/test-packages-action.yml +++ b/.github/workflows/test-packages-action.yml @@ -80,6 +80,12 @@ jobs: outputs: pkg-matrix-include: ${{ steps.generate-pkg-matrix.outputs.matrix }} steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t" + - name: Checkout Source Code uses: actions/checkout@v3 From 45455b0f6c069ff5b5550ced8d7a11927a1bf4a8 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 27 Sep 2023 22:27:51 +0100 Subject: [PATCH 023/147] Update workflows `env`. Signed-off-by: Pedro Algarvio --- .github/workflows/build-deb-packages.yml | 7 +++++++ .github/workflows/build-deps-onedir.yml | 5 +++++ .github/workflows/build-docs.yml | 7 +++++++ .github/workflows/build-macos-packages.yml | 5 +++++ .github/workflows/build-rpm-packages.yml | 4 ++++ .github/workflows/build-salt-onedir.yml | 5 +++++ .github/workflows/build-windows-packages.yml | 7 +++++++ .github/workflows/release-upload-virustotal.yml | 7 +++++++ .github/workflows/test-action-macos.yml | 1 - .github/workflows/test-action.yml | 1 - .github/workflows/test-package-downloads-action-linux.yml | 3 +-- .github/workflows/test-package-downloads-action-macos.yml | 5 +---- .../workflows/test-package-downloads-action-windows.yml | 3 +-- .github/workflows/test-packages-action-macos.yml | 5 +---- .github/workflows/test-packages-action.yml | 3 +-- 15 files changed, 52 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index 7a015939da1..33ddb619814 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -21,6 +21,13 @@ on: type: string description: The backend to build the packages with +env: + COLUMNS: 190 + AWS_MAX_ATTEMPTS: "10" + AWS_RETRY_MODE: "adaptive" + PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ + PIP_EXTRA_INDEX_URL: https://pypi.org/simple + jobs: build: name: DEB diff --git a/.github/workflows/build-deps-onedir.yml b/.github/workflows/build-deps-onedir.yml index e95b40974b7..f716b4c56c8 100644 --- a/.github/workflows/build-deps-onedir.yml +++ b/.github/workflows/build-deps-onedir.yml @@ -29,6 +29,11 @@ on: env: RELENV_DATA: "${{ github.workspace }}/.relenv" + COLUMNS: 190 + AWS_MAX_ATTEMPTS: "10" + AWS_RETRY_MODE: "adaptive" + PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ + PIP_EXTRA_INDEX_URL: https://pypi.org/simple jobs: diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml index 32ff96dbf38..67fd425061f 100644 --- a/.github/workflows/build-docs.yml +++ b/.github/workflows/build-docs.yml @@ -13,6 +13,13 @@ on: type: string description: Seed used to invalidate caches +env: + COLUMNS: 190 + AWS_MAX_ATTEMPTS: "10" + AWS_RETRY_MODE: "adaptive" + PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ + PIP_EXTRA_INDEX_URL: https://pypi.org/simple + jobs: build: name: Build diff --git a/.github/workflows/build-macos-packages.yml b/.github/workflows/build-macos-packages.yml index 9502286bf56..db9f5fd9939 100644 --- a/.github/workflows/build-macos-packages.yml +++ b/.github/workflows/build-macos-packages.yml @@ -29,6 +29,11 @@ on: type: string description: The backend to build the packages with +env: + COLUMNS: 190 + PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ + PIP_EXTRA_INDEX_URL: https://pypi.org/simple + jobs: build-pkgs: diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 0d838740cea..b5527c22dcd 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -23,6 +23,10 @@ on: env: COLUMNS: 190 + AWS_MAX_ATTEMPTS: "10" + AWS_RETRY_MODE: "adaptive" + PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ + PIP_EXTRA_INDEX_URL: https://pypi.org/simple jobs: build: diff --git a/.github/workflows/build-salt-onedir.yml b/.github/workflows/build-salt-onedir.yml index f9dd28c1959..250084753f0 100644 --- a/.github/workflows/build-salt-onedir.yml +++ b/.github/workflows/build-salt-onedir.yml @@ -29,6 +29,11 @@ on: env: RELENV_DATA: "${{ github.workspace }}/.relenv" + COLUMNS: 190 + AWS_MAX_ATTEMPTS: "10" + AWS_RETRY_MODE: "adaptive" + PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ + PIP_EXTRA_INDEX_URL: https://pypi.org/simple jobs: diff --git a/.github/workflows/build-windows-packages.yml b/.github/workflows/build-windows-packages.yml index ec2d70dce03..333fdc4dafc 100644 --- a/.github/workflows/build-windows-packages.yml +++ b/.github/workflows/build-windows-packages.yml @@ -29,6 +29,13 @@ on: type: string description: The backend to build the packages with +env: + COLUMNS: 190 + AWS_MAX_ATTEMPTS: "10" + AWS_RETRY_MODE: "adaptive" + PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ + PIP_EXTRA_INDEX_URL: https://pypi.org/simple + jobs: build-pkgs: diff --git a/.github/workflows/release-upload-virustotal.yml b/.github/workflows/release-upload-virustotal.yml index 71594ac244e..30f4db2dcb9 100644 --- a/.github/workflows/release-upload-virustotal.yml +++ b/.github/workflows/release-upload-virustotal.yml @@ -16,6 +16,13 @@ on: permissions: contents: read +env: + COLUMNS: 190 + AWS_MAX_ATTEMPTS: "10" + AWS_RETRY_MODE: "adaptive" + PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ + PIP_EXTRA_INDEX_URL: https://pypi.org/simple + jobs: upload-virustotal: name: Upload VirusTotal diff --git a/.github/workflows/test-action-macos.yml b/.github/workflows/test-action-macos.yml index 211e81c47b1..d3cfe272d91 100644 --- a/.github/workflows/test-action-macos.yml +++ b/.github/workflows/test-action-macos.yml @@ -57,7 +57,6 @@ on: description: Skip Publishing JUnit Reports default: false - env: COLUMNS: 190 PIP_INDEX_URL: "https://pypi-proxy.saltstack.net/root/local/+simple/" diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index 432b1b80b7a..747dfb01a83 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -57,7 +57,6 @@ on: description: Skip Publishing JUnit Reports default: false - env: COLUMNS: 190 AWS_MAX_ATTEMPTS: "10" diff --git a/.github/workflows/test-package-downloads-action-linux.yml b/.github/workflows/test-package-downloads-action-linux.yml index 6518a826dfc..1fa9aa77449 100644 --- a/.github/workflows/test-package-downloads-action-linux.yml +++ b/.github/workflows/test-package-downloads-action-linux.yml @@ -60,9 +60,8 @@ on: description: The nox session to run default: ci-test-onedir - env: - COLUMNS: 160 + COLUMNS: 190 AWS_MAX_ATTEMPTS: "10" AWS_RETRY_MODE: "adaptive" PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ diff --git a/.github/workflows/test-package-downloads-action-macos.yml b/.github/workflows/test-package-downloads-action-macos.yml index 2763f85f33b..e07785666b5 100644 --- a/.github/workflows/test-package-downloads-action-macos.yml +++ b/.github/workflows/test-package-downloads-action-macos.yml @@ -60,11 +60,8 @@ on: description: The nox session to run default: ci-test-onedir - env: - COLUMNS: 160 - AWS_MAX_ATTEMPTS: "10" - AWS_RETRY_MODE: "adaptive" + COLUMNS: 190 PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ PIP_EXTRA_INDEX_URL: https://pypi.org/simple diff --git a/.github/workflows/test-package-downloads-action-windows.yml b/.github/workflows/test-package-downloads-action-windows.yml index e4ad2233114..3afe6dc7b40 100644 --- a/.github/workflows/test-package-downloads-action-windows.yml +++ b/.github/workflows/test-package-downloads-action-windows.yml @@ -65,9 +65,8 @@ on: description: Skip Publishing JUnit Reports default: false - env: - COLUMNS: 160 + COLUMNS: 190 AWS_MAX_ATTEMPTS: "10" AWS_RETRY_MODE: "adaptive" PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ diff --git a/.github/workflows/test-packages-action-macos.yml b/.github/workflows/test-packages-action-macos.yml index 7ccc1c1dc03..ffcceba86ac 100644 --- a/.github/workflows/test-packages-action-macos.yml +++ b/.github/workflows/test-packages-action-macos.yml @@ -61,11 +61,8 @@ on: description: Skip Publishing JUnit Reports default: false - env: - COLUMNS: 160 - AWS_MAX_ATTEMPTS: "10" - AWS_RETRY_MODE: "adaptive" + COLUMNS: 190 PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ PIP_EXTRA_INDEX_URL: https://pypi.org/simple diff --git a/.github/workflows/test-packages-action.yml b/.github/workflows/test-packages-action.yml index 8fff0af1f74..c869a7c4f67 100644 --- a/.github/workflows/test-packages-action.yml +++ b/.github/workflows/test-packages-action.yml @@ -61,9 +61,8 @@ on: description: Skip Publishing JUnit Reports default: false - env: - COLUMNS: 160 + COLUMNS: 190 AWS_MAX_ATTEMPTS: "10" AWS_RETRY_MODE: "adaptive" PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ From c6bc5720e993c1117daf5084a51f61db947c134b Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 28 Sep 2023 17:10:31 +0100 Subject: [PATCH 024/147] Allow handling windows artifacts when not on windows, and vice-versa Signed-off-by: Pedro Algarvio --- noxfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/noxfile.py b/noxfile.py index be36d102054..117ee6aa483 100644 --- a/noxfile.py +++ b/noxfile.py @@ -1195,7 +1195,7 @@ def decompress_dependencies(session): "Check cicd/images.yml for what's available." ) distro_slug = session.posargs.pop(0) - if IS_WINDOWS: + if "windows" in distro_slug: nox_dependencies_tarball = f"nox.{distro_slug}.tar.gz" else: nox_dependencies_tarball = f"nox.{distro_slug}.tar.xz" @@ -1212,7 +1212,7 @@ def decompress_dependencies(session): session.log("Finding broken 'python' symlinks under '.nox/' ...") for dirname in os.scandir(REPO_ROOT / ".nox"): - if not IS_WINDOWS: + if "windows" not in distro_slug: scan_path = REPO_ROOT.joinpath(".nox", dirname, "bin") else: scan_path = REPO_ROOT.joinpath(".nox", dirname, "Scripts") From 7f2d7c342f16775bdf5e96da13c311d4b8b91978 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 8 May 2023 12:14:23 +0100 Subject: [PATCH 025/147] Upgrade to `coverage==7.3.1` Signed-off-by: Pedro Algarvio --- noxfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index 117ee6aa483..cb4e53e6563 100644 --- a/noxfile.py +++ b/noxfile.py @@ -326,7 +326,7 @@ def _install_coverage_requirement(session): if SKIP_REQUIREMENTS_INSTALL is False: coverage_requirement = COVERAGE_REQUIREMENT if coverage_requirement is None: - coverage_requirement = "coverage==5.2" + coverage_requirement = "coverage==7.3.1" session.install( "--progress-bar=off", coverage_requirement, silent=PIP_INSTALL_SILENT ) From d53eff39fdab1bd240b6188c01e4542f719fa5ca Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 20 Sep 2023 17:24:04 +0100 Subject: [PATCH 026/147] On VMs, use Salt's onedir to combine code coverage And newer Python versions where we don't want to download the onedir Signed-off-by: Pedro Algarvio --- .github/workflows/test-action-macos.yml | 2 +- .../test-package-downloads-action-macos.yml | 2 +- noxfile.py | 22 +++++++++++++++++++ tools/vm.py | 2 +- 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-action-macos.yml b/.github/workflows/test-action-macos.yml index d3cfe272d91..9bf6b6b9b93 100644 --- a/.github/workflows/test-action-macos.yml +++ b/.github/workflows/test-action-macos.yml @@ -20,7 +20,7 @@ on: required: false type: string description: The python version to run tests with - default: "3.9" + default: "3.11" salt-version: type: string required: true diff --git a/.github/workflows/test-package-downloads-action-macos.yml b/.github/workflows/test-package-downloads-action-macos.yml index e07785666b5..754b4f34aff 100644 --- a/.github/workflows/test-package-downloads-action-macos.yml +++ b/.github/workflows/test-package-downloads-action-macos.yml @@ -43,7 +43,7 @@ on: required: false type: string description: The python version to run tests with - default: "3.10" + default: "3.11" package-name: required: false type: string diff --git a/noxfile.py b/noxfile.py index cb4e53e6563..8b9a1669b75 100644 --- a/noxfile.py +++ b/noxfile.py @@ -1327,6 +1327,28 @@ def combine_coverage(session): pass +@nox.session( + python=str(ONEDIR_PYTHON_PATH), + name="combine-coverage-onedir", + venv_params=["--system-site-packages"], +) +def combine_coverage_onedir(session): + _install_coverage_requirement(session) + env = { + # The full path to the .coverage data file. Makes sure we always write + # them to the same directory + "COVERAGE_FILE": str(COVERAGE_FILE), + } + + # Always combine and generate the XML coverage report + try: + session.run("coverage", "combine", env=env) + except CommandFailed: + # Sometimes some of the coverage files are corrupt which would trigger a CommandFailed + # exception + pass + + @nox.session(python="3", name="create-html-coverage-report") def create_html_coverage_report(session): _install_coverage_requirement(session) diff --git a/tools/vm.py b/tools/vm.py index 628b7bdc128..e6ff0ade9b2 100644 --- a/tools/vm.py +++ b/tools/vm.py @@ -1432,7 +1432,7 @@ class VM: """ Combine the code coverage databases """ - return self.run_nox("combine-coverage", session_args=[self.name]) + return self.run_nox("combine-coverage-onedir", session_args=[self.name]) def create_xml_coverage_reports(self): """ From b44f80163ac46e9d6c02ea0e9c385f9f9b5b9e48 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 21 Sep 2023 13:14:51 +0100 Subject: [PATCH 027/147] Reduce the swarm minions count Newer coverage library versions consume more memory and this will avoid consuming it all and not finishing the test suite. Signed-off-by: Pedro Algarvio --- tests/pytests/scenarios/swarm/conftest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/pytests/scenarios/swarm/conftest.py b/tests/pytests/scenarios/swarm/conftest.py index 95a4fe58a35..8147eb8049d 100644 --- a/tests/pytests/scenarios/swarm/conftest.py +++ b/tests/pytests/scenarios/swarm/conftest.py @@ -41,7 +41,7 @@ def salt_cli(salt_master): @pytest.fixture(scope="package") def minion_count(): # Allow this to be changed via an environment variable if needed - return int(os.environ.get("SALT_CI_MINION_SWARM_COUNT", 20)) + return int(os.environ.get("SALT_CI_MINION_SWARM_COUNT", 15)) @pytest.fixture(scope="package") @@ -53,7 +53,7 @@ def minion_swarm(salt_master, minion_count): with ExitStack() as stack: for idx in range(minion_count): minion_factory = salt_master.salt_minion_daemon( - random_string("swarm-minion-{}-".format(idx)), + random_string(f"swarm-minion-{idx}-"), extra_cli_arguments_after_first_start_failure=["--log-level=info"], ) stack.enter_context(minion_factory.started()) From 686f1d2fa9f0a5a7258d08e89538ee6e9a51c51d Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 22 Sep 2023 15:27:41 +0100 Subject: [PATCH 028/147] Try a few times before raising the error Signed-off-by: Pedro Algarvio --- .../pytests/functional/channel/test_server.py | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/tests/pytests/functional/channel/test_server.py b/tests/pytests/functional/channel/test_server.py index bdf96679b78..82a9450450f 100644 --- a/tests/pytests/functional/channel/test_server.py +++ b/tests/pytests/functional/channel/test_server.py @@ -165,11 +165,21 @@ def test_pub_server_channel( req_server_channel.post_fork(handle_payload, io_loop=io_loop) if master_config["transport"] == "zeromq": - p = Path(str(master_config["sock_dir"])) / "workers.ipc" - mode = os.lstat(p).st_mode - assert bool(os.lstat(p).st_mode & stat.S_IRUSR) - assert not bool(os.lstat(p).st_mode & stat.S_IRGRP) - assert not bool(os.lstat(p).st_mode & stat.S_IROTH) + time.sleep(1) + attempts = 5 + while True: + try: + p = Path(str(master_config["sock_dir"])) / "workers.ipc" + mode = os.lstat(p).st_mode + assert bool(os.lstat(p).st_mode & stat.S_IRUSR) + assert not bool(os.lstat(p).st_mode & stat.S_IRGRP) + assert not bool(os.lstat(p).st_mode & stat.S_IROTH) + break + except FileNotFoundError as exc: + if not attempts: + raise exc from None + attempts -= 1 + time.sleep(2.5) pub_channel = salt.channel.client.AsyncPubChannel.factory(minion_config) received = [] From dae70dab94cd8fefae917808e9cae4d3d375e5f4 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 27 Sep 2023 21:24:41 +0100 Subject: [PATCH 029/147] Fix workaround in order not to break nox Signed-off-by: Pedro Algarvio --- noxfile.py | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 70 insertions(+), 4 deletions(-) diff --git a/noxfile.py b/noxfile.py index 8b9a1669b75..ecd1458aa4e 100644 --- a/noxfile.py +++ b/noxfile.py @@ -13,7 +13,6 @@ import os import pathlib import shutil import sqlite3 -import subprocess import sys import tarfile import tempfile @@ -332,6 +331,73 @@ def _install_coverage_requirement(session): ) +def _downgrade_importlib_metadata(session): + distro_data = session_run_always( + session, + "python", + "-c", + "import distro, json, sys; print(json.dumps(distro.linux_distribution()), file=sys.stdout, flush=True)", + stderr=None, + silent=True, + log=False, + ) + distro_info = tuple(json.loads(distro_data.strip())) + session.log("Linux Distribution Details: {}".format(distro_info)) + if ( + ("amazon" in distro_info[0].lower() and distro_info[1] == "2") + or ("debian" in distro_info[0].lower() and distro_info[1] == "10") + or ("centos" in distro_info[0].lower() and distro_info[1] == "7") + ): + session.log("Downgrading importlib-metadata ...") + # Workaround for installing and running classic packages from 3005.1 + # They can only run with importlib-metadata<5.0.0. + with tempfile.NamedTemporaryFile(suffix=".txt") as tfile: + with open(tfile.name, "w") as wfh: + wfh.write("importlib-metadata<5.0.0\n") + # We need to upgrade pip to be able to use `--use-feature` + session_run_always( + session, + "/usr/bin/python3", + "-m", + "pip", + "--version", + ) + session_run_always( + session, + "/usr/bin/python3", + "-m", + "pip", + "install", + "--constraint={}".format(tfile.name), + "-U", + "pip>=21.0", + silent=False, + log=True, + external=True, + ) + session_run_always( + session, + "/usr/bin/python3", + "-m", + "pip", + "--version", + ) + # Properly downgrade importlib-metadata without breaking nox + session_run_always( + session, + "/usr/bin/python3", + "-m", + "pip", + "install", + "--constraint={}".format(tfile.name), + "-U", + "nox", + silent=False, + log=True, + external=True, + ) + + def _run_with_coverage(session, *test_cmd, env=None, on_rerun=False): _install_coverage_requirement(session) if on_rerun is False: @@ -1892,9 +1958,9 @@ def ci_test_onedir_pkgs(session): if chunk in ("upgrade-classic", "downgrade-classic"): cmd_args.append("--classic") - # Workaround for installing and running classic packages from 3005.1 - # They can only run with importlib-metadata<5.0.0. - subprocess.run(["pip3", "install", "importlib-metadata==4.13.0"], check=False) + + if IS_LINUX: + _downgrade_importlib_metadata(session) pytest_args = ( cmd_args[:] From e1d88d98719c070ef9dab563b3e25cda52e21fe9 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 28 Sep 2023 22:06:48 +0100 Subject: [PATCH 030/147] Bump to `actions/checkout@v4` Signed-off-by: Pedro Algarvio --- .github/workflows/build-deb-packages.yml | 4 ++-- .../workflows/build-deps-ci-action-macos.yml | 2 +- .github/workflows/build-deps-ci-action.yml | 2 +- .github/workflows/build-deps-onedir.yml | 6 ++--- .github/workflows/build-docs.yml | 2 +- .github/workflows/build-macos-packages.yml | 2 +- .github/workflows/build-rpm-packages.yml | 2 +- .github/workflows/build-salt-onedir.yml | 6 ++--- .github/workflows/build-windows-packages.yml | 2 +- .github/workflows/ci.yml | 8 +++---- .github/workflows/lint-action.yml | 4 ++-- .github/workflows/nightly.yml | 22 ++++++++--------- .github/workflows/pre-commit-action.yml | 2 +- .github/workflows/release-tag.yml | 4 ++-- .github/workflows/release-update-winrepo.yml | 4 ++-- .../workflows/release-upload-virustotal.yml | 2 +- .github/workflows/release.yml | 12 +++++----- .github/workflows/scheduled.yml | 8 +++---- .github/workflows/staging.yml | 24 +++++++++---------- .../templates/build-deb-repo.yml.jinja | 2 +- .../templates/build-macos-repo.yml.jinja | 2 +- .../templates/build-onedir-repo.yml.jinja | 2 +- .../templates/build-rpm-repo.yml.jinja | 2 +- .../templates/build-src-repo.yml.jinja | 2 +- .../templates/build-windows-repo.yml.jinja | 2 +- .github/workflows/templates/ci.yml.jinja | 6 ++--- .github/workflows/templates/layout.yml.jinja | 2 +- .github/workflows/templates/nightly.yml.jinja | 2 +- .github/workflows/templates/release.yml.jinja | 14 +++++------ .github/workflows/templates/staging.yml.jinja | 4 ++-- .github/workflows/test-action-macos.yml | 6 ++--- .github/workflows/test-action.yml | 6 ++--- .../test-package-downloads-action-linux.yml | 4 ++-- .../test-package-downloads-action-macos.yml | 4 ++-- .../test-package-downloads-action-windows.yml | 4 ++-- .../workflows/test-packages-action-macos.yml | 6 ++--- .github/workflows/test-packages-action.yml | 6 ++--- .github/workflows/triage.yml | 2 +- 38 files changed, 98 insertions(+), 98 deletions(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index 33ddb619814..31cc710ed3f 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -49,11 +49,11 @@ jobs: steps: # Checkout here so we can easily use custom actions - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 # Checkout here for the build process - name: Checkout in build directory - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: pkgs/checkout/ diff --git a/.github/workflows/build-deps-ci-action-macos.yml b/.github/workflows/build-deps-ci-action-macos.yml index 4f613bf18cb..1d3f0221628 100644 --- a/.github/workflows/build-deps-ci-action-macos.yml +++ b/.github/workflows/build-deps-ci-action-macos.yml @@ -63,7 +63,7 @@ jobs: t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" - name: Checkout Source Code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Cache nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }} id: nox-dependencies-cache diff --git a/.github/workflows/build-deps-ci-action.yml b/.github/workflows/build-deps-ci-action.yml index 6fa79ac5ff0..40c1708c439 100644 --- a/.github/workflows/build-deps-ci-action.yml +++ b/.github/workflows/build-deps-ci-action.yml @@ -68,7 +68,7 @@ jobs: t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t" - name: Checkout Source Code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Cache nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }} id: nox-dependencies-cache diff --git a/.github/workflows/build-deps-onedir.yml b/.github/workflows/build-deps-onedir.yml index f716b4c56c8..3cf048bd4d0 100644 --- a/.github/workflows/build-deps-onedir.yml +++ b/.github/workflows/build-deps-onedir.yml @@ -57,7 +57,7 @@ jobs: run: | t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Relenv id: setup-relenv @@ -99,7 +99,7 @@ jobs: run: | t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python 3.10 uses: actions/setup-python@v4 @@ -145,7 +145,7 @@ jobs: run: | t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python 3.10 uses: actions/setup-python@v4 diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml index 67fd425061f..eef8243169f 100644 --- a/.github/workflows/build-docs.yml +++ b/.github/workflows/build-docs.yml @@ -39,7 +39,7 @@ jobs: # - pdf steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Download Release Patch if: ${{ startsWith(github.event.ref, 'refs/tags') == false }} diff --git a/.github/workflows/build-macos-packages.yml b/.github/workflows/build-macos-packages.yml index db9f5fd9939..440aefba715 100644 --- a/.github/workflows/build-macos-packages.yml +++ b/.github/workflows/build-macos-packages.yml @@ -74,7 +74,7 @@ jobs: echo "sign-pkgs=false" >> "$GITHUB_OUTPUT" fi - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: 3.9 diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index b5527c22dcd..dfd62c10e8e 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -48,7 +48,7 @@ jobs: image: ghcr.io/saltstack/salt-ci-containers/packaging:centosstream-9 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Download Onedir Tarball as an Artifact uses: actions/download-artifact@v3 diff --git a/.github/workflows/build-salt-onedir.yml b/.github/workflows/build-salt-onedir.yml index 250084753f0..6ee7e802be0 100644 --- a/.github/workflows/build-salt-onedir.yml +++ b/.github/workflows/build-salt-onedir.yml @@ -57,7 +57,7 @@ jobs: run: | t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -106,7 +106,7 @@ jobs: run: | t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python 3.10 uses: actions/setup-python@v4 @@ -159,7 +159,7 @@ jobs: run: | t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python 3.10 uses: actions/setup-python@v4 with: diff --git a/.github/workflows/build-windows-packages.yml b/.github/workflows/build-windows-packages.yml index 333fdc4dafc..821d33c60d4 100644 --- a/.github/workflows/build-windows-packages.yml +++ b/.github/workflows/build-windows-packages.yml @@ -85,7 +85,7 @@ jobs: echo "sign-pkgs=false" >> "$GITHUB_OUTPUT" fi - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: 3.9 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f9af175715d..8165761d85c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,7 @@ jobs: releases: ${{ steps.get-salt-releases.outputs.releases }} testing-releases: ${{ steps.get-testing-releases.outputs.testing-releases }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 # Full clone to also get the tags to get the right salt version @@ -265,7 +265,7 @@ jobs: needs: - prepare-workflow steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Get Python Version id: get-python-version @@ -397,7 +397,7 @@ jobs: - prepare-release runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "medium", "x86_64"]') || 'ubuntu-latest' }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python 3.10 uses: actions/setup-python@v4 @@ -2114,7 +2114,7 @@ jobs: - ubuntu-2204 - ubuntu-2204-arm64 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python 3.10 if: ${{ github.event.repository.private == false }} diff --git a/.github/workflows/lint-action.yml b/.github/workflows/lint-action.yml index a19b9d3088e..347ddd29198 100644 --- a/.github/workflows/lint-action.yml +++ b/.github/workflows/lint-action.yml @@ -34,7 +34,7 @@ jobs: run: | git config --global --add safe.directory "$(pwd)" - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Nox run: | @@ -79,7 +79,7 @@ jobs: run: | git config --global --add safe.directory "$(pwd)" - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Nox run: | diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 1df5b0fd696..9475cccff58 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -93,7 +93,7 @@ jobs: releases: ${{ steps.get-salt-releases.outputs.releases }} testing-releases: ${{ steps.get-testing-releases.outputs.testing-releases }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 # Full clone to also get the tags to get the right salt version @@ -309,7 +309,7 @@ jobs: needs: - prepare-workflow steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Get Python Version id: get-python-version @@ -446,7 +446,7 @@ jobs: - prepare-release runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "medium", "x86_64"]') || 'ubuntu-latest' }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python 3.10 uses: actions/setup-python@v4 @@ -2175,7 +2175,7 @@ jobs: - ubuntu-2204 - ubuntu-2204-arm64 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python 3.10 if: ${{ github.event.repository.private == false }} @@ -2224,7 +2224,7 @@ jobs: - prepare-workflow - build-salt-onedir steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -2345,7 +2345,7 @@ jobs: arch: aarch64 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Download System Dependencies run: | @@ -2486,7 +2486,7 @@ jobs: arch: aarch64 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Download System Dependencies run: | @@ -2571,7 +2571,7 @@ jobs: - prepare-workflow - build-windows-pkgs-onedir steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -2665,7 +2665,7 @@ jobs: - prepare-workflow - build-macos-pkgs-onedir steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -2741,7 +2741,7 @@ jobs: - prepare-workflow - build-salt-onedir steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -2916,7 +2916,7 @@ jobs: - ubuntu-2204-arm64 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Get Salt Project GitHub Actions Bot Environment run: | diff --git a/.github/workflows/pre-commit-action.yml b/.github/workflows/pre-commit-action.yml index fbafa2c4b47..a4f97ae5d33 100644 --- a/.github/workflows/pre-commit-action.yml +++ b/.github/workflows/pre-commit-action.yml @@ -37,7 +37,7 @@ jobs: run: | git config --global --add safe.directory "$(pwd)" - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: ./.github/actions/setup-actionlint with: cache-seed: ${{ inputs.cache-seed }} diff --git a/.github/workflows/release-tag.yml b/.github/workflows/release-tag.yml index f1bc68d3fff..2908fd96f43 100644 --- a/.github/workflows/release-tag.yml +++ b/.github/workflows/release-tag.yml @@ -41,7 +41,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: ${{ github.event.inputs.saltRepo }} ref: ${{ github.event.inputs.saltBranch }} @@ -58,7 +58,7 @@ jobs: with: python-version: 3.8 - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install pypa/build run: | python -m pip install build --user diff --git a/.github/workflows/release-update-winrepo.yml b/.github/workflows/release-update-winrepo.yml index 88fbd71773a..4eac8c2c836 100644 --- a/.github/workflows/release-update-winrepo.yml +++ b/.github/workflows/release-update-winrepo.yml @@ -23,12 +23,12 @@ jobs: steps: - name: Checkout Salt - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: salt - name: Checkout WinRepo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: winrepo repository: twangboy/salt-winrepo-ng diff --git a/.github/workflows/release-upload-virustotal.yml b/.github/workflows/release-upload-virustotal.yml index 30f4db2dcb9..d47d6ce6a6f 100644 --- a/.github/workflows/release-upload-virustotal.yml +++ b/.github/workflows/release-upload-virustotal.yml @@ -34,7 +34,7 @@ jobs: steps: - name: Checkout Salt - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set Up Python 3.10 uses: actions/setup-python@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4465c05cd46..5e87d4ef2c6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -59,7 +59,7 @@ jobs: latest-release: ${{ steps.get-salt-releases.outputs.latest-release }} releases: ${{ steps.get-salt-releases.outputs.releases }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 # Full clone to also get the tags to get the right salt version @@ -139,7 +139,7 @@ jobs: - platform: darwin arch: x86_64 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -176,7 +176,7 @@ jobs: steps: - name: Clone The Salt Repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Rclone uses: AnimMouse/setup-rclone@v1 @@ -205,7 +205,7 @@ jobs: steps: - name: Clone The Salt Repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Get Salt Project GitHub Actions Bot Environment run: | @@ -1029,7 +1029,7 @@ jobs: environment: release steps: - name: Clone The Salt Repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ssh-key: ${{ secrets.GHA_SSH_KEY }} @@ -1134,7 +1134,7 @@ jobs: - linux - repo-release steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 461325d6122..6ac5e68bc52 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -83,7 +83,7 @@ jobs: releases: ${{ steps.get-salt-releases.outputs.releases }} testing-releases: ${{ steps.get-testing-releases.outputs.testing-releases }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 # Full clone to also get the tags to get the right salt version @@ -299,7 +299,7 @@ jobs: needs: - prepare-workflow steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Get Python Version id: get-python-version @@ -431,7 +431,7 @@ jobs: - prepare-release runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "medium", "x86_64"]') || 'ubuntu-latest' }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python 3.10 uses: actions/setup-python@v4 @@ -2148,7 +2148,7 @@ jobs: - ubuntu-2204 - ubuntu-2204-arm64 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python 3.10 if: ${{ github.event.repository.private == false }} diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 78cc3c03c10..d2daa5abdfd 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -79,7 +79,7 @@ jobs: releases: ${{ steps.get-salt-releases.outputs.releases }} testing-releases: ${{ steps.get-testing-releases.outputs.testing-releases }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 # Full clone to also get the tags to get the right salt version @@ -308,7 +308,7 @@ jobs: needs: - prepare-workflow steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Get Python Version id: get-python-version @@ -441,7 +441,7 @@ jobs: - prepare-release runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "medium", "x86_64"]') || 'ubuntu-latest' }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python 3.10 uses: actions/setup-python@v4 @@ -2118,7 +2118,7 @@ jobs: - prepare-workflow - build-salt-onedir steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -2239,7 +2239,7 @@ jobs: arch: aarch64 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Download System Dependencies run: | @@ -2380,7 +2380,7 @@ jobs: arch: aarch64 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Download System Dependencies run: | @@ -2467,7 +2467,7 @@ jobs: - prepare-workflow - build-windows-pkgs-onedir steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -2561,7 +2561,7 @@ jobs: - prepare-workflow - build-macos-pkgs-onedir steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -2637,7 +2637,7 @@ jobs: - prepare-workflow - build-salt-onedir steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -2756,7 +2756,7 @@ jobs: - build-onedir-repo steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Get Salt Project GitHub Actions Bot Environment run: | @@ -2801,7 +2801,7 @@ jobs: - linux - repo-staging steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Get Salt Project GitHub Actions Bot Environment run: | @@ -3702,7 +3702,7 @@ jobs: - linux - repo-staging steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts diff --git a/.github/workflows/templates/build-deb-repo.yml.jinja b/.github/workflows/templates/build-deb-repo.yml.jinja index 4f88e516a3d..a4e3dd8a2aa 100644 --- a/.github/workflows/templates/build-deb-repo.yml.jinja +++ b/.github/workflows/templates/build-deb-repo.yml.jinja @@ -19,7 +19,7 @@ <%- endfor %> steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Download System Dependencies run: | diff --git a/.github/workflows/templates/build-macos-repo.yml.jinja b/.github/workflows/templates/build-macos-repo.yml.jinja index f4494b24d74..b24e0a9c4a4 100644 --- a/.github/workflows/templates/build-macos-repo.yml.jinja +++ b/.github/workflows/templates/build-macos-repo.yml.jinja @@ -1,6 +1,6 @@ steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts diff --git a/.github/workflows/templates/build-onedir-repo.yml.jinja b/.github/workflows/templates/build-onedir-repo.yml.jinja index b68049c9a5c..581503ab1eb 100644 --- a/.github/workflows/templates/build-onedir-repo.yml.jinja +++ b/.github/workflows/templates/build-onedir-repo.yml.jinja @@ -1,6 +1,6 @@ steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts diff --git a/.github/workflows/templates/build-rpm-repo.yml.jinja b/.github/workflows/templates/build-rpm-repo.yml.jinja index 6f1b27c6eca..ba0702ffc03 100644 --- a/.github/workflows/templates/build-rpm-repo.yml.jinja +++ b/.github/workflows/templates/build-rpm-repo.yml.jinja @@ -29,7 +29,7 @@ <%- endfor %> steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Download System Dependencies run: | diff --git a/.github/workflows/templates/build-src-repo.yml.jinja b/.github/workflows/templates/build-src-repo.yml.jinja index 6a9c2634e96..728ed00f093 100644 --- a/.github/workflows/templates/build-src-repo.yml.jinja +++ b/.github/workflows/templates/build-src-repo.yml.jinja @@ -1,6 +1,6 @@ steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts diff --git a/.github/workflows/templates/build-windows-repo.yml.jinja b/.github/workflows/templates/build-windows-repo.yml.jinja index 0142e5cc09c..d806fd00bb3 100644 --- a/.github/workflows/templates/build-windows-repo.yml.jinja +++ b/.github/workflows/templates/build-windows-repo.yml.jinja @@ -1,6 +1,6 @@ steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts diff --git a/.github/workflows/templates/ci.yml.jinja b/.github/workflows/templates/ci.yml.jinja index c5d5facd6d5..67d8d1f877b 100644 --- a/.github/workflows/templates/ci.yml.jinja +++ b/.github/workflows/templates/ci.yml.jinja @@ -57,7 +57,7 @@ needs: - prepare-workflow steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Get Python Version id: get-python-version @@ -215,7 +215,7 @@ - prepare-release runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "medium", "x86_64"]') || 'ubuntu-latest' }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python 3.10 uses: actions/setup-python@v4 @@ -329,7 +329,7 @@ - <{ need }> <%- endfor %> steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python 3.10 if: ${{ github.event.repository.private == false }} diff --git a/.github/workflows/templates/layout.yml.jinja b/.github/workflows/templates/layout.yml.jinja index 773ebeb6227..be681625f53 100644 --- a/.github/workflows/templates/layout.yml.jinja +++ b/.github/workflows/templates/layout.yml.jinja @@ -97,7 +97,7 @@ jobs: releases: ${{ steps.get-salt-releases.outputs.releases }} testing-releases: ${{ steps.get-testing-releases.outputs.testing-releases }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 # Full clone to also get the tags to get the right salt version diff --git a/.github/workflows/templates/nightly.yml.jinja b/.github/workflows/templates/nightly.yml.jinja index 7bd74c31da0..67b07ad5ffa 100644 --- a/.github/workflows/templates/nightly.yml.jinja +++ b/.github/workflows/templates/nightly.yml.jinja @@ -157,7 +157,7 @@ concurrency: <%- endif %> steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Get Salt Project GitHub Actions Bot Environment run: | diff --git a/.github/workflows/templates/release.yml.jinja b/.github/workflows/templates/release.yml.jinja index d0068105403..14f7698cb1c 100644 --- a/.github/workflows/templates/release.yml.jinja +++ b/.github/workflows/templates/release.yml.jinja @@ -87,7 +87,7 @@ permissions: latest-release: ${{ steps.get-salt-releases.outputs.latest-release }} releases: ${{ steps.get-salt-releases.outputs.releases }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 # Full clone to also get the tags to get the right salt version @@ -173,7 +173,7 @@ permissions: - platform: darwin arch: x86_64 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -210,7 +210,7 @@ permissions: steps: - name: Clone The Salt Repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Rclone uses: AnimMouse/setup-rclone@v1 @@ -240,7 +240,7 @@ permissions: steps: - name: Clone The Salt Repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Get Salt Project GitHub Actions Bot Environment run: | @@ -280,7 +280,7 @@ permissions: environment: <{ gh_environment }> steps: - name: Clone The Salt Repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ssh-key: ${{ secrets.GHA_SSH_KEY }} @@ -391,7 +391,7 @@ permissions: environment: <{ gh_environment }> steps: - name: Clone The Salt Repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ssh-key: ${{ secrets.GHA_SSH_KEY }} @@ -422,7 +422,7 @@ permissions: - linux - repo-<{ gh_environment }> steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts diff --git a/.github/workflows/templates/staging.yml.jinja b/.github/workflows/templates/staging.yml.jinja index c55377b98cc..e11a763b0a0 100644 --- a/.github/workflows/templates/staging.yml.jinja +++ b/.github/workflows/templates/staging.yml.jinja @@ -94,7 +94,7 @@ concurrency: - linux - repo-<{ gh_environment }> steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Get Salt Project GitHub Actions Bot Environment run: | @@ -183,7 +183,7 @@ concurrency: - linux - repo-<{ gh_environment }> steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts diff --git a/.github/workflows/test-action-macos.yml b/.github/workflows/test-action-macos.yml index 9bf6b6b9b93..dd12938561e 100644 --- a/.github/workflows/test-action-macos.yml +++ b/.github/workflows/test-action-macos.yml @@ -77,7 +77,7 @@ jobs: t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t" - name: Checkout Source Code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -104,7 +104,7 @@ jobs: steps: - name: Checkout Source Code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Salt Version run: | @@ -385,7 +385,7 @@ jobs: steps: - name: Checkout Source Code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download Code Coverage Test Run Artifacts uses: actions/download-artifact@v3 diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index 747dfb01a83..0cb10a4aa8d 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -82,7 +82,7 @@ jobs: t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t" - name: Checkout Source Code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -112,7 +112,7 @@ jobs: steps: - name: Checkout Source Code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Salt Version run: | @@ -335,7 +335,7 @@ jobs: steps: - name: Checkout Source Code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download Code Coverage Test Run Artifacts uses: actions/download-artifact@v3 diff --git a/.github/workflows/test-package-downloads-action-linux.yml b/.github/workflows/test-package-downloads-action-linux.yml index 1fa9aa77449..97dc23ad336 100644 --- a/.github/workflows/test-package-downloads-action-linux.yml +++ b/.github/workflows/test-package-downloads-action-linux.yml @@ -86,7 +86,7 @@ jobs: t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t" - name: Checkout Source Code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download Onedir Tarball as an Artifact uses: actions/download-artifact@v3 @@ -225,7 +225,7 @@ jobs: steps: - name: Checkout Source Code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download Test Run Artifacts id: download-test-run-artifacts diff --git a/.github/workflows/test-package-downloads-action-macos.yml b/.github/workflows/test-package-downloads-action-macos.yml index 754b4f34aff..4e66714715a 100644 --- a/.github/workflows/test-package-downloads-action-macos.yml +++ b/.github/workflows/test-package-downloads-action-macos.yml @@ -81,7 +81,7 @@ jobs: t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" - name: Checkout Source Code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download Onedir Tarball as an Artifact uses: actions/download-artifact@v3 @@ -205,7 +205,7 @@ jobs: steps: - name: Checkout Source Code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download Test Run Artifacts id: download-test-run-artifacts diff --git a/.github/workflows/test-package-downloads-action-windows.yml b/.github/workflows/test-package-downloads-action-windows.yml index 3afe6dc7b40..911f9b711a3 100644 --- a/.github/workflows/test-package-downloads-action-windows.yml +++ b/.github/workflows/test-package-downloads-action-windows.yml @@ -85,7 +85,7 @@ jobs: steps: - name: Checkout Source Code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download Onedir Tarball as an Artifact uses: actions/download-artifact@v3 @@ -224,7 +224,7 @@ jobs: steps: - name: Checkout Source Code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download Test Run Artifacts id: download-test-run-artifacts diff --git a/.github/workflows/test-packages-action-macos.yml b/.github/workflows/test-packages-action-macos.yml index ffcceba86ac..7767b104a7f 100644 --- a/.github/workflows/test-packages-action-macos.yml +++ b/.github/workflows/test-packages-action-macos.yml @@ -81,7 +81,7 @@ jobs: t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" - name: Checkout Source Code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -105,7 +105,7 @@ jobs: steps: - name: Checkout Source Code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download Packages uses: actions/download-artifact@v3 @@ -220,7 +220,7 @@ jobs: steps: - name: Checkout Source Code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download Test Run Artifacts id: download-test-run-artifacts diff --git a/.github/workflows/test-packages-action.yml b/.github/workflows/test-packages-action.yml index c869a7c4f67..fc5170197f2 100644 --- a/.github/workflows/test-packages-action.yml +++ b/.github/workflows/test-packages-action.yml @@ -86,7 +86,7 @@ jobs: t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t" - name: Checkout Source Code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -113,7 +113,7 @@ jobs: steps: - name: Checkout Source Code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download Packages uses: actions/download-artifact@v3 @@ -228,7 +228,7 @@ jobs: steps: - name: Checkout Source Code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download Test Run Artifacts id: download-test-run-artifacts diff --git a/.github/workflows/triage.yml b/.github/workflows/triage.yml index 8f33b708207..2971429a4dc 100644 --- a/.github/workflows/triage.yml +++ b/.github/workflows/triage.yml @@ -25,7 +25,7 @@ jobs: runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "x86_64"]') || 'ubuntu-latest' }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 From b2633987effc675314d3ed9084829363ebc13337 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 28 Sep 2023 22:45:55 +0100 Subject: [PATCH 031/147] Just install the dependencies directly Signed-off-by: Pedro Algarvio --- noxfile.py | 66 +++++++++++++++++------------------------------------- 1 file changed, 21 insertions(+), 45 deletions(-) diff --git a/noxfile.py b/noxfile.py index ecd1458aa4e..ac7dbb18504 100644 --- a/noxfile.py +++ b/noxfile.py @@ -349,53 +349,29 @@ def _downgrade_importlib_metadata(session): or ("centos" in distro_info[0].lower() and distro_info[1] == "7") ): session.log("Downgrading importlib-metadata ...") + nox_version = session_run_always( + session, + "nox", + "--version", + silent=True, + log=False, + ).strip() # Workaround for installing and running classic packages from 3005.1 # They can only run with importlib-metadata<5.0.0. - with tempfile.NamedTemporaryFile(suffix=".txt") as tfile: - with open(tfile.name, "w") as wfh: - wfh.write("importlib-metadata<5.0.0\n") - # We need to upgrade pip to be able to use `--use-feature` - session_run_always( - session, - "/usr/bin/python3", - "-m", - "pip", - "--version", - ) - session_run_always( - session, - "/usr/bin/python3", - "-m", - "pip", - "install", - "--constraint={}".format(tfile.name), - "-U", - "pip>=21.0", - silent=False, - log=True, - external=True, - ) - session_run_always( - session, - "/usr/bin/python3", - "-m", - "pip", - "--version", - ) - # Properly downgrade importlib-metadata without breaking nox - session_run_always( - session, - "/usr/bin/python3", - "-m", - "pip", - "install", - "--constraint={}".format(tfile.name), - "-U", - "nox", - silent=False, - log=True, - external=True, - ) + session_run_always( + session, + "/usr/bin/python3", + "-m", + "pip", + "install", + "-U", + "importlib-metadata<=4.13.0", + "virtualenv<=20.21.1", + "nox=={}".format(nox_version), + silent=False, + log=True, + external=True, + ) def _run_with_coverage(session, *test_cmd, env=None, on_rerun=False): From 8c243a64decebec3bc234248c6032d02f6cceaee Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 29 Sep 2023 08:21:10 +0100 Subject: [PATCH 032/147] Downgrade `importlib-metadata` from the workflow, not nox. Signed-off-by: Pedro Algarvio --- .github/workflows/test-packages-action.yml | 6 +++ noxfile.py | 46 ---------------------- 2 files changed, 6 insertions(+), 46 deletions(-) diff --git a/.github/workflows/test-packages-action.yml b/.github/workflows/test-packages-action.yml index fc5170197f2..f455bf7b0a7 100644 --- a/.github/workflows/test-packages-action.yml +++ b/.github/workflows/test-packages-action.yml @@ -174,6 +174,12 @@ jobs: run: | tools --timestamps vm decompress-dependencies ${{ inputs.distro-slug }} + - name: Downgrade importlib-metadata + if: ${{ contains(fromJSON('["amazonlinux-2", "centos-7", "debian-10"]'), inputs.distro-slug) && contains(fromJSON('["upgrade-classic", "downgrade-classic"]'), matrix.test-chunk) }} + run: | + # This step can go away once we stop testing classic packages upgrade/downgrades to/from 3005.x + tools --timestamps vm ssh ${{ inputs.distro-slug }} -- "sudo python3 -m pip install -U 'importlib-metadata<=4.13.0' 'virtualenv<=20.21.1'" + - name: Show System Info & Test Plan run: | tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ diff --git a/noxfile.py b/noxfile.py index ac7dbb18504..22d8fedb76b 100644 --- a/noxfile.py +++ b/noxfile.py @@ -331,49 +331,6 @@ def _install_coverage_requirement(session): ) -def _downgrade_importlib_metadata(session): - distro_data = session_run_always( - session, - "python", - "-c", - "import distro, json, sys; print(json.dumps(distro.linux_distribution()), file=sys.stdout, flush=True)", - stderr=None, - silent=True, - log=False, - ) - distro_info = tuple(json.loads(distro_data.strip())) - session.log("Linux Distribution Details: {}".format(distro_info)) - if ( - ("amazon" in distro_info[0].lower() and distro_info[1] == "2") - or ("debian" in distro_info[0].lower() and distro_info[1] == "10") - or ("centos" in distro_info[0].lower() and distro_info[1] == "7") - ): - session.log("Downgrading importlib-metadata ...") - nox_version = session_run_always( - session, - "nox", - "--version", - silent=True, - log=False, - ).strip() - # Workaround for installing and running classic packages from 3005.1 - # They can only run with importlib-metadata<5.0.0. - session_run_always( - session, - "/usr/bin/python3", - "-m", - "pip", - "install", - "-U", - "importlib-metadata<=4.13.0", - "virtualenv<=20.21.1", - "nox=={}".format(nox_version), - silent=False, - log=True, - external=True, - ) - - def _run_with_coverage(session, *test_cmd, env=None, on_rerun=False): _install_coverage_requirement(session) if on_rerun is False: @@ -1935,9 +1892,6 @@ def ci_test_onedir_pkgs(session): if chunk in ("upgrade-classic", "downgrade-classic"): cmd_args.append("--classic") - if IS_LINUX: - _downgrade_importlib_metadata(session) - pytest_args = ( cmd_args[:] + [ From 309829e5e3bc9fdeaf5ad01fa035e72d4e9cb460 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 29 Sep 2023 09:15:23 +0100 Subject: [PATCH 033/147] Set and make use of the `TOOLS_DISTRO_SLUG` environment variable in CI Signed-off-by: Pedro Algarvio --- noxfile.py | 12 ++++++++++++ tools/vm.py | 1 + 2 files changed, 13 insertions(+) diff --git a/noxfile.py b/noxfile.py index 22d8fedb76b..cc3723c44f3 100644 --- a/noxfile.py +++ b/noxfile.py @@ -326,6 +326,18 @@ def _install_coverage_requirement(session): coverage_requirement = COVERAGE_REQUIREMENT if coverage_requirement is None: coverage_requirement = "coverage==7.3.1" + if IS_LINUX: + distro_slug = os.environ.get("TOOLS_DISTRO_SLUG") + if distro_slug is not None and distro_slug in ( + "centos-7", + "debian-10", + "photonos-3", + ): + # Keep the old coverage requirement version since the new one, on these + # plaforms turns the test suite quite slow. + # Unit tests don't finish before the 5 hours timeout when they should + # finish within 1 to 2 hours. + coverage_requirement = "coverage==5.2" session.install( "--progress-bar=off", coverage_requirement, silent=PIP_INSTALL_SILENT ) diff --git a/tools/vm.py b/tools/vm.py index e6ff0ade9b2..ad45dbed6f0 100644 --- a/tools/vm.py +++ b/tools/vm.py @@ -1331,6 +1331,7 @@ class VM: if not env: return write_env = {k: str(v) for (k, v) in env.items()} + write_env["TOOLS_DISTRO_SLUG"] = self.name write_env_filename = ".ci-env" write_env_filepath = tools.utils.REPO_ROOT / ".ci-env" write_env_filepath.write_text(json.dumps(write_env)) From 4b02270161604917d1e6d43ec6d89d9d350e7308 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 29 Sep 2023 18:38:31 +0100 Subject: [PATCH 034/147] Create the XML coverage reports using the onedir Signed-off-by: Pedro Algarvio --- noxfile.py | 17 +++++++++++++++-- tools/vm.py | 4 +++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/noxfile.py b/noxfile.py index cc3723c44f3..16d5ceb5386 100644 --- a/noxfile.py +++ b/noxfile.py @@ -1381,8 +1381,7 @@ def create_html_coverage_report(session): ) -@nox.session(python="3", name="create-xml-coverage-reports") -def create_xml_coverage_reports(session): +def _create_xml_coverage_reports(session): _install_coverage_requirement(session) env = { # The full path to the .coverage data file. Makes sure we always write @@ -1419,6 +1418,20 @@ def create_xml_coverage_reports(session): session_warn(session, "Failed to generate the source XML code coverage report") +@nox.session(python="3", name="create-xml-coverage-reports") +def create_xml_coverage_reports(session): + _create_xml_coverage_reports(session) + + +@nox.session( + python=str(ONEDIR_PYTHON_PATH), + name="create-xml-coverage-reports-onedir", + venv_params=["--system-site-packages"], +) +def create_xml_coverage_reports_onedir(session): + _create_xml_coverage_reports(session) + + class Tee: """ Python class to mimic linux tee behaviour diff --git a/tools/vm.py b/tools/vm.py index ad45dbed6f0..000abc4e40f 100644 --- a/tools/vm.py +++ b/tools/vm.py @@ -1439,7 +1439,9 @@ class VM: """ Create XML coverage reports """ - return self.run_nox("create-xml-coverage-reports", session_args=[self.name]) + return self.run_nox( + "create-xml-coverage-reports-onedir", session_args=[self.name] + ) def compress_dependencies(self): """ From 22178c5be1149294b43cc8365e9ec38945b381dd Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 29 Sep 2023 18:46:53 +0100 Subject: [PATCH 035/147] We need XML coverage reports for codedov. Remove the step for now. Signed-off-by: Pedro Algarvio --- .github/workflows/test-action-macos.yml | 5 ----- .github/workflows/test-action.yml | 5 ----- .github/workflows/test-package-downloads-action-linux.yml | 5 ----- .github/workflows/test-package-downloads-action-macos.yml | 5 ----- .github/workflows/test-package-downloads-action-windows.yml | 5 ----- 5 files changed, 25 deletions(-) diff --git a/.github/workflows/test-action-macos.yml b/.github/workflows/test-action-macos.yml index dd12938561e..6e4c769953f 100644 --- a/.github/workflows/test-action-macos.yml +++ b/.github/workflows/test-action-macos.yml @@ -316,11 +316,6 @@ jobs: run: | nox -e combine-coverage - - name: Create XML Coverage Reports - if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' - run: | - nox -e create-xml-coverage-reports - - name: Prepare Test Run Artifacts id: download-artifacts-from-vm if: always() && job.status != 'cancelled' diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index 0cb10a4aa8d..da5e6bbe4bc 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -257,11 +257,6 @@ jobs: run: | tools --timestamps vm combine-coverage ${{ inputs.distro-slug }} - - name: Create XML Coverage Reports - if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' - run: | - tools --timestamps vm create-xml-coverage-reports ${{ inputs.distro-slug }} - - name: Download Test Run Artifacts id: download-artifacts-from-vm if: always() && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' diff --git a/.github/workflows/test-package-downloads-action-linux.yml b/.github/workflows/test-package-downloads-action-linux.yml index 97dc23ad336..5bc62f53165 100644 --- a/.github/workflows/test-package-downloads-action-linux.yml +++ b/.github/workflows/test-package-downloads-action-linux.yml @@ -178,11 +178,6 @@ jobs: run: | tools --timestamps vm combine-coverage ${{ inputs.distro-slug }} - - name: Create XML Coverage Reports - if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' - run: | - tools --timestamps vm create-xml-coverage-reports ${{ inputs.distro-slug }} - - name: Download Test Run Artifacts id: download-artifacts-from-vm if: always() && steps.spin-up-vm.outcome == 'success' diff --git a/.github/workflows/test-package-downloads-action-macos.yml b/.github/workflows/test-package-downloads-action-macos.yml index 4e66714715a..cab0016181c 100644 --- a/.github/workflows/test-package-downloads-action-macos.yml +++ b/.github/workflows/test-package-downloads-action-macos.yml @@ -171,11 +171,6 @@ jobs: run: | nox --force-color -e combine-coverage - - name: Create XML Coverage Reports - if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' - run: | - tools --timestamps vm create-xml-coverage-reports ${{ inputs.distro-slug }} - - name: Prepare Test Run Artifacts id: download-artifacts-from-vm if: always() && job.status != 'cancelled' diff --git a/.github/workflows/test-package-downloads-action-windows.yml b/.github/workflows/test-package-downloads-action-windows.yml index 911f9b711a3..fe628957ca4 100644 --- a/.github/workflows/test-package-downloads-action-windows.yml +++ b/.github/workflows/test-package-downloads-action-windows.yml @@ -177,11 +177,6 @@ jobs: run: | tools --timestamps vm combine-coverage ${{ inputs.distro-slug }} - - name: Create XML Coverage Reports - if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' - run: | - tools --timestamps vm create-xml-coverage-reports ${{ inputs.distro-slug }} - - name: Download Test Run Artifacts id: download-artifacts-from-vm if: always() && steps.spin-up-vm.outcome == 'success' From 8d40802c737c258f4fa476bbb68e0f762217ff88 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 30 Sep 2023 08:24:17 +0100 Subject: [PATCH 036/147] This is not a fast test Signed-off-by: Pedro Algarvio --- .../pytests/integration/runners/state/orchestrate/test_events.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/pytests/integration/runners/state/orchestrate/test_events.py b/tests/pytests/integration/runners/state/orchestrate/test_events.py index 3604d1c4c65..5ebaf500765 100644 --- a/tests/pytests/integration/runners/state/orchestrate/test_events.py +++ b/tests/pytests/integration/runners/state/orchestrate/test_events.py @@ -186,6 +186,7 @@ def test_jid_in_ret_event(salt_run_cli, salt_master, salt_minion, event_listener # This test is flaky on FreeBSD @pytest.mark.skip_on_freebsd +@pytest.mark.slow_test @pytest.mark.skip_on_spawning_platform( reason="The '__low__' global is not populated on spawning platforms" ) From 03a3bccdbf1737d36c752b415e7657e9b8a7579d Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 29 Sep 2023 20:38:51 +0100 Subject: [PATCH 037/147] Lock the `pygithub` version being installed in the test Signed-off-by: Pedro Algarvio --- pkg/tests/integration/test_pip.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/tests/integration/test_pip.py b/pkg/tests/integration/test_pip.py index d6102c431e3..a55d8fdd8bb 100644 --- a/pkg/tests/integration/test_pip.py +++ b/pkg/tests/integration/test_pip.py @@ -46,7 +46,7 @@ def test_pip_install(salt_call_cli, install_salt, shell): """ Test pip.install and ensure module can use installed library """ - dep = "PyGithub" + dep = "PyGithub==1.56.0" repo = "https://github.com/saltstack/salt.git" try: From 872293bbb090ea135298751e5d34c47b253ab268 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 30 Sep 2023 14:42:05 +0100 Subject: [PATCH 038/147] Bump lowest coverage version to `6.2` Signed-off-by: Pedro Algarvio --- noxfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index 16d5ceb5386..1ce1575380c 100644 --- a/noxfile.py +++ b/noxfile.py @@ -337,7 +337,7 @@ def _install_coverage_requirement(session): # plaforms turns the test suite quite slow. # Unit tests don't finish before the 5 hours timeout when they should # finish within 1 to 2 hours. - coverage_requirement = "coverage==5.2" + coverage_requirement = "coverage==6.2" session.install( "--progress-bar=off", coverage_requirement, silent=PIP_INSTALL_SILENT ) From 727c3fe784ff646bf06f16a5cb71091ccee931be Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Fri, 29 Sep 2023 13:15:54 -0700 Subject: [PATCH 039/147] Ensure that the correct value of jid_inclue is passed if the argument is included in the passed keyword arguments --- salt/modules/schedule.py | 3 +- tests/pytests/unit/modules/test_schedule.py | 32 +++++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/salt/modules/schedule.py b/salt/modules/schedule.py index 64e2234c3bd..b8553bc6f78 100644 --- a/salt/modules/schedule.py +++ b/salt/modules/schedule.py @@ -521,8 +521,7 @@ def build_schedule_item(name, **kwargs): else: schedule[name]["enabled"] = True - if "jid_include" not in kwargs or kwargs["jid_include"]: - schedule[name]["jid_include"] = True + schedule[name]["jid_include"] = kwargs.get("jid_include", True) if "splay" in kwargs: if isinstance(kwargs["splay"], dict): diff --git a/tests/pytests/unit/modules/test_schedule.py b/tests/pytests/unit/modules/test_schedule.py index d3488559143..d39ae30e5c2 100644 --- a/tests/pytests/unit/modules/test_schedule.py +++ b/tests/pytests/unit/modules/test_schedule.py @@ -198,6 +198,38 @@ def test_build_schedule_item_invalid_jobs_args(): ) == {"comment": comment2, "result": False} +def test_build_schedule_item_jid_include(): + """ + Test build_schedule_item when jid_include is passed and not passed + """ + ret = schedule.build_schedule_item("job1", function="test.args", jid_include=False) + assert ret == { + "function": "test.args", + "maxrunning": 1, + "name": "job1", + "enabled": True, + "jid_include": False, + } + + ret = schedule.build_schedule_item("job1", function="test.args", jid_include=True) + assert ret == { + "function": "test.args", + "maxrunning": 1, + "name": "job1", + "enabled": True, + "jid_include": True, + } + + ret = schedule.build_schedule_item("job1", function="test.args") + assert ret == { + "function": "test.args", + "maxrunning": 1, + "name": "job1", + "enabled": True, + "jid_include": True, + } + + # 'add' function tests: 1 From 6164155e2456f355d541a407cb3e8a919c2b43cd Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Fri, 29 Sep 2023 13:17:21 -0700 Subject: [PATCH 040/147] Adding changelog. --- changelog/65302.fixed.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/65302.fixed.md diff --git a/changelog/65302.fixed.md b/changelog/65302.fixed.md new file mode 100644 index 00000000000..087bd27314e --- /dev/null +++ b/changelog/65302.fixed.md @@ -0,0 +1 @@ +Ensure that the correct value of jid_inclue is passed if the argument is included in the passed keyword arguments. From a6b3b79923323c0f544a13b22701d42b56855fe7 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 30 Sep 2023 18:31:44 +0100 Subject: [PATCH 041/147] Also check for `SALT_TRANSPORT` in `ci_test_onedir` Signed-off-by: Pedro Algarvio --- noxfile.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/noxfile.py b/noxfile.py index 1ce1575380c..3f6d8aa178d 100644 --- a/noxfile.py +++ b/noxfile.py @@ -1174,6 +1174,14 @@ def ci_test_onedir(session): ) ) + transport = os.environ.get("SALT_TRANSPORT") or "zeromq" + valid_transports = ("zeromq", "tcp") + if transport not in valid_transports: + session.error( + "The value for the SALT_TRANSPORT environment variable can only be " + f"one of: {', '.join(valid_transports)}" + ) + _ci_test(session, "zeromq", onedir=True) From cb287ef190b77cd13e294bb0f6030fbdad3d95fc Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 1 Oct 2023 21:13:38 +0100 Subject: [PATCH 042/147] Go back to `coverage==5.5` Signed-off-by: Pedro Algarvio --- noxfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index 3f6d8aa178d..b914e301721 100644 --- a/noxfile.py +++ b/noxfile.py @@ -337,7 +337,7 @@ def _install_coverage_requirement(session): # plaforms turns the test suite quite slow. # Unit tests don't finish before the 5 hours timeout when they should # finish within 1 to 2 hours. - coverage_requirement = "coverage==6.2" + coverage_requirement = "coverage==5.5" session.install( "--progress-bar=off", coverage_requirement, silent=PIP_INSTALL_SILENT ) From 1405465755d017c5410f8e67b864195c0613e8d3 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 1 Oct 2023 21:19:20 +0100 Subject: [PATCH 043/147] Write directly to `$GITHUB_OUTPUT` Signed-off-by: Pedro Algarvio --- .github/workflows/test-action-macos.yml | 4 +--- .github/workflows/test-action.yml | 4 +--- tools/ci.py | 19 +++++++++++++------ 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test-action-macos.yml b/.github/workflows/test-action-macos.yml index 6e4c769953f..ec78982b40e 100644 --- a/.github/workflows/test-action-macos.yml +++ b/.github/workflows/test-action-macos.yml @@ -85,9 +85,7 @@ jobs: - name: Generate Test Matrix id: generate-matrix run: | - TEST_MATRIX=$(tools ci matrix ${{ inputs.distro-slug }}) - echo "$TEST_MATRIX" - echo "matrix=$TEST_MATRIX" >> "$GITHUB_OUTPUT" + tools ci matrix ${{ inputs.distro-slug }} test: name: Test diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index da5e6bbe4bc..2d54f22a2f3 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -90,9 +90,7 @@ jobs: - name: Generate Test Matrix id: generate-matrix run: | - TEST_MATRIX=$(tools ci matrix ${{ inputs.distro-slug }}) - echo "$TEST_MATRIX" - echo "matrix=$TEST_MATRIX" >> "$GITHUB_OUTPUT" + tools ci matrix ${{ inputs.distro-slug }} test: name: Test diff --git a/tools/ci.py b/tools/ci.py index 81a18c2d4e9..f45ff409e6a 100644 --- a/tools/ci.py +++ b/tools/ci.py @@ -633,7 +633,14 @@ def matrix(ctx: Context, distro_slug: str): if "macos" in distro_slug and chunk == "scenarios": continue _matrix.append({"transport": transport, "tests-chunk": chunk}) - print(json.dumps(_matrix)) + + ctx.info("Generated matrix:") + ctx.print(_matrix, soft_wrap=True) + + github_output = os.environ.get("GITHUB_OUTPUT") + if github_output is not None: + with open(github_output, "a", encoding="utf-8") as wfh: + wfh.write(f"matrix={json.dumps(_matrix)}\n") ctx.exit(0) @@ -667,7 +674,7 @@ def pkg_matrix( ctx.warn("The 'GITHUB_OUTPUT' variable is not set.") if TYPE_CHECKING: assert testing_releases - matrix = [] + _matrix = [] sessions = [ "install", ] @@ -733,20 +740,20 @@ def pkg_matrix( if version < tools.utils.Version("3006.0") ] for version in versions: - matrix.append( + _matrix.append( { "test-chunk": session, "version": version, } ) if distro_slug.startswith("windows"): - matrix[-1]["pkg-type"] = pkg_type.upper() + _matrix[-1]["pkg-type"] = pkg_type.upper() ctx.info("Generated matrix:") - ctx.print(matrix, soft_wrap=True) + ctx.print(_matrix, soft_wrap=True) if github_output is not None: with open(github_output, "a", encoding="utf-8") as wfh: - wfh.write(f"matrix={json.dumps(matrix)}\n") + wfh.write(f"matrix={json.dumps(_matrix)}\n") ctx.exit(0) From 95b43d4226305cb8aed8501f0528c3b74c2f4287 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 2 Oct 2023 07:29:28 +0100 Subject: [PATCH 044/147] Split integration tests into 2 chunks on full test runs Signed-off-by: Pedro Algarvio --- .github/workflows/test-action-macos.yml | 1 - .github/workflows/test-action.yml | 8 ++++---- tests/conftest.py | 6 +++++- tools/ci.py | 18 ++++++++++++++++-- 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test-action-macos.yml b/.github/workflows/test-action-macos.yml index ec78982b40e..35699265067 100644 --- a/.github/workflows/test-action-macos.yml +++ b/.github/workflows/test-action-macos.yml @@ -324,7 +324,6 @@ jobs: tree -a artifacts if [ "${{ inputs.skip-code-coverage }}" != "true" ]; then mv artifacts/coverage/.coverage artifacts/coverage/.coverage.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.${{ matrix.transport }}.${{ matrix.tests-chunk }} - echo "COVERAGE_FILE=artifacts/coverage/.coverage.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.${{ matrix.transport }}.${{ matrix.tests-chunk }}" >> GITHUB_ENV fi - name: Upload Code Coverage Test Run Artifacts diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index 2d54f22a2f3..97da633407c 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -90,7 +90,7 @@ jobs: - name: Generate Test Matrix id: generate-matrix run: | - tools ci matrix ${{ inputs.distro-slug }} + tools ci matrix ${{ fromJSON(inputs.testrun)['type'] == 'full' && '--full ' || '' }}${{ inputs.distro-slug }} test: name: Test @@ -248,7 +248,8 @@ jobs: run: | tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ --nox-session=${{ inputs.nox-session }} --rerun-failures -E SALT_TRANSPORT ${{ (inputs.skip-code-coverage && matrix.tests-chunk != 'unit') && '--skip-code-coverage' || '' }} \ - ${{ inputs.distro-slug }} ${{ matrix.tests-chunk }} -- --slow-tests --core-tests + ${{ inputs.distro-slug }} ${{ matrix.tests-chunk }} -- --slow-tests --core-tests \ + --test-group-count=${{ matrix.test-chunk-total || 1 }} --test-group=${{ matrix.test-chunk-no || 1 }} - name: Combine Coverage Reports if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' @@ -265,8 +266,7 @@ jobs: rm -rf artifacts/salt* tree -a artifacts if [ "${{ inputs.skip-code-coverage }}" != "true" ]; then - mv artifacts/coverage/.coverage artifacts/coverage/.coverage.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.${{ matrix.transport }}.${{ matrix.tests-chunk }} - echo "COVERAGE_FILE=artifacts/coverage/.coverage.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.${{ matrix.transport }}.${{ matrix.tests-chunk }}" >> GITHUB_ENV + mv artifacts/coverage/.coverage artifacts/coverage/.coverage.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.${{ matrix.transport }}.${{ matrix.tests-chunk }}.${{ matrix.test-chunk-no || '1' }} fi - name: Destroy VM diff --git a/tests/conftest.py b/tests/conftest.py index ff35313df7f..5bb4e5764c3 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -835,6 +835,10 @@ def groups_collection_modifyitems(config, items): # We're not selection tests using groups, don't do any filtering return + if group_count == 1: + # Just one group, don't do any filtering + return + total_items = len(items) tests_in_group, deselected = get_group(items, group_count, group_id) @@ -845,7 +849,7 @@ def groups_collection_modifyitems(config, items): terminal_reporter = config.pluginmanager.get_plugin("terminalreporter") terminal_reporter.write( - "Running test group #{} ({} tests)\n".format(group_id, len(items)), + f"Running test group #{group_id}(out of #{group_count}) ({len(items)} tests)\n", yellow=True, ) diff --git a/tools/ci.py b/tools/ci.py index f45ff409e6a..4600da2cc64 100644 --- a/tools/ci.py +++ b/tools/ci.py @@ -609,9 +609,12 @@ def define_testrun(ctx: Context, event_name: str, changed_files: pathlib.Path): "distro_slug": { "help": "The distribution slug to generate the matrix for", }, + "full": { + "help": "Full test run", + }, }, ) -def matrix(ctx: Context, distro_slug: str): +def matrix(ctx: Context, distro_slug: str, full: bool = False): """ Generate the test matrix. """ @@ -632,7 +635,18 @@ def matrix(ctx: Context, distro_slug: str): continue if "macos" in distro_slug and chunk == "scenarios": continue - _matrix.append({"transport": transport, "tests-chunk": chunk}) + if full and chunk == "integration": + for idx in range(1, 3): + _matrix.append( + { + "transport": transport, + "tests-chunk": chunk, + "test-chunk-no": idx, + "test-chunk-total": 2, + } + ) + else: + _matrix.append({"transport": transport, "tests-chunk": chunk}) ctx.info("Generated matrix:") ctx.print(_matrix, soft_wrap=True) From 72976d6a0b9ff54ea90a21cadacc3ad0dc1bdd18 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 2 Oct 2023 08:11:02 +0100 Subject: [PATCH 045/147] Typo Signed-off-by: Pedro Algarvio --- tests/support/pytest/transport.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/support/pytest/transport.py b/tests/support/pytest/transport.py index eaa8adc8bd4..d71e8fe0254 100644 --- a/tests/support/pytest/transport.py +++ b/tests/support/pytest/transport.py @@ -130,10 +130,10 @@ class Collector(salt.utils.process.SignalHandlingProcess): while True: curr_time = time.time() if time.time() > self.hard_timeout: - log.error("Hard timeout reaced in test collector!") + log.error("Hard timeout reached in test collector!") break if curr_time - last_msg >= self.timeout: - log.error("Receive timeout reaced in test collector!") + log.error("Receive timeout reached in test collector!") break try: payload = yield self._recv() From 18defa2f5db5c563836b6e03dd1cd865b012996e Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 2 Oct 2023 11:21:32 +0100 Subject: [PATCH 046/147] Increase splits for faster test results turnaround. Signed-off-by: Pedro Algarvio --- .github/workflows/test-action.yml | 9 +++++---- noxfile.py | 14 ++++++++------ tools/ci.py | 15 +++++++++++---- 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index 97da633407c..53724030e46 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -107,6 +107,7 @@ jobs: include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include) }} env: SALT_TRANSPORT: ${{ matrix.transport }} + TEST_GROUP: ${{ matrix.test-group || 1 }} steps: - name: Checkout Source Code @@ -248,8 +249,8 @@ jobs: run: | tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ --nox-session=${{ inputs.nox-session }} --rerun-failures -E SALT_TRANSPORT ${{ (inputs.skip-code-coverage && matrix.tests-chunk != 'unit') && '--skip-code-coverage' || '' }} \ - ${{ inputs.distro-slug }} ${{ matrix.tests-chunk }} -- --slow-tests --core-tests \ - --test-group-count=${{ matrix.test-chunk-total || 1 }} --test-group=${{ matrix.test-chunk-no || 1 }} + -E TEST_GROUP ${{ inputs.distro-slug }} ${{ matrix.tests-chunk }} -- --slow-tests --core-tests \ + --test-group-count=${{ matrix.test-group-count || 1 }} --test-group=${{ matrix.test-group || 1 }} - name: Combine Coverage Reports if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' @@ -266,7 +267,7 @@ jobs: rm -rf artifacts/salt* tree -a artifacts if [ "${{ inputs.skip-code-coverage }}" != "true" ]; then - mv artifacts/coverage/.coverage artifacts/coverage/.coverage.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.${{ matrix.transport }}.${{ matrix.tests-chunk }}.${{ matrix.test-chunk-no || '1' }} + mv artifacts/coverage/.coverage artifacts/coverage/.coverage.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.${{ matrix.transport }}.${{ matrix.tests-chunk }}.grp${{ matrix.test-group || '1' }} fi - name: Destroy VM @@ -311,7 +312,7 @@ jobs: # always run even if the previous steps fails if: always() && inputs.skip-junit-reports == false with: - check_name: Test Results(${{ inputs.distro-slug }}, transport=${{ matrix.transport }}, tests-chunk=${{ matrix.tests-chunk }}) + check_name: Test Results(${{ inputs.distro-slug }}, transport=${{ matrix.transport }}, tests-chunk=${{ matrix.tests-chunk }}, group=${{ matrix.test-group || '1' }}) report_paths: 'artifacts/xml-unittests-output/*.xml' annotate_only: true diff --git a/noxfile.py b/noxfile.py index b914e301721..313b31a2c18 100644 --- a/noxfile.py +++ b/noxfile.py @@ -1065,6 +1065,8 @@ def _ci_test(session, transport, onedir=False): "scenarios": ["tests/pytests/scenarios"], } + test_group_number = os.environ.get("TEST_GROUP") or "1" + if not session.posargs: chunk_cmd = [] junit_report_filename = "test-results" @@ -1081,20 +1083,20 @@ def _ci_test(session, transport, onedir=False): for values in chunks.values(): for value in values: chunk_cmd.append(f"--ignore={value}") - junit_report_filename = f"test-results-{chunk}" - runtests_log_filename = f"runtests-{chunk}" + junit_report_filename = f"test-results-{chunk}-grp{test_group_number}" + runtests_log_filename = f"runtests-{chunk}-grp{test_group_number}" else: chunk_cmd = chunks[chunk] - junit_report_filename = f"test-results-{chunk}" - runtests_log_filename = f"runtests-{chunk}" + junit_report_filename = f"test-results-{chunk}-grp{test_group_number}" + runtests_log_filename = f"runtests-{chunk}-grp{test_group_number}" if session.posargs: if session.posargs[0] == "--": session.posargs.pop(0) chunk_cmd.extend(session.posargs) else: chunk_cmd = [chunk] + session.posargs - junit_report_filename = "test-results" - runtests_log_filename = "runtests" + junit_report_filename = f"test-results-grp{test_group_number}" + runtests_log_filename = f"runtests-grp{test_group_number}" rerun_failures = os.environ.get("RERUN_FAILURES", "0") == "1" track_code_coverage = os.environ.get("SKIP_CODE_COVERAGE", "0") == "0" diff --git a/tools/ci.py b/tools/ci.py index 4600da2cc64..2bf5af5a25f 100644 --- a/tools/ci.py +++ b/tools/ci.py @@ -619,6 +619,12 @@ def matrix(ctx: Context, distro_slug: str, full: bool = False): Generate the test matrix. """ _matrix = [] + _splits = { + "functional": 4, + "integration": 6, + "scenarios": 2, + "unit": 3, + } for transport in ("zeromq", "tcp"): if transport == "tcp": if distro_slug not in ( @@ -635,14 +641,15 @@ def matrix(ctx: Context, distro_slug: str, full: bool = False): continue if "macos" in distro_slug and chunk == "scenarios": continue - if full and chunk == "integration": - for idx in range(1, 3): + splits = _splits.get(chunk) or 1 + if full and splits > 1: + for split in range(1, splits + 1): _matrix.append( { "transport": transport, "tests-chunk": chunk, - "test-chunk-no": idx, - "test-chunk-total": 2, + "test-group": split, + "test-group-count": splits, } ) else: From ef30291e53255e132c174d44d0d27c1789998874 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 2 Oct 2023 19:44:40 +0100 Subject: [PATCH 047/147] Fix code coverage collection/reporting. Create Salt specific coverage report. Signed-off-by: Pedro Algarvio --- .coveragerc | 6 +- .github/workflows/ci.yml | 20 ++++- .github/workflows/nightly.yml | 20 ++++- .github/workflows/scheduled.yml | 20 ++++- .github/workflows/templates/ci.yml.jinja | 20 ++++- noxfile.py | 96 +++++++++++++++++++----- 6 files changed, 146 insertions(+), 36 deletions(-) diff --git a/.coveragerc b/.coveragerc index 40da2c6666d..bdd2587d114 100644 --- a/.coveragerc +++ b/.coveragerc @@ -7,11 +7,13 @@ relative_files = True omit = setup.py .nox/* -source = - pkg +source_pkgs = + pkg.tests salt tests tools +disable_warnings = module-not-imported + [report] # Regexes for lines to exclude from consideration diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8165761d85c..b99a0a6ac77 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2140,15 +2140,27 @@ jobs: run: | nox --force-color -e combine-coverage - - name: Create Code Coverage HTML Report + - name: Create Salt Code Coverage HTML Report + run: | + nox --force-color -e create-html-coverage-report -- salt + + - name: Upload Salt Code Coverage HTML Report + uses: actions/upload-artifact@v3 + with: + name: code-coverage-salt-html-report + path: artifacts/coverage/html/salt + retention-days: 7 + if-no-files-found: error + + - name: Create Full Code Coverage HTML Report run: | nox --force-color -e create-html-coverage-report - - name: Upload Code Coverage HTML Report + - name: Upload Full Code Coverage HTML Report uses: actions/upload-artifact@v3 with: - name: code-coverage-html-report - path: artifacts/coverage/html + name: code-coverage-full-html-report + path: artifacts/coverage/html/full retention-days: 7 if-no-files-found: error diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 9475cccff58..70dd302031a 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -2201,15 +2201,27 @@ jobs: run: | nox --force-color -e combine-coverage - - name: Create Code Coverage HTML Report + - name: Create Salt Code Coverage HTML Report + run: | + nox --force-color -e create-html-coverage-report -- salt + + - name: Upload Salt Code Coverage HTML Report + uses: actions/upload-artifact@v3 + with: + name: code-coverage-salt-html-report + path: artifacts/coverage/html/salt + retention-days: 7 + if-no-files-found: error + + - name: Create Full Code Coverage HTML Report run: | nox --force-color -e create-html-coverage-report - - name: Upload Code Coverage HTML Report + - name: Upload Full Code Coverage HTML Report uses: actions/upload-artifact@v3 with: - name: code-coverage-html-report - path: artifacts/coverage/html + name: code-coverage-full-html-report + path: artifacts/coverage/html/full retention-days: 7 if-no-files-found: error diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 6ac5e68bc52..f8bb593c84c 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -2174,15 +2174,27 @@ jobs: run: | nox --force-color -e combine-coverage - - name: Create Code Coverage HTML Report + - name: Create Salt Code Coverage HTML Report + run: | + nox --force-color -e create-html-coverage-report -- salt + + - name: Upload Salt Code Coverage HTML Report + uses: actions/upload-artifact@v3 + with: + name: code-coverage-salt-html-report + path: artifacts/coverage/html/salt + retention-days: 7 + if-no-files-found: error + + - name: Create Full Code Coverage HTML Report run: | nox --force-color -e create-html-coverage-report - - name: Upload Code Coverage HTML Report + - name: Upload Full Code Coverage HTML Report uses: actions/upload-artifact@v3 with: - name: code-coverage-html-report - path: artifacts/coverage/html + name: code-coverage-full-html-report + path: artifacts/coverage/html/full retention-days: 7 if-no-files-found: error diff --git a/.github/workflows/templates/ci.yml.jinja b/.github/workflows/templates/ci.yml.jinja index 67d8d1f877b..e5d0f6171b8 100644 --- a/.github/workflows/templates/ci.yml.jinja +++ b/.github/workflows/templates/ci.yml.jinja @@ -355,15 +355,27 @@ run: | nox --force-color -e combine-coverage - - name: Create Code Coverage HTML Report + - name: Create Salt Code Coverage HTML Report + run: | + nox --force-color -e create-html-coverage-report -- salt + + - name: Upload Salt Code Coverage HTML Report + uses: actions/upload-artifact@v3 + with: + name: code-coverage-salt-html-report + path: artifacts/coverage/html/salt + retention-days: 7 + if-no-files-found: error + + - name: Create Full Code Coverage HTML Report run: | nox --force-color -e create-html-coverage-report - - name: Upload Code Coverage HTML Report + - name: Upload Full Code Coverage HTML Report uses: actions/upload-artifact@v3 with: - name: code-coverage-html-report - path: artifacts/coverage/html + name: code-coverage-full-html-report + path: artifacts/coverage/html/full retention-days: 7 if-no-files-found: error <%- endif %> diff --git a/noxfile.py b/noxfile.py index 313b31a2c18..7ebca469e84 100644 --- a/noxfile.py +++ b/noxfile.py @@ -405,7 +405,9 @@ def _run_with_coverage(session, *test_cmd, env=None, on_rerun=False): # Always combine and generate the XML coverage report try: session.run( - "coverage", "combine", "--debug=pathmap", env=coverage_base_env + "coverage", + "combine", + env=coverage_base_env, ) except CommandFailed: # Sometimes some of the coverage files are corrupt which would trigger a CommandFailed @@ -417,7 +419,7 @@ def _run_with_coverage(session, *test_cmd, env=None, on_rerun=False): "xml", "-o", str(COVERAGE_OUTPUT_DIR.joinpath("tests.xml").relative_to(REPO_ROOT)), - "--omit=salt/*,artifacts/salt/*", + "--omit=salt/*", "--include=tests/*,pkg/tests/*", env=coverage_base_env, ) @@ -428,7 +430,7 @@ def _run_with_coverage(session, *test_cmd, env=None, on_rerun=False): "-o", str(COVERAGE_OUTPUT_DIR.joinpath("salt.xml").relative_to(REPO_ROOT)), "--omit=tests/*,pkg/tests/*", - "--include=salt/*,artifacts/salt/*", + "--include=salt/*", env=coverage_base_env, ) # Generate html report for tests code coverage @@ -437,7 +439,7 @@ def _run_with_coverage(session, *test_cmd, env=None, on_rerun=False): "html", "-d", str(COVERAGE_OUTPUT_DIR.joinpath("html").relative_to(REPO_ROOT)), - "--omit=salt/*,artifacts/salt/*", + "--omit=salt/*", "--include=tests/*,pkg/tests/*", env=coverage_base_env, ) @@ -448,7 +450,7 @@ def _run_with_coverage(session, *test_cmd, env=None, on_rerun=False): "-d", str(COVERAGE_OUTPUT_DIR.joinpath("html").relative_to(REPO_ROOT)), "--omit=tests/*,pkg/tests/*", - "--include=salt/*,artifacts/salt/*", + "--include=salt/*", env=coverage_base_env, ) @@ -499,7 +501,7 @@ def _report_coverage(session): ) cmd_args = [ "--omit=tests/*,pkg/tests/*", - "--include=salt/*,artifacts/salt/*", + "--include=salt/*", ] elif report_section == "tests": @@ -507,7 +509,7 @@ def _report_coverage(session): COVERAGE_OUTPUT_DIR.relative_to(REPO_ROOT) / "coverage-tests.json" ) cmd_args = [ - "--omit=salt/*,artifacts/salt/*", + "--omit=salt/*", "--include=tests/*,pkg/tests/*", ] else: @@ -515,9 +517,16 @@ def _report_coverage(session): COVERAGE_OUTPUT_DIR.relative_to(REPO_ROOT) / "coverage.json" ) cmd_args = [ - "--include=salt/*,artifacts/salt/*,tests/*,pkg/tests/*", + "--include=salt/*,tests/*,pkg/tests/*", ] + session.run( + "coverage", + "report", + *cmd_args, + env=env, + ) + session.run( "coverage", "json", @@ -526,12 +535,6 @@ def _report_coverage(session): *cmd_args, env=env, ) - session.run( - "coverage", - "report", - *cmd_args, - env=env, - ) @nox.session(python=_PYTHON_VERSIONS, name="test-parametrized") @@ -1379,14 +1382,71 @@ def create_html_coverage_report(session): "COVERAGE_FILE": str(COVERAGE_FILE), } + report_section = None + if session.posargs: + report_section = session.posargs.pop(0) + if report_section not in ("salt", "tests"): + session.error("The report section can only be one of 'salt', 'tests'.") + if session.posargs: + session.error( + "Only one argument can be passed to the session, which is optional " + "and is one of 'salt', 'tests'." + ) + + if not IS_WINDOWS: + # The coverage file might have come from a windows machine, fix paths + with sqlite3.connect(COVERAGE_FILE) as db: + res = db.execute(r"SELECT * FROM file WHERE path LIKE '%salt\%'") + if res.fetchone(): + session_warn( + session, + "Replacing backwards slashes with forward slashes on file " + "paths in the coverage database", + ) + db.execute(r"UPDATE OR IGNORE file SET path=replace(path, '\', '/');") + + if report_section == "salt": + report_dir = str( + COVERAGE_OUTPUT_DIR.joinpath("html", "salt").relative_to(REPO_ROOT) + ) + json_coverage_file = ( + COVERAGE_OUTPUT_DIR.relative_to(REPO_ROOT) / "coverage-salt.json" + ) + cmd_args = [ + "--omit=tests/*,pkg/tests/*", + "--include=salt/*", + ] + + elif report_section == "tests": + report_dir = str( + COVERAGE_OUTPUT_DIR.joinpath("html", "tests").relative_to(REPO_ROOT) + ) + json_coverage_file = ( + COVERAGE_OUTPUT_DIR.relative_to(REPO_ROOT) / "coverage-tests.json" + ) + cmd_args = [ + "--omit=salt/*", + "--include=tests/*,pkg/tests/*", + ] + else: + report_dir = str( + COVERAGE_OUTPUT_DIR.joinpath("html", "full").relative_to(REPO_ROOT) + ) + json_coverage_file = ( + COVERAGE_OUTPUT_DIR.relative_to(REPO_ROOT) / "coverage.json" + ) + cmd_args = [ + "--include=salt/*,tests/*,pkg/tests/*", + ] + # Generate html report for Salt and tests combined code coverage session.run( "coverage", "html", "-d", - str(COVERAGE_OUTPUT_DIR.joinpath("html").relative_to(REPO_ROOT)), - "--include=salt/*,artifacts/salt/*,tests/*,pkg/tests/*", + report_dir, "--show-contexts", + *cmd_args, env=env, ) @@ -1406,7 +1466,7 @@ def _create_xml_coverage_reports(session): "xml", "-o", str(COVERAGE_OUTPUT_DIR.joinpath("tests.xml").relative_to(REPO_ROOT)), - "--omit=salt/*,artifacts/salt/*", + "--omit=salt/*", "--include=tests/*,pkg/tests/*", env=env, ) @@ -1421,7 +1481,7 @@ def _create_xml_coverage_reports(session): "-o", str(COVERAGE_OUTPUT_DIR.joinpath("salt.xml").relative_to(REPO_ROOT)), "--omit=tests/*,pkg/tests/*", - "--include=salt/*,artifacts/salt/*", + "--include=salt/*", env=env, ) except CommandFailed: From f1e138731b8314d7a1acd5305267c4e4a0bb164c Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 2 Oct 2023 12:20:32 +0100 Subject: [PATCH 048/147] Split build deps onedir jobs Signed-off-by: Pedro Algarvio --- .github/actions/build-onedir-deps/action.yml | 16 +- .github/workflows/build-deps-onedir-linux.yml | 81 ++++++++ .github/workflows/build-deps-onedir-macos.yml | 83 +++++++++ .../workflows/build-deps-onedir-windows.yml | 84 +++++++++ .github/workflows/build-deps-onedir.yml | 174 ------------------ .github/workflows/ci.yml | 40 +++- .github/workflows/nightly.yml | 40 +++- .github/workflows/scheduled.yml | 40 +++- .github/workflows/staging.yml | 40 +++- .github/workflows/templates/ci.yml.jinja | 13 +- 10 files changed, 410 insertions(+), 201 deletions(-) create mode 100644 .github/workflows/build-deps-onedir-linux.yml create mode 100644 .github/workflows/build-deps-onedir-macos.yml create mode 100644 .github/workflows/build-deps-onedir-windows.yml delete mode 100644 .github/workflows/build-deps-onedir.yml diff --git a/.github/actions/build-onedir-deps/action.yml b/.github/actions/build-onedir-deps/action.yml index fceb79f0eb7..50e302bd40f 100644 --- a/.github/actions/build-onedir-deps/action.yml +++ b/.github/actions/build-onedir-deps/action.yml @@ -43,13 +43,15 @@ runs: with: path: artifacts/${{ inputs.package-name }} key: > - ${{ inputs.cache-prefix }}|${{ inputs.python-version }}|deps|${{ inputs.platform }}|${{ inputs.arch }}|${{ inputs.package-name }}| - ${{ hashFiles( - format('{0}/.relenv/**/*.xz', github.workspace), - 'requirements/static/pkg/*/*.txt', - '.github/actions/build-onedir-deps/action.yml', - 'cicd/shared-gh-workflows-context.yml' - ) }} + ${{ inputs.cache-prefix }}|${{ inputs.python-version }}|deps|${{ inputs.platform }}|${{ inputs.arch }}|${{ inputs.package-name }}|${{ + hashFiles( + format('{0}/.relenv/**/*.xz', github.workspace), + 'requirements/static/pkg/*/*.txt', + '.github/actions/build-onedir-deps/action.yml', + '.github/workflows/build-deps-onedir-*.yml', + 'cicd/shared-gh-workflows-context.yml' + ) + }} - name: Install Salt Onedir Package Dependencies shell: bash diff --git a/.github/workflows/build-deps-onedir-linux.yml b/.github/workflows/build-deps-onedir-linux.yml new file mode 100644 index 00000000000..ebd686defdf --- /dev/null +++ b/.github/workflows/build-deps-onedir-linux.yml @@ -0,0 +1,81 @@ +--- +name: Build Packaging Dependencies Onedir + +on: + workflow_call: + inputs: + salt-version: + type: string + required: true + description: The Salt version to set prior to building packages. + github-hosted-runners: + type: boolean + required: true + self-hosted-runners: + type: boolean + required: true + cache-seed: + required: true + type: string + description: Seed used to invalidate caches + relenv-version: + required: true + type: string + description: The version of relenv to use + python-version: + required: true + type: string + description: The version of python to use with relenv + +env: + RELENV_DATA: "${{ github.workspace }}/.relenv" + COLUMNS: 190 + AWS_MAX_ATTEMPTS: "10" + AWS_RETRY_MODE: "adaptive" + PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ + PIP_EXTRA_INDEX_URL: https://pypi.org/simple + +jobs: + + build-deps-linux: + name: Linux + if: ${{ inputs.self-hosted-runners }} + strategy: + fail-fast: false + matrix: + arch: + - x86_64 + - aarch64 + runs-on: + - self-hosted + - linux + - ${{ matrix.arch }} + steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" + + - uses: actions/checkout@v4 + + - name: Setup Relenv + id: setup-relenv + uses: ./.github/actions/setup-relenv + with: + platform: linux + arch: ${{ matrix.arch }} + version: ${{ inputs.relenv-version }} + cache-seed: ${{ inputs.cache-seed }} + python-version: ${{ inputs.python-version }} + + - name: Setup Python Tools Scripts + uses: ./.github/actions/setup-python-tools-scripts + + - name: Install Salt Packaging Dependencies into Relenv Onedir + uses: ./.github/actions/build-onedir-deps + with: + platform: linux + arch: ${{ matrix.arch }} + python-version: "${{ inputs.python-version }}" + cache-prefix: ${{ inputs.cache-seed }}|relenv|${{ steps.setup-relenv.outputs.version }} diff --git a/.github/workflows/build-deps-onedir-macos.yml b/.github/workflows/build-deps-onedir-macos.yml new file mode 100644 index 00000000000..033a650d0a4 --- /dev/null +++ b/.github/workflows/build-deps-onedir-macos.yml @@ -0,0 +1,83 @@ +--- +name: Build Packaging Dependencies Onedir + +on: + workflow_call: + inputs: + salt-version: + type: string + required: true + description: The Salt version to set prior to building packages. + github-hosted-runners: + type: boolean + required: true + self-hosted-runners: + type: boolean + required: true + cache-seed: + required: true + type: string + description: Seed used to invalidate caches + relenv-version: + required: true + type: string + description: The version of relenv to use + python-version: + required: true + type: string + description: The version of python to use with relenv + +env: + RELENV_DATA: "${{ github.workspace }}/.relenv" + COLUMNS: 190 + AWS_MAX_ATTEMPTS: "10" + AWS_RETRY_MODE: "adaptive" + PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ + PIP_EXTRA_INDEX_URL: https://pypi.org/simple + +jobs: + + build-deps-macos: + name: macOS + if: ${{ inputs.github-hosted-runners }} + strategy: + fail-fast: false + max-parallel: 2 + matrix: + arch: + - x86_64 + runs-on: macos-12 + steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" + + - uses: actions/checkout@v4 + + - name: Set up Python 3.10 + uses: actions/setup-python@v4 + with: + python-version: "3.10" + + - name: Setup Relenv + id: setup-relenv + uses: ./.github/actions/setup-relenv + with: + platform: darwin + arch: ${{ matrix.arch }} + version: ${{ inputs.relenv-version }} + cache-seed: ${{ inputs.cache-seed }} + python-version: ${{ inputs.python-version }} + + - name: Setup Python Tools Scripts + uses: ./.github/actions/setup-python-tools-scripts + + - name: Install Salt Packaging Dependencies into Relenv Onedir + uses: ./.github/actions/build-onedir-deps + with: + platform: darwin + arch: ${{ matrix.arch }} + python-version: "${{ inputs.python-version }}" + cache-prefix: ${{ inputs.cache-seed }}|relenv|${{ steps.setup-relenv.outputs.version }} diff --git a/.github/workflows/build-deps-onedir-windows.yml b/.github/workflows/build-deps-onedir-windows.yml new file mode 100644 index 00000000000..bb7538a6ef0 --- /dev/null +++ b/.github/workflows/build-deps-onedir-windows.yml @@ -0,0 +1,84 @@ +--- +name: Build Packaging Dependencies Onedir + +on: + workflow_call: + inputs: + salt-version: + type: string + required: true + description: The Salt version to set prior to building packages. + github-hosted-runners: + type: boolean + required: true + self-hosted-runners: + type: boolean + required: true + cache-seed: + required: true + type: string + description: Seed used to invalidate caches + relenv-version: + required: true + type: string + description: The version of relenv to use + python-version: + required: true + type: string + description: The version of python to use with relenv + +env: + RELENV_DATA: "${{ github.workspace }}/.relenv" + COLUMNS: 190 + AWS_MAX_ATTEMPTS: "10" + AWS_RETRY_MODE: "adaptive" + PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ + PIP_EXTRA_INDEX_URL: https://pypi.org/simple + +jobs: + + build-deps-windows: + name: Windows + if: ${{ inputs.github-hosted-runners }} + strategy: + fail-fast: false + max-parallel: 2 + matrix: + arch: + - x86 + - amd64 + runs-on: windows-latest + steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" + + - uses: actions/checkout@v4 + + - name: Set up Python 3.10 + uses: actions/setup-python@v4 + with: + python-version: "3.10" + + - name: Setup Relenv + id: setup-relenv + uses: ./.github/actions/setup-relenv + with: + platform: windows + arch: ${{ matrix.arch }} + version: ${{ inputs.relenv-version }} + cache-seed: ${{ inputs.cache-seed }} + python-version: ${{ inputs.python-version }} + + - name: Setup Python Tools Scripts + uses: ./.github/actions/setup-python-tools-scripts + + - name: Install Salt Packaging Dependencies into Relenv Onedir + uses: ./.github/actions/build-onedir-deps + with: + platform: windows + arch: ${{ matrix.arch }} + python-version: "${{ inputs.python-version }}" + cache-prefix: ${{ inputs.cache-seed }}|relenv|${{ steps.setup-relenv.outputs.version }} diff --git a/.github/workflows/build-deps-onedir.yml b/.github/workflows/build-deps-onedir.yml deleted file mode 100644 index 3cf048bd4d0..00000000000 --- a/.github/workflows/build-deps-onedir.yml +++ /dev/null @@ -1,174 +0,0 @@ ---- -name: Build Packaging Dependencies Onedir - -on: - workflow_call: - inputs: - salt-version: - type: string - required: true - description: The Salt version to set prior to building packages. - github-hosted-runners: - type: boolean - required: true - self-hosted-runners: - type: boolean - required: true - cache-seed: - required: true - type: string - description: Seed used to invalidate caches - relenv-version: - required: true - type: string - description: The version of relenv to use - python-version: - required: true - type: string - description: The version of python to use with relenv - -env: - RELENV_DATA: "${{ github.workspace }}/.relenv" - COLUMNS: 190 - AWS_MAX_ATTEMPTS: "10" - AWS_RETRY_MODE: "adaptive" - PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ - PIP_EXTRA_INDEX_URL: https://pypi.org/simple - -jobs: - - build-deps-linux: - name: Linux - if: ${{ inputs.self-hosted-runners }} - strategy: - fail-fast: false - matrix: - arch: - - x86_64 - - aarch64 - runs-on: - - self-hosted - - linux - - ${{ matrix.arch }} - steps: - - - name: "Throttle Builds" - shell: bash - run: | - t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" - - - uses: actions/checkout@v4 - - - name: Setup Relenv - id: setup-relenv - uses: ./.github/actions/setup-relenv - with: - platform: linux - arch: ${{ matrix.arch }} - version: ${{ inputs.relenv-version }} - cache-seed: ${{ inputs.cache-seed }} - python-version: ${{ inputs.python-version }} - - - name: Setup Python Tools Scripts - uses: ./.github/actions/setup-python-tools-scripts - - - name: Install Salt Packaging Dependencies into Relenv Onedir - uses: ./.github/actions/build-onedir-deps - with: - platform: linux - arch: ${{ matrix.arch }} - python-version: "${{ inputs.python-version }}" - cache-prefix: ${{ inputs.cache-seed }}|relenv|${{ steps.setup-relenv.outputs.version }} - - - build-deps-windows: - name: Windows - if: ${{ inputs.github-hosted-runners }} - strategy: - fail-fast: false - max-parallel: 2 - matrix: - arch: - - x86 - - amd64 - runs-on: windows-latest - steps: - - - name: "Throttle Builds" - shell: bash - run: | - t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" - - - uses: actions/checkout@v4 - - - name: Set up Python 3.10 - uses: actions/setup-python@v4 - with: - python-version: "3.10" - - - name: Setup Relenv - id: setup-relenv - uses: ./.github/actions/setup-relenv - with: - platform: windows - arch: ${{ matrix.arch }} - version: ${{ inputs.relenv-version }} - cache-seed: ${{ inputs.cache-seed }} - python-version: ${{ inputs.python-version }} - - - name: Setup Python Tools Scripts - uses: ./.github/actions/setup-python-tools-scripts - - - name: Install Salt Packaging Dependencies into Relenv Onedir - uses: ./.github/actions/build-onedir-deps - with: - platform: windows - arch: ${{ matrix.arch }} - python-version: "${{ inputs.python-version }}" - cache-prefix: ${{ inputs.cache-seed }}|relenv|${{ steps.setup-relenv.outputs.version }} - - - build-deps-macos: - name: macOS - if: ${{ inputs.github-hosted-runners }} - strategy: - fail-fast: false - max-parallel: 2 - matrix: - arch: - - x86_64 - runs-on: macos-12 - steps: - - - name: "Throttle Builds" - shell: bash - run: | - t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" - - - uses: actions/checkout@v4 - - - name: Set up Python 3.10 - uses: actions/setup-python@v4 - with: - python-version: "3.10" - - - name: Setup Relenv - id: setup-relenv - uses: ./.github/actions/setup-relenv - with: - platform: darwin - arch: ${{ matrix.arch }} - version: ${{ inputs.relenv-version }} - cache-seed: ${{ inputs.cache-seed }} - python-version: ${{ inputs.python-version }} - - - name: Setup Python Tools Scripts - uses: ./.github/actions/setup-python-tools-scripts - - - name: Install Salt Packaging Dependencies into Relenv Onedir - uses: ./.github/actions/build-onedir-deps - with: - platform: darwin - arch: ${{ matrix.arch }} - python-version: "${{ inputs.python-version }}" - cache-prefix: ${{ inputs.cache-seed }}|relenv|${{ steps.setup-relenv.outputs.version }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b99a0a6ac77..2c2fe347233 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -431,12 +431,40 @@ jobs: with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - build-deps-onedir: + build-deps-onedir-linux: name: Build Dependencies Onedir if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-onedir'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - uses: ./.github/workflows/build-deps-onedir.yml + uses: ./.github/workflows/build-deps-onedir-linux.yml + with: + cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + relenv-version: "0.13.11" + python-version: "3.10.13" + + build-deps-onedir-windows: + name: Build Dependencies Onedir + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-onedir'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + uses: ./.github/workflows/build-deps-onedir-windows.yml + with: + cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + relenv-version: "0.13.11" + python-version: "3.10.13" + + build-deps-onedir-macos: + name: Build Dependencies Onedir + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-onedir'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + uses: ./.github/workflows/build-deps-onedir-macos.yml with: cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -450,7 +478,9 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-salt-onedir'] }} needs: - prepare-workflow - - build-deps-onedir + - build-deps-onedir-linux + - build-deps-onedir-windows + - build-deps-onedir-macos - build-source-tarball uses: ./.github/workflows/build-salt-onedir.yml with: @@ -2175,7 +2205,9 @@ jobs: - pre-commit - lint - build-docs - - build-deps-onedir + - build-deps-onedir-linux + - build-deps-onedir-windows + - build-deps-onedir-macos - build-salt-onedir - build-rpm-pkgs-src - build-deb-pkgs-src diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 70dd302031a..5c52d2717fe 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -480,12 +480,40 @@ jobs: with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - build-deps-onedir: + build-deps-onedir-linux: name: Build Dependencies Onedir if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-onedir'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - uses: ./.github/workflows/build-deps-onedir.yml + uses: ./.github/workflows/build-deps-onedir-linux.yml + with: + cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + relenv-version: "0.13.11" + python-version: "3.10.13" + + build-deps-onedir-windows: + name: Build Dependencies Onedir + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-onedir'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + uses: ./.github/workflows/build-deps-onedir-windows.yml + with: + cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + relenv-version: "0.13.11" + python-version: "3.10.13" + + build-deps-onedir-macos: + name: Build Dependencies Onedir + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-onedir'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + uses: ./.github/workflows/build-deps-onedir-macos.yml with: cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -499,7 +527,9 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-salt-onedir'] }} needs: - prepare-workflow - - build-deps-onedir + - build-deps-onedir-linux + - build-deps-onedir-windows + - build-deps-onedir-macos - build-source-tarball uses: ./.github/workflows/build-salt-onedir.yml with: @@ -2975,7 +3005,9 @@ jobs: - pre-commit - lint - build-docs - - build-deps-onedir + - build-deps-onedir-linux + - build-deps-onedir-windows + - build-deps-onedir-macos - build-salt-onedir - build-rpm-pkgs-src - build-deb-pkgs-src diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index f8bb593c84c..85f15461dc3 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -465,12 +465,40 @@ jobs: with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - build-deps-onedir: + build-deps-onedir-linux: name: Build Dependencies Onedir if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-onedir'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - uses: ./.github/workflows/build-deps-onedir.yml + uses: ./.github/workflows/build-deps-onedir-linux.yml + with: + cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + relenv-version: "0.13.11" + python-version: "3.10.13" + + build-deps-onedir-windows: + name: Build Dependencies Onedir + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-onedir'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + uses: ./.github/workflows/build-deps-onedir-windows.yml + with: + cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + relenv-version: "0.13.11" + python-version: "3.10.13" + + build-deps-onedir-macos: + name: Build Dependencies Onedir + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-onedir'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + uses: ./.github/workflows/build-deps-onedir-macos.yml with: cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -484,7 +512,9 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-salt-onedir'] }} needs: - prepare-workflow - - build-deps-onedir + - build-deps-onedir-linux + - build-deps-onedir-windows + - build-deps-onedir-macos - build-source-tarball uses: ./.github/workflows/build-salt-onedir.yml with: @@ -2211,7 +2241,9 @@ jobs: - pre-commit - lint - build-docs - - build-deps-onedir + - build-deps-onedir-linux + - build-deps-onedir-windows + - build-deps-onedir-macos - build-salt-onedir - build-rpm-pkgs-src - build-deb-pkgs-src diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index d2daa5abdfd..416940e344c 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -475,12 +475,40 @@ jobs: with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - build-deps-onedir: + build-deps-onedir-linux: name: Build Dependencies Onedir if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-onedir'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - uses: ./.github/workflows/build-deps-onedir.yml + uses: ./.github/workflows/build-deps-onedir-linux.yml + with: + cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + relenv-version: "0.13.11" + python-version: "3.10.13" + + build-deps-onedir-windows: + name: Build Dependencies Onedir + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-onedir'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + uses: ./.github/workflows/build-deps-onedir-windows.yml + with: + cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + relenv-version: "0.13.11" + python-version: "3.10.13" + + build-deps-onedir-macos: + name: Build Dependencies Onedir + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-onedir'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + uses: ./.github/workflows/build-deps-onedir-macos.yml with: cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -494,7 +522,9 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-salt-onedir'] }} needs: - prepare-workflow - - build-deps-onedir + - build-deps-onedir-linux + - build-deps-onedir-windows + - build-deps-onedir-macos - build-source-tarball uses: ./.github/workflows/build-salt-onedir.yml with: @@ -3755,7 +3785,9 @@ jobs: - pre-commit - lint - build-docs - - build-deps-onedir + - build-deps-onedir-linux + - build-deps-onedir-windows + - build-deps-onedir-macos - build-salt-onedir - build-rpm-pkgs-src - build-deb-pkgs-src diff --git a/.github/workflows/templates/ci.yml.jinja b/.github/workflows/templates/ci.yml.jinja index e5d0f6171b8..896bc880354 100644 --- a/.github/workflows/templates/ci.yml.jinja +++ b/.github/workflows/templates/ci.yml.jinja @@ -254,14 +254,16 @@ <%- set job_name = "build-deps-onedir" %> <%- if includes.get(job_name, True) %> + <%- for platform in ("linux", "windows", "macos") %> + <%- set platform_job_name = "{}-{}".format(job_name, platform) %> - <{ job_name }>: - <%- do conclusion_needs.append(job_name) %> + <{ platform_job_name }>: + <%- do conclusion_needs.append(platform_job_name) %> name: Build Dependencies Onedir if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['<{ job_name }>'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - uses: ./.github/workflows/build-deps-onedir.yml + uses: ./.github/workflows/build-deps-onedir-<{ platform }>.yml with: cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -270,6 +272,7 @@ relenv-version: "<{ relenv_version }>" python-version: "<{ python_version }>" + <%- endfor %> <%- endif %> @@ -282,7 +285,9 @@ if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['<{ job_name }>'] }} needs: - prepare-workflow - - build-deps-onedir + <%- for platform in ("linux", "windows", "macos") %> + - build-deps-onedir-<{ platform }> + <%- endfor %> - build-source-tarball uses: ./.github/workflows/build-salt-onedir.yml with: From 5be7c858eb97652b43f5e984d9d01325782d3751 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 2 Oct 2023 12:21:19 +0100 Subject: [PATCH 049/147] Split build salt onedir jobs Signed-off-by: Pedro Algarvio --- .github/actions/build-onedir-salt/action.yml | 16 +- .github/workflows/build-salt-onedir-linux.yml | 88 ++++++++ .github/workflows/build-salt-onedir-macos.yml | 89 ++++++++ .../workflows/build-salt-onedir-windows.yml | 91 ++++++++ .github/workflows/build-salt-onedir.yml | 194 ------------------ .github/workflows/ci.yml | 118 +++++++---- .github/workflows/nightly.yml | 120 +++++++---- .github/workflows/scheduled.yml | 118 +++++++---- .github/workflows/staging.yml | 120 +++++++---- .../templates/build-ci-deps.yml.jinja | 6 +- .../templates/build-packages.yml.jinja | 14 +- .../workflows/templates/build-repos.yml.jinja | 20 +- .github/workflows/templates/ci.yml.jinja | 11 +- 13 files changed, 603 insertions(+), 402 deletions(-) create mode 100644 .github/workflows/build-salt-onedir-linux.yml create mode 100644 .github/workflows/build-salt-onedir-macos.yml create mode 100644 .github/workflows/build-salt-onedir-windows.yml delete mode 100644 .github/workflows/build-salt-onedir.yml diff --git a/.github/actions/build-onedir-salt/action.yml b/.github/actions/build-onedir-salt/action.yml index 1f115607e81..10e92bbcb89 100644 --- a/.github/actions/build-onedir-salt/action.yml +++ b/.github/actions/build-onedir-salt/action.yml @@ -47,13 +47,15 @@ runs: with: path: artifacts/${{ inputs.package-name }} key: > - ${{ inputs.cache-prefix }}|${{ inputs.python-version }}|deps|${{ inputs.platform }}|${{ inputs.arch }}|${{ inputs.package-name }}| - ${{ hashFiles( - format('{0}/.relenv/**/*.xz', github.workspace), - 'requirements/static/pkg/*/*.txt', - '.github/actions/build-onedir-deps/action.yml', - 'cicd/shared-gh-workflows-context.yml' - ) }} + ${{ inputs.cache-prefix }}|${{ inputs.python-version }}|deps|${{ inputs.platform }}|${{ inputs.arch }}|${{ inputs.package-name }}|${{ + hashFiles( + format('{0}/.relenv/**/*.xz', github.workspace), + 'requirements/static/pkg/*/*.txt', + '.github/actions/build-onedir-deps/action.yml', + '.github/workflows/build-deps-onedir-*.yml', + 'cicd/shared-gh-workflows-context.yml' + ) + }} - name: Download Source Tarball uses: actions/download-artifact@v3 diff --git a/.github/workflows/build-salt-onedir-linux.yml b/.github/workflows/build-salt-onedir-linux.yml new file mode 100644 index 00000000000..2550ece63a9 --- /dev/null +++ b/.github/workflows/build-salt-onedir-linux.yml @@ -0,0 +1,88 @@ +--- +name: Build Salt Onedir + +on: + workflow_call: + inputs: + salt-version: + type: string + required: true + description: The Salt version to set prior to building packages. + github-hosted-runners: + type: boolean + required: true + self-hosted-runners: + type: boolean + required: true + cache-seed: + required: true + type: string + description: Seed used to invalidate caches + relenv-version: + required: true + type: string + description: The version of relenv to use + python-version: + required: true + type: string + description: The version of python to use with relenv + +env: + RELENV_DATA: "${{ github.workspace }}/.relenv" + COLUMNS: 190 + AWS_MAX_ATTEMPTS: "10" + AWS_RETRY_MODE: "adaptive" + PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ + PIP_EXTRA_INDEX_URL: https://pypi.org/simple + +jobs: + + build-salt-linux: + name: Linux + if: ${{ inputs.self-hosted-runners }} + strategy: + fail-fast: false + matrix: + arch: + - x86_64 + - aarch64 + runs-on: + - self-hosted + - linux + - ${{ matrix.arch }} + steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" + + - uses: actions/checkout@v4 + + - name: Setup Python Tools Scripts + uses: ./.github/actions/setup-python-tools-scripts + + - name: Setup Salt Version + id: setup-salt-version + uses: ./.github/actions/setup-salt-version + with: + salt-version: "${{ inputs.salt-version }}" + + - name: Setup Relenv + uses: ./.github/actions/setup-relenv + id: setup-relenv + with: + platform: linux + arch: ${{ matrix.arch }} + version: ${{ inputs.relenv-version }} + cache-seed: ${{ inputs.cache-seed }} + python-version: ${{ inputs.python-version }} + + - name: Install Salt into Relenv Onedir + uses: ./.github/actions/build-onedir-salt + with: + platform: linux + arch: ${{ matrix.arch }} + salt-version: "${{ inputs.salt-version }}" + python-version: "${{ inputs.python-version }}" + cache-prefix: ${{ inputs.cache-seed }}|relenv|${{ steps.setup-relenv.outputs.version }} diff --git a/.github/workflows/build-salt-onedir-macos.yml b/.github/workflows/build-salt-onedir-macos.yml new file mode 100644 index 00000000000..eedae19305c --- /dev/null +++ b/.github/workflows/build-salt-onedir-macos.yml @@ -0,0 +1,89 @@ +--- +name: Build Salt Onedir + +on: + workflow_call: + inputs: + salt-version: + type: string + required: true + description: The Salt version to set prior to building packages. + github-hosted-runners: + type: boolean + required: true + self-hosted-runners: + type: boolean + required: true + cache-seed: + required: true + type: string + description: Seed used to invalidate caches + relenv-version: + required: true + type: string + description: The version of relenv to use + python-version: + required: true + type: string + description: The version of python to use with relenv + +env: + RELENV_DATA: "${{ github.workspace }}/.relenv" + COLUMNS: 190 + AWS_MAX_ATTEMPTS: "10" + AWS_RETRY_MODE: "adaptive" + PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ + PIP_EXTRA_INDEX_URL: https://pypi.org/simple + +jobs: + + build-salt-macos: + name: macOS + if: ${{ inputs.github-hosted-runners }} + strategy: + fail-fast: false + max-parallel: 2 + matrix: + arch: + - x86_64 + runs-on: macos-12 + steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" + + - uses: actions/checkout@v4 + - name: Set up Python 3.10 + uses: actions/setup-python@v4 + with: + python-version: "3.10" + + - name: Setup Relenv + id: setup-relenv + uses: ./.github/actions/setup-relenv + with: + platform: darwin + arch: ${{ matrix.arch }} + version: ${{ inputs.relenv-version }} + cache-seed: ${{ inputs.cache-seed }} + python-version: ${{ inputs.python-version }} + + - name: Setup Python Tools Scripts + uses: ./.github/actions/setup-python-tools-scripts + + - name: Setup Salt Version + id: setup-salt-version + uses: ./.github/actions/setup-salt-version + with: + salt-version: "${{ inputs.salt-version }}" + + - name: Install Salt into Relenv Onedir + uses: ./.github/actions/build-onedir-salt + with: + platform: darwin + arch: ${{ matrix.arch }} + salt-version: "${{ inputs.salt-version }}" + python-version: "${{ inputs.python-version }}" + cache-prefix: ${{ inputs.cache-seed }}|relenv|${{ steps.setup-relenv.outputs.version }} diff --git a/.github/workflows/build-salt-onedir-windows.yml b/.github/workflows/build-salt-onedir-windows.yml new file mode 100644 index 00000000000..6ae148f9122 --- /dev/null +++ b/.github/workflows/build-salt-onedir-windows.yml @@ -0,0 +1,91 @@ +--- +name: Build Salt Onedir + +on: + workflow_call: + inputs: + salt-version: + type: string + required: true + description: The Salt version to set prior to building packages. + github-hosted-runners: + type: boolean + required: true + self-hosted-runners: + type: boolean + required: true + cache-seed: + required: true + type: string + description: Seed used to invalidate caches + relenv-version: + required: true + type: string + description: The version of relenv to use + python-version: + required: true + type: string + description: The version of python to use with relenv + +env: + RELENV_DATA: "${{ github.workspace }}/.relenv" + COLUMNS: 190 + AWS_MAX_ATTEMPTS: "10" + AWS_RETRY_MODE: "adaptive" + PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ + PIP_EXTRA_INDEX_URL: https://pypi.org/simple + +jobs: + + build-salt-windows: + name: Windows + if: ${{ inputs.github-hosted-runners }} + strategy: + fail-fast: false + max-parallel: 2 + matrix: + arch: + - x86 + - amd64 + runs-on: windows-latest + steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" + + - uses: actions/checkout@v4 + + - name: Set up Python 3.10 + uses: actions/setup-python@v4 + with: + python-version: "3.10" + + - name: Setup Relenv + id: setup-relenv + uses: ./.github/actions/setup-relenv + with: + platform: windows + arch: ${{ matrix.arch }} + version: ${{ inputs.relenv-version }} + cache-seed: ${{ inputs.cache-seed }} + python-version: ${{ inputs.python-version }} + + - name: Setup Python Tools Scripts + uses: ./.github/actions/setup-python-tools-scripts + + - name: Setup Salt Version + id: setup-salt-version + uses: ./.github/actions/setup-salt-version + with: + salt-version: "${{ inputs.salt-version }}" + + - name: Install Salt into Relenv Onedir + uses: ./.github/actions/build-onedir-salt + with: + platform: windows + arch: ${{ matrix.arch }} + salt-version: "${{ inputs.salt-version }}" + python-version: "${{ inputs.python-version }}" + cache-prefix: ${{ inputs.cache-seed }}|relenv|${{ steps.setup-relenv.outputs.version }} diff --git a/.github/workflows/build-salt-onedir.yml b/.github/workflows/build-salt-onedir.yml deleted file mode 100644 index 6ee7e802be0..00000000000 --- a/.github/workflows/build-salt-onedir.yml +++ /dev/null @@ -1,194 +0,0 @@ ---- -name: Build Salt Onedir - -on: - workflow_call: - inputs: - salt-version: - type: string - required: true - description: The Salt version to set prior to building packages. - github-hosted-runners: - type: boolean - required: true - self-hosted-runners: - type: boolean - required: true - cache-seed: - required: true - type: string - description: Seed used to invalidate caches - relenv-version: - required: true - type: string - description: The version of relenv to use - python-version: - required: true - type: string - description: The version of python to use with relenv - -env: - RELENV_DATA: "${{ github.workspace }}/.relenv" - COLUMNS: 190 - AWS_MAX_ATTEMPTS: "10" - AWS_RETRY_MODE: "adaptive" - PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ - PIP_EXTRA_INDEX_URL: https://pypi.org/simple - -jobs: - - build-salt-linux: - name: Linux - if: ${{ inputs.self-hosted-runners }} - strategy: - fail-fast: false - matrix: - arch: - - x86_64 - - aarch64 - runs-on: - - self-hosted - - linux - - ${{ matrix.arch }} - steps: - - - name: "Throttle Builds" - shell: bash - run: | - t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" - - - uses: actions/checkout@v4 - - - name: Setup Python Tools Scripts - uses: ./.github/actions/setup-python-tools-scripts - - - name: Setup Salt Version - id: setup-salt-version - uses: ./.github/actions/setup-salt-version - with: - salt-version: "${{ inputs.salt-version }}" - - - name: Setup Relenv - uses: ./.github/actions/setup-relenv - id: setup-relenv - with: - platform: linux - arch: ${{ matrix.arch }} - version: ${{ inputs.relenv-version }} - cache-seed: ${{ inputs.cache-seed }} - python-version: ${{ inputs.python-version }} - - - name: Install Salt into Relenv Onedir - uses: ./.github/actions/build-onedir-salt - with: - platform: linux - arch: ${{ matrix.arch }} - salt-version: "${{ inputs.salt-version }}" - python-version: "${{ inputs.python-version }}" - cache-prefix: ${{ inputs.cache-seed }}|relenv|${{ steps.setup-relenv.outputs.version }} - - - build-salt-windows: - name: Windows - if: ${{ inputs.github-hosted-runners }} - strategy: - fail-fast: false - max-parallel: 2 - matrix: - arch: - - x86 - - amd64 - runs-on: windows-latest - steps: - - - name: "Throttle Builds" - shell: bash - run: | - t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" - - - uses: actions/checkout@v4 - - - name: Set up Python 3.10 - uses: actions/setup-python@v4 - with: - python-version: "3.10" - - - name: Setup Relenv - id: setup-relenv - uses: ./.github/actions/setup-relenv - with: - platform: windows - arch: ${{ matrix.arch }} - version: ${{ inputs.relenv-version }} - cache-seed: ${{ inputs.cache-seed }} - python-version: ${{ inputs.python-version }} - - - name: Setup Python Tools Scripts - uses: ./.github/actions/setup-python-tools-scripts - - - name: Setup Salt Version - id: setup-salt-version - uses: ./.github/actions/setup-salt-version - with: - salt-version: "${{ inputs.salt-version }}" - - - name: Install Salt into Relenv Onedir - uses: ./.github/actions/build-onedir-salt - with: - platform: windows - arch: ${{ matrix.arch }} - salt-version: "${{ inputs.salt-version }}" - python-version: "${{ inputs.python-version }}" - cache-prefix: ${{ inputs.cache-seed }}|relenv|${{ steps.setup-relenv.outputs.version }} - - - build-salt-macos: - name: macOS - if: ${{ inputs.github-hosted-runners }} - strategy: - fail-fast: false - max-parallel: 2 - matrix: - arch: - - x86_64 - runs-on: macos-12 - steps: - - - name: "Throttle Builds" - shell: bash - run: | - t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" - - - uses: actions/checkout@v4 - - name: Set up Python 3.10 - uses: actions/setup-python@v4 - with: - python-version: "3.10" - - - name: Setup Relenv - id: setup-relenv - uses: ./.github/actions/setup-relenv - with: - platform: darwin - arch: ${{ matrix.arch }} - version: ${{ inputs.relenv-version }} - cache-seed: ${{ inputs.cache-seed }} - python-version: ${{ inputs.python-version }} - - - name: Setup Python Tools Scripts - uses: ./.github/actions/setup-python-tools-scripts - - - name: Setup Salt Version - id: setup-salt-version - uses: ./.github/actions/setup-salt-version - with: - salt-version: "${{ inputs.salt-version }}" - - - name: Install Salt into Relenv Onedir - uses: ./.github/actions/build-onedir-salt - with: - platform: darwin - arch: ${{ matrix.arch }} - salt-version: "${{ inputs.salt-version }}" - python-version: "${{ inputs.python-version }}" - cache-prefix: ${{ inputs.cache-seed }}|relenv|${{ steps.setup-relenv.outputs.version }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2c2fe347233..b5e9b526c17 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -473,16 +473,46 @@ jobs: relenv-version: "0.13.11" python-version: "3.10.13" - build-salt-onedir: + build-salt-onedir-linux: name: Build Salt Onedir if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-salt-onedir'] }} needs: - prepare-workflow - build-deps-onedir-linux + - build-source-tarball + uses: ./.github/workflows/build-salt-onedir-linux.yml + with: + cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + relenv-version: "0.13.11" + python-version: "3.10.13" + + build-salt-onedir-windows: + name: Build Salt Onedir + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-salt-onedir'] }} + needs: + - prepare-workflow - build-deps-onedir-windows + - build-source-tarball + uses: ./.github/workflows/build-salt-onedir-windows.yml + with: + cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + relenv-version: "0.13.11" + python-version: "3.10.13" + + build-salt-onedir-macos: + name: Build Salt Onedir + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-salt-onedir'] }} + needs: + - prepare-workflow - build-deps-onedir-macos - build-source-tarball - uses: ./.github/workflows/build-salt-onedir.yml + uses: ./.github/workflows/build-salt-onedir-macos.yml with: cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -496,7 +526,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-rpm-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -509,7 +539,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-rpm-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -522,7 +552,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deb-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -535,7 +565,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deb-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -548,7 +578,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-windows uses: ./.github/workflows/build-windows-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -561,7 +591,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-windows uses: ./.github/workflows/build-windows-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -574,7 +604,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-macos uses: ./.github/workflows/build-macos-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -587,7 +617,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-macos uses: ./.github/workflows/build-macos-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -600,7 +630,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-windows uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: windows-2016 @@ -617,7 +647,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-windows uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: windows-2019 @@ -634,7 +664,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-windows uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: windows-2022 @@ -651,7 +681,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-macos uses: ./.github/workflows/build-deps-ci-action-macos.yml with: distro-slug: macos-12 @@ -668,7 +698,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: almalinux-8 @@ -685,7 +715,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: almalinux-8-arm64 @@ -702,7 +732,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: almalinux-9 @@ -719,7 +749,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: almalinux-9-arm64 @@ -736,7 +766,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: amazonlinux-2 @@ -753,7 +783,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: amazonlinux-2-arm64 @@ -770,7 +800,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: archlinux-lts @@ -787,7 +817,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: centos-7 @@ -804,7 +834,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: centos-7-arm64 @@ -821,7 +851,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: centosstream-8 @@ -838,7 +868,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: centosstream-8-arm64 @@ -855,7 +885,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: centosstream-9 @@ -872,7 +902,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: centosstream-9-arm64 @@ -889,7 +919,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: debian-10 @@ -906,7 +936,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: debian-11 @@ -923,7 +953,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: debian-11-arm64 @@ -940,7 +970,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: fedora-37 @@ -957,7 +987,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: fedora-37-arm64 @@ -974,7 +1004,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: fedora-38 @@ -991,7 +1021,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: fedora-38-arm64 @@ -1008,7 +1038,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: opensuse-15 @@ -1025,7 +1055,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: photonos-3 @@ -1042,7 +1072,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: photonos-4 @@ -1059,7 +1089,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: photonos-4-arm64 @@ -1076,7 +1106,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: ubuntu-20.04 @@ -1093,7 +1123,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: ubuntu-20.04-arm64 @@ -1110,7 +1140,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: ubuntu-22.04 @@ -1127,7 +1157,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: ubuntu-22.04-arm64 @@ -2208,7 +2238,9 @@ jobs: - build-deps-onedir-linux - build-deps-onedir-windows - build-deps-onedir-macos - - build-salt-onedir + - build-salt-onedir-linux + - build-salt-onedir-windows + - build-salt-onedir-macos - build-rpm-pkgs-src - build-deb-pkgs-src - build-windows-pkgs-src diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 5c52d2717fe..e094519215d 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -522,16 +522,46 @@ jobs: relenv-version: "0.13.11" python-version: "3.10.13" - build-salt-onedir: + build-salt-onedir-linux: name: Build Salt Onedir if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-salt-onedir'] }} needs: - prepare-workflow - build-deps-onedir-linux + - build-source-tarball + uses: ./.github/workflows/build-salt-onedir-linux.yml + with: + cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + relenv-version: "0.13.11" + python-version: "3.10.13" + + build-salt-onedir-windows: + name: Build Salt Onedir + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-salt-onedir'] }} + needs: + - prepare-workflow - build-deps-onedir-windows + - build-source-tarball + uses: ./.github/workflows/build-salt-onedir-windows.yml + with: + cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + relenv-version: "0.13.11" + python-version: "3.10.13" + + build-salt-onedir-macos: + name: Build Salt Onedir + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-salt-onedir'] }} + needs: + - prepare-workflow - build-deps-onedir-macos - build-source-tarball - uses: ./.github/workflows/build-salt-onedir.yml + uses: ./.github/workflows/build-salt-onedir-macos.yml with: cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -545,7 +575,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-rpm-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -558,7 +588,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-rpm-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -571,7 +601,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deb-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -584,7 +614,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deb-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -597,7 +627,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-windows uses: ./.github/workflows/build-windows-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -613,7 +643,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-windows uses: ./.github/workflows/build-windows-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -629,7 +659,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-macos uses: ./.github/workflows/build-macos-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -645,7 +675,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-macos uses: ./.github/workflows/build-macos-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -661,7 +691,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-windows uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: windows-2016 @@ -678,7 +708,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-windows uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: windows-2019 @@ -695,7 +725,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-windows uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: windows-2022 @@ -712,7 +742,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-macos uses: ./.github/workflows/build-deps-ci-action-macos.yml with: distro-slug: macos-12 @@ -729,7 +759,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: almalinux-8 @@ -746,7 +776,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: almalinux-8-arm64 @@ -763,7 +793,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: almalinux-9 @@ -780,7 +810,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: almalinux-9-arm64 @@ -797,7 +827,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: amazonlinux-2 @@ -814,7 +844,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: amazonlinux-2-arm64 @@ -831,7 +861,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: archlinux-lts @@ -848,7 +878,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: centos-7 @@ -865,7 +895,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: centos-7-arm64 @@ -882,7 +912,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: centosstream-8 @@ -899,7 +929,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: centosstream-8-arm64 @@ -916,7 +946,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: centosstream-9 @@ -933,7 +963,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: centosstream-9-arm64 @@ -950,7 +980,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: debian-10 @@ -967,7 +997,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: debian-11 @@ -984,7 +1014,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: debian-11-arm64 @@ -1001,7 +1031,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: fedora-37 @@ -1018,7 +1048,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: fedora-37-arm64 @@ -1035,7 +1065,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: fedora-38 @@ -1052,7 +1082,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: fedora-38-arm64 @@ -1069,7 +1099,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: opensuse-15 @@ -1086,7 +1116,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: photonos-3 @@ -1103,7 +1133,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: photonos-4 @@ -1120,7 +1150,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: photonos-4-arm64 @@ -1137,7 +1167,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: ubuntu-20.04 @@ -1154,7 +1184,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: ubuntu-20.04-arm64 @@ -1171,7 +1201,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: ubuntu-22.04 @@ -1188,7 +1218,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: ubuntu-22.04-arm64 @@ -2264,7 +2294,6 @@ jobs: - repo-nightly needs: - prepare-workflow - - build-salt-onedir steps: - uses: actions/checkout@v4 @@ -2781,7 +2810,6 @@ jobs: - repo-nightly needs: - prepare-workflow - - build-salt-onedir steps: - uses: actions/checkout@v4 @@ -3008,7 +3036,9 @@ jobs: - build-deps-onedir-linux - build-deps-onedir-windows - build-deps-onedir-macos - - build-salt-onedir + - build-salt-onedir-linux + - build-salt-onedir-windows + - build-salt-onedir-macos - build-rpm-pkgs-src - build-deb-pkgs-src - build-windows-pkgs-src diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 85f15461dc3..95cbc29b6e9 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -507,16 +507,46 @@ jobs: relenv-version: "0.13.11" python-version: "3.10.13" - build-salt-onedir: + build-salt-onedir-linux: name: Build Salt Onedir if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-salt-onedir'] }} needs: - prepare-workflow - build-deps-onedir-linux + - build-source-tarball + uses: ./.github/workflows/build-salt-onedir-linux.yml + with: + cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + relenv-version: "0.13.11" + python-version: "3.10.13" + + build-salt-onedir-windows: + name: Build Salt Onedir + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-salt-onedir'] }} + needs: + - prepare-workflow - build-deps-onedir-windows + - build-source-tarball + uses: ./.github/workflows/build-salt-onedir-windows.yml + with: + cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + relenv-version: "0.13.11" + python-version: "3.10.13" + + build-salt-onedir-macos: + name: Build Salt Onedir + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-salt-onedir'] }} + needs: + - prepare-workflow - build-deps-onedir-macos - build-source-tarball - uses: ./.github/workflows/build-salt-onedir.yml + uses: ./.github/workflows/build-salt-onedir-macos.yml with: cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -530,7 +560,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-rpm-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -543,7 +573,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-rpm-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -556,7 +586,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deb-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -569,7 +599,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deb-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -582,7 +612,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-windows uses: ./.github/workflows/build-windows-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -595,7 +625,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-windows uses: ./.github/workflows/build-windows-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -608,7 +638,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-macos uses: ./.github/workflows/build-macos-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -621,7 +651,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-macos uses: ./.github/workflows/build-macos-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -634,7 +664,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-windows uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: windows-2016 @@ -651,7 +681,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-windows uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: windows-2019 @@ -668,7 +698,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-windows uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: windows-2022 @@ -685,7 +715,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-macos uses: ./.github/workflows/build-deps-ci-action-macos.yml with: distro-slug: macos-12 @@ -702,7 +732,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: almalinux-8 @@ -719,7 +749,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: almalinux-8-arm64 @@ -736,7 +766,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: almalinux-9 @@ -753,7 +783,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: almalinux-9-arm64 @@ -770,7 +800,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: amazonlinux-2 @@ -787,7 +817,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: amazonlinux-2-arm64 @@ -804,7 +834,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: archlinux-lts @@ -821,7 +851,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: centos-7 @@ -838,7 +868,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: centos-7-arm64 @@ -855,7 +885,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: centosstream-8 @@ -872,7 +902,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: centosstream-8-arm64 @@ -889,7 +919,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: centosstream-9 @@ -906,7 +936,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: centosstream-9-arm64 @@ -923,7 +953,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: debian-10 @@ -940,7 +970,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: debian-11 @@ -957,7 +987,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: debian-11-arm64 @@ -974,7 +1004,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: fedora-37 @@ -991,7 +1021,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: fedora-37-arm64 @@ -1008,7 +1038,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: fedora-38 @@ -1025,7 +1055,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: fedora-38-arm64 @@ -1042,7 +1072,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: opensuse-15 @@ -1059,7 +1089,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: photonos-3 @@ -1076,7 +1106,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: photonos-4 @@ -1093,7 +1123,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: photonos-4-arm64 @@ -1110,7 +1140,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: ubuntu-20.04 @@ -1127,7 +1157,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: ubuntu-20.04-arm64 @@ -1144,7 +1174,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: ubuntu-22.04 @@ -1161,7 +1191,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: ubuntu-22.04-arm64 @@ -2244,7 +2274,9 @@ jobs: - build-deps-onedir-linux - build-deps-onedir-windows - build-deps-onedir-macos - - build-salt-onedir + - build-salt-onedir-linux + - build-salt-onedir-windows + - build-salt-onedir-macos - build-rpm-pkgs-src - build-deb-pkgs-src - build-windows-pkgs-src diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 416940e344c..e68541a55f0 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -517,16 +517,46 @@ jobs: relenv-version: "0.13.11" python-version: "3.10.13" - build-salt-onedir: + build-salt-onedir-linux: name: Build Salt Onedir if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-salt-onedir'] }} needs: - prepare-workflow - build-deps-onedir-linux + - build-source-tarball + uses: ./.github/workflows/build-salt-onedir-linux.yml + with: + cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + relenv-version: "0.13.11" + python-version: "3.10.13" + + build-salt-onedir-windows: + name: Build Salt Onedir + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-salt-onedir'] }} + needs: + - prepare-workflow - build-deps-onedir-windows + - build-source-tarball + uses: ./.github/workflows/build-salt-onedir-windows.yml + with: + cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + relenv-version: "0.13.11" + python-version: "3.10.13" + + build-salt-onedir-macos: + name: Build Salt Onedir + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-salt-onedir'] }} + needs: + - prepare-workflow - build-deps-onedir-macos - build-source-tarball - uses: ./.github/workflows/build-salt-onedir.yml + uses: ./.github/workflows/build-salt-onedir-macos.yml with: cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -540,7 +570,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-rpm-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -553,7 +583,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-rpm-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -566,7 +596,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deb-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -579,7 +609,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deb-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -592,7 +622,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-windows uses: ./.github/workflows/build-windows-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -608,7 +638,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-windows uses: ./.github/workflows/build-windows-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -624,7 +654,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-macos uses: ./.github/workflows/build-macos-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -640,7 +670,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-macos uses: ./.github/workflows/build-macos-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -656,7 +686,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-windows uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: windows-2016 @@ -673,7 +703,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-windows uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: windows-2019 @@ -690,7 +720,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-windows uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: windows-2022 @@ -707,7 +737,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-macos uses: ./.github/workflows/build-deps-ci-action-macos.yml with: distro-slug: macos-12 @@ -724,7 +754,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: almalinux-8 @@ -741,7 +771,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: almalinux-8-arm64 @@ -758,7 +788,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: almalinux-9 @@ -775,7 +805,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: almalinux-9-arm64 @@ -792,7 +822,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: amazonlinux-2 @@ -809,7 +839,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: amazonlinux-2-arm64 @@ -826,7 +856,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: archlinux-lts @@ -843,7 +873,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: centos-7 @@ -860,7 +890,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: centos-7-arm64 @@ -877,7 +907,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: centosstream-8 @@ -894,7 +924,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: centosstream-8-arm64 @@ -911,7 +941,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: centosstream-9 @@ -928,7 +958,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: centosstream-9-arm64 @@ -945,7 +975,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: debian-10 @@ -962,7 +992,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: debian-11 @@ -979,7 +1009,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: debian-11-arm64 @@ -996,7 +1026,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: fedora-37 @@ -1013,7 +1043,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: fedora-37-arm64 @@ -1030,7 +1060,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: fedora-38 @@ -1047,7 +1077,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: fedora-38-arm64 @@ -1064,7 +1094,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: opensuse-15 @@ -1081,7 +1111,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: photonos-3 @@ -1098,7 +1128,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: photonos-4 @@ -1115,7 +1145,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: photonos-4-arm64 @@ -1132,7 +1162,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: ubuntu-20.04 @@ -1149,7 +1179,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: ubuntu-20.04-arm64 @@ -1166,7 +1196,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: ubuntu-22.04 @@ -1183,7 +1213,7 @@ jobs: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: ubuntu-22.04-arm64 @@ -2146,7 +2176,6 @@ jobs: - repo-staging needs: - prepare-workflow - - build-salt-onedir steps: - uses: actions/checkout@v4 @@ -2665,7 +2694,6 @@ jobs: - repo-staging needs: - prepare-workflow - - build-salt-onedir steps: - uses: actions/checkout@v4 @@ -3788,7 +3816,9 @@ jobs: - build-deps-onedir-linux - build-deps-onedir-windows - build-deps-onedir-macos - - build-salt-onedir + - build-salt-onedir-linux + - build-salt-onedir-windows + - build-salt-onedir-macos - build-rpm-pkgs-src - build-deb-pkgs-src - build-windows-pkgs-src diff --git a/.github/workflows/templates/build-ci-deps.yml.jinja b/.github/workflows/templates/build-ci-deps.yml.jinja index 928128140a5..7faabaee761 100644 --- a/.github/workflows/templates/build-ci-deps.yml.jinja +++ b/.github/workflows/templates/build-ci-deps.yml.jinja @@ -9,7 +9,7 @@ if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-windows uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: <{ slug }> @@ -31,7 +31,7 @@ if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-macos uses: ./.github/workflows/build-deps-ci-action-macos.yml with: distro-slug: <{ slug }> @@ -80,7 +80,7 @@ if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-linux uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: <{ slug }> diff --git a/.github/workflows/templates/build-packages.yml.jinja b/.github/workflows/templates/build-packages.yml.jinja index 929bac1109b..37cae00b1e8 100644 --- a/.github/workflows/templates/build-packages.yml.jinja +++ b/.github/workflows/templates/build-packages.yml.jinja @@ -1,9 +1,9 @@ -<%- for pkg_type, display_name, runner_type in ( - ("rpm", "RPM", "self-hosted"), - ("deb", "DEB", "self-hosted"), - ("windows", "Windows", "github-hosted"), - ("macos", "macOS", "github-hosted"), - ) %> +<%- for platform, pkg_type, display_name, runner_type in ( + ("linux", "rpm", "RPM", "self-hosted"), + ("linux", "deb", "DEB", "self-hosted"), + ("windows", "windows", "Windows", "github-hosted"), + ("macos", "macos", "macOS", "github-hosted"), + ) %> <%- for backend in ("onedir", "src") %> <%- set job_name = "build-{}-pkgs-{}".format(pkg_type, backend) %> @@ -16,7 +16,7 @@ if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['<{ runner_type }>'] }} needs: - prepare-workflow - - build-salt-onedir + - build-salt-onedir-<{ platform }> uses: ./.github/workflows/build-<{ pkg_type }>-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" diff --git a/.github/workflows/templates/build-repos.yml.jinja b/.github/workflows/templates/build-repos.yml.jinja index de984ed75de..8aa147ce40b 100644 --- a/.github/workflows/templates/build-repos.yml.jinja +++ b/.github/workflows/templates/build-repos.yml.jinja @@ -1,11 +1,11 @@ -<%- for type, display_name, needs_pkg in ( - ("src", "Source", False), - ("deb", "DEB", True), - ("rpm", "RPM", True), - ("windows", "Windows", True), - ("macos", "macOS", True), - ("onedir", "Onedir", False), - ) %> +<%- for platform, type, display_name, needs_pkg in ( + (None, "src", "Source", False), + ("linux", "deb", "DEB", True), + ("linux", "rpm", "RPM", True), + ("windows", "windows", "Windows", True), + ("macos", "macos", "macOS", True), + (None, "onedir", "Onedir", False), + ) %> <%- set job_name = "build-{}-repo".format(type) %> <%- do build_repo_needs.append(job_name) %> @@ -21,8 +21,8 @@ - prepare-workflow <%- if needs_pkg %> - build-<{ type }>-pkgs-onedir - <%- else %> - - build-salt-onedir + <%- elif platform %> + - build-salt-onedir-<{ platform }> <%- endif %> <%- include "build-{}-repo.yml.jinja".format(type) %> diff --git a/.github/workflows/templates/ci.yml.jinja b/.github/workflows/templates/ci.yml.jinja index 896bc880354..f09b92f64de 100644 --- a/.github/workflows/templates/ci.yml.jinja +++ b/.github/workflows/templates/ci.yml.jinja @@ -278,18 +278,18 @@ <%- set job_name = "build-salt-onedir" %> <%- if includes.get(job_name, True) %> + <%- for platform in ("linux", "windows", "macos") %> + <%- set platform_job_name = "{}-{}".format(job_name, platform) %> - <{ job_name }>: - <%- do conclusion_needs.append(job_name) %> + <{ platform_job_name }>: + <%- do conclusion_needs.append(platform_job_name) %> name: Build Salt Onedir if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['<{ job_name }>'] }} needs: - prepare-workflow - <%- for platform in ("linux", "windows", "macos") %> - build-deps-onedir-<{ platform }> - <%- endfor %> - build-source-tarball - uses: ./.github/workflows/build-salt-onedir.yml + uses: ./.github/workflows/build-salt-onedir-<{ platform }>.yml with: cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" @@ -298,6 +298,7 @@ relenv-version: "<{ relenv_version }>" python-version: "<{ python_version }>" + <%- endfor %> <%- endif %> From 44d47b4d8aa1fd810f4593b69e7781452428bc06 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 3 Oct 2023 13:32:58 +0100 Subject: [PATCH 050/147] Remove unused variables Signed-off-by: Pedro Algarvio --- tests/pytests/unit/fileclient/test_fileclient.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/tests/pytests/unit/fileclient/test_fileclient.py b/tests/pytests/unit/fileclient/test_fileclient.py index 20eebb2bd51..f52e74094ea 100644 --- a/tests/pytests/unit/fileclient/test_fileclient.py +++ b/tests/pytests/unit/fileclient/test_fileclient.py @@ -81,14 +81,11 @@ def test_fileclient_context_manager_closes(minion_opts, master_opts): "auth_timeout": 5, "master_ip": "127.0.0.1", "master_port": master_opts["ret_port"], - "master_uri": "tcp://127.0.0.1:{}".format(master_opts["ret_port"]), + "master_uri": f"tcp://127.0.0.1:{master_opts['ret_port']}", "request_channel_timeout": 1, "request_channel_tries": 1, } ) - master_uri = "tcp://{master_ip}:{master_port}".format( - master_ip="localhost", master_port=minion_opts["master_port"] - ) mock_reqchannel = MockReqChannel() patch_reqchannel = patch.object( salt.channel.client, "ReqChannel", return_value=mock_reqchannel @@ -116,14 +113,11 @@ def test_fileclient_timeout(minion_opts, master_opts): "auth_timeout": 5, "master_ip": "127.0.0.1", "master_port": master_opts["ret_port"], - "master_uri": "tcp://127.0.0.1:{}".format(master_opts["ret_port"]), + "master_uri": f"tcp://127.0.0.1:{master_opts['ret_port']}", "request_channel_timeout": 1, "request_channel_tries": 1, } ) - master_uri = "tcp://{master_ip}:{master_port}".format( - master_ip="localhost", master_port=minion_opts["master_port"] - ) async def mock_auth(): return True From 37ca0c08d0f7dfd83477f0456ddc1dd400beb6dd Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 3 Oct 2023 13:55:03 +0100 Subject: [PATCH 051/147] Upgrade to `mock==5.1.0` Signed-off-by: Pedro Algarvio --- requirements/static/ci/py3.10/cloud.txt | 3 +-- requirements/static/ci/py3.10/darwin.txt | 3 +-- requirements/static/ci/py3.10/freebsd.txt | 3 +-- requirements/static/ci/py3.10/linux.txt | 3 +-- requirements/static/ci/py3.10/windows.txt | 3 +-- requirements/static/ci/py3.7/cloud.txt | 3 +-- requirements/static/ci/py3.7/freebsd.txt | 3 +-- requirements/static/ci/py3.7/linux.txt | 3 +-- requirements/static/ci/py3.7/windows.txt | 3 +-- requirements/static/ci/py3.8/cloud.txt | 3 +-- requirements/static/ci/py3.8/freebsd.txt | 3 +-- requirements/static/ci/py3.8/linux.txt | 3 +-- requirements/static/ci/py3.8/windows.txt | 3 +-- requirements/static/ci/py3.9/cloud.txt | 3 +-- requirements/static/ci/py3.9/darwin.txt | 3 +-- requirements/static/ci/py3.9/freebsd.txt | 3 +-- requirements/static/ci/py3.9/linux.txt | 3 +-- requirements/static/ci/py3.9/windows.txt | 3 +-- tests/support/mock.py | 1 + 19 files changed, 19 insertions(+), 36 deletions(-) diff --git a/requirements/static/ci/py3.10/cloud.txt b/requirements/static/ci/py3.10/cloud.txt index 8191c938ac1..1179cd38b7d 100644 --- a/requirements/static/ci/py3.10/cloud.txt +++ b/requirements/static/ci/py3.10/cloud.txt @@ -788,7 +788,7 @@ markupsafe==2.1.2 # mako # moto # werkzeug -mock==3.0.5 +mock==5.1.0 # via # -c requirements/static/ci/py3.10/linux.txt # -r requirements/pytest.txt @@ -1212,7 +1212,6 @@ six==1.16.0 # junos-eznc # kazoo # kubernetes - # mock # more-itertools # ncclient # paramiko diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index 47b122502d4..256fe689592 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -536,7 +536,7 @@ markupsafe==2.1.2 # werkzeug mercurial==6.0.1 # via -r requirements/static/ci/darwin.in -mock==3.0.5 +mock==5.1.0 # via -r requirements/pytest.txt more-itertools==8.2.0 # via @@ -855,7 +855,6 @@ six==1.16.0 # jsonschema # junos-eznc # kubernetes - # mock # msrestazure # ncclient # paramiko diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index 693b0fa2bc0..18f4f42651c 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -528,7 +528,7 @@ markupsafe==2.1.2 # werkzeug mercurial==6.0.1 # via -r requirements/static/ci/freebsd.in -mock==3.0.5 +mock==5.1.0 # via -r requirements/pytest.txt more-itertools==5.0.0 # via @@ -848,7 +848,6 @@ six==1.16.0 # junos-eznc # kazoo # kubernetes - # mock # more-itertools # msrestazure # ncclient diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index 2caf2e6fd3a..0049950e1ef 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -543,7 +543,7 @@ markupsafe==2.1.2 # werkzeug mercurial==6.0.1 # via -r requirements/static/ci/linux.in -mock==3.0.5 +mock==5.1.0 # via -r requirements/pytest.txt more-itertools==5.0.0 # via @@ -889,7 +889,6 @@ six==1.16.0 # junos-eznc # kazoo # kubernetes - # mock # more-itertools # ncclient # paramiko diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index d7c65b7e59c..92a4b88303b 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -208,7 +208,7 @@ markupsafe==2.1.2 # mako # moto # werkzeug -mock==3.0.5 +mock==5.1.0 # via -r requirements/pytest.txt more-itertools==8.2.0 # via @@ -420,7 +420,6 @@ six==1.15.0 # google-auth # jsonschema # kubernetes - # mock # python-dateutil # pyvmomi # pywinrm diff --git a/requirements/static/ci/py3.7/cloud.txt b/requirements/static/ci/py3.7/cloud.txt index 3f64dfca7d5..97736d31111 100644 --- a/requirements/static/ci/py3.7/cloud.txt +++ b/requirements/static/ci/py3.7/cloud.txt @@ -818,7 +818,7 @@ markupsafe==2.1.2 # mako # moto # werkzeug -mock==3.0.5 +mock==5.1.0 # via # -c requirements/static/ci/py3.7/linux.txt # -r requirements/pytest.txt @@ -1266,7 +1266,6 @@ six==1.16.0 # junos-eznc # kazoo # kubernetes - # mock # more-itertools # ncclient # paramiko diff --git a/requirements/static/ci/py3.7/freebsd.txt b/requirements/static/ci/py3.7/freebsd.txt index 9d27b43d5b2..a979abdfb10 100644 --- a/requirements/static/ci/py3.7/freebsd.txt +++ b/requirements/static/ci/py3.7/freebsd.txt @@ -552,7 +552,7 @@ markupsafe==2.1.2 # werkzeug mercurial==6.0.1 # via -r requirements/static/ci/freebsd.in -mock==3.0.5 +mock==5.1.0 # via -r requirements/pytest.txt more-itertools==5.0.0 # via @@ -892,7 +892,6 @@ six==1.16.0 # junos-eznc # kazoo # kubernetes - # mock # more-itertools # msrestazure # ncclient diff --git a/requirements/static/ci/py3.7/linux.txt b/requirements/static/ci/py3.7/linux.txt index c9f7362187e..6f648598b31 100644 --- a/requirements/static/ci/py3.7/linux.txt +++ b/requirements/static/ci/py3.7/linux.txt @@ -567,7 +567,7 @@ markupsafe==2.1.2 # werkzeug mercurial==6.0.1 # via -r requirements/static/ci/linux.in -mock==3.0.5 +mock==5.1.0 # via -r requirements/pytest.txt more-itertools==5.0.0 # via @@ -933,7 +933,6 @@ six==1.16.0 # junos-eznc # kazoo # kubernetes - # mock # more-itertools # ncclient # paramiko diff --git a/requirements/static/ci/py3.7/windows.txt b/requirements/static/ci/py3.7/windows.txt index b240ba476ad..3a785589f0d 100644 --- a/requirements/static/ci/py3.7/windows.txt +++ b/requirements/static/ci/py3.7/windows.txt @@ -222,7 +222,7 @@ markupsafe==2.1.2 # mako # moto # werkzeug -mock==3.0.5 +mock==5.1.0 # via -r requirements/pytest.txt more-itertools==8.2.0 # via @@ -434,7 +434,6 @@ six==1.15.0 # google-auth # jsonschema # kubernetes - # mock # python-dateutil # pyvmomi # pywinrm diff --git a/requirements/static/ci/py3.8/cloud.txt b/requirements/static/ci/py3.8/cloud.txt index 0d2631e1fcc..5c0e53d37a7 100644 --- a/requirements/static/ci/py3.8/cloud.txt +++ b/requirements/static/ci/py3.8/cloud.txt @@ -806,7 +806,7 @@ markupsafe==2.1.2 # mako # moto # werkzeug -mock==3.0.5 +mock==5.1.0 # via # -c requirements/static/ci/py3.8/linux.txt # -r requirements/pytest.txt @@ -1254,7 +1254,6 @@ six==1.16.0 # junos-eznc # kazoo # kubernetes - # mock # more-itertools # ncclient # paramiko diff --git a/requirements/static/ci/py3.8/freebsd.txt b/requirements/static/ci/py3.8/freebsd.txt index c6d484ac22f..0a035c08cdf 100644 --- a/requirements/static/ci/py3.8/freebsd.txt +++ b/requirements/static/ci/py3.8/freebsd.txt @@ -542,7 +542,7 @@ markupsafe==2.1.2 # werkzeug mercurial==6.0.1 # via -r requirements/static/ci/freebsd.in -mock==3.0.5 +mock==5.1.0 # via -r requirements/pytest.txt more-itertools==5.0.0 # via @@ -882,7 +882,6 @@ six==1.16.0 # junos-eznc # kazoo # kubernetes - # mock # more-itertools # msrestazure # ncclient diff --git a/requirements/static/ci/py3.8/linux.txt b/requirements/static/ci/py3.8/linux.txt index bc1caeeba8c..337f491ddc5 100644 --- a/requirements/static/ci/py3.8/linux.txt +++ b/requirements/static/ci/py3.8/linux.txt @@ -557,7 +557,7 @@ markupsafe==2.1.2 # werkzeug mercurial==6.0.1 # via -r requirements/static/ci/linux.in -mock==3.0.5 +mock==5.1.0 # via -r requirements/pytest.txt more-itertools==5.0.0 # via @@ -923,7 +923,6 @@ six==1.16.0 # junos-eznc # kazoo # kubernetes - # mock # more-itertools # ncclient # paramiko diff --git a/requirements/static/ci/py3.8/windows.txt b/requirements/static/ci/py3.8/windows.txt index ff143d4fcff..244a1e0734f 100644 --- a/requirements/static/ci/py3.8/windows.txt +++ b/requirements/static/ci/py3.8/windows.txt @@ -210,7 +210,7 @@ markupsafe==2.1.2 # mako # moto # werkzeug -mock==3.0.5 +mock==5.1.0 # via -r requirements/pytest.txt more-itertools==8.2.0 # via @@ -422,7 +422,6 @@ six==1.15.0 # google-auth # jsonschema # kubernetes - # mock # python-dateutil # pyvmomi # pywinrm diff --git a/requirements/static/ci/py3.9/cloud.txt b/requirements/static/ci/py3.9/cloud.txt index 97ed2d28172..47593bdb4f1 100644 --- a/requirements/static/ci/py3.9/cloud.txt +++ b/requirements/static/ci/py3.9/cloud.txt @@ -806,7 +806,7 @@ markupsafe==2.1.2 # mako # moto # werkzeug -mock==3.0.5 +mock==5.1.0 # via # -c requirements/static/ci/py3.9/linux.txt # -r requirements/pytest.txt @@ -1256,7 +1256,6 @@ six==1.16.0 # junos-eznc # kazoo # kubernetes - # mock # more-itertools # ncclient # paramiko diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index bd6610b93ef..05970bc3186 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -550,7 +550,7 @@ markupsafe==2.1.2 # werkzeug mercurial==6.0.1 # via -r requirements/static/ci/darwin.in -mock==3.0.5 +mock==5.1.0 # via -r requirements/pytest.txt more-itertools==8.2.0 # via @@ -891,7 +891,6 @@ six==1.16.0 # jsonschema # junos-eznc # kubernetes - # mock # msrestazure # ncclient # paramiko diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index 5b2e19b1359..1e75e0a42d8 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -542,7 +542,7 @@ markupsafe==2.1.2 # werkzeug mercurial==6.0.1 # via -r requirements/static/ci/freebsd.in -mock==3.0.5 +mock==5.1.0 # via -r requirements/pytest.txt more-itertools==5.0.0 # via @@ -884,7 +884,6 @@ six==1.16.0 # junos-eznc # kazoo # kubernetes - # mock # more-itertools # msrestazure # ncclient diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index f8c2acc2047..8d2c2f6d54d 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -559,7 +559,7 @@ markupsafe==2.1.2 # werkzeug mercurial==6.0.1 # via -r requirements/static/ci/linux.in -mock==3.0.5 +mock==5.1.0 # via -r requirements/pytest.txt more-itertools==5.0.0 # via @@ -927,7 +927,6 @@ six==1.16.0 # junos-eznc # kazoo # kubernetes - # mock # more-itertools # ncclient # paramiko diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index d749dd23ae4..74979a411af 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -210,7 +210,7 @@ markupsafe==2.1.2 # mako # moto # werkzeug -mock==3.0.5 +mock==5.1.0 # via -r requirements/pytest.txt more-itertools==8.2.0 # via @@ -423,7 +423,6 @@ six==1.15.0 # google-auth # jsonschema # kubernetes - # mock # python-dateutil # pyvmomi # pywinrm diff --git a/tests/support/mock.py b/tests/support/mock.py index 2256ad8f5da..c050d0bf4e6 100644 --- a/tests/support/mock.py +++ b/tests/support/mock.py @@ -27,6 +27,7 @@ from mock import ( ANY, DEFAULT, FILTER_DIR, + AsyncMock, MagicMock, Mock, NonCallableMagicMock, From 669ce9b49c6d9aac8ae3fffe0d3efa2c584a094c Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 3 Oct 2023 13:57:07 +0100 Subject: [PATCH 052/147] Properly mock async method Signed-off-by: Pedro Algarvio --- .../unit/fileclient/test_fileclient.py | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/tests/pytests/unit/fileclient/test_fileclient.py b/tests/pytests/unit/fileclient/test_fileclient.py index f52e74094ea..0e072e5c36f 100644 --- a/tests/pytests/unit/fileclient/test_fileclient.py +++ b/tests/pytests/unit/fileclient/test_fileclient.py @@ -1,8 +1,6 @@ """ Tests for the salt fileclient """ - - import errno import logging import os @@ -11,7 +9,7 @@ import pytest import salt.utils.files from salt import fileclient -from tests.support.mock import MagicMock, Mock, patch +from tests.support.mock import AsyncMock, MagicMock, Mock, patch log = logging.getLogger(__name__) @@ -119,20 +117,17 @@ def test_fileclient_timeout(minion_opts, master_opts): } ) - async def mock_auth(): - return True - def mock_dumps(*args): return b"meh" with fileclient.get_file_client(minion_opts) as client: # Authenticate must return true - client.auth.authenticate = mock_auth - # Crypticle must return bytes to pass to transport.RequestClient.send - client.auth._crypticle = Mock() - client.auth._crypticle.dumps = mock_dumps - with pytest.raises(salt.exceptions.SaltClientError): - client.file_list() + with patch.object(client.auth, "authenticate", AsyncMock(return_value=True)): + # Crypticle must return bytes to pass to transport.RequestClient.send + client.auth._crypticle = Mock() + client.auth._crypticle.dumps = mock_dumps + with pytest.raises(salt.exceptions.SaltClientError): + client.file_list() def test_cache_skips_makedirs_on_race_condition(client_opts): From 3a4df003d95a3e5e3c1a688c1f20ecaf1ad41f6e Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 13 Jun 2023 07:37:19 +0100 Subject: [PATCH 053/147] Fix mock calls Signed-off-by: Pedro Algarvio --- tests/pytests/unit/modules/test_aptpkg.py | 12 +++++----- .../pytests/unit/modules/test_linux_sysctl.py | 8 +++---- tests/pytests/unit/modules/test_win_ip.py | 4 ++-- tests/pytests/unit/test_master.py | 2 +- tests/pytests/unit/utils/event/test_event.py | 24 +++++++++---------- tests/unit/modules/test_nilrt_ip.py | 4 ++-- .../unit/netapi/rest_tornado/test_saltnado.py | 22 +++++++---------- 7 files changed, 35 insertions(+), 41 deletions(-) diff --git a/tests/pytests/unit/modules/test_aptpkg.py b/tests/pytests/unit/modules/test_aptpkg.py index 33d976b8427..9a812d817ce 100644 --- a/tests/pytests/unit/modules/test_aptpkg.py +++ b/tests/pytests/unit/modules/test_aptpkg.py @@ -1298,17 +1298,17 @@ def test_call_apt_dpkg_lock(): ] cmd_mock = MagicMock(side_effect=cmd_side_effect) - cmd_call = ( + cmd_call = [ call( ["dpkg", "-l", "python"], - env={}, - ignore_retcode=False, output_loglevel="quiet", python_shell=True, + env={}, + ignore_retcode=False, username="Darth Vader", ), - ) - expected_calls = [cmd_call * 5] + ] + expected_calls = cmd_call * 5 with patch.dict( aptpkg.__salt__, @@ -1328,7 +1328,7 @@ def test_call_apt_dpkg_lock(): # We should attempt to call the cmd 5 times assert cmd_mock.call_count == 5 - cmd_mock.has_calls(expected_calls) + cmd_mock.assert_has_calls(expected_calls) def test_services_need_restart_checkrestart_missing(): diff --git a/tests/pytests/unit/modules/test_linux_sysctl.py b/tests/pytests/unit/modules/test_linux_sysctl.py index 0bdd24039d7..6b0875bc460 100644 --- a/tests/pytests/unit/modules/test_linux_sysctl.py +++ b/tests/pytests/unit/modules/test_linux_sysctl.py @@ -215,7 +215,7 @@ def test_persist_no_conf_failure(): ): with pytest.raises(CommandExecutionError): linux_sysctl.persist("net.ipv4.ip_forward", 42, config=None) - fopen_mock.called_once() + fopen_mock.assert_called_once() def test_persist_no_conf_success(): @@ -353,7 +353,7 @@ def test_persist_value_with_spaces_already_set(tmp_path): """ config = str(tmp_path / "existing_sysctl_with_spaces.conf") value = "|/usr/share/kdump-tools/dump-core %p %s %t %e" - config_file_content = "kernel.core_pattern = {}\n".format(value) + config_file_content = f"kernel.core_pattern = {value}\n" with fopen(config, "w", encoding="utf-8") as config_file: config_file.write(config_file_content) mock_run = MagicMock(return_value=value) @@ -383,7 +383,7 @@ def test_persist_value_with_spaces_already_configured(tmp_path): """ config = str(tmp_path / "existing_sysctl_with_spaces.conf") value = "|/usr/share/kdump-tools/dump-core %p %s %t %e" - config_file_content = "kernel.core_pattern = {}\n".format(value) + config_file_content = f"kernel.core_pattern = {value}\n" with fopen(config, "w", encoding="utf-8") as config_file: config_file.write(config_file_content) mock_run = MagicMock(return_value="") @@ -451,7 +451,7 @@ def test_persist_value_with_spaces_update_config(tmp_path): assert os.path.isfile(config) with fopen(config, encoding="utf-8") as config_file: written = config_file.read() - assert written == "kernel.core_pattern = {}\n".format(value) + assert written == f"kernel.core_pattern = {value}\n" def test_persist_value_with_spaces_new_file(tmp_path): diff --git a/tests/pytests/unit/modules/test_win_ip.py b/tests/pytests/unit/modules/test_win_ip.py index 38eb6b1ac5f..94a3fe7ca93 100644 --- a/tests/pytests/unit/modules/test_win_ip.py +++ b/tests/pytests/unit/modules/test_win_ip.py @@ -151,7 +151,7 @@ def test_enable(): ): assert win_ip.enable("Ethernet") - mock_cmd.called_once_with( + mock_cmd.assert_called_once_with( [ "netsh", "interface", @@ -180,7 +180,7 @@ def test_disable(): ): assert win_ip.disable("Ethernet") - mock_cmd.called_once_with( + mock_cmd.assert_called_once_with( [ "netsh", "interface", diff --git a/tests/pytests/unit/test_master.py b/tests/pytests/unit/test_master.py index cd11d217c79..502767d3e34 100644 --- a/tests/pytests/unit/test_master.py +++ b/tests/pytests/unit/test_master.py @@ -60,7 +60,7 @@ def test_fileserver_duration(): end = time.time() # Interval is equal to timeout so the _do_update method will be called # one time. - update.called_once() + update.assert_called_once() # Timeout is 1 second duration = end - start if duration > 2 and salt.utils.platform.spawning_platform(): diff --git a/tests/pytests/unit/utils/event/test_event.py b/tests/pytests/unit/utils/event/test_event.py index e289e72dad0..f4b6c159996 100644 --- a/tests/pytests/unit/utils/event/test_event.py +++ b/tests/pytests/unit/utils/event/test_event.py @@ -38,7 +38,7 @@ def sock_dir(tmp_path): def _assert_got_event(evt, data, msg=None, expected_failure=False): assert evt is not None, msg for key in data: - assert key in evt, "{}: Key {} missing".format(msg, key) + assert key in evt, f"{msg}: Key {key} missing" assertMsg = "{0}: Key {1} value mismatch, {2} != {3}" assertMsg = assertMsg.format(msg, key, data[key], evt[key]) if not expected_failure: @@ -59,8 +59,8 @@ def test_minion_event(sock_dir): :10 ] with salt.utils.event.MinionEvent(opts, listen=False) as me: - assert me.puburi == str(sock_dir / "minion_event_{}_pub.ipc".format(id_hash)) - assert me.pulluri == str(sock_dir / "minion_event_{}_pull.ipc".format(id_hash)) + assert me.puburi == str(sock_dir / f"minion_event_{id_hash}_pub.ipc") + assert me.pulluri == str(sock_dir / f"minion_event_{id_hash}_pull.ipc") def test_minion_event_tcp_ipc_mode(): @@ -73,8 +73,8 @@ def test_minion_event_tcp_ipc_mode(): def test_minion_event_no_id(sock_dir): with salt.utils.event.MinionEvent(dict(sock_dir=str(sock_dir)), listen=False) as me: id_hash = hashlib.sha256(salt.utils.stringutils.to_bytes("")).hexdigest()[:10] - assert me.puburi == str(sock_dir / "minion_event_{}_pub.ipc".format(id_hash)) - assert me.pulluri == str(sock_dir / "minion_event_{}_pull.ipc".format(id_hash)) + assert me.puburi == str(sock_dir / f"minion_event_{id_hash}_pub.ipc") + assert me.pulluri == str(sock_dir / f"minion_event_{id_hash}_pull.ipc") @pytest.mark.slow_test @@ -256,9 +256,9 @@ def test_event_many(sock_dir): with eventpublisher_process(str(sock_dir)): with salt.utils.event.MasterEvent(str(sock_dir), listen=True) as me: for i in range(500): - me.fire_event({"data": "{}".format(i)}, "testevents") + me.fire_event({"data": f"{i}"}, "testevents") evt = me.get_event(tag="testevents") - _assert_got_event(evt, {"data": "{}".format(i)}, "Event {}".format(i)) + _assert_got_event(evt, {"data": f"{i}"}, f"Event {i}") @pytest.mark.slow_test @@ -268,10 +268,10 @@ def test_event_many_backlog(sock_dir): with salt.utils.event.MasterEvent(str(sock_dir), listen=True) as me: # Must not exceed zmq HWM for i in range(500): - me.fire_event({"data": "{}".format(i)}, "testevents") + me.fire_event({"data": f"{i}"}, "testevents") for i in range(500): evt = me.get_event(tag="testevents") - _assert_got_event(evt, {"data": "{}".format(i)}, "Event {}".format(i)) + _assert_got_event(evt, {"data": f"{i}"}, f"Event {i}") # Test the fire_master function. As it wraps the underlying fire_event, @@ -300,7 +300,7 @@ def test_connect_pull_should_debug_log_on_StreamClosedError(): event = SaltEvent(node=None) with patch.object(event, "pusher") as mock_pusher: with patch.object( - salt.utils.event.log, "debug", auto_spec=True + salt.utils.event.log, "debug", autospec=True ) as mock_log_debug: mock_pusher.connect.side_effect = ( salt.ext.tornado.iostream.StreamClosedError @@ -317,10 +317,10 @@ def test_connect_pull_should_error_log_on_other_errors(error): event = SaltEvent(node=None) with patch.object(event, "pusher") as mock_pusher: with patch.object( - salt.utils.event.log, "debug", auto_spec=True + salt.utils.event.log, "debug", autospec=True ) as mock_log_debug: with patch.object( - salt.utils.event.log, "error", auto_spec=True + salt.utils.event.log, "error", autospec=True ) as mock_log_error: mock_pusher.connect.side_effect = error event.connect_pull() diff --git a/tests/unit/modules/test_nilrt_ip.py b/tests/unit/modules/test_nilrt_ip.py index 1261473edb4..50dc13b20b8 100644 --- a/tests/unit/modules/test_nilrt_ip.py +++ b/tests/unit/modules/test_nilrt_ip.py @@ -28,7 +28,7 @@ class NilrtIPTestCase(TestCase, LoaderModuleMockMixin): "salt.modules.nilrt_ip._change_dhcp_config", return_value=True ) as change_dhcp_config_mock: assert nilrt_ip._change_state("test_interface", "down") - assert change_dhcp_config_mock.called_with("test_interface", False) + change_dhcp_config_mock.assert_called_with("test_interface", False) def test_change_state_up_state(self): """ @@ -42,7 +42,7 @@ class NilrtIPTestCase(TestCase, LoaderModuleMockMixin): "salt.modules.nilrt_ip._change_dhcp_config", return_value=True ) as change_dhcp_config_mock: assert nilrt_ip._change_state("test_interface", "up") - assert change_dhcp_config_mock.called_with("test_interface") + change_dhcp_config_mock.assert_called_with("test_interface") def test_set_static_all_with_dns(self): """ diff --git a/tests/unit/netapi/rest_tornado/test_saltnado.py b/tests/unit/netapi/rest_tornado/test_saltnado.py index 7b63a65d4f3..c4758e700ab 100644 --- a/tests/unit/netapi/rest_tornado/test_saltnado.py +++ b/tests/unit/netapi/rest_tornado/test_saltnado.py @@ -647,7 +647,6 @@ class TestDisbatchLocal(salt.ext.tornado.testing.AsyncTestCase): with patch.object( self.handler.application.event_listener, "get_event", - autospec=True, side_effect=fancy_get_event, ), patch.dict( self.handler.application.opts, @@ -698,7 +697,6 @@ class TestDisbatchLocal(salt.ext.tornado.testing.AsyncTestCase): with patch.object( self.handler.application.event_listener, "get_event", - autospec=True, side_effect=fancy_get_event, ), patch.object( self.handler, @@ -729,8 +727,8 @@ class TestDisbatchLocal(salt.ext.tornado.testing.AsyncTestCase): { "tag": "fnord", "data": { - "return": "return from fnord {}".format(i), - "id": "fnord {}".format(i), + "return": f"return from fnord {i}", + "id": f"fnord {i}", }, } ) @@ -760,7 +758,6 @@ class TestDisbatchLocal(salt.ext.tornado.testing.AsyncTestCase): with patch.object( self.handler.application.event_listener, "get_event", - autospec=True, side_effect=fancy_get_event, ), patch.object( self.handler, @@ -794,8 +791,8 @@ class TestDisbatchLocal(salt.ext.tornado.testing.AsyncTestCase): { "tag": "fnord", "data": { - "return": "return from fnord {}".format(i), - "id": "fnord {}".format(i), + "return": f"return from fnord {i}", + "id": f"fnord {i}", }, } ) @@ -820,7 +817,6 @@ class TestDisbatchLocal(salt.ext.tornado.testing.AsyncTestCase): with patch.object( self.handler.application.event_listener, "get_event", - autospec=True, side_effect=fancy_get_event, ), patch.dict( self.handler.application.opts, @@ -843,12 +839,12 @@ class TestDisbatchLocal(salt.ext.tornado.testing.AsyncTestCase): completed_events = [salt.ext.tornado.gen.Future() for _ in range(10)] events_by_id = {} for i, event in enumerate(completed_events): - id_ = "fnord {}".format(i) + id_ = f"fnord {i}" events_by_id[id_] = event event.set_result( { "tag": "fnord", - "data": {"return": "return from {}".format(id_), "id": id_}, + "data": {"return": f"return from {id_}", "id": id_}, } ) expected_result = { @@ -878,7 +874,6 @@ class TestDisbatchLocal(salt.ext.tornado.testing.AsyncTestCase): with patch.object( self.handler.application.event_listener, "get_event", - autospec=True, side_effect=fancy_get_event, ), patch.dict( self.handler.application.opts, @@ -904,12 +899,12 @@ class TestDisbatchLocal(salt.ext.tornado.testing.AsyncTestCase): events_by_id = {} # Setup some real-enough looking return data for i, event in enumerate(completed_events): - id_ = "fnord {}".format(i) + id_ = f"fnord {i}" events_by_id[id_] = event event.set_result( { "tag": "fnord", - "data": {"return": "return from {}".format(id_), "id": id_}, + "data": {"return": f"return from {id_}", "id": id_}, } ) # Hard coded instead of dynamic to avoid potentially writing a test @@ -971,7 +966,6 @@ class TestDisbatchLocal(salt.ext.tornado.testing.AsyncTestCase): with patch.object( self.handler.application.event_listener, "get_event", - autospec=True, side_effect=fancy_get_event, ), patch.object( self.handler, From 9f2d4cfe3cf965f3e872ecd4cc492537c1e006c3 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 12 Sep 2023 13:04:03 +0100 Subject: [PATCH 054/147] The correct method is `assert_called_once_with` not `called_once_with` Signed-off-by: Pedro Algarvio --- tests/pytests/unit/modules/test_msteams.py | 2 +- tests/pytests/unit/states/test_file.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/pytests/unit/modules/test_msteams.py b/tests/pytests/unit/modules/test_msteams.py index 05e6a3d2284..1307cd854bd 100644 --- a/tests/pytests/unit/modules/test_msteams.py +++ b/tests/pytests/unit/modules/test_msteams.py @@ -24,7 +24,7 @@ def test_post_card(): with patch("salt.utils.http.query", http_mock): ret = msteams.post_card("test") assert ret - assert http_mock.called_once_with( + assert http_mock.assert_called_once_with( method="POST", header_dict={"Content-Type": "application/json"}, data='{"text": "test", "title": Null, "themeColor": Null}', diff --git a/tests/pytests/unit/states/test_file.py b/tests/pytests/unit/states/test_file.py index bb040f0fc60..393ede9b397 100644 --- a/tests/pytests/unit/states/test_file.py +++ b/tests/pytests/unit/states/test_file.py @@ -87,6 +87,6 @@ def test_file_recurse_directory_test(): "name": "/tmp/test", "result": False, } - assert salt_dunder["cp.list_master_dirs"].called_once_with( + assert salt_dunder["cp.list_master_dirs"].assert_called_once_with( prefix="does_not_exist/" ) From 6c762d7fb158ab76a17f263ef0b52371d446afb6 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 14 Sep 2023 08:03:14 +0100 Subject: [PATCH 055/147] Fix failing tests Signed-off-by: Pedro Algarvio --- tests/pytests/unit/modules/test_msteams.py | 6 ++++-- tests/pytests/unit/states/test_file.py | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/pytests/unit/modules/test_msteams.py b/tests/pytests/unit/modules/test_msteams.py index 1307cd854bd..a374dd90321 100644 --- a/tests/pytests/unit/modules/test_msteams.py +++ b/tests/pytests/unit/modules/test_msteams.py @@ -24,8 +24,10 @@ def test_post_card(): with patch("salt.utils.http.query", http_mock): ret = msteams.post_card("test") assert ret - assert http_mock.assert_called_once_with( + http_mock.assert_called_once_with( + "https://example.com/web_hook", method="POST", header_dict={"Content-Type": "application/json"}, - data='{"text": "test", "title": Null, "themeColor": Null}', + data='{"text": "test", "title": null, "themeColor": null}', + status=True, ) diff --git a/tests/pytests/unit/states/test_file.py b/tests/pytests/unit/states/test_file.py index 393ede9b397..03ee53626ee 100644 --- a/tests/pytests/unit/states/test_file.py +++ b/tests/pytests/unit/states/test_file.py @@ -87,6 +87,7 @@ def test_file_recurse_directory_test(): "name": "/tmp/test", "result": False, } - assert salt_dunder["cp.list_master_dirs"].assert_called_once_with( - prefix="does_not_exist/" + salt_dunder["cp.list_master_dirs"].assert_called_once_with( + saltenv="base", + prefix="does_not_exist/", ) From 908732afaa590fe54bac876788c37471c974a3a0 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 14 Sep 2023 08:05:22 +0100 Subject: [PATCH 056/147] Switch to the correct fixture usage Signed-off-by: Pedro Algarvio --- tests/pytests/unit/states/test_file.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/pytests/unit/states/test_file.py b/tests/pytests/unit/states/test_file.py index 03ee53626ee..b7e239045b4 100644 --- a/tests/pytests/unit/states/test_file.py +++ b/tests/pytests/unit/states/test_file.py @@ -7,19 +7,17 @@ import salt.states.file as file from tests.support.mock import MagicMock, call, create_autospec, patch -@pytest.fixture(autouse=True) -def setup_loader(request): - setup_loader_modules = { +@pytest.fixture +def configure_loader_modules(minion_opts): + return { file: { "__opts__": {"test": False}, "__env__": "base", } } - with pytest.helpers.loader_mock(request, setup_loader_modules) as loader_mock: - yield loader_mock -@pytest.fixture() +@pytest.fixture def fake_remove(): fake_remove_mod = create_autospec(filemod.remove) with patch.dict(file.__salt__, {"file.remove": fake_remove_mod}): From 1981c3784d4f331de6d79b871a3c972b449ff88f Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 3 Oct 2023 17:08:39 +0100 Subject: [PATCH 057/147] Switch to `more-itertools` when splitting the tests into slices/chunks Signed-off-by: Pedro Algarvio --- requirements/pytest.txt | 1 + requirements/static/ci/py3.10/cloud.txt | 1 + requirements/static/ci/py3.10/darwin.txt | 1 + requirements/static/ci/py3.10/freebsd.txt | 1 + requirements/static/ci/py3.10/linux.txt | 1 + requirements/static/ci/py3.10/windows.txt | 1 + requirements/static/ci/py3.7/cloud.txt | 1 + requirements/static/ci/py3.7/freebsd.txt | 1 + requirements/static/ci/py3.7/linux.txt | 1 + requirements/static/ci/py3.7/windows.txt | 1 + requirements/static/ci/py3.8/cloud.txt | 1 + requirements/static/ci/py3.8/freebsd.txt | 1 + requirements/static/ci/py3.8/linux.txt | 1 + requirements/static/ci/py3.8/windows.txt | 1 + requirements/static/ci/py3.9/cloud.txt | 1 + requirements/static/ci/py3.9/darwin.txt | 1 + requirements/static/ci/py3.9/freebsd.txt | 1 + requirements/static/ci/py3.9/linux.txt | 1 + requirements/static/ci/py3.9/windows.txt | 1 + tests/conftest.py | 39 ++++++----------------- 20 files changed, 29 insertions(+), 29 deletions(-) diff --git a/requirements/pytest.txt b/requirements/pytest.txt index 8573ca8a9e8..cafa2ec25a1 100644 --- a/requirements/pytest.txt +++ b/requirements/pytest.txt @@ -9,3 +9,4 @@ pytest-timeout pytest-httpserver pytest-custom-exit-code >= 0.3 flaky +more-itertools diff --git a/requirements/static/ci/py3.10/cloud.txt b/requirements/static/ci/py3.10/cloud.txt index 1179cd38b7d..61690e249bb 100644 --- a/requirements/static/ci/py3.10/cloud.txt +++ b/requirements/static/ci/py3.10/cloud.txt @@ -796,6 +796,7 @@ more-itertools==5.0.0 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/pytest.txt # cheroot # cherrypy # jaraco.classes diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index 256fe689592..84c3084d76d 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -541,6 +541,7 @@ mock==5.1.0 more-itertools==8.2.0 # via # -c requirements/static/ci/../pkg/py3.10/darwin.txt + # -r requirements/pytest.txt # cheroot # cherrypy # jaraco.classes diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index 18f4f42651c..0fceb5d4745 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -533,6 +533,7 @@ mock==5.1.0 more-itertools==5.0.0 # via # -c requirements/static/ci/../pkg/py3.10/freebsd.txt + # -r requirements/pytest.txt # cheroot # cherrypy # jaraco.classes diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index 0049950e1ef..64def55e0c7 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -548,6 +548,7 @@ mock==5.1.0 more-itertools==5.0.0 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -r requirements/pytest.txt # cheroot # cherrypy # jaraco.classes diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index 92a4b88303b..2fa1115bdba 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -213,6 +213,7 @@ mock==5.1.0 more-itertools==8.2.0 # via # -c requirements/static/ci/../pkg/py3.10/windows.txt + # -r requirements/pytest.txt # cheroot # cherrypy # jaraco.classes diff --git a/requirements/static/ci/py3.7/cloud.txt b/requirements/static/ci/py3.7/cloud.txt index 97736d31111..6f2799bc246 100644 --- a/requirements/static/ci/py3.7/cloud.txt +++ b/requirements/static/ci/py3.7/cloud.txt @@ -826,6 +826,7 @@ more-itertools==5.0.0 # via # -c requirements/static/ci/../pkg/py3.7/linux.txt # -c requirements/static/ci/py3.7/linux.txt + # -r requirements/pytest.txt # cheroot # cherrypy # jaraco.classes diff --git a/requirements/static/ci/py3.7/freebsd.txt b/requirements/static/ci/py3.7/freebsd.txt index a979abdfb10..ece9fe46717 100644 --- a/requirements/static/ci/py3.7/freebsd.txt +++ b/requirements/static/ci/py3.7/freebsd.txt @@ -557,6 +557,7 @@ mock==5.1.0 more-itertools==5.0.0 # via # -c requirements/static/ci/../pkg/py3.7/freebsd.txt + # -r requirements/pytest.txt # cheroot # cherrypy # jaraco.classes diff --git a/requirements/static/ci/py3.7/linux.txt b/requirements/static/ci/py3.7/linux.txt index 6f648598b31..cb9b1dd651b 100644 --- a/requirements/static/ci/py3.7/linux.txt +++ b/requirements/static/ci/py3.7/linux.txt @@ -572,6 +572,7 @@ mock==5.1.0 more-itertools==5.0.0 # via # -c requirements/static/ci/../pkg/py3.7/linux.txt + # -r requirements/pytest.txt # cheroot # cherrypy # jaraco.classes diff --git a/requirements/static/ci/py3.7/windows.txt b/requirements/static/ci/py3.7/windows.txt index 3a785589f0d..c1a761916ad 100644 --- a/requirements/static/ci/py3.7/windows.txt +++ b/requirements/static/ci/py3.7/windows.txt @@ -227,6 +227,7 @@ mock==5.1.0 more-itertools==8.2.0 # via # -c requirements/static/ci/../pkg/py3.7/windows.txt + # -r requirements/pytest.txt # cheroot # cherrypy # jaraco.classes diff --git a/requirements/static/ci/py3.8/cloud.txt b/requirements/static/ci/py3.8/cloud.txt index 5c0e53d37a7..fb1e07cb799 100644 --- a/requirements/static/ci/py3.8/cloud.txt +++ b/requirements/static/ci/py3.8/cloud.txt @@ -814,6 +814,7 @@ more-itertools==5.0.0 # via # -c requirements/static/ci/../pkg/py3.8/linux.txt # -c requirements/static/ci/py3.8/linux.txt + # -r requirements/pytest.txt # cheroot # cherrypy # jaraco.classes diff --git a/requirements/static/ci/py3.8/freebsd.txt b/requirements/static/ci/py3.8/freebsd.txt index 0a035c08cdf..40b37ce200b 100644 --- a/requirements/static/ci/py3.8/freebsd.txt +++ b/requirements/static/ci/py3.8/freebsd.txt @@ -547,6 +547,7 @@ mock==5.1.0 more-itertools==5.0.0 # via # -c requirements/static/ci/../pkg/py3.8/freebsd.txt + # -r requirements/pytest.txt # cheroot # cherrypy # jaraco.classes diff --git a/requirements/static/ci/py3.8/linux.txt b/requirements/static/ci/py3.8/linux.txt index 337f491ddc5..b5f42c25008 100644 --- a/requirements/static/ci/py3.8/linux.txt +++ b/requirements/static/ci/py3.8/linux.txt @@ -562,6 +562,7 @@ mock==5.1.0 more-itertools==5.0.0 # via # -c requirements/static/ci/../pkg/py3.8/linux.txt + # -r requirements/pytest.txt # cheroot # cherrypy # jaraco.classes diff --git a/requirements/static/ci/py3.8/windows.txt b/requirements/static/ci/py3.8/windows.txt index 244a1e0734f..95fcf8c0570 100644 --- a/requirements/static/ci/py3.8/windows.txt +++ b/requirements/static/ci/py3.8/windows.txt @@ -215,6 +215,7 @@ mock==5.1.0 more-itertools==8.2.0 # via # -c requirements/static/ci/../pkg/py3.8/windows.txt + # -r requirements/pytest.txt # cheroot # cherrypy # jaraco.classes diff --git a/requirements/static/ci/py3.9/cloud.txt b/requirements/static/ci/py3.9/cloud.txt index 47593bdb4f1..2a60c038d87 100644 --- a/requirements/static/ci/py3.9/cloud.txt +++ b/requirements/static/ci/py3.9/cloud.txt @@ -814,6 +814,7 @@ more-itertools==5.0.0 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/pytest.txt # cheroot # cherrypy # jaraco.classes diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index 05970bc3186..3983eec0a46 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -555,6 +555,7 @@ mock==5.1.0 more-itertools==8.2.0 # via # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # -r requirements/pytest.txt # cheroot # cherrypy # jaraco.classes diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index 1e75e0a42d8..a503e7130a9 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -547,6 +547,7 @@ mock==5.1.0 more-itertools==5.0.0 # via # -c requirements/static/ci/../pkg/py3.9/freebsd.txt + # -r requirements/pytest.txt # cheroot # cherrypy # jaraco.classes diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index 8d2c2f6d54d..9add0ba702a 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -564,6 +564,7 @@ mock==5.1.0 more-itertools==5.0.0 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -r requirements/pytest.txt # cheroot # cherrypy # jaraco.classes diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index 74979a411af..5dcd12b602e 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -215,6 +215,7 @@ mock==5.1.0 more-itertools==8.2.0 # via # -c requirements/static/ci/../pkg/py3.9/windows.txt + # -r requirements/pytest.txt # cheroot # cherrypy # jaraco.classes diff --git a/tests/conftest.py b/tests/conftest.py index 5bb4e5764c3..197ba8433dd 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -15,6 +15,7 @@ from unittest import TestCase # pylint: disable=blacklisted-module import _pytest.logging import _pytest.skipping +import more_itertools import psutil import pytest @@ -800,33 +801,6 @@ def pytest_runtest_setup(item): # ----- Test Groups Selection ---------------------------------------------------------------------------------------> -def get_group_size_and_start(total_items, total_groups, group_id): - """ - Calculate group size and start index. - """ - base_size = total_items // total_groups - rem = total_items % total_groups - - start = base_size * (group_id - 1) + min(group_id - 1, rem) - size = base_size + 1 if group_id <= rem else base_size - - return (start, size) - - -def get_group(items, total_groups, group_id): - """ - Get the items from the passed in group based on group size. - """ - if not 0 < group_id <= total_groups: - raise ValueError("Invalid test-group argument") - - start, size = get_group_size_and_start(len(items), total_groups, group_id) - selected = items[start : start + size] - deselected = items[:start] + items[start + size :] - assert len(selected) + len(deselected) == len(items) - return selected, deselected - - def groups_collection_modifyitems(config, items): group_count = config.getoption("test-group-count") group_id = config.getoption("test-group") @@ -841,7 +815,14 @@ def groups_collection_modifyitems(config, items): total_items = len(items) - tests_in_group, deselected = get_group(items, group_count, group_id) + # Devide into test groups + test_groups = more_itertools.divide(group_count, items) + # Pick the right group + tests_in_group = list(test_groups.pop(group_id - 1)) + # The rest are deselected tests + deselected = list(more_itertools.collapse(test_groups)) + # Sanity check + assert len(tests_in_group) + len(deselected) == total_items # Replace all items in the list items[:] = tests_in_group if deselected: @@ -849,7 +830,7 @@ def groups_collection_modifyitems(config, items): terminal_reporter = config.pluginmanager.get_plugin("terminalreporter") terminal_reporter.write( - f"Running test group #{group_id}(out of #{group_count}) ({len(items)} tests)\n", + f"Running test group #{group_id}(out of #{group_count}) ({len(items)} out of {total_items} tests)\n", yellow=True, ) From 1f9a8e89a54024601edb0096b62abbbae77890fa Mon Sep 17 00:00:00 2001 From: ScriptAutomate Date: Tue, 3 Oct 2023 17:56:49 -0500 Subject: [PATCH 058/147] Fix CI/CD with latest available golden images --- cicd/amis.yml | 2 +- cicd/golden-images.json | 164 ++++++++++++++++++++-------------------- 2 files changed, 83 insertions(+), 83 deletions(-) diff --git a/cicd/amis.yml b/cicd/amis.yml index efa0bef8829..3b206cb0cbf 100644 --- a/cicd/amis.yml +++ b/cicd/amis.yml @@ -1 +1 @@ -centosstream-9-x86_64: ami-091986d83f4c0bdd7 +centosstream-9-x86_64: ami-09b72b340acb62c73 diff --git a/cicd/golden-images.json b/cicd/golden-images.json index d4903742495..d56419485c4 100644 --- a/cicd/golden-images.json +++ b/cicd/golden-images.json @@ -1,8 +1,8 @@ { "almalinux-8-arm64": { - "ami": "ami-09017a2c26bb6cf37", + "ami": "ami-0c5e8a0573bb547d0", "ami_description": "CI Image of AlmaLinux 8 arm64", - "ami_name": "salt-project/ci/almalinux/8/arm64/20230912.1532", + "ami_name": "salt-project/ci/almalinux/8/arm64/20231003.1815", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -10,9 +10,9 @@ "ssh_username": "ec2-user" }, "almalinux-8": { - "ami": "ami-0da7449d7f17dca6d", + "ami": "ami-0575f7f2a015ab1ab", "ami_description": "CI Image of AlmaLinux 8 x86_64", - "ami_name": "salt-project/ci/almalinux/8/x86_64/20230912.1532", + "ami_name": "salt-project/ci/almalinux/8/x86_64/20231003.1815", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -20,9 +20,9 @@ "ssh_username": "ec2-user" }, "almalinux-9-arm64": { - "ami": "ami-0b45894ce343176b0", + "ami": "ami-04563f34c07df6b37", "ami_description": "CI Image of AlmaLinux 9 arm64", - "ami_name": "salt-project/ci/almalinux/9/arm64/20230912.1532", + "ami_name": "salt-project/ci/almalinux/9/arm64/20231003.1815", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -30,9 +30,9 @@ "ssh_username": "ec2-user" }, "almalinux-9": { - "ami": "ami-0c8a554820c140d45", + "ami": "ami-00c51c0a91489a9c5", "ami_description": "CI Image of AlmaLinux 9 x86_64", - "ami_name": "salt-project/ci/almalinux/9/x86_64/20230912.1532", + "ami_name": "salt-project/ci/almalinux/9/x86_64/20231003.1815", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -40,9 +40,9 @@ "ssh_username": "ec2-user" }, "amazonlinux-2-arm64": { - "ami": "ami-0aac44852e96fb156", + "ami": "ami-0ee09c7f2bab65079", "ami_description": "CI Image of AmazonLinux 2 arm64", - "ami_name": "salt-project/ci/amazonlinux/2/arm64/20230912.1532", + "ami_name": "salt-project/ci/amazonlinux/2/arm64/20231003.1833", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -50,9 +50,9 @@ "ssh_username": "ec2-user" }, "amazonlinux-2": { - "ami": "ami-04bf06c280f2957e0", + "ami": "ami-09db0feda451d650e", "ami_description": "CI Image of AmazonLinux 2 x86_64", - "ami_name": "salt-project/ci/amazonlinux/2/x86_64/20230912.1532", + "ami_name": "salt-project/ci/amazonlinux/2/x86_64/20231003.1833", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -60,9 +60,9 @@ "ssh_username": "ec2-user" }, "amazonlinux-2023.1-arm64": { - "ami": "ami-0430562e1dc073734", + "ami": "ami-0c822de48d792fb9d", "ami_description": "CI Image of AmazonLinux 2023.1 arm64", - "ami_name": "salt-project/ci/amazonlinux/2023.1/arm64/20230912.1532", + "ami_name": "salt-project/ci/amazonlinux/2023.1/arm64/20231003.1816", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -70,9 +70,9 @@ "ssh_username": "ec2-user" }, "amazonlinux-2023.1": { - "ami": "ami-09b7ab6b9bb5ceca3", + "ami": "ami-03c3c0511beff576d", "ami_description": "CI Image of AmazonLinux 2023.1 x86_64", - "ami_name": "salt-project/ci/amazonlinux/2023.1/x86_64/20230912.1532", + "ami_name": "salt-project/ci/amazonlinux/2023.1/x86_64/20231003.1816", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -80,9 +80,9 @@ "ssh_username": "ec2-user" }, "archlinux-lts": { - "ami": "ami-08ecb254b10e24bca", + "ami": "ami-05f4292e8255b141b", "ami_description": "CI Image of ArchLinux lts x86_64", - "ami_name": "salt-project/ci/archlinux/lts/x86_64/20230912.1532", + "ami_name": "salt-project/ci/archlinux/lts/x86_64/20231003.1816", "arch": "x86_64", "cloudwatch-agent-available": "false", "instance_type": "t3a.large", @@ -90,9 +90,9 @@ "ssh_username": "arch" }, "centos-7-arm64": { - "ami": "ami-0facb0416e994c2d4", + "ami": "ami-025673b9c304d342b", "ami_description": "CI Image of CentOS 7 arm64", - "ami_name": "salt-project/ci/centos/7/arm64/20230912.1553", + "ami_name": "salt-project/ci/centos/7/arm64/20231003.1816", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -100,9 +100,9 @@ "ssh_username": "centos" }, "centos-7": { - "ami": "ami-04e695ebbac38868e", + "ami": "ami-0838321a764f228c7", "ami_description": "CI Image of CentOS 7 x86_64", - "ami_name": "salt-project/ci/centos/7/x86_64/20230912.1553", + "ami_name": "salt-project/ci/centos/7/x86_64/20231003.1816", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -110,9 +110,9 @@ "ssh_username": "centos" }, "centosstream-8-arm64": { - "ami": "ami-02b1e24269822d3fc", + "ami": "ami-091cb758decb487e8", "ami_description": "CI Image of CentOSStream 8 arm64", - "ami_name": "salt-project/ci/centosstream/8/arm64/20230912.1532", + "ami_name": "salt-project/ci/centosstream/8/arm64/20231003.1833", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -120,9 +120,9 @@ "ssh_username": "centos" }, "centosstream-8": { - "ami": "ami-0706ab643607236c0", + "ami": "ami-0fe8dfc4c2f058f18", "ami_description": "CI Image of CentOSStream 8 x86_64", - "ami_name": "salt-project/ci/centosstream/8/x86_64/20230912.1532", + "ami_name": "salt-project/ci/centosstream/8/x86_64/20231003.1833", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -130,9 +130,9 @@ "ssh_username": "centos" }, "centosstream-9-arm64": { - "ami": "ami-032abe3ace927c296", + "ami": "ami-047b28f087ea4ff2d", "ami_description": "CI Image of CentOSStream 9 arm64", - "ami_name": "salt-project/ci/centosstream/9/arm64/20230912.1532", + "ami_name": "salt-project/ci/centosstream/9/arm64/20231003.1833", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -140,9 +140,9 @@ "ssh_username": "ec2-user" }, "centosstream-9": { - "ami": "ami-091986d83f4c0bdd7", + "ami": "ami-09b72b340acb62c73", "ami_description": "CI Image of CentOSStream 9 x86_64", - "ami_name": "salt-project/ci/centosstream/9/x86_64/20230912.1532", + "ami_name": "salt-project/ci/centosstream/9/x86_64/20231003.1833", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -150,9 +150,9 @@ "ssh_username": "ec2-user" }, "debian-10-arm64": { - "ami": "ami-08b7b9fb74d7c58f2", + "ami": "ami-000a9eea8161d49c2", "ami_description": "CI Image of Debian 10 arm64", - "ami_name": "salt-project/ci/debian/10/arm64/20230912.1546", + "ami_name": "salt-project/ci/debian/10/arm64/20231003.1816", "arch": "arm64", "cloudwatch-agent-available": "false", "instance_type": "m6g.large", @@ -160,9 +160,9 @@ "ssh_username": "admin" }, "debian-10": { - "ami": "ami-0002ea04be195948e", + "ami": "ami-0bc86919c717b283f", "ami_description": "CI Image of Debian 10 x86_64", - "ami_name": "salt-project/ci/debian/10/x86_64/20230912.1548", + "ami_name": "salt-project/ci/debian/10/x86_64/20231003.1816", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -170,9 +170,9 @@ "ssh_username": "admin" }, "debian-11-arm64": { - "ami": "ami-0e14ec1b2a5553f96", + "ami": "ami-0d8a43c4b48875d5e", "ami_description": "CI Image of Debian 11 arm64", - "ami_name": "salt-project/ci/debian/11/arm64/20230912.1548", + "ami_name": "salt-project/ci/debian/11/arm64/20231003.1816", "arch": "arm64", "cloudwatch-agent-available": "false", "instance_type": "m6g.large", @@ -180,9 +180,9 @@ "ssh_username": "admin" }, "debian-11": { - "ami": "ami-06c5ea0d19a5773d7", + "ami": "ami-08f2aa9302ed94d03", "ami_description": "CI Image of Debian 11 x86_64", - "ami_name": "salt-project/ci/debian/11/x86_64/20230912.1549", + "ami_name": "salt-project/ci/debian/11/x86_64/20231003.1816", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -190,9 +190,9 @@ "ssh_username": "admin" }, "debian-12-arm64": { - "ami": "ami-055b0a6d5bb3e9ecd", + "ami": "ami-040167a351bab697a", "ami_description": "CI Image of Debian 12 arm64", - "ami_name": "salt-project/ci/debian/12/arm64/20230912.1550", + "ami_name": "salt-project/ci/debian/12/arm64/20231003.1816", "arch": "arm64", "cloudwatch-agent-available": "false", "instance_type": "m6g.large", @@ -200,9 +200,9 @@ "ssh_username": "admin" }, "debian-12": { - "ami": "ami-0eada119571a913fd", + "ami": "ami-0ab900bcd009184e1", "ami_description": "CI Image of Debian 12 x86_64", - "ami_name": "salt-project/ci/debian/12/x86_64/20230912.1550", + "ami_name": "salt-project/ci/debian/12/x86_64/20231003.1816", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -210,9 +210,9 @@ "ssh_username": "admin" }, "fedora-37-arm64": { - "ami": "ami-02b916b21581ead5a", + "ami": "ami-0b1384d087e911992", "ami_description": "CI Image of Fedora 37 arm64", - "ami_name": "salt-project/ci/fedora/37/arm64/20230912.1533", + "ami_name": "salt-project/ci/fedora/37/arm64/20231003.1815", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -220,9 +220,9 @@ "ssh_username": "fedora" }, "fedora-37": { - "ami": "ami-01e0becc3552ad2f6", + "ami": "ami-0b6ddef61ab49e347", "ami_description": "CI Image of Fedora 37 x86_64", - "ami_name": "salt-project/ci/fedora/37/x86_64/20230912.1533", + "ami_name": "salt-project/ci/fedora/37/x86_64/20231003.1815", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -230,9 +230,9 @@ "ssh_username": "fedora" }, "fedora-38-arm64": { - "ami": "ami-01f4a3bdee88da9f3", + "ami": "ami-06fbccbb7128d2ab0", "ami_description": "CI Image of Fedora 38 arm64", - "ami_name": "salt-project/ci/fedora/38/arm64/20230912.1533", + "ami_name": "salt-project/ci/fedora/38/arm64/20231003.1815", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -240,9 +240,9 @@ "ssh_username": "fedora" }, "fedora-38": { - "ami": "ami-0c38a1907f5b55077", + "ami": "ami-0a2ac0bdbbcf16da9", "ami_description": "CI Image of Fedora 38 x86_64", - "ami_name": "salt-project/ci/fedora/38/x86_64/20230912.1543", + "ami_name": "salt-project/ci/fedora/38/x86_64/20231003.1815", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -250,9 +250,9 @@ "ssh_username": "fedora" }, "opensuse-15": { - "ami": "ami-0ecfb817deee506a9", + "ami": "ami-0f371e1a07228e0b4", "ami_description": "CI Image of Opensuse 15 x86_64", - "ami_name": "salt-project/ci/opensuse/15/x86_64/20230912.1533", + "ami_name": "salt-project/ci/opensuse/15/x86_64/20231003.1816", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -260,9 +260,9 @@ "ssh_username": "ec2-user" }, "photonos-3-arm64": { - "ami": "ami-0383031c08217b13e", + "ami": "ami-07561a2fff97ceb7e", "ami_description": "CI Image of PhotonOS 3 arm64", - "ami_name": "salt-project/ci/photonos/3/arm64/20230924.0913", + "ami_name": "salt-project/ci/photonos/3/arm64/20231003.1833", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -270,9 +270,9 @@ "ssh_username": "root" }, "photonos-3": { - "ami": "ami-06004a7d856e94355", + "ami": "ami-0a59b9fc8ef4c0839", "ami_description": "CI Image of PhotonOS 3 x86_64", - "ami_name": "salt-project/ci/photonos/3/x86_64/20230924.0913", + "ami_name": "salt-project/ci/photonos/3/x86_64/20231003.1834", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -280,9 +280,9 @@ "ssh_username": "root" }, "photonos-4-arm64": { - "ami": "ami-08808bcf97f824036", + "ami": "ami-0f03b431b8da281f4", "ami_description": "CI Image of PhotonOS 4 arm64", - "ami_name": "salt-project/ci/photonos/4/arm64/20230924.0924", + "ami_name": "salt-project/ci/photonos/4/arm64/20231003.1834", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -290,9 +290,9 @@ "ssh_username": "root" }, "photonos-4": { - "ami": "ami-0fd7a6ed4c61ee312", + "ami": "ami-0889afb0d3f3b5d0e", "ami_description": "CI Image of PhotonOS 4 x86_64", - "ami_name": "salt-project/ci/photonos/4/x86_64/20230924.0925", + "ami_name": "salt-project/ci/photonos/4/x86_64/20231003.1834", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -300,9 +300,9 @@ "ssh_username": "root" }, "photonos-5-arm64": { - "ami": "ami-0c85ad72d107ec4b8", + "ami": "ami-07442a02f7fe6b718", "ami_description": "CI Image of PhotonOS 5 arm64", - "ami_name": "salt-project/ci/photonos/5/arm64/20230924.0927", + "ami_name": "salt-project/ci/photonos/5/arm64/20231003.1834", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -310,9 +310,9 @@ "ssh_username": "root" }, "photonos-5": { - "ami": "ami-0732ce03b2ab6fad2", + "ami": "ami-086f2340a51cb9c3f", "ami_description": "CI Image of PhotonOS 5 x86_64", - "ami_name": "salt-project/ci/photonos/5/x86_64/20230924.0927", + "ami_name": "salt-project/ci/photonos/5/x86_64/20231003.1835", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -320,9 +320,9 @@ "ssh_username": "root" }, "ubuntu-20.04-arm64": { - "ami": "ami-05aeb3d5bf0a16369", + "ami": "ami-033e27e2d03cf3d10", "ami_description": "CI Image of Ubuntu 20.04 arm64", - "ami_name": "salt-project/ci/ubuntu/20.04/arm64/20230912.1551", + "ami_name": "salt-project/ci/ubuntu/20.04/arm64/20231003.1816", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -330,9 +330,9 @@ "ssh_username": "ubuntu" }, "ubuntu-20.04": { - "ami": "ami-00cec0054fd71d281", + "ami": "ami-0e878775d8e2a746d", "ami_description": "CI Image of Ubuntu 20.04 x86_64", - "ami_name": "salt-project/ci/ubuntu/20.04/x86_64/20230912.1550", + "ami_name": "salt-project/ci/ubuntu/20.04/x86_64/20231003.1816", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -340,9 +340,9 @@ "ssh_username": "ubuntu" }, "ubuntu-22.04-arm64": { - "ami": "ami-0f7dc3333620d58fd", + "ami": "ami-01be9d89d8cbf09de", "ami_description": "CI Image of Ubuntu 22.04 arm64", - "ami_name": "salt-project/ci/ubuntu/22.04/arm64/20230912.1551", + "ami_name": "salt-project/ci/ubuntu/22.04/arm64/20231003.1816", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -350,9 +350,9 @@ "ssh_username": "ubuntu" }, "ubuntu-22.04": { - "ami": "ami-0bc7c1824a6b0752f", + "ami": "ami-0af23aeeab0dc5c31", "ami_description": "CI Image of Ubuntu 22.04 x86_64", - "ami_name": "salt-project/ci/ubuntu/22.04/x86_64/20230912.1552", + "ami_name": "salt-project/ci/ubuntu/22.04/x86_64/20231003.1816", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -360,9 +360,9 @@ "ssh_username": "ubuntu" }, "ubuntu-23.04-arm64": { - "ami": "ami-0e8818777218efeeb", + "ami": "ami-0afa9a2fdcc3d6479", "ami_description": "CI Image of Ubuntu 23.04 arm64", - "ami_name": "salt-project/ci/ubuntu/23.04/arm64/20230912.1552", + "ami_name": "salt-project/ci/ubuntu/23.04/arm64/20231003.1816", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -370,9 +370,9 @@ "ssh_username": "ubuntu" }, "ubuntu-23.04": { - "ami": "ami-0813a38bf6a6cf4de", + "ami": "ami-05990aaa92c7aa77f", "ami_description": "CI Image of Ubuntu 23.04 x86_64", - "ami_name": "salt-project/ci/ubuntu/23.04/x86_64/20230912.1552", + "ami_name": "salt-project/ci/ubuntu/23.04/x86_64/20231003.1816", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -380,9 +380,9 @@ "ssh_username": "ubuntu" }, "windows-2016": { - "ami": "ami-099db55543619f54a", + "ami": "ami-0351b17103b653e06", "ami_description": "CI Image of Windows 2016 x86_64", - "ami_name": "salt-project/ci/windows/2016/x86_64/20230522.0606", + "ami_name": "salt-project/ci/windows/2016/x86_64/20231003.1831", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.xlarge", @@ -390,9 +390,9 @@ "ssh_username": "Administrator" }, "windows-2019": { - "ami": "ami-0860ee5bc9ee93e13", + "ami": "ami-027a53f66275e2fcd", "ami_description": "CI Image of Windows 2019 x86_64", - "ami_name": "salt-project/ci/windows/2019/x86_64/20230522.0606", + "ami_name": "salt-project/ci/windows/2019/x86_64/20231003.1832", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.xlarge", @@ -400,9 +400,9 @@ "ssh_username": "Administrator" }, "windows-2022": { - "ami": "ami-032e3abce2aa98da7", + "ami": "ami-09ddba69a43e5f0ed", "ami_description": "CI Image of Windows 2022 x86_64", - "ami_name": "salt-project/ci/windows/2022/x86_64/20230522.0606", + "ami_name": "salt-project/ci/windows/2022/x86_64/20231003.1922", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.xlarge", From dfd5194dd05776575521fd0fad5e913111f122af Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 4 Oct 2023 13:20:29 +0100 Subject: [PATCH 059/147] De-whitelist, again, since it's hanging on the newer windows golden images Signed-off-by: Pedro Algarvio --- tests/integration/modules/test_ssh.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/integration/modules/test_ssh.py b/tests/integration/modules/test_ssh.py index 0817877c86b..55586211622 100644 --- a/tests/integration/modules/test_ssh.py +++ b/tests/integration/modules/test_ssh.py @@ -26,7 +26,8 @@ def check_status(): return False -@pytest.mark.windows_whitelisted +# @pytest.mark.windows_whitelisted +# De-whitelist windows since it's hanging on the newer windows golden images @pytest.mark.skip_if_binaries_missing("ssh", "ssh-keygen", check_all=True) class SSHModuleTest(ModuleCase): """ From 6fb7f395d4ddd7158fe88e4ad3e3086ce1c54a56 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 4 Oct 2023 13:46:43 +0100 Subject: [PATCH 060/147] Update to latest golden images Signed-off-by: Pedro Algarvio --- cicd/golden-images.json | 164 ++++++++++++++++++++-------------------- 1 file changed, 82 insertions(+), 82 deletions(-) diff --git a/cicd/golden-images.json b/cicd/golden-images.json index d56419485c4..9a3f06f705a 100644 --- a/cicd/golden-images.json +++ b/cicd/golden-images.json @@ -1,8 +1,8 @@ { "almalinux-8-arm64": { - "ami": "ami-0c5e8a0573bb547d0", + "ami": "ami-0f08fc00f1689a8ec", "ami_description": "CI Image of AlmaLinux 8 arm64", - "ami_name": "salt-project/ci/almalinux/8/arm64/20231003.1815", + "ami_name": "salt-project/ci/almalinux/8/arm64/20231003.2057", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -10,9 +10,9 @@ "ssh_username": "ec2-user" }, "almalinux-8": { - "ami": "ami-0575f7f2a015ab1ab", + "ami": "ami-08f648e0e6fa619c2", "ami_description": "CI Image of AlmaLinux 8 x86_64", - "ami_name": "salt-project/ci/almalinux/8/x86_64/20231003.1815", + "ami_name": "salt-project/ci/almalinux/8/x86_64/20231003.2058", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -20,9 +20,9 @@ "ssh_username": "ec2-user" }, "almalinux-9-arm64": { - "ami": "ami-04563f34c07df6b37", + "ami": "ami-0394b210e1e09b962", "ami_description": "CI Image of AlmaLinux 9 arm64", - "ami_name": "salt-project/ci/almalinux/9/arm64/20231003.1815", + "ami_name": "salt-project/ci/almalinux/9/arm64/20231003.2058", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -30,9 +30,9 @@ "ssh_username": "ec2-user" }, "almalinux-9": { - "ami": "ami-00c51c0a91489a9c5", + "ami": "ami-0a909a150cfebea5b", "ami_description": "CI Image of AlmaLinux 9 x86_64", - "ami_name": "salt-project/ci/almalinux/9/x86_64/20231003.1815", + "ami_name": "salt-project/ci/almalinux/9/x86_64/20231003.2100", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -40,9 +40,9 @@ "ssh_username": "ec2-user" }, "amazonlinux-2-arm64": { - "ami": "ami-0ee09c7f2bab65079", + "ami": "ami-038eac6a08feecdb2", "ami_description": "CI Image of AmazonLinux 2 arm64", - "ami_name": "salt-project/ci/amazonlinux/2/arm64/20231003.1833", + "ami_name": "salt-project/ci/amazonlinux/2/arm64/20231003.2104", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -50,9 +50,9 @@ "ssh_username": "ec2-user" }, "amazonlinux-2": { - "ami": "ami-09db0feda451d650e", + "ami": "ami-09682e96e7785642d", "ami_description": "CI Image of AmazonLinux 2 x86_64", - "ami_name": "salt-project/ci/amazonlinux/2/x86_64/20231003.1833", + "ami_name": "salt-project/ci/amazonlinux/2/x86_64/20231003.2104", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -60,9 +60,9 @@ "ssh_username": "ec2-user" }, "amazonlinux-2023.1-arm64": { - "ami": "ami-0c822de48d792fb9d", + "ami": "ami-0e46c84fb43817334", "ami_description": "CI Image of AmazonLinux 2023.1 arm64", - "ami_name": "salt-project/ci/amazonlinux/2023.1/arm64/20231003.1816", + "ami_name": "salt-project/ci/amazonlinux/2023.1/arm64/20231003.2103", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -70,9 +70,9 @@ "ssh_username": "ec2-user" }, "amazonlinux-2023.1": { - "ami": "ami-03c3c0511beff576d", + "ami": "ami-0ac591368ec230345", "ami_description": "CI Image of AmazonLinux 2023.1 x86_64", - "ami_name": "salt-project/ci/amazonlinux/2023.1/x86_64/20231003.1816", + "ami_name": "salt-project/ci/amazonlinux/2023.1/x86_64/20231003.2103", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -80,9 +80,9 @@ "ssh_username": "ec2-user" }, "archlinux-lts": { - "ami": "ami-05f4292e8255b141b", + "ami": "ami-017de6f1e636021a0", "ami_description": "CI Image of ArchLinux lts x86_64", - "ami_name": "salt-project/ci/archlinux/lts/x86_64/20231003.1816", + "ami_name": "salt-project/ci/archlinux/lts/x86_64/20231003.2108", "arch": "x86_64", "cloudwatch-agent-available": "false", "instance_type": "t3a.large", @@ -90,9 +90,9 @@ "ssh_username": "arch" }, "centos-7-arm64": { - "ami": "ami-025673b9c304d342b", + "ami": "ami-088cb5f3066efa748", "ami_description": "CI Image of CentOS 7 arm64", - "ami_name": "salt-project/ci/centos/7/arm64/20231003.1816", + "ami_name": "salt-project/ci/centos/7/arm64/20231003.2108", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -100,9 +100,9 @@ "ssh_username": "centos" }, "centos-7": { - "ami": "ami-0838321a764f228c7", + "ami": "ami-05c4056c36cecc136", "ami_description": "CI Image of CentOS 7 x86_64", - "ami_name": "salt-project/ci/centos/7/x86_64/20231003.1816", + "ami_name": "salt-project/ci/centos/7/x86_64/20231003.2107", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -110,9 +110,9 @@ "ssh_username": "centos" }, "centosstream-8-arm64": { - "ami": "ami-091cb758decb487e8", + "ami": "ami-0e2a761782490f7c2", "ami_description": "CI Image of CentOSStream 8 arm64", - "ami_name": "salt-project/ci/centosstream/8/arm64/20231003.1833", + "ami_name": "salt-project/ci/centosstream/8/arm64/20231003.2109", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -120,9 +120,9 @@ "ssh_username": "centos" }, "centosstream-8": { - "ami": "ami-0fe8dfc4c2f058f18", + "ami": "ami-06178cd094ea71c34", "ami_description": "CI Image of CentOSStream 8 x86_64", - "ami_name": "salt-project/ci/centosstream/8/x86_64/20231003.1833", + "ami_name": "salt-project/ci/centosstream/8/x86_64/20231003.2108", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -130,9 +130,9 @@ "ssh_username": "centos" }, "centosstream-9-arm64": { - "ami": "ami-047b28f087ea4ff2d", + "ami": "ami-0ea1025028e6fe700", "ami_description": "CI Image of CentOSStream 9 arm64", - "ami_name": "salt-project/ci/centosstream/9/arm64/20231003.1833", + "ami_name": "salt-project/ci/centosstream/9/arm64/20231003.2109", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -140,9 +140,9 @@ "ssh_username": "ec2-user" }, "centosstream-9": { - "ami": "ami-09b72b340acb62c73", + "ami": "ami-0f474b360fca72512", "ami_description": "CI Image of CentOSStream 9 x86_64", - "ami_name": "salt-project/ci/centosstream/9/x86_64/20231003.1833", + "ami_name": "salt-project/ci/centosstream/9/x86_64/20231003.2109", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -150,9 +150,9 @@ "ssh_username": "ec2-user" }, "debian-10-arm64": { - "ami": "ami-000a9eea8161d49c2", + "ami": "ami-0b9cbee875ae2e145", "ami_description": "CI Image of Debian 10 arm64", - "ami_name": "salt-project/ci/debian/10/arm64/20231003.1816", + "ami_name": "salt-project/ci/debian/10/arm64/20231003.2114", "arch": "arm64", "cloudwatch-agent-available": "false", "instance_type": "m6g.large", @@ -160,9 +160,9 @@ "ssh_username": "admin" }, "debian-10": { - "ami": "ami-0bc86919c717b283f", + "ami": "ami-03b713e88ac915c18", "ami_description": "CI Image of Debian 10 x86_64", - "ami_name": "salt-project/ci/debian/10/x86_64/20231003.1816", + "ami_name": "salt-project/ci/debian/10/x86_64/20231003.2112", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -170,9 +170,9 @@ "ssh_username": "admin" }, "debian-11-arm64": { - "ami": "ami-0d8a43c4b48875d5e", + "ami": "ami-0e48f24d9def8d84c", "ami_description": "CI Image of Debian 11 arm64", - "ami_name": "salt-project/ci/debian/11/arm64/20231003.1816", + "ami_name": "salt-project/ci/debian/11/arm64/20231003.2114", "arch": "arm64", "cloudwatch-agent-available": "false", "instance_type": "m6g.large", @@ -180,9 +180,9 @@ "ssh_username": "admin" }, "debian-11": { - "ami": "ami-08f2aa9302ed94d03", + "ami": "ami-07a2fb75d29d0d6f7", "ami_description": "CI Image of Debian 11 x86_64", - "ami_name": "salt-project/ci/debian/11/x86_64/20231003.1816", + "ami_name": "salt-project/ci/debian/11/x86_64/20231003.2116", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -190,9 +190,9 @@ "ssh_username": "admin" }, "debian-12-arm64": { - "ami": "ami-040167a351bab697a", + "ami": "ami-027199ded9ce9f659", "ami_description": "CI Image of Debian 12 arm64", - "ami_name": "salt-project/ci/debian/12/arm64/20231003.1816", + "ami_name": "salt-project/ci/debian/12/arm64/20231003.2117", "arch": "arm64", "cloudwatch-agent-available": "false", "instance_type": "m6g.large", @@ -200,9 +200,9 @@ "ssh_username": "admin" }, "debian-12": { - "ami": "ami-0ab900bcd009184e1", + "ami": "ami-02156ad853a403599", "ami_description": "CI Image of Debian 12 x86_64", - "ami_name": "salt-project/ci/debian/12/x86_64/20231003.1816", + "ami_name": "salt-project/ci/debian/12/x86_64/20231003.2119", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -210,9 +210,9 @@ "ssh_username": "admin" }, "fedora-37-arm64": { - "ami": "ami-0b1384d087e911992", + "ami": "ami-0dfb1b2e3b6cd8847", "ami_description": "CI Image of Fedora 37 arm64", - "ami_name": "salt-project/ci/fedora/37/arm64/20231003.1815", + "ami_name": "salt-project/ci/fedora/37/arm64/20231003.2119", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -220,9 +220,9 @@ "ssh_username": "fedora" }, "fedora-37": { - "ami": "ami-0b6ddef61ab49e347", + "ami": "ami-0d27e014bf07af18b", "ami_description": "CI Image of Fedora 37 x86_64", - "ami_name": "salt-project/ci/fedora/37/x86_64/20231003.1815", + "ami_name": "salt-project/ci/fedora/37/x86_64/20231003.2120", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -230,9 +230,9 @@ "ssh_username": "fedora" }, "fedora-38-arm64": { - "ami": "ami-06fbccbb7128d2ab0", + "ami": "ami-04f5a34bae3040974", "ami_description": "CI Image of Fedora 38 arm64", - "ami_name": "salt-project/ci/fedora/38/arm64/20231003.1815", + "ami_name": "salt-project/ci/fedora/38/arm64/20231003.2120", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -240,9 +240,9 @@ "ssh_username": "fedora" }, "fedora-38": { - "ami": "ami-0a2ac0bdbbcf16da9", + "ami": "ami-0e69802061ed79891", "ami_description": "CI Image of Fedora 38 x86_64", - "ami_name": "salt-project/ci/fedora/38/x86_64/20231003.1815", + "ami_name": "salt-project/ci/fedora/38/x86_64/20231003.2123", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -250,9 +250,9 @@ "ssh_username": "fedora" }, "opensuse-15": { - "ami": "ami-0f371e1a07228e0b4", + "ami": "ami-0ebb684e16914ad0a", "ami_description": "CI Image of Opensuse 15 x86_64", - "ami_name": "salt-project/ci/opensuse/15/x86_64/20231003.1816", + "ami_name": "salt-project/ci/opensuse/15/x86_64/20231003.2110", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -260,9 +260,9 @@ "ssh_username": "ec2-user" }, "photonos-3-arm64": { - "ami": "ami-07561a2fff97ceb7e", + "ami": "ami-054765b3beb6dd97c", "ami_description": "CI Image of PhotonOS 3 arm64", - "ami_name": "salt-project/ci/photonos/3/arm64/20231003.1833", + "ami_name": "salt-project/ci/photonos/3/arm64/20231003.2129", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -270,9 +270,9 @@ "ssh_username": "root" }, "photonos-3": { - "ami": "ami-0a59b9fc8ef4c0839", + "ami": "ami-0224e8a4471113ebb", "ami_description": "CI Image of PhotonOS 3 x86_64", - "ami_name": "salt-project/ci/photonos/3/x86_64/20231003.1834", + "ami_name": "salt-project/ci/photonos/3/x86_64/20231003.2128", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -280,9 +280,9 @@ "ssh_username": "root" }, "photonos-4-arm64": { - "ami": "ami-0f03b431b8da281f4", + "ami": "ami-091f6d77aa3921394", "ami_description": "CI Image of PhotonOS 4 arm64", - "ami_name": "salt-project/ci/photonos/4/arm64/20231003.1834", + "ami_name": "salt-project/ci/photonos/4/arm64/20231003.2124", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -290,9 +290,9 @@ "ssh_username": "root" }, "photonos-4": { - "ami": "ami-0889afb0d3f3b5d0e", + "ami": "ami-0714704e9471a8e0c", "ami_description": "CI Image of PhotonOS 4 x86_64", - "ami_name": "salt-project/ci/photonos/4/x86_64/20231003.1834", + "ami_name": "salt-project/ci/photonos/4/x86_64/20231003.2130", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -300,9 +300,9 @@ "ssh_username": "root" }, "photonos-5-arm64": { - "ami": "ami-07442a02f7fe6b718", + "ami": "ami-05ebc5bddb487c20b", "ami_description": "CI Image of PhotonOS 5 arm64", - "ami_name": "salt-project/ci/photonos/5/arm64/20231003.1834", + "ami_name": "salt-project/ci/photonos/5/arm64/20231003.2130", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -310,9 +310,9 @@ "ssh_username": "root" }, "photonos-5": { - "ami": "ami-086f2340a51cb9c3f", + "ami": "ami-0b7e17bc1990da3af", "ami_description": "CI Image of PhotonOS 5 x86_64", - "ami_name": "salt-project/ci/photonos/5/x86_64/20231003.1835", + "ami_name": "salt-project/ci/photonos/5/x86_64/20231003.2131", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -320,9 +320,9 @@ "ssh_username": "root" }, "ubuntu-20.04-arm64": { - "ami": "ami-033e27e2d03cf3d10", + "ami": "ami-09210544c9163df86", "ami_description": "CI Image of Ubuntu 20.04 arm64", - "ami_name": "salt-project/ci/ubuntu/20.04/arm64/20231003.1816", + "ami_name": "salt-project/ci/ubuntu/20.04/arm64/20231003.2110", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -330,9 +330,9 @@ "ssh_username": "ubuntu" }, "ubuntu-20.04": { - "ami": "ami-0e878775d8e2a746d", + "ami": "ami-05894335447f4c052", "ami_description": "CI Image of Ubuntu 20.04 x86_64", - "ami_name": "salt-project/ci/ubuntu/20.04/x86_64/20231003.1816", + "ami_name": "salt-project/ci/ubuntu/20.04/x86_64/20231003.2110", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -340,9 +340,9 @@ "ssh_username": "ubuntu" }, "ubuntu-22.04-arm64": { - "ami": "ami-01be9d89d8cbf09de", + "ami": "ami-090423dbe605f6d3e", "ami_description": "CI Image of Ubuntu 22.04 arm64", - "ami_name": "salt-project/ci/ubuntu/22.04/arm64/20231003.1816", + "ami_name": "salt-project/ci/ubuntu/22.04/arm64/20231003.2111", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -350,9 +350,9 @@ "ssh_username": "ubuntu" }, "ubuntu-22.04": { - "ami": "ami-0af23aeeab0dc5c31", + "ami": "ami-0a465357b34ea7fdc", "ami_description": "CI Image of Ubuntu 22.04 x86_64", - "ami_name": "salt-project/ci/ubuntu/22.04/x86_64/20231003.1816", + "ami_name": "salt-project/ci/ubuntu/22.04/x86_64/20231003.2111", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -360,9 +360,9 @@ "ssh_username": "ubuntu" }, "ubuntu-23.04-arm64": { - "ami": "ami-0afa9a2fdcc3d6479", + "ami": "ami-0ed81524d646f95ee", "ami_description": "CI Image of Ubuntu 23.04 arm64", - "ami_name": "salt-project/ci/ubuntu/23.04/arm64/20231003.1816", + "ami_name": "salt-project/ci/ubuntu/23.04/arm64/20231003.2111", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -370,9 +370,9 @@ "ssh_username": "ubuntu" }, "ubuntu-23.04": { - "ami": "ami-05990aaa92c7aa77f", + "ami": "ami-02c7edd6357be51b6", "ami_description": "CI Image of Ubuntu 23.04 x86_64", - "ami_name": "salt-project/ci/ubuntu/23.04/x86_64/20231003.1816", + "ami_name": "salt-project/ci/ubuntu/23.04/x86_64/20231003.2112", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -380,9 +380,9 @@ "ssh_username": "ubuntu" }, "windows-2016": { - "ami": "ami-0351b17103b653e06", + "ami": "ami-04f113ff291a8953f", "ami_description": "CI Image of Windows 2016 x86_64", - "ami_name": "salt-project/ci/windows/2016/x86_64/20231003.1831", + "ami_name": "salt-project/ci/windows/2016/x86_64/20231003.2104", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.xlarge", @@ -390,9 +390,9 @@ "ssh_username": "Administrator" }, "windows-2019": { - "ami": "ami-027a53f66275e2fcd", + "ami": "ami-06475f495e0151fc9", "ami_description": "CI Image of Windows 2019 x86_64", - "ami_name": "salt-project/ci/windows/2019/x86_64/20231003.1832", + "ami_name": "salt-project/ci/windows/2019/x86_64/20231003.2106", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.xlarge", @@ -400,9 +400,9 @@ "ssh_username": "Administrator" }, "windows-2022": { - "ami": "ami-09ddba69a43e5f0ed", + "ami": "ami-0558da89560480f32", "ami_description": "CI Image of Windows 2022 x86_64", - "ami_name": "salt-project/ci/windows/2022/x86_64/20231003.1922", + "ami_name": "salt-project/ci/windows/2022/x86_64/20231003.2106", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.xlarge", From 68e5428d6bfb1378f66c9c418601749f8047f327 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 4 Oct 2023 16:23:59 +0100 Subject: [PATCH 061/147] Force package tests to run when golden images change Signed-off-by: Pedro Algarvio --- tools/ci.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/ci.py b/tools/ci.py index 2bf5af5a25f..aaca7e90a3c 100644 --- a/tools/ci.py +++ b/tools/ci.py @@ -370,6 +370,7 @@ def define_jobs( required_pkg_test_changes: set[str] = { changed_files_contents["pkg_tests"], changed_files_contents["workflows"], + changed_files_contents["golden_images"], } if jobs["test-pkg"] and required_pkg_test_changes == {"false"}: if "test:pkg" in labels: From c12bbd199570855e0482a5cb45e8ed270ba35c3b Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 4 Oct 2023 16:42:24 +0100 Subject: [PATCH 062/147] Fix the security groups selection for developer created VMs Signed-off-by: Pedro Algarvio --- tools/vm.py | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/tools/vm.py b/tools/vm.py index 000abc4e40f..9ecc33418c9 100644 --- a/tools/vm.py +++ b/tools/vm.py @@ -984,7 +984,6 @@ class VM: else: # This is a developer running log.info("Starting Developer configured VM") - # Get the develpers security group security_group_filters = [ { "Name": "vpc-id", @@ -994,10 +993,6 @@ class VM: "Name": "tag:spb:project", "Values": ["salt-project"], }, - { - "Name": "tag:spb:developer", - "Values": ["true"], - }, ] response = client.describe_security_groups(Filters=security_group_filters) if not response.get("SecurityGroups"): @@ -1008,6 +1003,26 @@ class VM: self.ctx.exit(1) # Override the launch template network interfaces config security_group_ids = [sg["GroupId"] for sg in response["SecurityGroups"]] + security_group_filters = [ + { + "Name": "vpc-id", + "Values": [vpc.id], + }, + { + "Name": "tag:Name", + "Values": [f"saltproject-{environment}-client-vpn-remote-access"], + }, + ] + response = client.describe_security_groups(Filters=security_group_filters) + if not response.get("SecurityGroups"): + self.ctx.error( + "Could not find the right VPN access security group. " + f"Filters:\n{pprint.pformat(security_group_filters)}" + ) + self.ctx.exit(1) + security_group_ids.extend( + [sg["GroupId"] for sg in response["SecurityGroups"]] + ) progress = create_progress_bar() create_task = progress.add_task( From a7bcc6f90a123fb26175492530fbf6b9f578b09d Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 4 Oct 2023 17:04:03 +0100 Subject: [PATCH 063/147] Log in which environment the developer VM is getting created Signed-off-by: Pedro Algarvio --- tools/vm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/vm.py b/tools/vm.py index 9ecc33418c9..cbb531247d2 100644 --- a/tools/vm.py +++ b/tools/vm.py @@ -983,7 +983,7 @@ class VM: log.info("Starting CI configured VM") else: # This is a developer running - log.info("Starting Developer configured VM") + log.info(f"Starting Developer configured VM In Environment '{environment}'") security_group_filters = [ { "Name": "vpc-id", From a932628c0cc4d417bc63eac19be8a6eacf51e121 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 4 Oct 2023 15:00:16 +0100 Subject: [PATCH 064/147] Avoid problematic `grub-efi-amd64-signed` package on Ubuntu Signed-off-by: Pedro Algarvio --- pkg/tests/conftest.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkg/tests/conftest.py b/pkg/tests/conftest.py index 36c60b0e57b..c618b7ed4bb 100644 --- a/pkg/tests/conftest.py +++ b/pkg/tests/conftest.py @@ -49,6 +49,18 @@ def _system_up_to_date( grains, shell, ): + if grains["os"] == "Ubuntu" and grains["osarch"] == "amd64": + # The grub-efi-amd64-signed package seems to be a problem + # right now when updating the system + env = os.environ.copy() + env["DEBIAN_FRONTEND"] = "noninteractive" + ret = shell.run( + "apt-mark", + "hold", + "grub-efi-amd64-signed", + env=env, + ) + assert ret.returncode == 0 if grains["os_family"] == "Debian": ret = shell.run("apt", "update") assert ret.returncode == 0 From db27171a0b7c17022bcc8869e36e0caf2b83d2a6 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 4 Oct 2023 21:29:31 +0100 Subject: [PATCH 065/147] Run `pyupgrade` against the changed files from the merge-forward Signed-off-by: Pedro Algarvio --- salt/modules/schedule.py | 96 +++++++++---------- tests/integration/modules/test_ssh.py | 24 ++--- .../runners/state/orchestrate/test_events.py | 8 +- 3 files changed, 54 insertions(+), 74 deletions(-) diff --git a/salt/modules/schedule.py b/salt/modules/schedule.py index b8553bc6f78..50ec9846ba6 100644 --- a/salt/modules/schedule.py +++ b/salt/modules/schedule.py @@ -260,14 +260,12 @@ def purge(**kwargs): if "test" in kwargs and kwargs["test"]: ret["result"] = True - ret["comment"].append( - "Job: {} would be deleted from schedule.".format(name) - ) + ret["comment"].append(f"Job: {name} would be deleted from schedule.") else: if kwargs.get("offline"): del current_schedule[name] - ret["comment"].append("Deleted job: {} from schedule.".format(name)) + ret["comment"].append(f"Deleted job: {name} from schedule.") ret["changes"][name] = "removed" else: @@ -291,7 +289,7 @@ def purge(**kwargs): ret["result"] = True ret["changes"][name] = "removed" ret["comment"].append( - "Deleted job: {} from schedule.".format(name) + f"Deleted job: {name} from schedule." ) else: ret["comment"].append( @@ -342,7 +340,7 @@ def delete(name, **kwargs): """ ret = { - "comment": "Failed to delete job {} from schedule.".format(name), + "comment": f"Failed to delete job {name} from schedule.", "result": False, "changes": {}, } @@ -351,7 +349,7 @@ def delete(name, **kwargs): ret["comment"] = "Job name is required." if "test" in kwargs and kwargs["test"]: - ret["comment"] = "Job: {} would be deleted from schedule.".format(name) + ret["comment"] = f"Job: {name} would be deleted from schedule." ret["result"] = True else: if kwargs.get("offline"): @@ -380,7 +378,7 @@ def delete(name, **kwargs): ) ret["result"] = True - ret["comment"] = "Deleted Job {} from schedule.".format(name) + ret["comment"] = f"Deleted Job {name} from schedule." ret["changes"][name] = "removed" else: persist = kwargs.get("persist", True) @@ -405,7 +403,7 @@ def delete(name, **kwargs): "persist": False, } else: - ret["comment"] = "Job {} does not exist.".format(name) + ret["comment"] = f"Job {name} does not exist." return ret try: @@ -589,7 +587,7 @@ def add(name, **kwargs): """ ret = { - "comment": "Failed to add job {} to schedule.".format(name), + "comment": f"Failed to add job {name} to schedule.", "result": False, "changes": {}, } @@ -598,7 +596,7 @@ def add(name, **kwargs): ) if name in current_schedule: - ret["comment"] = "Job {} already exists in schedule.".format(name) + ret["comment"] = f"Job {name} already exists in schedule." ret["result"] = False return ret @@ -634,7 +632,7 @@ def add(name, **kwargs): schedule_data[name] = _new if "test" in kwargs and kwargs["test"]: - ret["comment"] = "Job: {} would be added to schedule.".format(name) + ret["comment"] = f"Job: {name} would be added to schedule." ret["result"] = True else: if kwargs.get("offline"): @@ -656,7 +654,7 @@ def add(name, **kwargs): ) ret["result"] = True - ret["comment"] = "Added job: {} to schedule.".format(name) + ret["comment"] = f"Added job: {name} to schedule." ret["changes"][name] = "added" else: try: @@ -733,7 +731,7 @@ def modify(name, **kwargs): ) if name not in current_schedule: - ret["comment"] = "Job {} does not exist in schedule.".format(name) + ret["comment"] = f"Job {name} does not exist in schedule." ret["result"] = False return ret @@ -756,7 +754,7 @@ def modify(name, **kwargs): return _new if _new == _current: - ret["comment"] = "Job {} in correct state".format(name) + ret["comment"] = f"Job {name} in correct state" return ret ret["changes"][name] = { @@ -765,7 +763,7 @@ def modify(name, **kwargs): } if "test" in kwargs and kwargs["test"]: - ret["comment"] = "Job: {} would be modified in schedule.".format(name) + ret["comment"] = f"Job: {name} would be modified in schedule." else: if kwargs.get("offline"): current_schedule[name].update(_new) @@ -786,7 +784,7 @@ def modify(name, **kwargs): ) ret["result"] = True - ret["comment"] = "Modified job: {} in schedule.".format(name) + ret["comment"] = f"Modified job: {name} in schedule." else: persist = kwargs.get("persist", True) @@ -808,9 +806,9 @@ def modify(name, **kwargs): out = __salt__["event.fire"](event_data, "manage_schedule") if out: - ret["comment"] = "Modified job: {} in schedule.".format(name) + ret["comment"] = f"Modified job: {name} in schedule." else: - ret["comment"] = "Failed to modify job {} in schedule.".format(name) + ret["comment"] = f"Failed to modify job {name} in schedule." ret["result"] = False return ret @@ -839,18 +837,18 @@ def run_job(name, force=False): if name in schedule: data = schedule[name] if "enabled" in data and not data["enabled"] and not force: - ret["comment"] = "Job {} is disabled.".format(name) + ret["comment"] = f"Job {name} is disabled." else: out = __salt__["event.fire"]( {"name": name, "func": "run_job"}, "manage_schedule" ) if out: - ret["comment"] = "Scheduling Job {} on minion.".format(name) + ret["comment"] = f"Scheduling Job {name} on minion." else: - ret["comment"] = "Failed to run job {} on minion.".format(name) + ret["comment"] = f"Failed to run job {name} on minion." ret["result"] = False else: - ret["comment"] = "Job {} does not exist.".format(name) + ret["comment"] = f"Job {name} does not exist." ret["result"] = False return ret @@ -873,7 +871,7 @@ def enable_job(name, **kwargs): ret["result"] = False if "test" in __opts__ and __opts__["test"]: - ret["comment"] = "Job: {} would be enabled in schedule.".format(name) + ret["comment"] = f"Job: {name} would be enabled in schedule." else: persist = kwargs.get("persist", True) @@ -887,7 +885,7 @@ def enable_job(name, **kwargs): "persist": False, } else: - ret["comment"] = "Job {} does not exist.".format(name) + ret["comment"] = f"Job {name} does not exist." ret["result"] = False return ret @@ -904,13 +902,11 @@ def enable_job(name, **kwargs): # check item exists in schedule and is enabled if name in schedule and schedule[name]["enabled"]: ret["result"] = True - ret["comment"] = "Enabled Job {} in schedule.".format(name) + ret["comment"] = f"Enabled Job {name} in schedule." ret["changes"][name] = "enabled" else: ret["result"] = False - ret[ - "comment" - ] = "Failed to enable job {} in schedule.".format(name) + ret["comment"] = f"Failed to enable job {name} in schedule." return ret except KeyError: # Effectively a no-op, since we can't really return without an event system @@ -936,7 +932,7 @@ def disable_job(name, **kwargs): ret["result"] = False if "test" in kwargs and kwargs["test"]: - ret["comment"] = "Job: {} would be disabled in schedule.".format(name) + ret["comment"] = f"Job: {name} would be disabled in schedule." else: persist = kwargs.get("persist", True) @@ -950,7 +946,7 @@ def disable_job(name, **kwargs): "persist": False, } else: - ret["comment"] = "Job {} does not exist.".format(name) + ret["comment"] = f"Job {name} does not exist." ret["result"] = False return ret @@ -967,13 +963,13 @@ def disable_job(name, **kwargs): # check item exists in schedule and is enabled if name in schedule and not schedule[name]["enabled"]: ret["result"] = True - ret["comment"] = "Disabled Job {} in schedule.".format(name) + ret["comment"] = f"Disabled Job {name} in schedule." ret["changes"][name] = "disabled" else: ret["result"] = False ret[ "comment" - ] = "Failed to disable job {} in schedule.".format(name) + ] = f"Failed to disable job {name} in schedule." return ret except KeyError: # Effectively a no-op, since we can't really return without an event system @@ -1138,9 +1134,7 @@ def reload_(): try: schedule = salt.utils.yaml.safe_load(fp_) except salt.utils.yaml.YAMLError as exc: - ret["comment"].append( - "Unable to read existing schedule file: {}".format(exc) - ) + ret["comment"].append(f"Unable to read existing schedule file: {exc}") if schedule: if "schedule" in schedule and schedule["schedule"]: @@ -1188,7 +1182,7 @@ def move(name, target, **kwargs): ret["result"] = False if "test" in kwargs and kwargs["test"]: - ret["comment"] = "Job: {} would be moved from schedule.".format(name) + ret["comment"] = f"Job: {name} would be moved from schedule." else: opts_schedule = list_(show_all=True, where="opts", return_yaml=False) pillar_schedule = list_(show_all=True, where="pillar", return_yaml=False) @@ -1200,13 +1194,13 @@ def move(name, target, **kwargs): schedule_data = pillar_schedule[name] where = "pillar" else: - ret["comment"] = "Job {} does not exist.".format(name) + ret["comment"] = f"Job {name} does not exist." ret["result"] = False return ret schedule_opts = [] for key, value in schedule_data.items(): - temp = "{}={}".format(key, value) + temp = f"{key}={value}" schedule_opts.append(temp) response = __salt__["publish.publish"](target, "schedule.add", schedule_opts) @@ -1229,7 +1223,7 @@ def move(name, target, **kwargs): else: delete(name, where=where) ret["result"] = True - ret["comment"] = "Moved Job {} from schedule.".format(name) + ret["comment"] = f"Moved Job {name} from schedule." ret["minions"] = minions return ret return ret @@ -1253,7 +1247,7 @@ def copy(name, target, **kwargs): ret["result"] = False if "test" in kwargs and kwargs["test"]: - ret["comment"] = "Job: {} would be copied from schedule.".format(name) + ret["comment"] = f"Job: {name} would be copied from schedule." else: opts_schedule = list_(show_all=True, where="opts", return_yaml=False) pillar_schedule = list_(show_all=True, where="pillar", return_yaml=False) @@ -1263,13 +1257,13 @@ def copy(name, target, **kwargs): elif name in pillar_schedule: schedule_data = pillar_schedule[name] else: - ret["comment"] = "Job {} does not exist.".format(name) + ret["comment"] = f"Job {name} does not exist." ret["result"] = False return ret schedule_opts = [] for key, value in schedule_data.items(): - temp = "{}={}".format(key, value) + temp = f"{key}={value}" schedule_opts.append(temp) response = __salt__["publish.publish"](target, "schedule.add", schedule_opts) @@ -1291,7 +1285,7 @@ def copy(name, target, **kwargs): return ret else: ret["result"] = True - ret["comment"] = "Copied Job {} from schedule to minion(s).".format(name) + ret["comment"] = f"Copied Job {name} from schedule to minion(s)." ret["minions"] = minions return ret return ret @@ -1354,7 +1348,7 @@ def postpone_job(name, current_time, new_time, **kwargs): return ret if "test" in __opts__ and __opts__["test"]: - ret["comment"] = "Job: {} would be postponed in schedule.".format(name) + ret["comment"] = f"Job: {name} would be postponed in schedule." else: if name in list_(show_all=True, where="opts", return_yaml=False): @@ -1375,7 +1369,7 @@ def postpone_job(name, current_time, new_time, **kwargs): "func": "postpone_job", } else: - ret["comment"] = "Job {} does not exist.".format(name) + ret["comment"] = f"Job {name} does not exist." ret["result"] = False return ret @@ -1399,7 +1393,7 @@ def postpone_job(name, current_time, new_time, **kwargs): ret["result"] = False ret[ "comment" - ] = "Failed to postpone job {} in schedule.".format(name) + ] = f"Failed to postpone job {name} in schedule." return ret except KeyError: # Effectively a no-op, since we can't really return without an event system @@ -1445,7 +1439,7 @@ def skip_job(name, current_time, **kwargs): return ret if "test" in __opts__ and __opts__["test"]: - ret["comment"] = "Job: {} would be skipped in schedule.".format(name) + ret["comment"] = f"Job: {name} would be skipped in schedule." else: if name in list_(show_all=True, where="opts", return_yaml=False): @@ -1464,7 +1458,7 @@ def skip_job(name, current_time, **kwargs): "func": "skip_job", } else: - ret["comment"] = "Job {} does not exist.".format(name) + ret["comment"] = f"Job {name} does not exist." ret["result"] = False return ret @@ -1486,9 +1480,7 @@ def skip_job(name, current_time, **kwargs): ) else: ret["result"] = False - ret[ - "comment" - ] = "Failed to skip job {} in schedule.".format(name) + ret["comment"] = f"Failed to skip job {name} in schedule." return ret except KeyError: # Effectively a no-op, since we can't really return without an event system diff --git a/tests/integration/modules/test_ssh.py b/tests/integration/modules/test_ssh.py index 55586211622..751a09db304 100644 --- a/tests/integration/modules/test_ssh.py +++ b/tests/integration/modules/test_ssh.py @@ -86,9 +86,7 @@ class SSHModuleTest(ModuleCase): ) self.assertEqual(key_data["fingerprint"], GITHUB_FINGERPRINT) except AssertionError as exc: - raise AssertionError( - "AssertionError: {}. Function returned: {}".format(exc, ret) - ) + raise AssertionError(f"AssertionError: {exc}. Function returned: {ret}") @pytest.mark.slow_test def test_bad_enctype(self): @@ -125,9 +123,7 @@ class SSHModuleTest(ModuleCase): self.assertEqual(ret["key"], self.key) self.assertEqual(ret["fingerprint"], GITHUB_FINGERPRINT) except AssertionError as exc: - raise AssertionError( - "AssertionError: {}. Function returned: {}".format(exc, ret) - ) + raise AssertionError(f"AssertionError: {exc}. Function returned: {ret}") @pytest.mark.skip_on_photonos( reason="Skip on PhotonOS. Attempting to receive the SSH key from Github, using RSA keys which are disabled.", @@ -146,9 +142,7 @@ class SSHModuleTest(ModuleCase): self.assertEqual(ret[0]["key"], self.key) self.assertEqual(ret[0]["fingerprint"], GITHUB_FINGERPRINT) except AssertionError as exc: - raise AssertionError( - "AssertionError: {}. Function returned: {}".format(exc, ret) - ) + raise AssertionError(f"AssertionError: {exc}. Function returned: {ret}") @pytest.mark.slow_test def test_check_known_host_add(self): @@ -239,9 +233,7 @@ class SSHModuleTest(ModuleCase): self.assertEqual(ret["old"], None) self.assertEqual(ret["new"][0]["fingerprint"], GITHUB_FINGERPRINT) except AssertionError as exc: - raise AssertionError( - "AssertionError: {}. Function returned: {}".format(exc, ret) - ) + raise AssertionError(f"AssertionError: {exc}. Function returned: {ret}") # check that item does exist ret = self.run_function( "ssh.get_known_host_entries", @@ -251,9 +243,7 @@ class SSHModuleTest(ModuleCase): try: self.assertEqual(ret["fingerprint"], GITHUB_FINGERPRINT) except AssertionError as exc: - raise AssertionError( - "AssertionError: {}. Function returned: {}".format(exc, ret) - ) + raise AssertionError(f"AssertionError: {exc}. Function returned: {ret}") # add the same item once again ret = self.run_function( "ssh.set_known_host", ["root", "github.com"], config=self.known_hosts @@ -261,6 +251,4 @@ class SSHModuleTest(ModuleCase): try: self.assertEqual(ret["status"], "exists") except AssertionError as exc: - raise AssertionError( - "AssertionError: {}. Function returned: {}".format(exc, ret) - ) + raise AssertionError(f"AssertionError: {exc}. Function returned: {ret}") diff --git a/tests/pytests/integration/runners/state/orchestrate/test_events.py b/tests/pytests/integration/runners/state/orchestrate/test_events.py index 5ebaf500765..b1cde89ba73 100644 --- a/tests/pytests/integration/runners/state/orchestrate/test_events.py +++ b/tests/pytests/integration/runners/state/orchestrate/test_events.py @@ -170,7 +170,7 @@ def test_jid_in_ret_event(salt_run_cli, salt_master, salt_minion, event_listener for step_data in orch_job_data["data"][salt_master.id].values(): assert "__jid__" in step_data - expected_event_tag = "salt/run/{}/ret".format(jid) + expected_event_tag = f"salt/run/{jid}/ret" event_pattern = (salt_master.id, expected_event_tag) matched_events = event_listener.wait_for_events( @@ -178,7 +178,7 @@ def test_jid_in_ret_event(salt_run_cli, salt_master, salt_minion, event_listener ) assert ( matched_events.found_all_events - ), "Failed to receive the event with the tag '{}'".format(expected_event_tag) + ), f"Failed to receive the event with the tag '{expected_event_tag}'" for event in matched_events.matches: for job_data in event.data["return"]["data"][salt_master.id].values(): assert "__jid__" in job_data @@ -237,7 +237,7 @@ def test_parallel_orchestrations( assert duration > 20 assert duration < 19 * 10 / 2 - expected_event_tag = "salt/run/{}/ret".format(jid) + expected_event_tag = f"salt/run/{jid}/ret" event_pattern = (salt_master.id, expected_event_tag) matched_events = event_listener.wait_for_events( @@ -245,7 +245,7 @@ def test_parallel_orchestrations( ) assert ( matched_events.found_all_events - ), "Failed to receive the event with the tag '{}'".format(expected_event_tag) + ), f"Failed to receive the event with the tag '{expected_event_tag}'" for event in matched_events.matches: for job_data in event.data["return"]["data"][salt_master.id].values(): # we expect each duration to be greater than 10s From ee5231cbbbf50fc6d29bf216c150aa545f7044a0 Mon Sep 17 00:00:00 2001 From: Megan Wilhite Date: Thu, 5 Oct 2023 09:07:16 -0600 Subject: [PATCH 066/147] Increase code coverage on salt/state.py --- .../pytests/unit/state/test_state_compiler.py | 159 ++++++++++++++++++ 1 file changed, 159 insertions(+) diff --git a/tests/pytests/unit/state/test_state_compiler.py b/tests/pytests/unit/state/test_state_compiler.py index e03d4caee5a..8012010abd8 100644 --- a/tests/pytests/unit/state/test_state_compiler.py +++ b/tests/pytests/unit/state/test_state_compiler.py @@ -1143,3 +1143,162 @@ def test_verify_high_too_many_functions_declared_error_message( res = state_obj.verify_high(high) assert isinstance(res, list) assert any(err_msg in x for x in res) + + +def test_load_modules_pkg(minion_opts): + """ + Test load_modules when using this state: + nginx: + pkg.installed: + - provider: pacmanpkg + """ + data = { + "state": "pkg", + "name": "nginx", + "__sls__": "test", + "__env__": "base", + "__id__": "nginx", + "provider": "pacmanpkg", + "order": 10000, + "fun": "installed", + } + with patch("salt.state.State._gather_pillar"): + state_obj = salt.state.State(minion_opts) + state_obj.load_modules(data) + for func in [ + "pkg.available_version", + "pkg.file_list", + "pkg.group_diff", + "pkg.group_info", + ]: + assert func in state_obj.functions + + +def test_load_modules_list(minion_opts): + """ + Test load_modules when using providers in state + as a list, with this state: + nginx: + pkg.installed: + - provider: + - cmd: cmdmod + """ + data = { + "state": "pkg", + "name": "nginx", + "__sls__": "test", + "__env__": "base", + "__id__": "nginx", + "provider": [OrderedDict([("cmd", "cmdmod")])], + "order": 10000, + "fun": "installed", + } + with patch("salt.state.State._gather_pillar"): + state_obj = salt.state.State(minion_opts) + state_obj.load_modules(data) + for func in ["cmd.exec_code", "cmd.run", "cmd.script"]: + assert func in state_obj.functions + + +def test_load_modules_dict(minion_opts): + """ + Test load_modules when providers is a dict, which is + not valid. Testing this state: + nginx: + pkg.installed: + - provider: {cmd: test} + """ + data = { + "state": "pkg", + "name": "nginx", + "__sls__": "test", + "__env__": "base", + "__id__": "nginx", + "provider": OrderedDict([("cmd", "test")]), + "order": 10000, + "fun": "installed", + } + mock_raw_mod = MagicMock() + patch_raw_mod = patch("salt.loader.raw_mod", mock_raw_mod) + with patch("salt.state.State._gather_pillar"): + with patch_raw_mod: + state_obj = salt.state.State(minion_opts) + state_obj.load_modules(data) + mock_raw_mod.assert_not_called() + + +def test_check_refresh_grains(minion_opts): + """ + Test check_refresh when using this state: + grains_refresh: + module.run: + - name: saltutil.refresh_grains + - reload_grains: true + Ensure that the grains are loaded when reload_grains + is set. + """ + data = { + "state": "module", + "name": "saltutil.refresh_grains", + "__sls__": "test", + "__env__": "base", + "__id__": "grains_refresh", + "reload_grains": True, + "order": 10000, + "fun": "run", + } + ret = { + "name": "saltutil.refresh_grains", + "changes": {"ret": True}, + "comment": "Module function saltutil.refresh_grains executed", + "result": True, + "__sls__": "test", + "__run_num__": 0, + } + mock_refresh = MagicMock() + patch_refresh = patch("salt.state.State.module_refresh", mock_refresh) + with patch("salt.state.State._gather_pillar"): + with patch_refresh: + state_obj = salt.state.State(minion_opts) + state_obj.check_refresh(data, ret) + mock_refresh.assert_called_once() + assert "cwd" in state_obj.opts["grains"] + + +def test_check_refresh_pillar(minion_opts, caplog): + """ + Test check_refresh when using this state: + pillar_refresh: + module.run: + - name: saltutil.refresh_pillar + - reload_pillar: true + Ensure the pillar is refreshed. + """ + data = { + "state": "module", + "name": "saltutil.refresh_pillar", + "__sls__": "test", + "__env__": "base", + "__id__": "pillar_refresh", + "reload_pillar": True, + "order": 10000, + "fun": "run", + } + ret = { + "name": "saltutil.refresh_pillar", + "changes": {"ret": False}, + "comment": "Module function saltutil.refresh_pillar executed", + "result": False, + "__sls__": "test", + "__run_num__": 0, + } + mock_refresh = MagicMock() + patch_refresh = patch("salt.state.State.module_refresh", mock_refresh) + mock_pillar = MagicMock() + patch_pillar = patch("salt.state.State._gather_pillar", mock_pillar) + with patch_pillar, patch_refresh: + with caplog.at_level(logging.DEBUG): + state_obj = salt.state.State(minion_opts) + state_obj.check_refresh(data, ret) + mock_refresh.assert_called_once() + assert "Refreshing pillar..." in caplog.text From 90259a7729c74a89bf1042010e79553380e3e368 Mon Sep 17 00:00:00 2001 From: twangboy Date: Tue, 12 Sep 2023 15:37:22 -0600 Subject: [PATCH 067/147] Unskip the chocolatey tests on Windows --- tests/pytests/functional/states/test_chocolatey_1_2_1.py | 1 - tests/pytests/functional/states/test_chocolatey_latest.py | 1 - 2 files changed, 2 deletions(-) diff --git a/tests/pytests/functional/states/test_chocolatey_1_2_1.py b/tests/pytests/functional/states/test_chocolatey_1_2_1.py index 04e1d3ece1a..9dcc186636a 100644 --- a/tests/pytests/functional/states/test_chocolatey_1_2_1.py +++ b/tests/pytests/functional/states/test_chocolatey_1_2_1.py @@ -14,7 +14,6 @@ pytestmark = [ pytest.mark.skip_unless_on_windows, pytest.mark.slow_test, pytest.mark.destructive_test, - pytest.mark.skip_on_windows, ] diff --git a/tests/pytests/functional/states/test_chocolatey_latest.py b/tests/pytests/functional/states/test_chocolatey_latest.py index 6e2f55405d8..9d329d5fc59 100644 --- a/tests/pytests/functional/states/test_chocolatey_latest.py +++ b/tests/pytests/functional/states/test_chocolatey_latest.py @@ -14,7 +14,6 @@ pytestmark = [ pytest.mark.skip_unless_on_windows, pytest.mark.slow_test, pytest.mark.destructive_test, - pytest.mark.skip_on_windows, ] From 960bd47c062e8906a3a1b27d3bd471cd526ddafa Mon Sep 17 00:00:00 2001 From: Thomas Phipps Date: Tue, 26 Sep 2023 20:50:55 +0000 Subject: [PATCH 068/147] starter tests for salt.utils.cloud also includes framework for more tests --- tests/pytests/unit/utils/test_cloud.py | 277 ++++++++++++++++++++++++- 1 file changed, 274 insertions(+), 3 deletions(-) diff --git a/tests/pytests/unit/utils/test_cloud.py b/tests/pytests/unit/utils/test_cloud.py index db9d258d399..786e5370b8c 100644 --- a/tests/pytests/unit/utils/test_cloud.py +++ b/tests/pytests/unit/utils/test_cloud.py @@ -8,11 +8,13 @@ import os +import string import tempfile import pytest import salt.utils.cloud as cloud +from salt.exceptions import SaltCloudException from salt.utils.cloud import __ssh_gateway_arguments as ssh_gateway_arguments from tests.support.mock import MagicMock, patch @@ -74,7 +76,7 @@ def create_class(tmp_path): os.chdir(old_cwd) -def test_ssh_password_regex(create_class): +def test_ssh_password_regex(): """Test matching ssh password patterns""" for pattern in ( "Password for root@127.0.0.1:", @@ -125,7 +127,7 @@ def test_retrieve_password_from_keyring(create_class): assert pw_in_keyring == "fake_password_c8231" -def test_sftp_file_with_content_under_python3(create_class): +def test_sftp_file_with_content_under_python3(): with pytest.raises(Exception) as context: cloud.sftp_file("/tmp/test", "ТЕSТ test content") # we successful pass the place with os.write(tmpfd, ... @@ -133,7 +135,7 @@ def test_sftp_file_with_content_under_python3(create_class): @pytest.mark.skip_on_windows(reason="Not applicable for Windows.") -def test_check_key_path_and_mode(create_class): +def test_check_key_path_and_mode(): with tempfile.NamedTemporaryFile() as f: key_file = f.name @@ -657,3 +659,272 @@ def test_deploy_windows_master(master, expected): expected_args = "/S /master={} /minion-name=None".format(expected) assert mock.call_args_list[0].args[0] == expected_cmd assert mock.call_args_list[0].args[1] == expected_args + + +def test__render_script(): + pass + + +def test___ssh_gateway_config_dict(): + assert cloud.__ssh_gateway_config_dict(None) == {} + gate = { + "ssh_gateway": "Gozar", + "ssh_gateway_key": "Zuul", + "ssh_gateway_user": "Vinz Clortho", + "ssh_gateway_command": "Are you the keymaster?", + } + assert cloud.__ssh_gateway_config_dict(gate) == gate + + +def test_os_script(): + pass + + +def test_gen_keys(): + pass + + +def test_accept_key(): + pass + + +def test_remove_key(): + pass + + +def test_rename_key(): + pass + + +def test_minion_config(): + pass + + +def test_master_config(): + pass + + +def test_salt_config_to_yaml(): + pass + + +def test_bootstrap(): # this will be the big one + pass + + +def test_ssh_usernames(): + pass + + +def test_wait_for_fun(): + pass + + +def test_wait_for_passwd(): + pass + + +def test_run_inline_script(): + pass + + +def test_filter_event(): + pass + + +def test__exec_ssh_cmd(): + pass + + +def test_ssh_file(): + pass + + +def test_win_cmd(): + pass + + +def test_winrm_cmd(): + pass + + +def test_root_cmd(): + pass + + +def test_check_auth(): + pass + + +def test_ip_to_int(): + assert cloud.ip_to_int("127.0.0.1") == 2130706433 + + +def test_is_public_ip(): + assert cloud.is_public_ip("8.8.8.8") is True + assert cloud.is_public_ip("127.0.0.1") is False + assert cloud.is_public_ip("172.17.3.1") is False + assert cloud.is_public_ip("192.168.30.4") is False + assert cloud.is_public_ip("10.145.1.1") is False + assert cloud.is_public_ip("fe80::123:ffff:ffff:ffff") is False + assert cloud.is_public_ip("2001:db8:3333:4444:CCCC:DDDD:EEEE:FFFF") is True + + +def test_check_name(): + try: + cloud.check_name("test", string.ascii_letters) + except SaltCloudException as exc: + assert False, f"cloud.check_name rasied SaltCloudException: {exc}" + + with pytest.raises(SaltCloudException): + cloud.check_name("test", string.digits) + + +def test_remove_sshkey(): + pass + + +def test_wait_for_ip(): + pass + + +def test_list_nodes_select(): + pass + + +def test_lock_file(): + pass + + +def test_unlock_file(): + pass + + +def test_cachedir_index_del(): + pass + + +def test_init_cachedir(): + pass + + +def test_request_minion_cachedir(): + pass + + +def test_change_minion_cachedir(): + pass + + +def test_activate_minion_cachedir(): + pass + + +def test_delete_minion_cachedir(): + pass + + +def test_list_cache_nodes_full(): + pass + + +def test_update_bootstrap(): + pass + + +def test_cache_node_list(): + pass + + +def test_cache_node(): + pass + + +def test_missing_node_cache(): + pass + + +def test_diff_node_cache(): + pass + + +def test__strip_cache_events(): + events = { + "test": "foobar", + "passwd": "fakepass", + } + events2 = {"test1": "foobar", "test2": "foobar"} + opts = {"cache_event_strip_fields": ["passwd"]} + assert cloud._strip_cache_events(events, opts) == {"test": "foobar"} + assert cloud._strip_cache_events(events2, opts) == events2 + + +def test_salt_cloud_force_asciii(): + try: + "\u0411".encode("iso-8859-15") + except UnicodeEncodeError as exc: + with pytest.raises(UnicodeEncodeError): + cloud._salt_cloud_force_ascii(exc) + + with pytest.raises(TypeError): + cloud._salt_cloud_force_ascii("not the thing") + + try: + "\xa0\u2013".encode("iso-8859-15") + except UnicodeEncodeError as exc: + assert cloud._salt_cloud_force_ascii(exc) == ("-", 2) + + +def test__unwrap_dict(): + assert cloud._unwrap_dict({"a": {"b": {"c": "foobar"}}}, "a,b,c") == "foobar" + + +def test_run_func_until_ret_arg(): + pass + + +def test_get_salt_interface(): + with patch( + "salt.config.get_cloud_config_value", + MagicMock(side_effect=[False, "public_ips"]), + ) as cloud_config: + assert cloud.get_salt_interface({}, {}) == "public_ips" + assert cloud_config.call_count == 2 + with patch( + "salt.config.get_cloud_config_value", MagicMock(return_value="private_ips") + ) as cloud_config: + assert cloud.get_salt_interface({}, {}) == "private_ips" + assert cloud_config.call_count == 1 + + +def test_userdata_template(): + assert cloud.userdata_template(opts=None, vm_=None, userdata=None) is None + with patch("salt.config.get_cloud_config_value", MagicMock(return_value=False)): + assert cloud.userdata_template(opts=None, vm_=None, userdata="test") == "test" + with patch("salt.config.get_cloud_config_value", MagicMock(return_value=None)): + opts = {"userdata_template": None} + assert cloud.userdata_template(opts=opts, vm_=None, userdata="test") == "test" + + renders = {"jinja": MagicMock(return_value="test")} + + with patch("salt.config.get_cloud_config_value", MagicMock(return_value="jinja")): + with patch("salt.loader.render", MagicMock(return_value=renders)): + opts = { + "userdata_template": "test", + "renderer_blacklist": None, + "renderer_whitelist": None, + "renderer": "jinja", + } + assert cloud.userdata_template(opts=opts, vm_={}, userdata="test") == "test" + + renders = {"jinja": MagicMock(return_value=True)} + + with patch("salt.config.get_cloud_config_value", MagicMock(return_value="jinja")): + with patch("salt.loader.render", MagicMock(return_value=renders)): + opts = { + "userdata_template": "test", + "renderer_blacklist": None, + "renderer_whitelist": None, + "renderer": "jinja", + } + assert cloud.userdata_template(opts=opts, vm_={}, userdata="test") == "True" From 4612be8785f3a1e788dfb0778b48cf23581c0665 Mon Sep 17 00:00:00 2001 From: Thomas Phipps Date: Thu, 5 Oct 2023 20:50:52 +0000 Subject: [PATCH 069/147] remove blank test templates. --- tests/pytests/unit/utils/test_cloud.py | 156 ------------------------- 1 file changed, 156 deletions(-) diff --git a/tests/pytests/unit/utils/test_cloud.py b/tests/pytests/unit/utils/test_cloud.py index 786e5370b8c..ea55af44ef5 100644 --- a/tests/pytests/unit/utils/test_cloud.py +++ b/tests/pytests/unit/utils/test_cloud.py @@ -661,10 +661,6 @@ def test_deploy_windows_master(master, expected): assert mock.call_args_list[0].args[1] == expected_args -def test__render_script(): - pass - - def test___ssh_gateway_config_dict(): assert cloud.__ssh_gateway_config_dict(None) == {} gate = { @@ -676,86 +672,6 @@ def test___ssh_gateway_config_dict(): assert cloud.__ssh_gateway_config_dict(gate) == gate -def test_os_script(): - pass - - -def test_gen_keys(): - pass - - -def test_accept_key(): - pass - - -def test_remove_key(): - pass - - -def test_rename_key(): - pass - - -def test_minion_config(): - pass - - -def test_master_config(): - pass - - -def test_salt_config_to_yaml(): - pass - - -def test_bootstrap(): # this will be the big one - pass - - -def test_ssh_usernames(): - pass - - -def test_wait_for_fun(): - pass - - -def test_wait_for_passwd(): - pass - - -def test_run_inline_script(): - pass - - -def test_filter_event(): - pass - - -def test__exec_ssh_cmd(): - pass - - -def test_ssh_file(): - pass - - -def test_win_cmd(): - pass - - -def test_winrm_cmd(): - pass - - -def test_root_cmd(): - pass - - -def test_check_auth(): - pass - - def test_ip_to_int(): assert cloud.ip_to_int("127.0.0.1") == 2130706433 @@ -780,74 +696,6 @@ def test_check_name(): cloud.check_name("test", string.digits) -def test_remove_sshkey(): - pass - - -def test_wait_for_ip(): - pass - - -def test_list_nodes_select(): - pass - - -def test_lock_file(): - pass - - -def test_unlock_file(): - pass - - -def test_cachedir_index_del(): - pass - - -def test_init_cachedir(): - pass - - -def test_request_minion_cachedir(): - pass - - -def test_change_minion_cachedir(): - pass - - -def test_activate_minion_cachedir(): - pass - - -def test_delete_minion_cachedir(): - pass - - -def test_list_cache_nodes_full(): - pass - - -def test_update_bootstrap(): - pass - - -def test_cache_node_list(): - pass - - -def test_cache_node(): - pass - - -def test_missing_node_cache(): - pass - - -def test_diff_node_cache(): - pass - - def test__strip_cache_events(): events = { "test": "foobar", @@ -879,10 +727,6 @@ def test__unwrap_dict(): assert cloud._unwrap_dict({"a": {"b": {"c": "foobar"}}}, "a,b,c") == "foobar" -def test_run_func_until_ret_arg(): - pass - - def test_get_salt_interface(): with patch( "salt.config.get_cloud_config_value", From c5a40240ff95767f3ee9fd231c531155f60e7372 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 16 Sep 2023 11:55:40 +0100 Subject: [PATCH 070/147] Update the codecov configuration file Signed-off-by: Pedro Algarvio --- .codecov.yml | 151 +++++++++++++++++---------------------------------- 1 file changed, 49 insertions(+), 102 deletions(-) diff --git a/.codecov.yml b/.codecov.yml index 5b59b7fcbd4..0f57a7a304f 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -1,112 +1,72 @@ codecov: ci: - - jenkins.saltproject.io - github.com - max_report_age: 24 # The age you want coverage reports to expire at, or if you - # want to disable this check. Expired reports will not be processed by codecov. - require_ci_to_pass: yes # Less spammy. Only notify on passing builds. + max_report_age: 24 # The age you want coverage reports to expire at, or if you + # want to disable this check. Expired reports will not be processed by codecov. + require_ci_to_pass: yes # Less spammy. Only notify on passing builds. - -# notify: -# after_n_builds: 25 # Only notify after N builds -# # This value is the output of: -# # sh -c 'echo "$(ls .ci/ | grep kitchen | wc -l)"' -# wait_for_ci: yes # Should Codecov wait for all CI statuses to complete before sending ours. -# # Note: Codecov considers all non-codecov statues to be CI statuses + notify: + wait_for_ci: false # Should Codecov wait for all CI statuses to complete before sending ours. + # Note: Codecov considers all non-codecov statuses to be CI statuses + manual_trigger: true # We manually tell codecov to merge and process all uploaded coverage reports ignore: - - ^*.py$ # python files at the repo root, ie, setup.py - - doc/.* # ignore any code under doc/ - - salt/ext/.* # ignore any code under salt/ext + - ^*.py$ # python files at the repo root, ie, setup.py + - doc/.* # ignore any code under doc/ + - salt/ext/.* # ignore any code under salt/ext coverage: round: up range: 70..100 precision: 2 - notify: {} - status: false + status: + project: + default: + target: auto # auto compares coverage to the previous base commit + threshold: 5% # adjust accordingly based on how flaky your tests are + # this allows a 5% drop from the previous base commit coverage + flags: + - salt + - tests -# status: -# project: # measuring the overall project coverage -# default: -# informational: true # Use Codecov in informational mode. Default is false. If true is specified the -# # resulting status will pass no matter what the coverage is or what other settings -# # are specified. Informational mode is great to use if you want to expose codecov -# # information to other developers in your pull request without necessarily gating -# # PRs on that information. -# target: auto # will use the coverage from the base commit (pull request base or parent commit) coverage to compare against. -# base: auto # will use the pull request base if the commit is on a pull request. If not, the parent commit will be used. -# flags: -# - salt -# - tests -# salt: # declare a new status context "salt" -# informational: true -# paths: "!tests/" # remove all files in "tests/" -# target: auto # will use the coverage from the base commit (pull request base or parent commit) coverage to compare against. -# base: auto # will use the pull request base if the commit is on a pull request. If not, the parent commit will be used. -# if_no_uploads: error # will post commit status of "error" if no coverage reports were uploaded -# # options: success, error, failure -# if_not_found: success # if parent is not found report status as success, error, or failure -# if_ci_failed: error # if ci fails report status as success, error, or failure -# flags: -# - salt -# tests: # declare a new status context "tests" -# informational: true -# #target: 100% # we always want 100% coverage here -# target: auto # auto while we get this going -# base: auto # will use the pull request base if the commit is on a pull request. If not, the parent commit will be used. -# paths: "!salt/" # only include coverage in "tests/" folder -# if_no_uploads: error # will post commit status of "error" if no coverage reports were uploaded -# # options: success, error, failure -# if_not_found: success # if parent is not found report status as success, error, or failure -# if_ci_failed: error # if ci fails report status as success, error, or failure -# flags: -# - tests + salt: # declare a new status context "salt" + paths: + - "!tests/" # remove all files in "tests/" + target: auto # will use the coverage from the base commit (pull request base or parent commit) coverage to compare against. + flags: + - salt -# patch: # pull requests only: this commit status will measure the -# # entire pull requests Coverage Diff. Checking if the lines -# # adjusted are covered at least X%. -# default: -# informational: true # Use Codecov in informational mode. Default is false. If true is specified the -# # resulting status will pass no matter what the coverage is or what other settings -# # are specified. Informational mode is great to use if you want to expose codecov -# # information to other developers in your pull request without necessarily gating -# # PRs on that information. -# target: 100% # Newly added lines must have 100% coverage -# if_no_uploads: error # will post commit status of "error" if no coverage reports were uploaded -# # options: success, error, failure -# if_not_found: success -# if_ci_failed: error -# flags: -# - salt -# - tests + tests: # declare a new status context "tests" + paths: + - "!salt/" # only include coverage in "tests/" folder + target: auto # auto while we get this going + flags: + - tests -# changes: # if there are any unexpected changes in coverage -# default: -# informational: true # Use Codecov in informational mode. Default is false. If true is specified the -# # resulting status will pass no matter what the coverage is or what other settings -# # are specified. Informational mode is great to use if you want to expose codecov -# # information to other developers in your pull request without necessarily gating -# # PRs on that information. -# if_no_uploads: error -# if_not_found: success -# if_ci_failed: error -# flags: -# - salt -# - tests + patch: # pull requests only: this commit status will measure the + # entire pull requests Coverage Diff. Checking if the lines + # adjusted are covered at least X%. + default: + target: auto # auto compares coverage to the previous base commit + threshold: 5% # adjust accordingly based on how flaky your tests are + # this allows a 5% drop from the previous base commit coverage flags: salt: paths: - salt/ - carryforward: true # https://docs.codecov.io/docs/carryforward-flags + carryforward: true # https://docs.codecov.io/docs/carryforward-flags tests: paths: - tests/ carryforward: true + pkg: + paths: + - pkg/tests + carryforward: true unit: paths: - tests/unit @@ -125,23 +85,10 @@ flags: - tests/integration - tests/pytests/integration carryforward: true - system: - paths: - - tests/integration - - tests/pytests/integration - carryforward: true -#comment: -# layout: "reach, diff, flags, files" -# after_n_builds: 46 # Only comment on PRs after N builds -# # This value is the output of: -# # sh -c 'echo "$(ls .ci/ | grep kitchen | wc -l)"' -# -# behavior: new # Comment posting behaviour -# # default: update, if exists. Otherwise post new. -# # once: update, if exists. Otherwise post new. Skip if deleted. -# # new: delete old and post new. -# # spammy: post new (do not delete old comments). -# -# Disable Comments -comment: off +comment: + layout: "header, diff, flags, files" + behavior: default # Comment posting behaviour + # default: update, if exists. Otherwise post new. + # once: update, if exists. Otherwise post new. Skip if deleted. + # new: delete old and post new. From 1307a657b0c120abc36fd7bdfa48e3c38923bd4b Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 3 Oct 2023 17:36:52 +0100 Subject: [PATCH 071/147] Re-Start publishing code coverage data to codecov Signed-off-by: Pedro Algarvio --- .github/workflows/ci.yml | 50 +++++++++++++++++++ .github/workflows/nightly.yml | 50 +++++++++++++++++++ .github/workflows/scheduled.yml | 50 +++++++++++++++++++ .github/workflows/staging.yml | 41 +++++++++++++++ .github/workflows/templates/ci.yml.jinja | 9 ++++ .github/workflows/templates/layout.yml.jinja | 18 +++++++ .../workflows/templates/test-salt.yml.jinja | 3 ++ .github/workflows/test-action-macos.yml | 28 +++++++++++ .github/workflows/test-action.yml | 23 +++++++++ .../test-package-downloads-action-linux.yml | 23 +++++++++ .../test-package-downloads-action-macos.yml | 23 +++++++++ .../test-package-downloads-action-windows.yml | 23 +++++++++ 12 files changed, 341 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b5e9b526c17..f00c133fa11 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -238,6 +238,23 @@ jobs: with: name: testrun-changed-files.txt path: testrun-changed-files.txt + + - name: Install Codecov CLI + if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} + run: | + python3 -m pip install codecov-cli + + - name: Save Commit Metadata In Codecov + if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} + run: | + codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + create-commit --git-service github --sha ${{ github.sha }} + + - name: Create Codecov Coverage Report + if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} + run: | + codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + create-report --git-service github --sha ${{ github.sha }} pre-commit: name: Pre-Commit if: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} @@ -1650,6 +1667,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} + secrets: inherit windows-2019: name: Windows 2019 @@ -1670,6 +1688,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} + secrets: inherit windows-2022: name: Windows 2022 @@ -1690,6 +1709,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} + secrets: inherit macos-12: name: macOS 12 @@ -1710,6 +1730,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} + secrets: inherit almalinux-8: name: Alma Linux 8 @@ -1730,6 +1751,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} + secrets: inherit almalinux-9: name: Alma Linux 9 @@ -1750,6 +1772,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} + secrets: inherit amazonlinux-2: name: Amazon Linux 2 @@ -1770,6 +1793,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} + secrets: inherit archlinux-lts: name: Arch Linux LTS @@ -1790,6 +1814,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} + secrets: inherit centos-7: name: CentOS 7 @@ -1810,6 +1835,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} + secrets: inherit centosstream-8: name: CentOS Stream 8 @@ -1830,6 +1856,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} + secrets: inherit centosstream-9: name: CentOS Stream 9 @@ -1850,6 +1877,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} + secrets: inherit debian-10: name: Debian 10 @@ -1870,6 +1898,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} + secrets: inherit debian-11: name: Debian 11 @@ -1890,6 +1919,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} + secrets: inherit debian-11-arm64: name: Debian 11 Arm64 @@ -1910,6 +1940,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} + secrets: inherit fedora-37: name: Fedora 37 @@ -1930,6 +1961,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} + secrets: inherit fedora-38: name: Fedora 38 @@ -1950,6 +1982,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} + secrets: inherit opensuse-15: name: Opensuse 15 @@ -1970,6 +2003,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} + secrets: inherit photonos-3: name: Photon OS 3 @@ -1990,6 +2024,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} + secrets: inherit photonos-4: name: Photon OS 4 @@ -2010,6 +2045,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} + secrets: inherit photonos-4-arm64: name: Photon OS 4 Arm64 @@ -2030,6 +2066,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} + secrets: inherit ubuntu-2004: name: Ubuntu 20.04 @@ -2050,6 +2087,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} + secrets: inherit ubuntu-2004-arm64: name: Ubuntu 20.04 Arm64 @@ -2070,6 +2108,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} + secrets: inherit ubuntu-2204: name: Ubuntu 22.04 @@ -2090,6 +2129,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} + secrets: inherit ubuntu-2204-arm64: name: Ubuntu 22.04 Arm64 @@ -2110,6 +2150,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} + secrets: inherit combine-all-code-coverage: name: Combine Code Coverage @@ -2186,6 +2227,15 @@ jobs: run: | python3 -m pip install 'nox==2022.8.7' + - name: Install Codecov CLI + run: | + python3 -m pip install codecov-cli + + - name: Tell Codecov To Process Reports + run: | + codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + send-notifications --git-service github --sha ${{ github.sha }} + - name: Get coverage reports id: get-coverage-reports uses: actions/download-artifact@v3 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index e094519215d..7e96d50cdc1 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -282,6 +282,23 @@ jobs: with: name: testrun-changed-files.txt path: testrun-changed-files.txt + + - name: Install Codecov CLI + if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} + run: | + python3 -m pip install codecov-cli + + - name: Save Commit Metadata In Codecov + if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} + run: | + codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + create-commit --git-service github --sha ${{ github.sha }} + + - name: Create Codecov Coverage Report + if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} + run: | + codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + create-report --git-service github --sha ${{ github.sha }} pre-commit: name: Pre-Commit if: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} @@ -1711,6 +1728,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit windows-2019: name: Windows 2019 @@ -1731,6 +1749,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit windows-2022: name: Windows 2022 @@ -1751,6 +1770,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit macos-12: name: macOS 12 @@ -1771,6 +1791,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit almalinux-8: name: Alma Linux 8 @@ -1791,6 +1812,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit almalinux-9: name: Alma Linux 9 @@ -1811,6 +1833,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit amazonlinux-2: name: Amazon Linux 2 @@ -1831,6 +1854,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit archlinux-lts: name: Arch Linux LTS @@ -1851,6 +1875,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit centos-7: name: CentOS 7 @@ -1871,6 +1896,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit centosstream-8: name: CentOS Stream 8 @@ -1891,6 +1917,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit centosstream-9: name: CentOS Stream 9 @@ -1911,6 +1938,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit debian-10: name: Debian 10 @@ -1931,6 +1959,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit debian-11: name: Debian 11 @@ -1951,6 +1980,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit debian-11-arm64: name: Debian 11 Arm64 @@ -1971,6 +2001,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit fedora-37: name: Fedora 37 @@ -1991,6 +2022,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit fedora-38: name: Fedora 38 @@ -2011,6 +2043,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit opensuse-15: name: Opensuse 15 @@ -2031,6 +2064,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit photonos-3: name: Photon OS 3 @@ -2051,6 +2085,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit photonos-4: name: Photon OS 4 @@ -2071,6 +2106,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit photonos-4-arm64: name: Photon OS 4 Arm64 @@ -2091,6 +2127,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit ubuntu-2004: name: Ubuntu 20.04 @@ -2111,6 +2148,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit ubuntu-2004-arm64: name: Ubuntu 20.04 Arm64 @@ -2131,6 +2169,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit ubuntu-2204: name: Ubuntu 22.04 @@ -2151,6 +2190,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit ubuntu-2204-arm64: name: Ubuntu 22.04 Arm64 @@ -2171,6 +2211,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit combine-all-code-coverage: name: Combine Code Coverage @@ -2247,6 +2288,15 @@ jobs: run: | python3 -m pip install 'nox==2022.8.7' + - name: Install Codecov CLI + run: | + python3 -m pip install codecov-cli + + - name: Tell Codecov To Process Reports + run: | + codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + send-notifications --git-service github --sha ${{ github.sha }} + - name: Get coverage reports id: get-coverage-reports uses: actions/download-artifact@v3 diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 95cbc29b6e9..3153fa677f1 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -272,6 +272,23 @@ jobs: with: name: testrun-changed-files.txt path: testrun-changed-files.txt + + - name: Install Codecov CLI + if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} + run: | + python3 -m pip install codecov-cli + + - name: Save Commit Metadata In Codecov + if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} + run: | + codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + create-commit --git-service github --sha ${{ github.sha }} + + - name: Create Codecov Coverage Report + if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} + run: | + codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + create-report --git-service github --sha ${{ github.sha }} pre-commit: name: Pre-Commit if: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} @@ -1684,6 +1701,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit windows-2019: name: Windows 2019 @@ -1704,6 +1722,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit windows-2022: name: Windows 2022 @@ -1724,6 +1743,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit macos-12: name: macOS 12 @@ -1744,6 +1764,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit almalinux-8: name: Alma Linux 8 @@ -1764,6 +1785,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit almalinux-9: name: Alma Linux 9 @@ -1784,6 +1806,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit amazonlinux-2: name: Amazon Linux 2 @@ -1804,6 +1827,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit archlinux-lts: name: Arch Linux LTS @@ -1824,6 +1848,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit centos-7: name: CentOS 7 @@ -1844,6 +1869,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit centosstream-8: name: CentOS Stream 8 @@ -1864,6 +1890,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit centosstream-9: name: CentOS Stream 9 @@ -1884,6 +1911,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit debian-10: name: Debian 10 @@ -1904,6 +1932,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit debian-11: name: Debian 11 @@ -1924,6 +1953,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit debian-11-arm64: name: Debian 11 Arm64 @@ -1944,6 +1974,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit fedora-37: name: Fedora 37 @@ -1964,6 +1995,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit fedora-38: name: Fedora 38 @@ -1984,6 +2016,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit opensuse-15: name: Opensuse 15 @@ -2004,6 +2037,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit photonos-3: name: Photon OS 3 @@ -2024,6 +2058,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit photonos-4: name: Photon OS 4 @@ -2044,6 +2079,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit photonos-4-arm64: name: Photon OS 4 Arm64 @@ -2064,6 +2100,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit ubuntu-2004: name: Ubuntu 20.04 @@ -2084,6 +2121,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit ubuntu-2004-arm64: name: Ubuntu 20.04 Arm64 @@ -2104,6 +2142,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit ubuntu-2204: name: Ubuntu 22.04 @@ -2124,6 +2163,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit ubuntu-2204-arm64: name: Ubuntu 22.04 Arm64 @@ -2144,6 +2184,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false + secrets: inherit combine-all-code-coverage: name: Combine Code Coverage @@ -2220,6 +2261,15 @@ jobs: run: | python3 -m pip install 'nox==2022.8.7' + - name: Install Codecov CLI + run: | + python3 -m pip install codecov-cli + + - name: Tell Codecov To Process Reports + run: | + codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + send-notifications --git-service github --sha ${{ github.sha }} + - name: Get coverage reports id: get-coverage-reports uses: actions/download-artifact@v3 diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index e68541a55f0..0d39ffb3d8a 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -277,6 +277,23 @@ jobs: with: name: testrun-changed-files.txt path: testrun-changed-files.txt + + - name: Install Codecov CLI + if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} + run: | + python3 -m pip install codecov-cli + + - name: Save Commit Metadata In Codecov + if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} + run: | + codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + create-commit --git-service github --sha ${{ github.sha }} + + - name: Create Codecov Coverage Report + if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} + run: | + codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + create-report --git-service github --sha ${{ github.sha }} pre-commit: name: Pre-Commit if: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} @@ -1706,6 +1723,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true + secrets: inherit windows-2019: name: Windows 2019 @@ -1726,6 +1744,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true + secrets: inherit windows-2022: name: Windows 2022 @@ -1746,6 +1765,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true + secrets: inherit macos-12: name: macOS 12 @@ -1766,6 +1786,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true + secrets: inherit almalinux-8: name: Alma Linux 8 @@ -1786,6 +1807,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true + secrets: inherit almalinux-9: name: Alma Linux 9 @@ -1806,6 +1828,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true + secrets: inherit amazonlinux-2: name: Amazon Linux 2 @@ -1826,6 +1849,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true + secrets: inherit archlinux-lts: name: Arch Linux LTS @@ -1846,6 +1870,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true + secrets: inherit centos-7: name: CentOS 7 @@ -1866,6 +1891,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true + secrets: inherit centosstream-8: name: CentOS Stream 8 @@ -1886,6 +1912,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true + secrets: inherit centosstream-9: name: CentOS Stream 9 @@ -1906,6 +1933,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true + secrets: inherit debian-10: name: Debian 10 @@ -1926,6 +1954,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true + secrets: inherit debian-11: name: Debian 11 @@ -1946,6 +1975,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true + secrets: inherit debian-11-arm64: name: Debian 11 Arm64 @@ -1966,6 +1996,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true + secrets: inherit fedora-37: name: Fedora 37 @@ -1986,6 +2017,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true + secrets: inherit fedora-38: name: Fedora 38 @@ -2006,6 +2038,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true + secrets: inherit opensuse-15: name: Opensuse 15 @@ -2026,6 +2059,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true + secrets: inherit photonos-3: name: Photon OS 3 @@ -2046,6 +2080,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true + secrets: inherit photonos-4: name: Photon OS 4 @@ -2066,6 +2101,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true + secrets: inherit photonos-4-arm64: name: Photon OS 4 Arm64 @@ -2086,6 +2122,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true + secrets: inherit ubuntu-2004: name: Ubuntu 20.04 @@ -2106,6 +2143,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true + secrets: inherit ubuntu-2004-arm64: name: Ubuntu 20.04 Arm64 @@ -2126,6 +2164,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true + secrets: inherit ubuntu-2204: name: Ubuntu 22.04 @@ -2146,6 +2185,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true + secrets: inherit ubuntu-2204-arm64: name: Ubuntu 22.04 Arm64 @@ -2166,6 +2206,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true + secrets: inherit build-src-repo: name: Build Source Repository diff --git a/.github/workflows/templates/ci.yml.jinja b/.github/workflows/templates/ci.yml.jinja index f09b92f64de..c8f9892385a 100644 --- a/.github/workflows/templates/ci.yml.jinja +++ b/.github/workflows/templates/ci.yml.jinja @@ -347,6 +347,15 @@ run: | python3 -m pip install 'nox==<{ nox_version }>' + - name: Install Codecov CLI + run: | + python3 -m pip install codecov-cli + + - name: Tell Codecov To Process Reports + run: | + codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + send-notifications --git-service github --sha ${{ github.sha }} + - name: Get coverage reports id: get-coverage-reports uses: actions/download-artifact@v3 diff --git a/.github/workflows/templates/layout.yml.jinja b/.github/workflows/templates/layout.yml.jinja index be681625f53..80c056b8fa7 100644 --- a/.github/workflows/templates/layout.yml.jinja +++ b/.github/workflows/templates/layout.yml.jinja @@ -302,6 +302,24 @@ jobs: with: name: testrun-changed-files.txt path: testrun-changed-files.txt + + - name: Install Codecov CLI + if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} + run: | + python3 -m pip install codecov-cli + + - name: Save Commit Metadata In Codecov + if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} + run: | + codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + create-commit --git-service github --sha ${{ github.sha }} + + - name: Create Codecov Coverage Report + if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} + run: | + codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + create-report --git-service github --sha ${{ github.sha }} + <%- endblock prepare_workflow_job %> <%- endif %> diff --git a/.github/workflows/templates/test-salt.yml.jinja b/.github/workflows/templates/test-salt.yml.jinja index 688d9df5263..4ea79858ac2 100644 --- a/.github/workflows/templates/test-salt.yml.jinja +++ b/.github/workflows/templates/test-salt.yml.jinja @@ -23,6 +23,7 @@ cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }> skip-code-coverage: <{ skip_test_coverage_check }> skip-junit-reports: <{ skip_junit_reports_check }> + secrets: inherit <%- endfor %> @@ -48,6 +49,7 @@ cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }> skip-code-coverage: <{ skip_test_coverage_check }> skip-junit-reports: <{ skip_junit_reports_check }> + secrets: inherit <%- endfor %> @@ -92,5 +94,6 @@ cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }> skip-code-coverage: <{ skip_test_coverage_check }> skip-junit-reports: <{ skip_junit_reports_check }> + secrets: inherit <%- endfor %> diff --git a/.github/workflows/test-action-macos.yml b/.github/workflows/test-action-macos.yml index 35699265067..5720c661f7a 100644 --- a/.github/workflows/test-action-macos.yml +++ b/.github/workflows/test-action-macos.yml @@ -314,6 +314,34 @@ jobs: run: | nox -e combine-coverage + - name: Create XML Coverage Reports + if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' + run: | + nox -e create-xml-coverage-reports + + - name: Install Codecov CLI + if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' + run: | + python3 -m pip install codecov-cli + + - name: Upload Source Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' + run: | + codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + do-upload --git-service github --sha ${{ github.sha }} \ + --file artifacts/coverage/salt.xml \ + --flag salt --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ + --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} + + - name: Upload Tests Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' + run: | + codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + do-upload --git-service github --sha ${{ github.sha }} \ + --file artifacts/coverage/tests.xml \ + --flag tests --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ + --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} + - name: Prepare Test Run Artifacts id: download-artifacts-from-vm if: always() && job.status != 'cancelled' diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index 53724030e46..5cb4a75531c 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -275,6 +275,29 @@ jobs: run: | tools --timestamps vm destroy --no-wait ${{ inputs.distro-slug }} || true + - name: Install Codecov CLI + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + python3 -m pip install codecov-cli + + - name: Upload Source Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + do-upload --git-service github --sha ${{ github.sha }} \ + --file artifacts/coverage/salt.xml \ + --flag salt --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ + --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} + + - name: Upload Tests Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + do-upload --git-service github --sha ${{ github.sha }} \ + --file artifacts/coverage/tests.xml \ + --flag tests --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ + --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} + - name: Upload Code Coverage Test Run Artifacts if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' uses: actions/upload-artifact@v3 diff --git a/.github/workflows/test-package-downloads-action-linux.yml b/.github/workflows/test-package-downloads-action-linux.yml index 5bc62f53165..5c8f246539e 100644 --- a/.github/workflows/test-package-downloads-action-linux.yml +++ b/.github/workflows/test-package-downloads-action-linux.yml @@ -197,6 +197,29 @@ jobs: run: | sudo chown -R "$(id -un)" . + - name: Install Codecov CLI + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + python3 -m pip install codecov-cli + + - name: Upload Source Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + do-upload --git-service github --sha ${{ github.sha }} \ + --file artifacts/coverage/salt.xml \ + --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ + --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + + - name: Upload Tests Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + do-upload --git-service github --sha ${{ github.sha }} \ + --file artifacts/coverage/tests.xml \ + --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ + --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + - name: Upload Test Run Artifacts if: always() && steps.download-artifacts-from-vm.outcome == 'success' uses: actions/upload-artifact@v3 diff --git a/.github/workflows/test-package-downloads-action-macos.yml b/.github/workflows/test-package-downloads-action-macos.yml index cab0016181c..0e8cd225f7d 100644 --- a/.github/workflows/test-package-downloads-action-macos.yml +++ b/.github/workflows/test-package-downloads-action-macos.yml @@ -180,6 +180,29 @@ jobs: rm -rf artifacts/salt* tree -a artifacts + - name: Install Codecov CLI + if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' + run: | + python3 -m pip install codecov-cli + + - name: Upload Source Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' + run: | + codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + do-upload --git-service github --sha ${{ github.sha }} \ + --file artifacts/coverage/salt.xml \ + --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ + --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + + - name: Upload Tests Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' + run: | + codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + do-upload --git-service github --sha ${{ github.sha }} \ + --file artifacts/coverage/tests.xml \ + --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ + --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + - name: Upload Test Run Artifacts if: always() && job.status != 'cancelled' uses: actions/upload-artifact@v3 diff --git a/.github/workflows/test-package-downloads-action-windows.yml b/.github/workflows/test-package-downloads-action-windows.yml index fe628957ca4..4447ef505e6 100644 --- a/.github/workflows/test-package-downloads-action-windows.yml +++ b/.github/workflows/test-package-downloads-action-windows.yml @@ -196,6 +196,29 @@ jobs: run: | sudo chown -R "$(id -un)" . + - name: Install Codecov CLI + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + python3 -m pip install codecov-cli + + - name: Upload Source Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + do-upload --git-service github --sha ${{ github.sha }} \ + --file artifacts/coverage/salt.xml \ + --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ + --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + + - name: Upload Tests Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + do-upload --git-service github --sha ${{ github.sha }} \ + --file artifacts/coverage/tests.xml \ + --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ + --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + - name: Upload Test Run Artifacts if: always() && steps.download-artifacts-from-vm.outcome == 'success' uses: actions/upload-artifact@v3 From ccf40465ff6d84ceef53a569c692f99d0a7d45b3 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 17 Sep 2023 15:50:25 +0100 Subject: [PATCH 072/147] Tokenless coverage uploads are not supported by the codecov-cli tool Signed-off-by: Pedro Algarvio --- .codecov.yml | 8 ++-- .github/workflows/ci.yml | 46 ------------------- .github/workflows/nightly.yml | 46 ------------------- .github/workflows/scheduled.yml | 46 ------------------- .github/workflows/staging.yml | 39 ---------------- .github/workflows/templates/ci.yml.jinja | 4 ++ .github/workflows/templates/layout.yml.jinja | 4 ++ .../workflows/templates/test-salt.yml.jinja | 3 -- .github/workflows/test-action-macos.yml | 35 ++++++++++---- .github/workflows/test-action.yml | 35 ++++++++++---- .../test-package-downloads-action-linux.yml | 35 ++++++++++---- .../test-package-downloads-action-macos.yml | 35 ++++++++++---- .../test-package-downloads-action-windows.yml | 35 ++++++++++---- 13 files changed, 142 insertions(+), 229 deletions(-) diff --git a/.codecov.yml b/.codecov.yml index 0f57a7a304f..a7a94a5363f 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -9,7 +9,7 @@ codecov: notify: wait_for_ci: false # Should Codecov wait for all CI statuses to complete before sending ours. # Note: Codecov considers all non-codecov statuses to be CI statuses - manual_trigger: true # We manually tell codecov to merge and process all uploaded coverage reports +# manual_trigger: true # We manually tell codecov to merge and process all uploaded coverage reports ignore: @@ -86,9 +86,9 @@ flags: - tests/pytests/integration carryforward: true -comment: - layout: "header, diff, flags, files" - behavior: default # Comment posting behaviour +comment: off +# layout: "header, diff, flags, files" +# behavior: default # Comment posting behaviour # default: update, if exists. Otherwise post new. # once: update, if exists. Otherwise post new. Skip if deleted. # new: delete old and post new. diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f00c133fa11..8ec7ce96d5e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -239,22 +239,7 @@ jobs: name: testrun-changed-files.txt path: testrun-changed-files.txt - - name: Install Codecov CLI - if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} - run: | - python3 -m pip install codecov-cli - - name: Save Commit Metadata In Codecov - if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} - run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - create-commit --git-service github --sha ${{ github.sha }} - - - name: Create Codecov Coverage Report - if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} - run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - create-report --git-service github --sha ${{ github.sha }} pre-commit: name: Pre-Commit if: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} @@ -1667,7 +1652,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit windows-2019: name: Windows 2019 @@ -1688,7 +1672,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit windows-2022: name: Windows 2022 @@ -1709,7 +1692,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit macos-12: name: macOS 12 @@ -1730,7 +1712,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit almalinux-8: name: Alma Linux 8 @@ -1751,7 +1732,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit almalinux-9: name: Alma Linux 9 @@ -1772,7 +1752,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit amazonlinux-2: name: Amazon Linux 2 @@ -1793,7 +1772,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit archlinux-lts: name: Arch Linux LTS @@ -1814,7 +1792,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit centos-7: name: CentOS 7 @@ -1835,7 +1812,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit centosstream-8: name: CentOS Stream 8 @@ -1856,7 +1832,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit centosstream-9: name: CentOS Stream 9 @@ -1877,7 +1852,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit debian-10: name: Debian 10 @@ -1898,7 +1872,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit debian-11: name: Debian 11 @@ -1919,7 +1892,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit debian-11-arm64: name: Debian 11 Arm64 @@ -1940,7 +1912,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit fedora-37: name: Fedora 37 @@ -1961,7 +1932,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit fedora-38: name: Fedora 38 @@ -1982,7 +1952,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit opensuse-15: name: Opensuse 15 @@ -2003,7 +1972,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit photonos-3: name: Photon OS 3 @@ -2024,7 +1992,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit photonos-4: name: Photon OS 4 @@ -2045,7 +2012,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit photonos-4-arm64: name: Photon OS 4 Arm64 @@ -2066,7 +2032,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit ubuntu-2004: name: Ubuntu 20.04 @@ -2087,7 +2052,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit ubuntu-2004-arm64: name: Ubuntu 20.04 Arm64 @@ -2108,7 +2072,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit ubuntu-2204: name: Ubuntu 22.04 @@ -2129,7 +2092,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit ubuntu-2204-arm64: name: Ubuntu 22.04 Arm64 @@ -2150,7 +2112,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit combine-all-code-coverage: name: Combine Code Coverage @@ -2227,14 +2188,7 @@ jobs: run: | python3 -m pip install 'nox==2022.8.7' - - name: Install Codecov CLI - run: | - python3 -m pip install codecov-cli - - name: Tell Codecov To Process Reports - run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - send-notifications --git-service github --sha ${{ github.sha }} - name: Get coverage reports id: get-coverage-reports diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 7e96d50cdc1..ebd0e46c3ec 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -283,22 +283,7 @@ jobs: name: testrun-changed-files.txt path: testrun-changed-files.txt - - name: Install Codecov CLI - if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} - run: | - python3 -m pip install codecov-cli - - name: Save Commit Metadata In Codecov - if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} - run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - create-commit --git-service github --sha ${{ github.sha }} - - - name: Create Codecov Coverage Report - if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} - run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - create-report --git-service github --sha ${{ github.sha }} pre-commit: name: Pre-Commit if: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} @@ -1728,7 +1713,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit windows-2019: name: Windows 2019 @@ -1749,7 +1733,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit windows-2022: name: Windows 2022 @@ -1770,7 +1753,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit macos-12: name: macOS 12 @@ -1791,7 +1773,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit almalinux-8: name: Alma Linux 8 @@ -1812,7 +1793,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit almalinux-9: name: Alma Linux 9 @@ -1833,7 +1813,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit amazonlinux-2: name: Amazon Linux 2 @@ -1854,7 +1833,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit archlinux-lts: name: Arch Linux LTS @@ -1875,7 +1853,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit centos-7: name: CentOS 7 @@ -1896,7 +1873,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit centosstream-8: name: CentOS Stream 8 @@ -1917,7 +1893,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit centosstream-9: name: CentOS Stream 9 @@ -1938,7 +1913,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit debian-10: name: Debian 10 @@ -1959,7 +1933,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit debian-11: name: Debian 11 @@ -1980,7 +1953,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit debian-11-arm64: name: Debian 11 Arm64 @@ -2001,7 +1973,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit fedora-37: name: Fedora 37 @@ -2022,7 +1993,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit fedora-38: name: Fedora 38 @@ -2043,7 +2013,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit opensuse-15: name: Opensuse 15 @@ -2064,7 +2033,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit photonos-3: name: Photon OS 3 @@ -2085,7 +2053,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit photonos-4: name: Photon OS 4 @@ -2106,7 +2073,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit photonos-4-arm64: name: Photon OS 4 Arm64 @@ -2127,7 +2093,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit ubuntu-2004: name: Ubuntu 20.04 @@ -2148,7 +2113,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit ubuntu-2004-arm64: name: Ubuntu 20.04 Arm64 @@ -2169,7 +2133,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit ubuntu-2204: name: Ubuntu 22.04 @@ -2190,7 +2153,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit ubuntu-2204-arm64: name: Ubuntu 22.04 Arm64 @@ -2211,7 +2173,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit combine-all-code-coverage: name: Combine Code Coverage @@ -2288,14 +2249,7 @@ jobs: run: | python3 -m pip install 'nox==2022.8.7' - - name: Install Codecov CLI - run: | - python3 -m pip install codecov-cli - - name: Tell Codecov To Process Reports - run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - send-notifications --git-service github --sha ${{ github.sha }} - name: Get coverage reports id: get-coverage-reports diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 3153fa677f1..7d4eb15b89c 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -273,22 +273,7 @@ jobs: name: testrun-changed-files.txt path: testrun-changed-files.txt - - name: Install Codecov CLI - if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} - run: | - python3 -m pip install codecov-cli - - name: Save Commit Metadata In Codecov - if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} - run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - create-commit --git-service github --sha ${{ github.sha }} - - - name: Create Codecov Coverage Report - if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} - run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - create-report --git-service github --sha ${{ github.sha }} pre-commit: name: Pre-Commit if: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} @@ -1701,7 +1686,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit windows-2019: name: Windows 2019 @@ -1722,7 +1706,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit windows-2022: name: Windows 2022 @@ -1743,7 +1726,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit macos-12: name: macOS 12 @@ -1764,7 +1746,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit almalinux-8: name: Alma Linux 8 @@ -1785,7 +1766,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit almalinux-9: name: Alma Linux 9 @@ -1806,7 +1786,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit amazonlinux-2: name: Amazon Linux 2 @@ -1827,7 +1806,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit archlinux-lts: name: Arch Linux LTS @@ -1848,7 +1826,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit centos-7: name: CentOS 7 @@ -1869,7 +1846,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit centosstream-8: name: CentOS Stream 8 @@ -1890,7 +1866,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit centosstream-9: name: CentOS Stream 9 @@ -1911,7 +1886,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit debian-10: name: Debian 10 @@ -1932,7 +1906,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit debian-11: name: Debian 11 @@ -1953,7 +1926,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit debian-11-arm64: name: Debian 11 Arm64 @@ -1974,7 +1946,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit fedora-37: name: Fedora 37 @@ -1995,7 +1966,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit fedora-38: name: Fedora 38 @@ -2016,7 +1986,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit opensuse-15: name: Opensuse 15 @@ -2037,7 +2006,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit photonos-3: name: Photon OS 3 @@ -2058,7 +2026,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit photonos-4: name: Photon OS 4 @@ -2079,7 +2046,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit photonos-4-arm64: name: Photon OS 4 Arm64 @@ -2100,7 +2066,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit ubuntu-2004: name: Ubuntu 20.04 @@ -2121,7 +2086,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit ubuntu-2004-arm64: name: Ubuntu 20.04 Arm64 @@ -2142,7 +2106,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit ubuntu-2204: name: Ubuntu 22.04 @@ -2163,7 +2126,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit ubuntu-2204-arm64: name: Ubuntu 22.04 Arm64 @@ -2184,7 +2146,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit combine-all-code-coverage: name: Combine Code Coverage @@ -2261,14 +2222,7 @@ jobs: run: | python3 -m pip install 'nox==2022.8.7' - - name: Install Codecov CLI - run: | - python3 -m pip install codecov-cli - - name: Tell Codecov To Process Reports - run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - send-notifications --git-service github --sha ${{ github.sha }} - name: Get coverage reports id: get-coverage-reports diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 0d39ffb3d8a..812a0e138ac 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -278,22 +278,7 @@ jobs: name: testrun-changed-files.txt path: testrun-changed-files.txt - - name: Install Codecov CLI - if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} - run: | - python3 -m pip install codecov-cli - - name: Save Commit Metadata In Codecov - if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} - run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - create-commit --git-service github --sha ${{ github.sha }} - - - name: Create Codecov Coverage Report - if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} - run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - create-report --git-service github --sha ${{ github.sha }} pre-commit: name: Pre-Commit if: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} @@ -1723,7 +1708,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit windows-2019: name: Windows 2019 @@ -1744,7 +1728,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit windows-2022: name: Windows 2022 @@ -1765,7 +1748,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit macos-12: name: macOS 12 @@ -1786,7 +1768,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit almalinux-8: name: Alma Linux 8 @@ -1807,7 +1788,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit almalinux-9: name: Alma Linux 9 @@ -1828,7 +1808,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit amazonlinux-2: name: Amazon Linux 2 @@ -1849,7 +1828,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit archlinux-lts: name: Arch Linux LTS @@ -1870,7 +1848,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit centos-7: name: CentOS 7 @@ -1891,7 +1868,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit centosstream-8: name: CentOS Stream 8 @@ -1912,7 +1888,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit centosstream-9: name: CentOS Stream 9 @@ -1933,7 +1908,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit debian-10: name: Debian 10 @@ -1954,7 +1928,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit debian-11: name: Debian 11 @@ -1975,7 +1948,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit debian-11-arm64: name: Debian 11 Arm64 @@ -1996,7 +1968,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit fedora-37: name: Fedora 37 @@ -2017,7 +1988,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit fedora-38: name: Fedora 38 @@ -2038,7 +2008,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit opensuse-15: name: Opensuse 15 @@ -2059,7 +2028,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit photonos-3: name: Photon OS 3 @@ -2080,7 +2048,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit photonos-4: name: Photon OS 4 @@ -2101,7 +2068,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit photonos-4-arm64: name: Photon OS 4 Arm64 @@ -2122,7 +2088,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit ubuntu-2004: name: Ubuntu 20.04 @@ -2143,7 +2108,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit ubuntu-2004-arm64: name: Ubuntu 20.04 Arm64 @@ -2164,7 +2128,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit ubuntu-2204: name: Ubuntu 22.04 @@ -2185,7 +2148,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit ubuntu-2204-arm64: name: Ubuntu 22.04 Arm64 @@ -2206,7 +2168,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit build-src-repo: name: Build Source Repository diff --git a/.github/workflows/templates/ci.yml.jinja b/.github/workflows/templates/ci.yml.jinja index c8f9892385a..1fdb3d1ddf8 100644 --- a/.github/workflows/templates/ci.yml.jinja +++ b/.github/workflows/templates/ci.yml.jinja @@ -347,6 +347,8 @@ run: | python3 -m pip install 'nox==<{ nox_version }>' +{# We can't yet use tokenless uploads with the codecov CLI + - name: Install Codecov CLI run: | python3 -m pip install codecov-cli @@ -356,6 +358,8 @@ codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ send-notifications --git-service github --sha ${{ github.sha }} +#} + - name: Get coverage reports id: get-coverage-reports uses: actions/download-artifact@v3 diff --git a/.github/workflows/templates/layout.yml.jinja b/.github/workflows/templates/layout.yml.jinja index 80c056b8fa7..bf98f9c2277 100644 --- a/.github/workflows/templates/layout.yml.jinja +++ b/.github/workflows/templates/layout.yml.jinja @@ -303,6 +303,8 @@ jobs: name: testrun-changed-files.txt path: testrun-changed-files.txt +{# We can't yet use tokenless uploads with the codecov CLI + - name: Install Codecov CLI if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} run: | @@ -320,6 +322,8 @@ jobs: codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ create-report --git-service github --sha ${{ github.sha }} +#} + <%- endblock prepare_workflow_job %> <%- endif %> diff --git a/.github/workflows/templates/test-salt.yml.jinja b/.github/workflows/templates/test-salt.yml.jinja index 4ea79858ac2..688d9df5263 100644 --- a/.github/workflows/templates/test-salt.yml.jinja +++ b/.github/workflows/templates/test-salt.yml.jinja @@ -23,7 +23,6 @@ cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }> skip-code-coverage: <{ skip_test_coverage_check }> skip-junit-reports: <{ skip_junit_reports_check }> - secrets: inherit <%- endfor %> @@ -49,7 +48,6 @@ cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }> skip-code-coverage: <{ skip_test_coverage_check }> skip-junit-reports: <{ skip_junit_reports_check }> - secrets: inherit <%- endfor %> @@ -94,6 +92,5 @@ cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }> skip-code-coverage: <{ skip_test_coverage_check }> skip-junit-reports: <{ skip_junit_reports_check }> - secrets: inherit <%- endfor %> diff --git a/.github/workflows/test-action-macos.yml b/.github/workflows/test-action-macos.yml index 5720c661f7a..a5993444dcf 100644 --- a/.github/workflows/test-action-macos.yml +++ b/.github/workflows/test-action-macos.yml @@ -322,24 +322,41 @@ jobs: - name: Install Codecov CLI if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' run: | - python3 -m pip install codecov-cli + # We can't yet use tokenless uploads with the codecov CLI + # python3 -m pip install codecov-cli + # + curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import + curl -Os https://uploader.codecov.io/latest/macos/codecov + curl -Os https://uploader.codecov.io/latest/macos/codecov.SHA256SUM + curl -Os https://uploader.codecov.io/latest/macos/codecov.SHA256SUM.sig + gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM + shasum -a 256 -c codecov.SHA256SUM + chmod +x codecov - name: Upload Source Code Coverage To Codecov if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - do-upload --git-service github --sha ${{ github.sha }} \ - --file artifacts/coverage/salt.xml \ - --flag salt --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/salt.xml \ + # --flag salt --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ + # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} + ./codecov --file artifacts/coverage/salt.xml \ + --flags salt,${{ inputs.distro-slug }},${{ matrix.tests-chunk }} \ --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} - name: Upload Tests Code Coverage To Codecov if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - do-upload --git-service github --sha ${{ github.sha }} \ - --file artifacts/coverage/tests.xml \ - --flag tests --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/tests.xml \ + # --flag tests --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ + # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} + ./codecov --file artifacts/coverage/tests.xml \ + --flags tests,${{ inputs.distro-slug }},${{ matrix.tests-chunk }} \ --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} - name: Prepare Test Run Artifacts diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index 5cb4a75531c..59b340022a2 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -278,24 +278,41 @@ jobs: - name: Install Codecov CLI if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' run: | - python3 -m pip install codecov-cli + # We can't yet use tokenless uploads with the codecov CLI + # python3 -m pip install codecov-cli + # + curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import + curl -Os https://uploader.codecov.io/latest/linux/codecov + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig + gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM + shasum -a 256 -c codecov.SHA256SUM + chmod +x codecov - name: Upload Source Code Coverage To Codecov if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - do-upload --git-service github --sha ${{ github.sha }} \ - --file artifacts/coverage/salt.xml \ - --flag salt --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/salt.xml \ + # --flag salt --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ + # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} + ./codecov --file artifacts/coverage/salt.xml \ + --flags salt,${{ inputs.distro-slug }},${{ matrix.tests-chunk }} \ --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} - name: Upload Tests Code Coverage To Codecov if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - do-upload --git-service github --sha ${{ github.sha }} \ - --file artifacts/coverage/tests.xml \ - --flag tests --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/tests.xml \ + # --flag tests --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ + # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} + ./codecov --file artifacts/coverage/tests.xml \ + --flags tests,${{ inputs.distro-slug }},${{ matrix.tests-chunk }} \ --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} - name: Upload Code Coverage Test Run Artifacts diff --git a/.github/workflows/test-package-downloads-action-linux.yml b/.github/workflows/test-package-downloads-action-linux.yml index 5c8f246539e..651c4eb36bd 100644 --- a/.github/workflows/test-package-downloads-action-linux.yml +++ b/.github/workflows/test-package-downloads-action-linux.yml @@ -200,24 +200,41 @@ jobs: - name: Install Codecov CLI if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' run: | - python3 -m pip install codecov-cli + # We can't yet use tokenless uploads with the codecov CLI + # python3 -m pip install codecov-cli + # + curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import + curl -Os https://uploader.codecov.io/latest/linux/codecov + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig + gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM + shasum -a 256 -c codecov.SHA256SUM + chmod +x codecov - name: Upload Source Code Coverage To Codecov if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - do-upload --git-service github --sha ${{ github.sha }} \ - --file artifacts/coverage/salt.xml \ - --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/salt.xml \ + # --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ + # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + ./codecov --file artifacts/coverage/salt.xml \ + --flags salt,${{ inputs.distro-slug }},pkg \ --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - name: Upload Tests Code Coverage To Codecov if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - do-upload --git-service github --sha ${{ github.sha }} \ - --file artifacts/coverage/tests.xml \ - --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/tests.xml \ + # --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ + # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + ./codecov --file artifacts/coverage/tests.xml \ + --flags tests,${{ inputs.distro-slug }},pkg \ --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - name: Upload Test Run Artifacts diff --git a/.github/workflows/test-package-downloads-action-macos.yml b/.github/workflows/test-package-downloads-action-macos.yml index 0e8cd225f7d..54683f4a35f 100644 --- a/.github/workflows/test-package-downloads-action-macos.yml +++ b/.github/workflows/test-package-downloads-action-macos.yml @@ -183,24 +183,41 @@ jobs: - name: Install Codecov CLI if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' run: | - python3 -m pip install codecov-cli + # We can't yet use tokenless uploads with the codecov CLI + # python3 -m pip install codecov-cli + # + curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import + curl -Os https://uploader.codecov.io/latest/macos/codecov + curl -Os https://uploader.codecov.io/latest/macos/codecov.SHA256SUM + curl -Os https://uploader.codecov.io/latest/macos/codecov.SHA256SUM.sig + gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM + shasum -a 256 -c codecov.SHA256SUM + chmod +x codecov - name: Upload Source Code Coverage To Codecov if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - do-upload --git-service github --sha ${{ github.sha }} \ - --file artifacts/coverage/salt.xml \ - --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/salt.xml \ + # --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ + # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + ./codecov --file artifacts/coverage/salt.xml \ + --flags salt,${{ inputs.distro-slug }},pkg \ --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - name: Upload Tests Code Coverage To Codecov if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - do-upload --git-service github --sha ${{ github.sha }} \ - --file artifacts/coverage/tests.xml \ - --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/tests.xml \ + # --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ + # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + ./codecov --file artifacts/coverage/tests.xml \ + --flags tests,${{ inputs.distro-slug }},pkg \ --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - name: Upload Test Run Artifacts diff --git a/.github/workflows/test-package-downloads-action-windows.yml b/.github/workflows/test-package-downloads-action-windows.yml index 4447ef505e6..41763ec44af 100644 --- a/.github/workflows/test-package-downloads-action-windows.yml +++ b/.github/workflows/test-package-downloads-action-windows.yml @@ -199,24 +199,41 @@ jobs: - name: Install Codecov CLI if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' run: | - python3 -m pip install codecov-cli + # We can't yet use tokenless uploads with the codecov CLI + # python3 -m pip install codecov-cli + # + curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import + curl -Os https://uploader.codecov.io/latest/linux/codecov + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig + gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM + shasum -a 256 -c codecov.SHA256SUM + chmod +x codecov - name: Upload Source Code Coverage To Codecov if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - do-upload --git-service github --sha ${{ github.sha }} \ - --file artifacts/coverage/salt.xml \ - --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/salt.xml \ + # --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ + # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + ./codecov --file artifacts/coverage/salt.xml \ + --flags salt,${{ inputs.distro-slug }},pkg \ --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - name: Upload Tests Code Coverage To Codecov if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - do-upload --git-service github --sha ${{ github.sha }} \ - --file artifacts/coverage/tests.xml \ - --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/tests.xml \ + # --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ + # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + ./codecov --file artifacts/coverage/tests.xml \ + --flags tests,${{ inputs.distro-slug }},pkg \ --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - name: Upload Test Run Artifacts From 688e5ac1b9b03f5eb077d2d970501f1bcee46f3e Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 17 Sep 2023 21:59:23 +0100 Subject: [PATCH 073/147] Re-enable codecov comments Signed-off-by: Pedro Algarvio --- .codecov.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.codecov.yml b/.codecov.yml index a7a94a5363f..1952de97f5b 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -4,10 +4,10 @@ codecov: max_report_age: 24 # The age you want coverage reports to expire at, or if you # want to disable this check. Expired reports will not be processed by codecov. - require_ci_to_pass: yes # Less spammy. Only notify on passing builds. + require_ci_to_pass: false notify: - wait_for_ci: false # Should Codecov wait for all CI statuses to complete before sending ours. + wait_for_ci: true # Should Codecov wait for all CI statuses to complete before sending ours. # Note: Codecov considers all non-codecov statuses to be CI statuses # manual_trigger: true # We manually tell codecov to merge and process all uploaded coverage reports @@ -86,9 +86,9 @@ flags: - tests/pytests/integration carryforward: true -comment: off -# layout: "header, diff, flags, files" -# behavior: default # Comment posting behaviour +comment: + layout: "reach, diff, flags, files" + behavior: default # Comment posting behaviour # default: update, if exists. Otherwise post new. # once: update, if exists. Otherwise post new. Skip if deleted. # new: delete old and post new. From d1e22b8647a2141cb6e40ef948fba9cb6ba6cb44 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 18 Sep 2023 16:48:03 +0100 Subject: [PATCH 074/147] Pass the commit SHA explicitly Signed-off-by: Pedro Algarvio --- .github/workflows/test-action-macos.yml | 2 ++ .github/workflows/test-action.yml | 2 ++ .github/workflows/test-package-downloads-action-linux.yml | 2 ++ .github/workflows/test-package-downloads-action-macos.yml | 2 ++ .github/workflows/test-package-downloads-action-windows.yml | 2 ++ 5 files changed, 10 insertions(+) diff --git a/.github/workflows/test-action-macos.yml b/.github/workflows/test-action-macos.yml index a5993444dcf..69d8c3d6e5f 100644 --- a/.github/workflows/test-action-macos.yml +++ b/.github/workflows/test-action-macos.yml @@ -343,6 +343,7 @@ jobs: # --flag salt --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} ./codecov --file artifacts/coverage/salt.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} \ --flags salt,${{ inputs.distro-slug }},${{ matrix.tests-chunk }} \ --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} @@ -356,6 +357,7 @@ jobs: # --flag tests --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} ./codecov --file artifacts/coverage/tests.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} \ --flags tests,${{ inputs.distro-slug }},${{ matrix.tests-chunk }} \ --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index 59b340022a2..e8d27b967c5 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -299,6 +299,7 @@ jobs: # --flag salt --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} ./codecov --file artifacts/coverage/salt.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} \ --flags salt,${{ inputs.distro-slug }},${{ matrix.tests-chunk }} \ --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} @@ -312,6 +313,7 @@ jobs: # --flag tests --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} ./codecov --file artifacts/coverage/tests.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} \ --flags tests,${{ inputs.distro-slug }},${{ matrix.tests-chunk }} \ --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} diff --git a/.github/workflows/test-package-downloads-action-linux.yml b/.github/workflows/test-package-downloads-action-linux.yml index 651c4eb36bd..91352fd745c 100644 --- a/.github/workflows/test-package-downloads-action-linux.yml +++ b/.github/workflows/test-package-downloads-action-linux.yml @@ -221,6 +221,7 @@ jobs: # --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs ./codecov --file artifacts/coverage/salt.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} \ --flags salt,${{ inputs.distro-slug }},pkg \ --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs @@ -234,6 +235,7 @@ jobs: # --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs ./codecov --file artifacts/coverage/tests.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} \ --flags tests,${{ inputs.distro-slug }},pkg \ --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs diff --git a/.github/workflows/test-package-downloads-action-macos.yml b/.github/workflows/test-package-downloads-action-macos.yml index 54683f4a35f..7c6ec2ad839 100644 --- a/.github/workflows/test-package-downloads-action-macos.yml +++ b/.github/workflows/test-package-downloads-action-macos.yml @@ -204,6 +204,7 @@ jobs: # --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs ./codecov --file artifacts/coverage/salt.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} \ --flags salt,${{ inputs.distro-slug }},pkg \ --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs @@ -217,6 +218,7 @@ jobs: # --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs ./codecov --file artifacts/coverage/tests.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} \ --flags tests,${{ inputs.distro-slug }},pkg \ --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs diff --git a/.github/workflows/test-package-downloads-action-windows.yml b/.github/workflows/test-package-downloads-action-windows.yml index 41763ec44af..f4c4349dfe6 100644 --- a/.github/workflows/test-package-downloads-action-windows.yml +++ b/.github/workflows/test-package-downloads-action-windows.yml @@ -220,6 +220,7 @@ jobs: # --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs ./codecov --file artifacts/coverage/salt.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} \ --flags salt,${{ inputs.distro-slug }},pkg \ --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs @@ -233,6 +234,7 @@ jobs: # --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs ./codecov --file artifacts/coverage/tests.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} \ --flags tests,${{ inputs.distro-slug }},pkg \ --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs From 91594e8f682d6ee10397394453a948eb014d962a Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 18 Sep 2023 16:59:25 +0100 Subject: [PATCH 075/147] Also pass the parent commit explicitly on PRs Signed-off-by: Pedro Algarvio --- .github/workflows/test-action-macos.yml | 4 ++-- .github/workflows/test-action.yml | 4 ++-- .github/workflows/test-package-downloads-action-linux.yml | 4 ++-- .github/workflows/test-package-downloads-action-macos.yml | 4 ++-- .github/workflows/test-package-downloads-action-windows.yml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test-action-macos.yml b/.github/workflows/test-action-macos.yml index 69d8c3d6e5f..9c32a50b9fa 100644 --- a/.github/workflows/test-action-macos.yml +++ b/.github/workflows/test-action-macos.yml @@ -343,7 +343,7 @@ jobs: # --flag salt --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} ./codecov --file artifacts/coverage/salt.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ --flags salt,${{ inputs.distro-slug }},${{ matrix.tests-chunk }} \ --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} @@ -357,7 +357,7 @@ jobs: # --flag tests --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} ./codecov --file artifacts/coverage/tests.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ --flags tests,${{ inputs.distro-slug }},${{ matrix.tests-chunk }} \ --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index e8d27b967c5..82c00dc6a0d 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -299,7 +299,7 @@ jobs: # --flag salt --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} ./codecov --file artifacts/coverage/salt.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ --flags salt,${{ inputs.distro-slug }},${{ matrix.tests-chunk }} \ --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} @@ -313,7 +313,7 @@ jobs: # --flag tests --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} ./codecov --file artifacts/coverage/tests.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ --flags tests,${{ inputs.distro-slug }},${{ matrix.tests-chunk }} \ --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} diff --git a/.github/workflows/test-package-downloads-action-linux.yml b/.github/workflows/test-package-downloads-action-linux.yml index 91352fd745c..91254b036ef 100644 --- a/.github/workflows/test-package-downloads-action-linux.yml +++ b/.github/workflows/test-package-downloads-action-linux.yml @@ -221,7 +221,7 @@ jobs: # --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs ./codecov --file artifacts/coverage/salt.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ --flags salt,${{ inputs.distro-slug }},pkg \ --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs @@ -235,7 +235,7 @@ jobs: # --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs ./codecov --file artifacts/coverage/tests.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ --flags tests,${{ inputs.distro-slug }},pkg \ --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs diff --git a/.github/workflows/test-package-downloads-action-macos.yml b/.github/workflows/test-package-downloads-action-macos.yml index 7c6ec2ad839..2b9a47688cf 100644 --- a/.github/workflows/test-package-downloads-action-macos.yml +++ b/.github/workflows/test-package-downloads-action-macos.yml @@ -204,7 +204,7 @@ jobs: # --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs ./codecov --file artifacts/coverage/salt.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ --flags salt,${{ inputs.distro-slug }},pkg \ --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs @@ -218,7 +218,7 @@ jobs: # --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs ./codecov --file artifacts/coverage/tests.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ --flags tests,${{ inputs.distro-slug }},pkg \ --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs diff --git a/.github/workflows/test-package-downloads-action-windows.yml b/.github/workflows/test-package-downloads-action-windows.yml index f4c4349dfe6..f84c4c3d211 100644 --- a/.github/workflows/test-package-downloads-action-windows.yml +++ b/.github/workflows/test-package-downloads-action-windows.yml @@ -220,7 +220,7 @@ jobs: # --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs ./codecov --file artifacts/coverage/salt.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ --flags salt,${{ inputs.distro-slug }},pkg \ --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs @@ -234,7 +234,7 @@ jobs: # --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs ./codecov --file artifacts/coverage/tests.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ --flags tests,${{ inputs.distro-slug }},pkg \ --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs From f54ef8c4ddc9d7fe6fb97689145e5bad4f6887af Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 19 Sep 2023 11:19:08 +0100 Subject: [PATCH 076/147] Include the transport in the codecov flags Signed-off-by: Pedro Algarvio --- .github/workflows/test-action-macos.yml | 8 ++++---- .github/workflows/test-action.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test-action-macos.yml b/.github/workflows/test-action-macos.yml index 9c32a50b9fa..d1830599228 100644 --- a/.github/workflows/test-action-macos.yml +++ b/.github/workflows/test-action-macos.yml @@ -339,12 +339,12 @@ jobs: # We can't yet use tokenless uploads with the codecov CLI #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/salt.xml \ + # --file artifacts/coverage/salt.xml --flag ${{ matrix.transport }} \ # --flag salt --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} ./codecov --file artifacts/coverage/salt.xml \ --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags salt,${{ inputs.distro-slug }},${{ matrix.tests-chunk }} \ + --flags salt,${{ inputs.distro-slug }},${{ matrix.transport }},${{ matrix.tests-chunk }} \ --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} - name: Upload Tests Code Coverage To Codecov @@ -353,12 +353,12 @@ jobs: # We can't yet use tokenless uploads with the codecov CLI #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/tests.xml \ + # --file artifacts/coverage/tests.xml --flag ${{ matrix.transport }} \ # --flag tests --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} ./codecov --file artifacts/coverage/tests.xml \ --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags tests,${{ inputs.distro-slug }},${{ matrix.tests-chunk }} \ + --flags tests,${{ inputs.distro-slug }},${{ matrix.transport }},${{ matrix.tests-chunk }} \ --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} - name: Prepare Test Run Artifacts diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index 82c00dc6a0d..046a8f5ffc6 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -295,12 +295,12 @@ jobs: # We can't yet use tokenless uploads with the codecov CLI #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/salt.xml \ + # --file artifacts/coverage/salt.xml --flag ${{ matrix.transport }} \ # --flag salt --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} ./codecov --file artifacts/coverage/salt.xml \ --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags salt,${{ inputs.distro-slug }},${{ matrix.tests-chunk }} \ + --flags salt,${{ inputs.distro-slug }},${{ matrix.transport }},${{ matrix.tests-chunk }} \ --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} - name: Upload Tests Code Coverage To Codecov @@ -309,12 +309,12 @@ jobs: # We can't yet use tokenless uploads with the codecov CLI #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/tests.xml \ + # --file artifacts/coverage/tests.xml --flag ${{ matrix.transport }} \ # --flag tests --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} ./codecov --file artifacts/coverage/tests.xml \ --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags tests,${{ inputs.distro-slug }},${{ matrix.tests-chunk }} \ + --flags tests,${{ inputs.distro-slug }},${{ matrix.transport }},${{ matrix.tests-chunk }} \ --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} - name: Upload Code Coverage Test Run Artifacts From 7d767770f6488f47f90706a3841922d0a10a6bd9 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 21 Sep 2023 13:11:06 +0100 Subject: [PATCH 077/147] Fail on problems uploading to codecov. Try a few times. Signed-off-by: Pedro Algarvio --- .github/workflows/test-action-macos.yml | 40 ++++++++++++++--- .github/workflows/test-action.yml | 44 +++++++++++++++---- .../test-package-downloads-action-linux.yml | 44 +++++++++++++++---- .../test-package-downloads-action-macos.yml | 44 +++++++++++++++---- .../test-package-downloads-action-windows.yml | 44 +++++++++++++++---- 5 files changed, 178 insertions(+), 38 deletions(-) diff --git a/.github/workflows/test-action-macos.yml b/.github/workflows/test-action-macos.yml index d1830599228..d65db1e8c7e 100644 --- a/.github/workflows/test-action-macos.yml +++ b/.github/workflows/test-action-macos.yml @@ -342,10 +342,24 @@ jobs: # --file artifacts/coverage/salt.xml --flag ${{ matrix.transport }} \ # --flag salt --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} - ./codecov --file artifacts/coverage/salt.xml \ + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/salt.xml \ --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ --flags salt,${{ inputs.distro-slug }},${{ matrix.transport }},${{ matrix.tests-chunk }} \ - --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} + --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi - name: Upload Tests Code Coverage To Codecov if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' @@ -356,10 +370,24 @@ jobs: # --file artifacts/coverage/tests.xml --flag ${{ matrix.transport }} \ # --flag tests --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} - ./codecov --file artifacts/coverage/tests.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags tests,${{ inputs.distro-slug }},${{ matrix.transport }},${{ matrix.tests-chunk }} \ - --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/tests.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags tests,${{ inputs.distro-slug }},${{ matrix.transport }},${{ matrix.tests-chunk }} \ + --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi - name: Prepare Test Run Artifacts id: download-artifacts-from-vm diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index 046a8f5ffc6..1abe3bb9466 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -298,10 +298,24 @@ jobs: # --file artifacts/coverage/salt.xml --flag ${{ matrix.transport }} \ # --flag salt --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} - ./codecov --file artifacts/coverage/salt.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags salt,${{ inputs.distro-slug }},${{ matrix.transport }},${{ matrix.tests-chunk }} \ - --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/salt.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags salt,${{ inputs.distro-slug }},${{ matrix.transport }},${{ matrix.tests-chunk }} \ + --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi - name: Upload Tests Code Coverage To Codecov if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' @@ -312,10 +326,24 @@ jobs: # --file artifacts/coverage/tests.xml --flag ${{ matrix.transport }} \ # --flag tests --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} - ./codecov --file artifacts/coverage/tests.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags tests,${{ inputs.distro-slug }},${{ matrix.transport }},${{ matrix.tests-chunk }} \ - --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/tests.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags tests,${{ inputs.distro-slug }},${{ matrix.transport }},${{ matrix.tests-chunk }} \ + --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi - name: Upload Code Coverage Test Run Artifacts if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' diff --git a/.github/workflows/test-package-downloads-action-linux.yml b/.github/workflows/test-package-downloads-action-linux.yml index 91254b036ef..499898ca8d2 100644 --- a/.github/workflows/test-package-downloads-action-linux.yml +++ b/.github/workflows/test-package-downloads-action-linux.yml @@ -220,10 +220,24 @@ jobs: # --file artifacts/coverage/salt.xml \ # --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - ./codecov --file artifacts/coverage/salt.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags salt,${{ inputs.distro-slug }},pkg \ - --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/salt.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags salt,${{ inputs.distro-slug }},pkg \ + --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi - name: Upload Tests Code Coverage To Codecov if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' @@ -234,10 +248,24 @@ jobs: # --file artifacts/coverage/tests.xml \ # --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - ./codecov --file artifacts/coverage/tests.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags tests,${{ inputs.distro-slug }},pkg \ - --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/tests.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags tests,${{ inputs.distro-slug }},pkg \ + --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi - name: Upload Test Run Artifacts if: always() && steps.download-artifacts-from-vm.outcome == 'success' diff --git a/.github/workflows/test-package-downloads-action-macos.yml b/.github/workflows/test-package-downloads-action-macos.yml index 2b9a47688cf..812f5f8506e 100644 --- a/.github/workflows/test-package-downloads-action-macos.yml +++ b/.github/workflows/test-package-downloads-action-macos.yml @@ -203,10 +203,24 @@ jobs: # --file artifacts/coverage/salt.xml \ # --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - ./codecov --file artifacts/coverage/salt.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags salt,${{ inputs.distro-slug }},pkg \ - --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/salt.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags salt,${{ inputs.distro-slug }},pkg \ + --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi - name: Upload Tests Code Coverage To Codecov if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' @@ -217,10 +231,24 @@ jobs: # --file artifacts/coverage/tests.xml \ # --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - ./codecov --file artifacts/coverage/tests.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags tests,${{ inputs.distro-slug }},pkg \ - --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/tests.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags tests,${{ inputs.distro-slug }},pkg \ + --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi - name: Upload Test Run Artifacts if: always() && job.status != 'cancelled' diff --git a/.github/workflows/test-package-downloads-action-windows.yml b/.github/workflows/test-package-downloads-action-windows.yml index f84c4c3d211..e90b5fc5c73 100644 --- a/.github/workflows/test-package-downloads-action-windows.yml +++ b/.github/workflows/test-package-downloads-action-windows.yml @@ -219,10 +219,24 @@ jobs: # --file artifacts/coverage/salt.xml \ # --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - ./codecov --file artifacts/coverage/salt.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags salt,${{ inputs.distro-slug }},pkg \ - --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/salt.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags salt,${{ inputs.distro-slug }},pkg \ + --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi - name: Upload Tests Code Coverage To Codecov if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' @@ -233,10 +247,24 @@ jobs: # --file artifacts/coverage/tests.xml \ # --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - ./codecov --file artifacts/coverage/tests.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags tests,${{ inputs.distro-slug }},pkg \ - --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/tests.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags tests,${{ inputs.distro-slug }},pkg \ + --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi - name: Upload Test Run Artifacts if: always() && steps.download-artifacts-from-vm.outcome == 'success' From 6953b8167cfdde35a0dfa8b4c4d007dbad449aaf Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 3 Oct 2023 17:44:30 +0100 Subject: [PATCH 078/147] We need to send less reports to codecov. Signed-off-by: Pedro Algarvio --- .github/workflows/test-action-macos.yml | 150 ++++++++++++------------ .github/workflows/test-action.yml | 145 ++++++++++++----------- 2 files changed, 150 insertions(+), 145 deletions(-) diff --git a/.github/workflows/test-action-macos.yml b/.github/workflows/test-action-macos.yml index d65db1e8c7e..cfa911fbdd1 100644 --- a/.github/workflows/test-action-macos.yml +++ b/.github/workflows/test-action-macos.yml @@ -314,81 +314,6 @@ jobs: run: | nox -e combine-coverage - - name: Create XML Coverage Reports - if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' - run: | - nox -e create-xml-coverage-reports - - - name: Install Codecov CLI - if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' - run: | - # We can't yet use tokenless uploads with the codecov CLI - # python3 -m pip install codecov-cli - # - curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import - curl -Os https://uploader.codecov.io/latest/macos/codecov - curl -Os https://uploader.codecov.io/latest/macos/codecov.SHA256SUM - curl -Os https://uploader.codecov.io/latest/macos/codecov.SHA256SUM.sig - gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM - shasum -a 256 -c codecov.SHA256SUM - chmod +x codecov - - - name: Upload Source Code Coverage To Codecov - if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' - run: | - # We can't yet use tokenless uploads with the codecov CLI - #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/salt.xml --flag ${{ matrix.transport }} \ - # --flag salt --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ - # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} - n=0 - until [ "$n" -ge 5 ] - do - if ./codecov --file artifacts/coverage/salt.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags salt,${{ inputs.distro-slug }},${{ matrix.transport }},${{ matrix.tests-chunk }} \ - --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} --nonZero; then - rc=$? - break - fi - rc=$? - n=$((n+1)) - sleep 15 - done - if [ "$rc" -ne 0 ]; then - echo "Failed to upload codecov stats" - exit 1 - fi - - - name: Upload Tests Code Coverage To Codecov - if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' - run: | - # We can't yet use tokenless uploads with the codecov CLI - #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/tests.xml --flag ${{ matrix.transport }} \ - # --flag tests --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ - # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} - n=0 - until [ "$n" -ge 5 ] - do - if ./codecov --file artifacts/coverage/tests.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags tests,${{ inputs.distro-slug }},${{ matrix.transport }},${{ matrix.tests-chunk }} \ - --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} --nonZero; then - rc=$? - break - fi - rc=$? - n=$((n+1)) - sleep 15 - done - if [ "$rc" -ne 0 ]; then - echo "Failed to upload codecov stats" - exit 1 - fi - - name: Prepare Test Run Artifacts id: download-artifacts-from-vm if: always() && job.status != 'cancelled' @@ -481,6 +406,81 @@ jobs: run: | nox --force-color -e combine-coverage + - name: Create XML Coverage Reports + if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success' && job.status != 'cancelled' + run: | + nox -e create-xml-coverage-reports + + - name: Install Codecov CLI + if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success' && job.status != 'cancelled' + run: | + # We can't yet use tokenless uploads with the codecov CLI + # python3 -m pip install codecov-cli + # + curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import + curl -Os https://uploader.codecov.io/latest/macos/codecov + curl -Os https://uploader.codecov.io/latest/macos/codecov.SHA256SUM + curl -Os https://uploader.codecov.io/latest/macos/codecov.SHA256SUM.sig + gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM + shasum -a 256 -c codecov.SHA256SUM + chmod +x codecov + + - name: Upload Source Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success' && job.status != 'cancelled' + run: | + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/salt.xml \ + # --flag salt --flag ${{ inputs.distro-slug }} \ + # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }} + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/salt.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags salt,${{ inputs.distro-slug }} \ + --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }} --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi + + - name: Upload Tests Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success' && job.status != 'cancelled' + run: | + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/tests.xml \ + # --flag tests --flag ${{ inputs.distro-slug }} \ + # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }} + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/tests.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags tests,${{ inputs.distro-slug }} \ + --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }} --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi + - name: Upload Code Coverage DB if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success' uses: actions/upload-artifact@v3 diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index 1abe3bb9466..48e25f985d1 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -275,76 +275,6 @@ jobs: run: | tools --timestamps vm destroy --no-wait ${{ inputs.distro-slug }} || true - - name: Install Codecov CLI - if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' - run: | - # We can't yet use tokenless uploads with the codecov CLI - # python3 -m pip install codecov-cli - # - curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import - curl -Os https://uploader.codecov.io/latest/linux/codecov - curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM - curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig - gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM - shasum -a 256 -c codecov.SHA256SUM - chmod +x codecov - - - name: Upload Source Code Coverage To Codecov - if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' - run: | - # We can't yet use tokenless uploads with the codecov CLI - #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/salt.xml --flag ${{ matrix.transport }} \ - # --flag salt --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ - # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} - n=0 - until [ "$n" -ge 5 ] - do - if ./codecov --file artifacts/coverage/salt.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags salt,${{ inputs.distro-slug }},${{ matrix.transport }},${{ matrix.tests-chunk }} \ - --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} --nonZero; then - rc=$? - break - fi - rc=$? - n=$((n+1)) - sleep 15 - done - if [ "$rc" -ne 0 ]; then - echo "Failed to upload codecov stats" - exit 1 - fi - - - name: Upload Tests Code Coverage To Codecov - if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' - run: | - # We can't yet use tokenless uploads with the codecov CLI - #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/tests.xml --flag ${{ matrix.transport }} \ - # --flag tests --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ - # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} - n=0 - until [ "$n" -ge 5 ] - do - if ./codecov --file artifacts/coverage/tests.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags tests,${{ inputs.distro-slug }},${{ matrix.transport }},${{ matrix.tests-chunk }} \ - --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} --nonZero; then - rc=$? - break - fi - rc=$? - n=$((n+1)) - sleep 15 - done - if [ "$rc" -ne 0 ]; then - echo "Failed to upload codecov stats" - exit 1 - fi - - name: Upload Code Coverage Test Run Artifacts if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' uses: actions/upload-artifact@v3 @@ -423,6 +353,81 @@ jobs: run: | nox --force-color -e combine-coverage + - name: Create XML Coverage Reports + if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success' && job.status != 'cancelled' + run: | + nox -e create-xml-coverage-reports + + - name: Install Codecov CLI + if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success' && job.status != 'cancelled' + run: | + # We can't yet use tokenless uploads with the codecov CLI + # python3 -m pip install codecov-cli + # + curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import + curl -Os https://uploader.codecov.io/latest/linux/codecov + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig + gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM + shasum -a 256 -c codecov.SHA256SUM + chmod +x codecov + + - name: Upload Source Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success' && job.status != 'cancelled' + run: | + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/salt.xml \ + # --flag salt --flag ${{ inputs.distro-slug }} \ + # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }} + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/salt.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags salt,${{ inputs.distro-slug }} \ + --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }} --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi + + - name: Upload Tests Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success' && job.status != 'cancelled' + run: | + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/tests.xml \ + # --flag tests --flag ${{ inputs.distro-slug }} \ + # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }} + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/tests.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags tests,${{ inputs.distro-slug }} \ + --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }} --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi + - name: Upload Code Coverage DB if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success' uses: actions/upload-artifact@v3 From 66b05b04a2077fbfaaed5503f9fa9446a07e4ea2 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 4 Oct 2023 20:32:19 +0100 Subject: [PATCH 079/147] Minor splits adjustments Signed-off-by: Pedro Algarvio --- tools/ci.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/ci.py b/tools/ci.py index aaca7e90a3c..066c9a13efa 100644 --- a/tools/ci.py +++ b/tools/ci.py @@ -621,10 +621,10 @@ def matrix(ctx: Context, distro_slug: str, full: bool = False): """ _matrix = [] _splits = { - "functional": 4, - "integration": 6, + "functional": 5, + "integration": 7, "scenarios": 2, - "unit": 3, + "unit": 4, } for transport in ("zeromq", "tcp"): if transport == "tcp": From 4ebc2c367039758c356b57cc47dd01683ff6036d Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 5 Oct 2023 08:57:18 +0100 Subject: [PATCH 080/147] Expire reports only after 72 hours Signed-off-by: Pedro Algarvio --- .codecov.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.codecov.yml b/.codecov.yml index 1952de97f5b..2631d8344f5 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -2,7 +2,7 @@ codecov: ci: - github.com - max_report_age: 24 # The age you want coverage reports to expire at, or if you + max_report_age: 72 # The age, in hours, you want coverage reports to expire at, or if you # want to disable this check. Expired reports will not be processed by codecov. require_ci_to_pass: false From 5242d44474a7c93d85711aaed86b0e8dcb392802 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 5 Oct 2023 09:57:50 +0100 Subject: [PATCH 081/147] Reduce code duplication and some code coverage reporting improvements Signed-off-by: Pedro Algarvio --- .../workflows/build-deps-ci-action-macos.yml | 1 + .github/workflows/ci.yml | 28 +- .github/workflows/nightly.yml | 28 +- .github/workflows/scheduled.yml | 28 +- .github/workflows/templates/ci.yml.jinja | 28 +- .github/workflows/test-action-macos.yml | 12 - .github/workflows/test-action.yml | 12 - .../test-package-downloads-action-linux.yml | 4 +- .../test-package-downloads-action-macos.yml | 4 +- .../test-package-downloads-action-windows.yml | 4 +- noxfile.py | 371 ++++++------------ tools/vm.py | 6 +- 12 files changed, 240 insertions(+), 286 deletions(-) diff --git a/.github/workflows/build-deps-ci-action-macos.yml b/.github/workflows/build-deps-ci-action-macos.yml index 1d3f0221628..ded5ad9c794 100644 --- a/.github/workflows/build-deps-ci-action-macos.yml +++ b/.github/workflows/build-deps-ci-action-macos.yml @@ -48,6 +48,7 @@ env: COLUMNS: 190 PIP_INDEX_URL: "https://pypi-proxy.saltstack.net/root/local/+simple/" PIP_EXTRA_INDEX_URL: "https://pypi.org/simple" + GITHUB_ACTIONS_PIPELINE: "1" jobs: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8ec7ce96d5e..a9aa04b9e87 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2204,6 +2204,14 @@ jobs: run: | nox --force-color -e combine-coverage + - name: Report Salt Code Coverage + run: | + nox --force-color -e coverage-report -- salt + + - name: Create Salt Code Coverage HTML Report + run: | + nox --force-color -e create-html-coverage-report -- salt + - name: Create Salt Code Coverage HTML Report run: | nox --force-color -e create-html-coverage-report -- salt @@ -2216,11 +2224,27 @@ jobs: retention-days: 7 if-no-files-found: error - - name: Create Full Code Coverage HTML Report + - name: Report Combined Code Coverage + run: | + nox --force-color -e coverage-report + + - name: Create Combined Code Coverage JSON Report + run: | + nox --force-color -e create-json-coverage-reports + + - name: Upload Combined Code Coverage JSON Report + uses: actions/upload-artifact@v3 + with: + name: code-coverage-full-json-report + path: artifacts/coverage/coverage.json + retention-days: 7 + if-no-files-found: error + + - name: Create Combined Code Coverage HTML Report run: | nox --force-color -e create-html-coverage-report - - name: Upload Full Code Coverage HTML Report + - name: Upload Combined Code Coverage HTML Report uses: actions/upload-artifact@v3 with: name: code-coverage-full-html-report diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index ebd0e46c3ec..558696de3d9 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -2265,6 +2265,14 @@ jobs: run: | nox --force-color -e combine-coverage + - name: Report Salt Code Coverage + run: | + nox --force-color -e coverage-report -- salt + + - name: Create Salt Code Coverage HTML Report + run: | + nox --force-color -e create-html-coverage-report -- salt + - name: Create Salt Code Coverage HTML Report run: | nox --force-color -e create-html-coverage-report -- salt @@ -2277,11 +2285,27 @@ jobs: retention-days: 7 if-no-files-found: error - - name: Create Full Code Coverage HTML Report + - name: Report Combined Code Coverage + run: | + nox --force-color -e coverage-report + + - name: Create Combined Code Coverage JSON Report + run: | + nox --force-color -e create-json-coverage-reports + + - name: Upload Combined Code Coverage JSON Report + uses: actions/upload-artifact@v3 + with: + name: code-coverage-full-json-report + path: artifacts/coverage/coverage.json + retention-days: 7 + if-no-files-found: error + + - name: Create Combined Code Coverage HTML Report run: | nox --force-color -e create-html-coverage-report - - name: Upload Full Code Coverage HTML Report + - name: Upload Combined Code Coverage HTML Report uses: actions/upload-artifact@v3 with: name: code-coverage-full-html-report diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 7d4eb15b89c..8282074b4d6 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -2238,6 +2238,14 @@ jobs: run: | nox --force-color -e combine-coverage + - name: Report Salt Code Coverage + run: | + nox --force-color -e coverage-report -- salt + + - name: Create Salt Code Coverage HTML Report + run: | + nox --force-color -e create-html-coverage-report -- salt + - name: Create Salt Code Coverage HTML Report run: | nox --force-color -e create-html-coverage-report -- salt @@ -2250,11 +2258,27 @@ jobs: retention-days: 7 if-no-files-found: error - - name: Create Full Code Coverage HTML Report + - name: Report Combined Code Coverage + run: | + nox --force-color -e coverage-report + + - name: Create Combined Code Coverage JSON Report + run: | + nox --force-color -e create-json-coverage-reports + + - name: Upload Combined Code Coverage JSON Report + uses: actions/upload-artifact@v3 + with: + name: code-coverage-full-json-report + path: artifacts/coverage/coverage.json + retention-days: 7 + if-no-files-found: error + + - name: Create Combined Code Coverage HTML Report run: | nox --force-color -e create-html-coverage-report - - name: Upload Full Code Coverage HTML Report + - name: Upload Combined Code Coverage HTML Report uses: actions/upload-artifact@v3 with: name: code-coverage-full-html-report diff --git a/.github/workflows/templates/ci.yml.jinja b/.github/workflows/templates/ci.yml.jinja index 1fdb3d1ddf8..e40a65b956a 100644 --- a/.github/workflows/templates/ci.yml.jinja +++ b/.github/workflows/templates/ci.yml.jinja @@ -374,6 +374,14 @@ run: | nox --force-color -e combine-coverage + - name: Report Salt Code Coverage + run: | + nox --force-color -e coverage-report -- salt + + - name: Create Salt Code Coverage HTML Report + run: | + nox --force-color -e create-html-coverage-report -- salt + - name: Create Salt Code Coverage HTML Report run: | nox --force-color -e create-html-coverage-report -- salt @@ -386,11 +394,27 @@ retention-days: 7 if-no-files-found: error - - name: Create Full Code Coverage HTML Report + - name: Report Combined Code Coverage + run: | + nox --force-color -e coverage-report + + - name: Create Combined Code Coverage JSON Report + run: | + nox --force-color -e create-json-coverage-reports + + - name: Upload Combined Code Coverage JSON Report + uses: actions/upload-artifact@v3 + with: + name: code-coverage-full-json-report + path: artifacts/coverage/coverage.json + retention-days: 7 + if-no-files-found: error + + - name: Create Combined Code Coverage HTML Report run: | nox --force-color -e create-html-coverage-report - - name: Upload Full Code Coverage HTML Report + - name: Upload Combined Code Coverage HTML Report uses: actions/upload-artifact@v3 with: name: code-coverage-full-html-report diff --git a/.github/workflows/test-action-macos.yml b/.github/workflows/test-action-macos.yml index cfa911fbdd1..c332d4a5647 100644 --- a/.github/workflows/test-action-macos.yml +++ b/.github/workflows/test-action-macos.yml @@ -400,12 +400,6 @@ jobs: run: | python3 -m pip install 'nox==${{ inputs.nox-version }}' - - name: Combine Code Coverage - if: ${{ inputs.skip-code-coverage == false }} - continue-on-error: true - run: | - nox --force-color -e combine-coverage - - name: Create XML Coverage Reports if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success' && job.status != 'cancelled' run: | @@ -494,12 +488,6 @@ jobs: run: | nox --force-color -e report-coverage -- salt - - name: Report Tests Code Coverage - if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success' - continue-on-error: true - run: | - nox --force-color -e report-coverage -- tests - - name: Report Combined Code Coverage if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success' continue-on-error: true diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index 48e25f985d1..dccbd3134b6 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -347,12 +347,6 @@ jobs: run: | python3 -m pip install 'nox==${{ inputs.nox-version }}' - - name: Combine Code Coverage - if: ${{ inputs.skip-code-coverage == false }} - continue-on-error: true - run: | - nox --force-color -e combine-coverage - - name: Create XML Coverage Reports if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success' && job.status != 'cancelled' run: | @@ -441,12 +435,6 @@ jobs: run: | nox --force-color -e report-coverage -- salt - - name: Report Tests Code Coverage - if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success' - continue-on-error: true - run: | - nox --force-color -e report-coverage -- tests - - name: Report Combined Code Coverage if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success' continue-on-error: true diff --git a/.github/workflows/test-package-downloads-action-linux.yml b/.github/workflows/test-package-downloads-action-linux.yml index 499898ca8d2..a9086d6634d 100644 --- a/.github/workflows/test-package-downloads-action-linux.yml +++ b/.github/workflows/test-package-downloads-action-linux.yml @@ -173,10 +173,10 @@ jobs: -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ inputs.distro-slug }} -- download-pkgs - - name: Combine Coverage Reports + - name: Create XML Coverage Reports if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' run: | - tools --timestamps vm combine-coverage ${{ inputs.distro-slug }} + tools --timestamps vm create-xml-coverage-reports ${{ inputs.distro-slug }} - name: Download Test Run Artifacts id: download-artifacts-from-vm diff --git a/.github/workflows/test-package-downloads-action-macos.yml b/.github/workflows/test-package-downloads-action-macos.yml index 812f5f8506e..2934889ce5f 100644 --- a/.github/workflows/test-package-downloads-action-macos.yml +++ b/.github/workflows/test-package-downloads-action-macos.yml @@ -166,10 +166,10 @@ jobs: run: | sudo chown -R "$(id -un)" . - - name: Combine Coverage Reports + - name: Create XML Coverage Reports if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' run: | - nox --force-color -e combine-coverage + nox --force-color -e create-xml-coverage-reports - name: Prepare Test Run Artifacts id: download-artifacts-from-vm diff --git a/.github/workflows/test-package-downloads-action-windows.yml b/.github/workflows/test-package-downloads-action-windows.yml index e90b5fc5c73..4db10708173 100644 --- a/.github/workflows/test-package-downloads-action-windows.yml +++ b/.github/workflows/test-package-downloads-action-windows.yml @@ -172,10 +172,10 @@ jobs: -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ inputs.distro-slug }} -- download-pkgs - - name: Combine Coverage Reports + - name: Create XML Coverage Reports if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' run: | - tools --timestamps vm combine-coverage ${{ inputs.distro-slug }} + tools --timestamps vm create-xml-coverage-reports ${{ inputs.distro-slug }} - name: Download Test Run Artifacts id: download-artifacts-from-vm diff --git a/noxfile.py b/noxfile.py index 7ebca469e84..83dc559a9d5 100644 --- a/noxfile.py +++ b/noxfile.py @@ -6,7 +6,9 @@ Nox configuration script """ # pylint: disable=resource-leakage,3rd-party-module-not-gated +import contextlib import datetime +import glob import gzip import json import os @@ -351,8 +353,6 @@ def _run_with_coverage(session, *test_cmd, env=None, on_rerun=False): if env is None: env = {} - coverage_base_env = {} - sitecustomize_dir = session.run( "salt-factories", "--coverage", silent=True, log=True, stderr=None ) @@ -384,80 +384,36 @@ def _run_with_coverage(session, *test_cmd, env=None, on_rerun=False): python_path_entries.insert(0, str(sitecustomize_dir)) python_path_env_var = os.pathsep.join(python_path_entries) - # The full path to the .coverage data file. Makes sure we always write - # them to the same directory - coverage_base_env["COVERAGE_FILE"] = COVERAGE_FILE - env.update( { # The updated python path so that sitecustomize is importable "PYTHONPATH": python_path_env_var, # Instruct sub processes to also run under coverage "COVERAGE_PROCESS_START": str(REPO_ROOT / ".coveragerc"), - }, - **coverage_base_env, + # The full path to the .coverage data file. Makes sure we always write + # them to the same directory + "COVERAGE_FILE": COVERAGE_FILE, + } ) - try: - session.run(*test_cmd, env=env) - finally: - if os.environ.get("GITHUB_ACTIONS_PIPELINE", "0") == "0": - # Always combine and generate the XML coverage report - try: - session.run( - "coverage", - "combine", - env=coverage_base_env, - ) - except CommandFailed: - # Sometimes some of the coverage files are corrupt which would trigger a CommandFailed - # exception - pass - # Generate report for tests code coverage - session.run( - "coverage", - "xml", - "-o", - str(COVERAGE_OUTPUT_DIR.joinpath("tests.xml").relative_to(REPO_ROOT)), - "--omit=salt/*", - "--include=tests/*,pkg/tests/*", - env=coverage_base_env, - ) - # Generate report for salt code coverage - session.run( - "coverage", - "xml", - "-o", - str(COVERAGE_OUTPUT_DIR.joinpath("salt.xml").relative_to(REPO_ROOT)), - "--omit=tests/*,pkg/tests/*", - "--include=salt/*", - env=coverage_base_env, - ) - # Generate html report for tests code coverage - session.run( - "coverage", - "html", - "-d", - str(COVERAGE_OUTPUT_DIR.joinpath("html").relative_to(REPO_ROOT)), - "--omit=salt/*", - "--include=tests/*,pkg/tests/*", - env=coverage_base_env, - ) - # Generate html report for salt code coverage - session.run( - "coverage", - "html", - "-d", - str(COVERAGE_OUTPUT_DIR.joinpath("html").relative_to(REPO_ROOT)), - "--omit=tests/*,pkg/tests/*", - "--include=salt/*", - env=coverage_base_env, - ) + session.run(*test_cmd, env=env) -def _report_coverage(session): +def _report_coverage( + session, + combine=True, + cli_report=True, + html_report=False, + xml_report=False, + json_report=False, +): _install_coverage_requirement(session) + if not any([combine, cli_report, html_report, xml_report, json_report]): + session.error( + "At least one of combine, cli_report, html_report, xml_report, json_report needs to be True" + ) + env = { # The full path to the .coverage data file. Makes sure we always write # them to the same directory @@ -468,45 +424,56 @@ def _report_coverage(session): if session.posargs: report_section = session.posargs.pop(0) if report_section not in ("salt", "tests"): - session.error("The report section can only be one of 'salt', 'tests'.") + session.error( + f"The report section can only be one of 'salt', 'tests', not: {report_section}" + ) if session.posargs: session.error( "Only one argument can be passed to the session, which is optional " "and is one of 'salt', 'tests'." ) - # Always combine and generate the XML coverage report - try: - session.run("coverage", "combine", env=env) - except CommandFailed: - # Sometimes some of the coverage files are corrupt which would trigger a CommandFailed - # exception - pass + if combine is True: + coverage_db_files = glob.glob(f"{COVERAGE_FILE}.*") + if coverage_db_files: + with contextlib.suppress(CommandFailed): + # Sometimes some of the coverage files are corrupt which would trigger a CommandFailed + # exception + session.run("coverage", "combine", env=env) + elif os.path.exists(COVERAGE_FILE): + session_warn(session, "Coverage files already combined.") - if not IS_WINDOWS: - # The coverage file might have come from a windows machine, fix paths - with sqlite3.connect(COVERAGE_FILE) as db: - res = db.execute(r"SELECT * FROM file WHERE path LIKE '%salt\%'") - if res.fetchone(): - session_warn( - session, - "Replacing backwards slashes with forward slashes on file " - "paths in the coverage database", - ) - db.execute(r"UPDATE OR IGNORE file SET path=replace(path, '\', '/');") + if os.path.exists(COVERAGE_FILE) and not IS_WINDOWS: + # Some coverage files might have come from a windows machine, fix paths + with sqlite3.connect(COVERAGE_FILE) as db: + res = db.execute(r"SELECT * FROM file WHERE path LIKE '%salt\%'") + if res.fetchone(): + session_warn( + session, + "Replacing backwards slashes with forward slashes on file " + "paths in the coverage database", + ) + db.execute( + r"UPDATE OR IGNORE file SET path=replace(path, '\', '/');" + ) + + if not os.path.exists(COVERAGE_FILE): + session.error("No coverage files found.") if report_section == "salt": - json_coverage_file = ( - COVERAGE_OUTPUT_DIR.relative_to(REPO_ROOT) / "coverage-salt.json" - ) + json_coverage_file = COVERAGE_OUTPUT_DIR.relative_to(REPO_ROOT) / "salt.json" + xml_coverage_file = COVERAGE_OUTPUT_DIR.relative_to(REPO_ROOT) / "salt.xml" + html_coverage_dir = COVERAGE_OUTPUT_DIR.relative_to(REPO_ROOT) / "html" / "salt" cmd_args = [ "--omit=tests/*,pkg/tests/*", "--include=salt/*", ] elif report_section == "tests": - json_coverage_file = ( - COVERAGE_OUTPUT_DIR.relative_to(REPO_ROOT) / "coverage-tests.json" + json_coverage_file = COVERAGE_OUTPUT_DIR.relative_to(REPO_ROOT) / "tests.json" + xml_coverage_file = COVERAGE_OUTPUT_DIR.relative_to(REPO_ROOT) / "tests.xml" + html_coverage_dir = ( + COVERAGE_OUTPUT_DIR.relative_to(REPO_ROOT) / "html" / "tests" ) cmd_args = [ "--omit=salt/*", @@ -516,25 +483,58 @@ def _report_coverage(session): json_coverage_file = ( COVERAGE_OUTPUT_DIR.relative_to(REPO_ROOT) / "coverage.json" ) + xml_coverage_file = COVERAGE_OUTPUT_DIR.relative_to(REPO_ROOT) / "coverage.xml" + html_coverage_dir = COVERAGE_OUTPUT_DIR.relative_to(REPO_ROOT) / "html" / "full" cmd_args = [ "--include=salt/*,tests/*,pkg/tests/*", ] - session.run( - "coverage", - "report", - *cmd_args, - env=env, - ) + if cli_report: + session.run( + "coverage", + "report", + "--precision=2", + *cmd_args, + env=env, + ) - session.run( - "coverage", - "json", - "-o", - str(json_coverage_file), - *cmd_args, - env=env, - ) + if html_report: + session.run( + "coverage", + "html", + "-d", + str(html_coverage_dir), + "--show-contexts", + "--precision=2", + *cmd_args, + env=env, + ) + + if xml_report: + try: + session.run( + "coverage", + "xml", + "-o", + str(xml_coverage_file), + *cmd_args, + env=env, + ) + except CommandFailed: + session_warn( + session, "Failed to generate the source XML code coverage report" + ) + + if json_report: + session.run( + "coverage", + "json", + "-o", + str(json_coverage_file), + "--show-contexts", + *cmd_args, + env=env, + ) @nox.session(python=_PYTHON_VERSIONS, name="test-parametrized") @@ -1208,7 +1208,12 @@ def ci_test_onedir_tcp(session): @nox.session(python="3", name="report-coverage") def report_coverage(session): - _report_coverage(session) + _report_coverage(session, combine=True, cli_report=True) + + +@nox.session(python="3", name="coverage-report") +def coverage_report(session): + _report_coverage(session, combine=True, cli_report=True) @nox.session(python=False, name="decompress-dependencies") @@ -1335,20 +1340,7 @@ def pre_archive_cleanup(session, pkg): @nox.session(python="3", name="combine-coverage") def combine_coverage(session): - _install_coverage_requirement(session) - env = { - # The full path to the .coverage data file. Makes sure we always write - # them to the same directory - "COVERAGE_FILE": str(COVERAGE_FILE), - } - - # Always combine and generate the XML coverage report - try: - session.run("coverage", "combine", env=env) - except CommandFailed: - # Sometimes some of the coverage files are corrupt which would trigger a CommandFailed - # exception - pass + _report_coverage(session, combine=True, cli_report=False) @nox.session( @@ -1357,140 +1349,17 @@ def combine_coverage(session): venv_params=["--system-site-packages"], ) def combine_coverage_onedir(session): - _install_coverage_requirement(session) - env = { - # The full path to the .coverage data file. Makes sure we always write - # them to the same directory - "COVERAGE_FILE": str(COVERAGE_FILE), - } - - # Always combine and generate the XML coverage report - try: - session.run("coverage", "combine", env=env) - except CommandFailed: - # Sometimes some of the coverage files are corrupt which would trigger a CommandFailed - # exception - pass + _report_coverage(session, combine=True, cli_report=False) @nox.session(python="3", name="create-html-coverage-report") def create_html_coverage_report(session): - _install_coverage_requirement(session) - env = { - # The full path to the .coverage data file. Makes sure we always write - # them to the same directory - "COVERAGE_FILE": str(COVERAGE_FILE), - } - - report_section = None - if session.posargs: - report_section = session.posargs.pop(0) - if report_section not in ("salt", "tests"): - session.error("The report section can only be one of 'salt', 'tests'.") - if session.posargs: - session.error( - "Only one argument can be passed to the session, which is optional " - "and is one of 'salt', 'tests'." - ) - - if not IS_WINDOWS: - # The coverage file might have come from a windows machine, fix paths - with sqlite3.connect(COVERAGE_FILE) as db: - res = db.execute(r"SELECT * FROM file WHERE path LIKE '%salt\%'") - if res.fetchone(): - session_warn( - session, - "Replacing backwards slashes with forward slashes on file " - "paths in the coverage database", - ) - db.execute(r"UPDATE OR IGNORE file SET path=replace(path, '\', '/');") - - if report_section == "salt": - report_dir = str( - COVERAGE_OUTPUT_DIR.joinpath("html", "salt").relative_to(REPO_ROOT) - ) - json_coverage_file = ( - COVERAGE_OUTPUT_DIR.relative_to(REPO_ROOT) / "coverage-salt.json" - ) - cmd_args = [ - "--omit=tests/*,pkg/tests/*", - "--include=salt/*", - ] - - elif report_section == "tests": - report_dir = str( - COVERAGE_OUTPUT_DIR.joinpath("html", "tests").relative_to(REPO_ROOT) - ) - json_coverage_file = ( - COVERAGE_OUTPUT_DIR.relative_to(REPO_ROOT) / "coverage-tests.json" - ) - cmd_args = [ - "--omit=salt/*", - "--include=tests/*,pkg/tests/*", - ] - else: - report_dir = str( - COVERAGE_OUTPUT_DIR.joinpath("html", "full").relative_to(REPO_ROOT) - ) - json_coverage_file = ( - COVERAGE_OUTPUT_DIR.relative_to(REPO_ROOT) / "coverage.json" - ) - cmd_args = [ - "--include=salt/*,tests/*,pkg/tests/*", - ] - - # Generate html report for Salt and tests combined code coverage - session.run( - "coverage", - "html", - "-d", - report_dir, - "--show-contexts", - *cmd_args, - env=env, - ) - - -def _create_xml_coverage_reports(session): - _install_coverage_requirement(session) - env = { - # The full path to the .coverage data file. Makes sure we always write - # them to the same directory - "COVERAGE_FILE": str(COVERAGE_FILE), - } - - # Generate report for tests code coverage - try: - session.run( - "coverage", - "xml", - "-o", - str(COVERAGE_OUTPUT_DIR.joinpath("tests.xml").relative_to(REPO_ROOT)), - "--omit=salt/*", - "--include=tests/*,pkg/tests/*", - env=env, - ) - except CommandFailed: - session_warn(session, "Failed to generate the tests XML code coverage report") - - # Generate report for salt code coverage - try: - session.run( - "coverage", - "xml", - "-o", - str(COVERAGE_OUTPUT_DIR.joinpath("salt.xml").relative_to(REPO_ROOT)), - "--omit=tests/*,pkg/tests/*", - "--include=salt/*", - env=env, - ) - except CommandFailed: - session_warn(session, "Failed to generate the source XML code coverage report") + _report_coverage(session, combine=True, cli_report=False, html_report=True) @nox.session(python="3", name="create-xml-coverage-reports") def create_xml_coverage_reports(session): - _create_xml_coverage_reports(session) + _report_coverage(session, combine=True, cli_report=False, xml_report=True) @nox.session( @@ -1499,7 +1368,21 @@ def create_xml_coverage_reports(session): venv_params=["--system-site-packages"], ) def create_xml_coverage_reports_onedir(session): - _create_xml_coverage_reports(session) + _report_coverage(session, combine=True, cli_report=False, xml_report=True) + + +@nox.session(python="3", name="create-json-coverage-reports") +def create_json_coverage_reports(session): + _report_coverage(session, combine=True, cli_report=False, json_report=True) + + +@nox.session( + python=str(ONEDIR_PYTHON_PATH), + name="create-json-coverage-reports-onedir", + venv_params=["--system-site-packages"], +) +def create_json_coverage_reports_onedir(session): + _report_coverage(session, combine=True, cli_report=False, json_report=True) class Tee: diff --git a/tools/vm.py b/tools/vm.py index cbb531247d2..d4aefd9837b 100644 --- a/tools/vm.py +++ b/tools/vm.py @@ -1448,15 +1448,13 @@ class VM: """ Combine the code coverage databases """ - return self.run_nox("combine-coverage-onedir", session_args=[self.name]) + return self.run_nox("combine-coverage-onedir") def create_xml_coverage_reports(self): """ Create XML coverage reports """ - return self.run_nox( - "create-xml-coverage-reports-onedir", session_args=[self.name] - ) + return self.run_nox("create-xml-coverage-reports-onedir") def compress_dependencies(self): """ From e1e6e769adbe9ef11b37e13d302735e4b97d5342 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 5 Oct 2023 11:17:56 +0100 Subject: [PATCH 082/147] Workflow improvements, namely UI grouping Signed-off-by: Pedro Algarvio --- .github/workflows/ci.yml | 42 +++--- .github/workflows/nightly.yml | 42 +++--- .github/workflows/release.yml | 86 ++++++------ .github/workflows/scheduled.yml | 42 +++--- .github/workflows/staging.yml | 128 +++++++++--------- .github/workflows/templates/release.yml.jinja | 2 +- .github/workflows/templates/staging.yml.jinja | 2 +- ...=> test-salt-pkg-repo-downloads.yml.jinja} | 69 +++++----- .../templates/test-salt-pkg.yml.jinja | 7 +- .../test-package-downloads-action-linux.yml | 9 +- .../test-package-downloads-action-macos.yml | 9 +- .../test-package-downloads-action-windows.yml | 9 +- .../workflows/test-packages-action-macos.yml | 6 +- .github/workflows/test-packages-action.yml | 6 +- tools/ci.py | 2 - 15 files changed, 239 insertions(+), 222 deletions(-) rename .github/workflows/templates/{test-pkg-repo-downloads.yml.jinja => test-salt-pkg-repo-downloads.yml.jinja} (85%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a9aa04b9e87..cabeaf684cb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1172,7 +1172,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-pkg-tests: - name: Amazon Linux 2 + name: Amazon Linux 2 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1194,7 +1194,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centos-7-pkg-tests: - name: CentOS 7 + name: CentOS 7 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1216,7 +1216,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-8-pkg-tests: - name: CentOS Stream 8 + name: CentOS Stream 8 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1238,7 +1238,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-9-pkg-tests: - name: CentOS Stream 9 + name: CentOS Stream 9 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1260,7 +1260,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-10-pkg-tests: - name: Debian 10 + name: Debian 10 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1282,7 +1282,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-pkg-tests: - name: Debian 11 + name: Debian 11 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1304,7 +1304,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-arm64-pkg-tests: - name: Debian 11 Arm64 + name: Debian 11 Arm64 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1326,7 +1326,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-3-pkg-tests: - name: Photon OS 3 + name: Photon OS 3 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1348,7 +1348,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-pkg-tests: - name: Photon OS 4 + name: Photon OS 4 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1370,7 +1370,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-arm64-pkg-tests: - name: Photon OS 4 Arm64 + name: Photon OS 4 Arm64 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1392,7 +1392,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-pkg-tests: - name: Ubuntu 20.04 + name: Ubuntu 20.04 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1414,7 +1414,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-arm64-pkg-tests: - name: Ubuntu 20.04 Arm64 + name: Ubuntu 20.04 Arm64 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1436,7 +1436,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-pkg-tests: - name: Ubuntu 22.04 + name: Ubuntu 22.04 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1458,7 +1458,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-arm64-pkg-tests: - name: Ubuntu 22.04 Arm64 + name: Ubuntu 22.04 Arm64 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1480,7 +1480,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} macos-12-pkg-tests: - name: macOS 12 + name: macOS 12 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -1502,7 +1502,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-nsis-pkg-tests: - name: Windows 2016 + name: Windows 2016 NSIS Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1524,7 +1524,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-msi-pkg-tests: - name: Windows 2016 + name: Windows 2016 MSI Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1546,7 +1546,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-nsis-pkg-tests: - name: Windows 2019 + name: Windows 2019 NSIS Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1568,7 +1568,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-msi-pkg-tests: - name: Windows 2019 + name: Windows 2019 MSI Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1590,7 +1590,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-nsis-pkg-tests: - name: Windows 2022 + name: Windows 2022 NSIS Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1612,7 +1612,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-msi-pkg-tests: - name: Windows 2022 + name: Windows 2022 MSI Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 558696de3d9..dc54c93db45 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -1233,7 +1233,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-pkg-tests: - name: Amazon Linux 2 + name: Amazon Linux 2 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1255,7 +1255,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centos-7-pkg-tests: - name: CentOS 7 + name: CentOS 7 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1277,7 +1277,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-8-pkg-tests: - name: CentOS Stream 8 + name: CentOS Stream 8 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1299,7 +1299,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-9-pkg-tests: - name: CentOS Stream 9 + name: CentOS Stream 9 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1321,7 +1321,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-10-pkg-tests: - name: Debian 10 + name: Debian 10 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1343,7 +1343,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-pkg-tests: - name: Debian 11 + name: Debian 11 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1365,7 +1365,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-arm64-pkg-tests: - name: Debian 11 Arm64 + name: Debian 11 Arm64 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1387,7 +1387,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-3-pkg-tests: - name: Photon OS 3 + name: Photon OS 3 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1409,7 +1409,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-pkg-tests: - name: Photon OS 4 + name: Photon OS 4 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1431,7 +1431,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-arm64-pkg-tests: - name: Photon OS 4 Arm64 + name: Photon OS 4 Arm64 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1453,7 +1453,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-pkg-tests: - name: Ubuntu 20.04 + name: Ubuntu 20.04 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1475,7 +1475,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-arm64-pkg-tests: - name: Ubuntu 20.04 Arm64 + name: Ubuntu 20.04 Arm64 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1497,7 +1497,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-pkg-tests: - name: Ubuntu 22.04 + name: Ubuntu 22.04 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1519,7 +1519,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-arm64-pkg-tests: - name: Ubuntu 22.04 Arm64 + name: Ubuntu 22.04 Arm64 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1541,7 +1541,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} macos-12-pkg-tests: - name: macOS 12 + name: macOS 12 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -1563,7 +1563,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-nsis-pkg-tests: - name: Windows 2016 + name: Windows 2016 NSIS Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1585,7 +1585,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-msi-pkg-tests: - name: Windows 2016 + name: Windows 2016 MSI Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1607,7 +1607,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-nsis-pkg-tests: - name: Windows 2019 + name: Windows 2019 NSIS Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1629,7 +1629,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-msi-pkg-tests: - name: Windows 2019 + name: Windows 2019 MSI Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1651,7 +1651,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-nsis-pkg-tests: - name: Windows 2022 + name: Windows 2022 NSIS Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1673,7 +1673,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-msi-pkg-tests: - name: Windows 2022 + name: Windows 2022 MSI Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5e87d4ef2c6..ff9535b58d2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -224,7 +224,7 @@ jobs: tools pkg repo publish release ${{ needs.prepare-workflow.outputs.salt-version }} almalinux-8-package-download-tests: - name: Test Alma Linux 8 package Downloads + name: Alma Linux 8 Package Download if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: - prepare-workflow @@ -247,7 +247,7 @@ jobs: secrets: inherit almalinux-8-arm64-package-download-tests: - name: Test Alma Linux 8 Arm64 package Downloads + name: Alma Linux 8 Arm64 Package Download if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: - prepare-workflow @@ -270,7 +270,7 @@ jobs: secrets: inherit almalinux-9-package-download-tests: - name: Test Alma Linux 9 package Downloads + name: Alma Linux 9 Package Download if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: - prepare-workflow @@ -293,7 +293,7 @@ jobs: secrets: inherit almalinux-9-arm64-package-download-tests: - name: Test Alma Linux 9 Arm64 package Downloads + name: Alma Linux 9 Arm64 Package Download if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: - prepare-workflow @@ -316,7 +316,7 @@ jobs: secrets: inherit amazonlinux-2-package-download-tests: - name: Test Amazon Linux 2 package Downloads + name: Amazon Linux 2 Package Download if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: - prepare-workflow @@ -339,7 +339,7 @@ jobs: secrets: inherit amazonlinux-2-arm64-package-download-tests: - name: Test Amazon Linux 2 Arm64 package Downloads + name: Amazon Linux 2 Arm64 Package Download if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: - prepare-workflow @@ -362,7 +362,7 @@ jobs: secrets: inherit centos-7-package-download-tests: - name: Test CentOS 7 package Downloads + name: CentOS 7 Package Download if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: - prepare-workflow @@ -385,7 +385,7 @@ jobs: secrets: inherit centos-7-arm64-package-download-tests: - name: Test CentOS 7 Arm64 package Downloads + name: CentOS 7 Arm64 Package Download if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: - prepare-workflow @@ -408,7 +408,7 @@ jobs: secrets: inherit centosstream-8-package-download-tests: - name: Test CentOS Stream 8 package Downloads + name: CentOS Stream 8 Package Download if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: - prepare-workflow @@ -431,7 +431,7 @@ jobs: secrets: inherit centosstream-8-arm64-package-download-tests: - name: Test CentOS Stream 8 Arm64 package Downloads + name: CentOS Stream 8 Arm64 Package Download if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: - prepare-workflow @@ -454,7 +454,7 @@ jobs: secrets: inherit centosstream-9-package-download-tests: - name: Test CentOS Stream 9 package Downloads + name: CentOS Stream 9 Package Download if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: - prepare-workflow @@ -477,7 +477,7 @@ jobs: secrets: inherit centosstream-9-arm64-package-download-tests: - name: Test CentOS Stream 9 Arm64 package Downloads + name: CentOS Stream 9 Arm64 Package Download if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: - prepare-workflow @@ -500,7 +500,7 @@ jobs: secrets: inherit debian-10-package-download-tests: - name: Test Debian 10 package Downloads + name: Debian 10 Package Download if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: - prepare-workflow @@ -523,7 +523,7 @@ jobs: secrets: inherit debian-11-package-download-tests: - name: Test Debian 11 package Downloads + name: Debian 11 Package Download if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: - prepare-workflow @@ -546,7 +546,7 @@ jobs: secrets: inherit debian-11-arm64-package-download-tests: - name: Test Debian 11 Arm64 package Downloads + name: Debian 11 Arm64 Package Download if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: - prepare-workflow @@ -569,7 +569,7 @@ jobs: secrets: inherit fedora-37-package-download-tests: - name: Test Fedora 37 package Downloads + name: Fedora 37 Package Download if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: - prepare-workflow @@ -592,7 +592,7 @@ jobs: secrets: inherit fedora-37-arm64-package-download-tests: - name: Test Fedora 37 Arm64 package Downloads + name: Fedora 37 Arm64 Package Download if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: - prepare-workflow @@ -615,7 +615,7 @@ jobs: secrets: inherit fedora-38-package-download-tests: - name: Test Fedora 38 package Downloads + name: Fedora 38 Package Download if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: - prepare-workflow @@ -638,7 +638,7 @@ jobs: secrets: inherit fedora-38-arm64-package-download-tests: - name: Test Fedora 38 Arm64 package Downloads + name: Fedora 38 Arm64 Package Download if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: - prepare-workflow @@ -661,7 +661,7 @@ jobs: secrets: inherit photonos-3-package-download-tests: - name: Test Photon OS 3 package Downloads + name: Photon OS 3 Package Download if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: - prepare-workflow @@ -684,7 +684,7 @@ jobs: secrets: inherit photonos-4-package-download-tests: - name: Test Photon OS 4 package Downloads + name: Photon OS 4 Package Download if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: - prepare-workflow @@ -707,7 +707,7 @@ jobs: secrets: inherit photonos-4-arm64-package-download-tests: - name: Test Photon OS 4 Arm64 package Downloads + name: Photon OS 4 Arm64 Package Download if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: - prepare-workflow @@ -730,7 +730,7 @@ jobs: secrets: inherit ubuntu-2004-package-download-tests: - name: Test Ubuntu 20.04 package Downloads + name: Ubuntu 20.04 Package Download if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: - prepare-workflow @@ -753,7 +753,7 @@ jobs: secrets: inherit ubuntu-2004-arm64-package-download-tests: - name: Test Ubuntu 20.04 Arm64 package Downloads + name: Ubuntu 20.04 Arm64 Package Download if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: - prepare-workflow @@ -776,7 +776,7 @@ jobs: secrets: inherit ubuntu-2204-package-download-tests: - name: Test Ubuntu 22.04 package Downloads + name: Ubuntu 22.04 Package Download if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: - prepare-workflow @@ -799,7 +799,7 @@ jobs: secrets: inherit ubuntu-2204-arm64-package-download-tests: - name: Test Ubuntu 22.04 Arm64 package Downloads + name: Ubuntu 22.04 Arm64 Package Download if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: - prepare-workflow @@ -822,7 +822,7 @@ jobs: secrets: inherit ubuntu-2204-onedir-download-tests: - name: Test Ubuntu 22.04 onedir Downloads + name: Ubuntu 22.04 Package Download if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: - prepare-workflow @@ -845,7 +845,7 @@ jobs: secrets: inherit ubuntu-2204-arm64-onedir-download-tests: - name: Test Ubuntu 22.04 Arm64 onedir Downloads + name: Ubuntu 22.04 Arm64 Package Download if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: - prepare-workflow @@ -867,8 +867,8 @@ jobs: pkg-type: onedir secrets: inherit - macos-12-Package-download-tests: - name: Test macOS 12 Package Downloads + macos-12-package-download-tests: + name: macOS 12 Package Download if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: - prepare-workflow @@ -890,8 +890,8 @@ jobs: pkg-type: package secrets: inherit - macos-12-Onedir-download-tests: - name: Test macOS 12 Onedir Downloads + macos-12-onedir-download-tests: + name: macOS 12 Package Download if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: - prepare-workflow @@ -913,9 +913,9 @@ jobs: pkg-type: onedir secrets: inherit - windows-2022-NSIS-amd64-download-tests: + windows-2022-nsis-amd64-download-tests: if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - name: Test Windows 2022 amd64 NSIS Package Downloads + name: Windows 2022 Package Download needs: - prepare-workflow - publish-repositories @@ -936,9 +936,9 @@ jobs: latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" secrets: inherit - windows-2022-MSI-amd64-download-tests: + windows-2022-msi-amd64-download-tests: if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - name: Test Windows 2022 amd64 MSI Package Downloads + name: Windows 2022 Package Download needs: - prepare-workflow - publish-repositories @@ -959,9 +959,9 @@ jobs: latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" secrets: inherit - windows-2022-Onedir-amd64-download-tests: + windows-2022-onedir-amd64-download-tests: if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - name: Test Windows 2022 amd64 Onedir Package Downloads + name: Windows 2022 Package Download needs: - prepare-workflow - publish-repositories @@ -1021,11 +1021,11 @@ jobs: - ubuntu-2204-arm64-package-download-tests - ubuntu-2204-onedir-download-tests - ubuntu-2204-arm64-onedir-download-tests - - macos-12-Package-download-tests - - macos-12-Onedir-download-tests - - windows-2022-NSIS-amd64-download-tests - - windows-2022-MSI-amd64-download-tests - - windows-2022-Onedir-amd64-download-tests + - macos-12-package-download-tests + - macos-12-onedir-download-tests + - windows-2022-nsis-amd64-download-tests + - windows-2022-msi-amd64-download-tests + - windows-2022-onedir-amd64-download-tests environment: release steps: - name: Clone The Salt Repository diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 8282074b4d6..f0adb6704ba 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -1206,7 +1206,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-pkg-tests: - name: Amazon Linux 2 + name: Amazon Linux 2 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1228,7 +1228,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centos-7-pkg-tests: - name: CentOS 7 + name: CentOS 7 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1250,7 +1250,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-8-pkg-tests: - name: CentOS Stream 8 + name: CentOS Stream 8 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1272,7 +1272,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-9-pkg-tests: - name: CentOS Stream 9 + name: CentOS Stream 9 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1294,7 +1294,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-10-pkg-tests: - name: Debian 10 + name: Debian 10 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1316,7 +1316,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-pkg-tests: - name: Debian 11 + name: Debian 11 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1338,7 +1338,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-arm64-pkg-tests: - name: Debian 11 Arm64 + name: Debian 11 Arm64 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1360,7 +1360,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-3-pkg-tests: - name: Photon OS 3 + name: Photon OS 3 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1382,7 +1382,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-pkg-tests: - name: Photon OS 4 + name: Photon OS 4 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1404,7 +1404,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-arm64-pkg-tests: - name: Photon OS 4 Arm64 + name: Photon OS 4 Arm64 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1426,7 +1426,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-pkg-tests: - name: Ubuntu 20.04 + name: Ubuntu 20.04 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1448,7 +1448,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-arm64-pkg-tests: - name: Ubuntu 20.04 Arm64 + name: Ubuntu 20.04 Arm64 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1470,7 +1470,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-pkg-tests: - name: Ubuntu 22.04 + name: Ubuntu 22.04 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1492,7 +1492,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-arm64-pkg-tests: - name: Ubuntu 22.04 Arm64 + name: Ubuntu 22.04 Arm64 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1514,7 +1514,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} macos-12-pkg-tests: - name: macOS 12 + name: macOS 12 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -1536,7 +1536,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-nsis-pkg-tests: - name: Windows 2016 + name: Windows 2016 NSIS Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1558,7 +1558,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-msi-pkg-tests: - name: Windows 2016 + name: Windows 2016 MSI Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1580,7 +1580,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-nsis-pkg-tests: - name: Windows 2019 + name: Windows 2019 NSIS Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1602,7 +1602,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-msi-pkg-tests: - name: Windows 2019 + name: Windows 2019 MSI Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1624,7 +1624,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-nsis-pkg-tests: - name: Windows 2022 + name: Windows 2022 NSIS Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1646,7 +1646,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-msi-pkg-tests: - name: Windows 2022 + name: Windows 2022 MSI Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 812a0e138ac..ef40f32310b 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -1228,7 +1228,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-pkg-tests: - name: Amazon Linux 2 + name: Amazon Linux 2 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1250,7 +1250,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centos-7-pkg-tests: - name: CentOS 7 + name: CentOS 7 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1272,7 +1272,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-8-pkg-tests: - name: CentOS Stream 8 + name: CentOS Stream 8 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1294,7 +1294,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-9-pkg-tests: - name: CentOS Stream 9 + name: CentOS Stream 9 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1316,7 +1316,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-10-pkg-tests: - name: Debian 10 + name: Debian 10 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1338,7 +1338,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-pkg-tests: - name: Debian 11 + name: Debian 11 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1360,7 +1360,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-arm64-pkg-tests: - name: Debian 11 Arm64 + name: Debian 11 Arm64 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1382,7 +1382,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-3-pkg-tests: - name: Photon OS 3 + name: Photon OS 3 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1404,7 +1404,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-pkg-tests: - name: Photon OS 4 + name: Photon OS 4 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1426,7 +1426,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-arm64-pkg-tests: - name: Photon OS 4 Arm64 + name: Photon OS 4 Arm64 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1448,7 +1448,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-pkg-tests: - name: Ubuntu 20.04 + name: Ubuntu 20.04 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1470,7 +1470,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-arm64-pkg-tests: - name: Ubuntu 20.04 Arm64 + name: Ubuntu 20.04 Arm64 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1492,7 +1492,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-pkg-tests: - name: Ubuntu 22.04 + name: Ubuntu 22.04 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1514,7 +1514,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-arm64-pkg-tests: - name: Ubuntu 22.04 Arm64 + name: Ubuntu 22.04 Arm64 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1536,7 +1536,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} macos-12-pkg-tests: - name: macOS 12 + name: macOS 12 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -1558,7 +1558,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-nsis-pkg-tests: - name: Windows 2016 + name: Windows 2016 NSIS Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1580,7 +1580,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-msi-pkg-tests: - name: Windows 2016 + name: Windows 2016 MSI Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1602,7 +1602,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-nsis-pkg-tests: - name: Windows 2019 + name: Windows 2019 NSIS Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1624,7 +1624,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-msi-pkg-tests: - name: Windows 2019 + name: Windows 2019 MSI Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1646,7 +1646,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-nsis-pkg-tests: - name: Windows 2022 + name: Windows 2022 NSIS Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1668,7 +1668,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-msi-pkg-tests: - name: Windows 2022 + name: Windows 2022 MSI Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2915,7 +2915,7 @@ jobs: if-no-files-found: error almalinux-8-package-download-tests: - name: Test Alma Linux 8 package Downloads + name: Alma Linux 8 Package Download if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2937,7 +2937,7 @@ jobs: secrets: inherit almalinux-8-arm64-package-download-tests: - name: Test Alma Linux 8 Arm64 package Downloads + name: Alma Linux 8 Arm64 Package Download if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2959,7 +2959,7 @@ jobs: secrets: inherit almalinux-9-package-download-tests: - name: Test Alma Linux 9 package Downloads + name: Alma Linux 9 Package Download if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2981,7 +2981,7 @@ jobs: secrets: inherit almalinux-9-arm64-package-download-tests: - name: Test Alma Linux 9 Arm64 package Downloads + name: Alma Linux 9 Arm64 Package Download if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -3003,7 +3003,7 @@ jobs: secrets: inherit amazonlinux-2-package-download-tests: - name: Test Amazon Linux 2 package Downloads + name: Amazon Linux 2 Package Download if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -3025,7 +3025,7 @@ jobs: secrets: inherit amazonlinux-2-arm64-package-download-tests: - name: Test Amazon Linux 2 Arm64 package Downloads + name: Amazon Linux 2 Arm64 Package Download if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -3047,7 +3047,7 @@ jobs: secrets: inherit centos-7-package-download-tests: - name: Test CentOS 7 package Downloads + name: CentOS 7 Package Download if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -3069,7 +3069,7 @@ jobs: secrets: inherit centos-7-arm64-package-download-tests: - name: Test CentOS 7 Arm64 package Downloads + name: CentOS 7 Arm64 Package Download if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -3091,7 +3091,7 @@ jobs: secrets: inherit centosstream-8-package-download-tests: - name: Test CentOS Stream 8 package Downloads + name: CentOS Stream 8 Package Download if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -3113,7 +3113,7 @@ jobs: secrets: inherit centosstream-8-arm64-package-download-tests: - name: Test CentOS Stream 8 Arm64 package Downloads + name: CentOS Stream 8 Arm64 Package Download if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -3135,7 +3135,7 @@ jobs: secrets: inherit centosstream-9-package-download-tests: - name: Test CentOS Stream 9 package Downloads + name: CentOS Stream 9 Package Download if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -3157,7 +3157,7 @@ jobs: secrets: inherit centosstream-9-arm64-package-download-tests: - name: Test CentOS Stream 9 Arm64 package Downloads + name: CentOS Stream 9 Arm64 Package Download if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -3179,7 +3179,7 @@ jobs: secrets: inherit debian-10-package-download-tests: - name: Test Debian 10 package Downloads + name: Debian 10 Package Download if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -3201,7 +3201,7 @@ jobs: secrets: inherit debian-11-package-download-tests: - name: Test Debian 11 package Downloads + name: Debian 11 Package Download if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -3223,7 +3223,7 @@ jobs: secrets: inherit debian-11-arm64-package-download-tests: - name: Test Debian 11 Arm64 package Downloads + name: Debian 11 Arm64 Package Download if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -3245,7 +3245,7 @@ jobs: secrets: inherit fedora-37-package-download-tests: - name: Test Fedora 37 package Downloads + name: Fedora 37 Package Download if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -3267,7 +3267,7 @@ jobs: secrets: inherit fedora-37-arm64-package-download-tests: - name: Test Fedora 37 Arm64 package Downloads + name: Fedora 37 Arm64 Package Download if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -3289,7 +3289,7 @@ jobs: secrets: inherit fedora-38-package-download-tests: - name: Test Fedora 38 package Downloads + name: Fedora 38 Package Download if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -3311,7 +3311,7 @@ jobs: secrets: inherit fedora-38-arm64-package-download-tests: - name: Test Fedora 38 Arm64 package Downloads + name: Fedora 38 Arm64 Package Download if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -3333,7 +3333,7 @@ jobs: secrets: inherit photonos-3-package-download-tests: - name: Test Photon OS 3 package Downloads + name: Photon OS 3 Package Download if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -3355,7 +3355,7 @@ jobs: secrets: inherit photonos-4-package-download-tests: - name: Test Photon OS 4 package Downloads + name: Photon OS 4 Package Download if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -3377,7 +3377,7 @@ jobs: secrets: inherit photonos-4-arm64-package-download-tests: - name: Test Photon OS 4 Arm64 package Downloads + name: Photon OS 4 Arm64 Package Download if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -3399,7 +3399,7 @@ jobs: secrets: inherit ubuntu-2004-package-download-tests: - name: Test Ubuntu 20.04 package Downloads + name: Ubuntu 20.04 Package Download if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -3421,7 +3421,7 @@ jobs: secrets: inherit ubuntu-2004-arm64-package-download-tests: - name: Test Ubuntu 20.04 Arm64 package Downloads + name: Ubuntu 20.04 Arm64 Package Download if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -3443,7 +3443,7 @@ jobs: secrets: inherit ubuntu-2204-package-download-tests: - name: Test Ubuntu 22.04 package Downloads + name: Ubuntu 22.04 Package Download if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -3465,7 +3465,7 @@ jobs: secrets: inherit ubuntu-2204-arm64-package-download-tests: - name: Test Ubuntu 22.04 Arm64 package Downloads + name: Ubuntu 22.04 Arm64 Package Download if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -3487,7 +3487,7 @@ jobs: secrets: inherit ubuntu-2204-onedir-download-tests: - name: Test Ubuntu 22.04 onedir Downloads + name: Ubuntu 22.04 Package Download if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -3509,7 +3509,7 @@ jobs: secrets: inherit ubuntu-2204-arm64-onedir-download-tests: - name: Test Ubuntu 22.04 Arm64 onedir Downloads + name: Ubuntu 22.04 Arm64 Package Download if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -3530,8 +3530,8 @@ jobs: pkg-type: onedir secrets: inherit - macos-12-Package-download-tests: - name: Test macOS 12 Package Downloads + macos-12-package-download-tests: + name: macOS 12 Package Download if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -3552,8 +3552,8 @@ jobs: pkg-type: package secrets: inherit - macos-12-Onedir-download-tests: - name: Test macOS 12 Onedir Downloads + macos-12-onedir-download-tests: + name: macOS 12 Package Download if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -3574,9 +3574,9 @@ jobs: pkg-type: onedir secrets: inherit - windows-2022-NSIS-amd64-download-tests: + windows-2022-nsis-amd64-download-tests: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - name: Test Windows 2022 amd64 NSIS Package Downloads + name: Windows 2022 Package Download needs: - prepare-workflow - publish-repositories @@ -3596,9 +3596,9 @@ jobs: latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" secrets: inherit - windows-2022-MSI-amd64-download-tests: + windows-2022-msi-amd64-download-tests: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - name: Test Windows 2022 amd64 MSI Package Downloads + name: Windows 2022 Package Download needs: - prepare-workflow - publish-repositories @@ -3618,9 +3618,9 @@ jobs: latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" secrets: inherit - windows-2022-Onedir-amd64-download-tests: + windows-2022-onedir-amd64-download-tests: if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - name: Test Windows 2022 amd64 Onedir Package Downloads + name: Windows 2022 Package Download needs: - prepare-workflow - publish-repositories @@ -3751,11 +3751,11 @@ jobs: - ubuntu-2204-arm64-package-download-tests - ubuntu-2204-onedir-download-tests - ubuntu-2204-arm64-onedir-download-tests - - macos-12-Package-download-tests - - macos-12-Onedir-download-tests - - windows-2022-NSIS-amd64-download-tests - - windows-2022-MSI-amd64-download-tests - - windows-2022-Onedir-amd64-download-tests + - macos-12-package-download-tests + - macos-12-onedir-download-tests + - windows-2022-nsis-amd64-download-tests + - windows-2022-msi-amd64-download-tests + - windows-2022-onedir-amd64-download-tests environment: staging runs-on: - self-hosted diff --git a/.github/workflows/templates/release.yml.jinja b/.github/workflows/templates/release.yml.jinja index 14f7698cb1c..4e109f90463 100644 --- a/.github/workflows/templates/release.yml.jinja +++ b/.github/workflows/templates/release.yml.jinja @@ -259,7 +259,7 @@ permissions: tools pkg repo publish <{ gh_environment }> ${{ needs.prepare-workflow.outputs.salt-version }} <%- if includes.get("test-pkg-downloads", True) %> - <%- include "test-pkg-repo-downloads.yml.jinja" %> + <%- include "test-salt-pkg-repo-downloads.yml.jinja" %> <%- endif %> release: diff --git a/.github/workflows/templates/staging.yml.jinja b/.github/workflows/templates/staging.yml.jinja index e11a763b0a0..8e3a0c98d9f 100644 --- a/.github/workflows/templates/staging.yml.jinja +++ b/.github/workflows/templates/staging.yml.jinja @@ -158,7 +158,7 @@ concurrency: if-no-files-found: error <%- if includes.get("test-pkg-downloads", True) %> - <%- include "test-pkg-repo-downloads.yml.jinja" %> + <%- include "test-salt-pkg-repo-downloads.yml.jinja" %> <%- endif %> publish-pypi: diff --git a/.github/workflows/templates/test-pkg-repo-downloads.yml.jinja b/.github/workflows/templates/test-salt-pkg-repo-downloads.yml.jinja similarity index 85% rename from .github/workflows/templates/test-pkg-repo-downloads.yml.jinja rename to .github/workflows/templates/test-salt-pkg-repo-downloads.yml.jinja index 3fbc063d4eb..bb6da5a4a05 100644 --- a/.github/workflows/templates/test-pkg-repo-downloads.yml.jinja +++ b/.github/workflows/templates/test-salt-pkg-repo-downloads.yml.jinja @@ -1,42 +1,41 @@ - <%- set linux_pkg_tests = ( - ("almalinux-8", "Alma Linux 8", "x86_64", "package"), - ("almalinux-8-arm64", "Alma Linux 8 Arm64", "aarch64", "package"), - ("almalinux-9", "Alma Linux 9", "x86_64", "package"), - ("almalinux-9-arm64", "Alma Linux 9 Arm64", "aarch64", "package"), - ("amazonlinux-2", "Amazon Linux 2", "x86_64", "package"), - ("amazonlinux-2-arm64", "Amazon Linux 2 Arm64", "aarch64", "package"), - ("centos-7", "CentOS 7", "x86_64", "package"), - ("centos-7-arm64", "CentOS 7 Arm64", "aarch64", "package"), - ("centosstream-8", "CentOS Stream 8", "x86_64", "package"), - ("centosstream-8-arm64", "CentOS Stream 8 Arm64", "aarch64", "package"), - ("centosstream-9", "CentOS Stream 9", "x86_64", "package"), - ("centosstream-9-arm64", "CentOS Stream 9 Arm64", "aarch64", "package"), - ("debian-10", "Debian 10", "x86_64", "package"), - ("debian-11", "Debian 11", "x86_64", "package"), - ("debian-11-arm64", "Debian 11 Arm64", "aarch64", "package"), - ("fedora-37", "Fedora 37", "x86_64", "package"), - ("fedora-37-arm64", "Fedora 37 Arm64", "aarch64", "package"), - ("fedora-38", "Fedora 38", "x86_64", "package"), - ("fedora-38-arm64", "Fedora 38 Arm64", "aarch64", "package"), - ("photonos-3", "Photon OS 3", "x86_64", "package"), - ("photonos-4", "Photon OS 4", "x86_64", "package"), - ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64", "package"), - ("ubuntu-20.04", "Ubuntu 20.04", "x86_64", "package"), - ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64", "package"), - ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "package"), - ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "package"), - ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "onedir"), - ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "onedir") + ("almalinux-8", "Alma Linux 8", "x86_64", "Package"), + ("almalinux-8-arm64", "Alma Linux 8 Arm64", "aarch64", "Package"), + ("almalinux-9", "Alma Linux 9", "x86_64", "Package"), + ("almalinux-9-arm64", "Alma Linux 9 Arm64", "aarch64", "Package"), + ("amazonlinux-2", "Amazon Linux 2", "x86_64", "Package"), + ("amazonlinux-2-arm64", "Amazon Linux 2 Arm64", "aarch64", "Package"), + ("centos-7", "CentOS 7", "x86_64", "Package"), + ("centos-7-arm64", "CentOS 7 Arm64", "aarch64", "Package"), + ("centosstream-8", "CentOS Stream 8", "x86_64", "Package"), + ("centosstream-8-arm64", "CentOS Stream 8 Arm64", "aarch64", "Package"), + ("centosstream-9", "CentOS Stream 9", "x86_64", "Package"), + ("centosstream-9-arm64", "CentOS Stream 9 Arm64", "aarch64", "Package"), + ("debian-10", "Debian 10", "x86_64", "Package"), + ("debian-11", "Debian 11", "x86_64", "Package"), + ("debian-11-arm64", "Debian 11 Arm64", "aarch64", "Package"), + ("fedora-37", "Fedora 37", "x86_64", "Package"), + ("fedora-37-arm64", "Fedora 37 Arm64", "aarch64", "Package"), + ("fedora-38", "Fedora 38", "x86_64", "Package"), + ("fedora-38-arm64", "Fedora 38 Arm64", "aarch64", "Package"), + ("photonos-3", "Photon OS 3", "x86_64", "Package"), + ("photonos-4", "Photon OS 4", "x86_64", "Package"), + ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64", "Package"), + ("ubuntu-20.04", "Ubuntu 20.04", "x86_64", "Package"), + ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64", "Package"), + ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "Package"), + ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "Package"), + ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "Onedir"), + ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "Onedir") ) %> <%- for slug, display_name, arch, pkg_type in linux_pkg_tests %> - <%- set job_name = "{}-{}-download-tests".format(slug.replace(".", ""), pkg_type) %> + <%- set job_name = "{}-{}-download-tests".format(slug.replace(".", ""), pkg_type.lower()) %> <{ job_name }>: <%- do test_repo_needs.append(job_name) %> - name: Test <{ display_name }> <{ pkg_type }> Downloads + name: <{ display_name }> Package Download <%- if gh_environment == "staging" %> if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} <%- else %> @@ -71,11 +70,11 @@ ("macos-12", "macOS 12", "x86_64", "Package"), ("macos-12", "macOS 12", "x86_64", "Onedir"), ) %> - <%- set job_name = "{}-{}-download-tests".format(slug.replace(".", ""), pkg_type) %> + <%- set job_name = "{}-{}-download-tests".format(slug.replace(".", ""), pkg_type.lower()) %> <{ job_name }>: <%- do test_repo_needs.append(job_name) %> - name: Test <{ display_name }> <{ pkg_type }> Downloads + name: <{ display_name }> Package Download <%- if gh_environment == "staging" %> if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} <%- else %> @@ -109,7 +108,7 @@ ("windows-2022", "Windows 2022", "amd64"), ) %> <%- for pkg_type in ("NSIS", "MSI", "Onedir") %> - <%- set job_name = "{}-{}-{}-download-tests".format(slug.replace(".", ""), pkg_type, arch.lower()) %> + <%- set job_name = "{}-{}-{}-download-tests".format(slug.replace(".", ""), pkg_type.lower(), arch.lower()) %> <{ job_name }>: <%- do test_repo_needs.append(job_name) %> @@ -118,7 +117,7 @@ <%- else %> if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} <%- endif %> - name: Test <{ display_name }> <{ arch }> <{ pkg_type }> Package Downloads + name: <{ display_name }> Package Download needs: - prepare-workflow - publish-repositories diff --git a/.github/workflows/templates/test-salt-pkg.yml.jinja b/.github/workflows/templates/test-salt-pkg.yml.jinja index ee29c420b4f..d078bea80e2 100644 --- a/.github/workflows/templates/test-salt-pkg.yml.jinja +++ b/.github/workflows/templates/test-salt-pkg.yml.jinja @@ -1,4 +1,3 @@ - <%- set linux_pkg_tests = ( ("almalinux-8", "Alma Linux 8", "x86_64", "rpm"), ("almalinux-9", "Alma Linux 9", "x86_64", "rpm"), @@ -39,7 +38,7 @@ <{ job_name }>: <%- do test_salt_pkg_needs.append(job_name) %> - name: <{ display_name }> + name: <{ display_name }> Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -69,7 +68,7 @@ <{ job_name }>: <%- do test_salt_pkg_needs.append(job_name) %> - name: <{ display_name }> + name: <{ display_name }> Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -101,7 +100,7 @@ <{ job_name }>: <%- do test_salt_pkg_needs.append(job_name) %> - name: <{ display_name }> + name: <{ display_name }> <{ pkg_type }> Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/test-package-downloads-action-linux.yml b/.github/workflows/test-package-downloads-action-linux.yml index a9086d6634d..a1bf24ece8a 100644 --- a/.github/workflows/test-package-downloads-action-linux.yml +++ b/.github/workflows/test-package-downloads-action-linux.yml @@ -70,13 +70,20 @@ env: jobs: test: - name: Test Pkg Download + name: Test runs-on: - self-hosted - linux - bastion environment: ${{ inputs.environment }} timeout-minutes: 120 # 2 Hours - More than this and something is wrong + strategy: + fail-fast: false + matrix: + arch: + - ${{ inputs.arch }} + pkg-type: + - ${{ inputs.pkg-type }} steps: diff --git a/.github/workflows/test-package-downloads-action-macos.yml b/.github/workflows/test-package-downloads-action-macos.yml index 2934889ce5f..e6f4573a2b2 100644 --- a/.github/workflows/test-package-downloads-action-macos.yml +++ b/.github/workflows/test-package-downloads-action-macos.yml @@ -68,10 +68,17 @@ env: jobs: test: - name: Test Pkg Download + name: Test runs-on: ${{ inputs.distro-slug }} environment: ${{ inputs.environment }} timeout-minutes: 120 # 2 Hours - More than this and something is wrong + strategy: + fail-fast: false + matrix: + arch: + - ${{ inputs.arch }} + pkg-type: + - ${{ inputs.pkg-type }} steps: diff --git a/.github/workflows/test-package-downloads-action-windows.yml b/.github/workflows/test-package-downloads-action-windows.yml index 4db10708173..60d8b1be9aa 100644 --- a/.github/workflows/test-package-downloads-action-windows.yml +++ b/.github/workflows/test-package-downloads-action-windows.yml @@ -75,13 +75,20 @@ env: jobs: test: - name: Test Pkg Download + name: Test runs-on: - self-hosted - linux - bastion environment: ${{ inputs.environment }} timeout-minutes: 120 # 2 Hours - More than this and something is wrong + strategy: + fail-fast: false + matrix: + arch: + - ${{ inputs.arch }} + pkg-type: + - ${{ inputs.pkg-type }} steps: - name: Checkout Source Code diff --git a/.github/workflows/test-packages-action-macos.yml b/.github/workflows/test-packages-action-macos.yml index 7767b104a7f..a84edb76b8c 100644 --- a/.github/workflows/test-packages-action-macos.yml +++ b/.github/workflows/test-packages-action-macos.yml @@ -69,7 +69,7 @@ env: jobs: generate-matrix: - name: Test Pkg Matrix + name: Generate Matrix runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "x86_64"]') || 'ubuntu-latest' }} outputs: pkg-matrix-include: ${{ steps.generate-pkg-matrix.outputs.matrix }} @@ -93,7 +93,7 @@ jobs: test: - name: Test Pkg + name: Test runs-on: ${{ inputs.distro-slug }} timeout-minutes: 120 # 2 Hours - More than this and something is wrong needs: @@ -207,7 +207,7 @@ jobs: !artifacts/salt-*.tar.* report: - name: Test Pkg Reports + name: Report runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "x86_64"]') || 'ubuntu-latest' }} if: always() && (inputs.skip-code-coverage == false || inputs.skip-junit-reports == false) && needs.test.result != 'cancelled' && needs.test.result != 'skipped' needs: diff --git a/.github/workflows/test-packages-action.yml b/.github/workflows/test-packages-action.yml index f455bf7b0a7..b38efca107f 100644 --- a/.github/workflows/test-packages-action.yml +++ b/.github/workflows/test-packages-action.yml @@ -71,7 +71,7 @@ env: jobs: generate-matrix: - name: Test ${{ inputs.pkg-type }} Pkg Matrix + name: Generate Matrix runs-on: - self-hosted - linux @@ -98,7 +98,7 @@ jobs: test: - name: Test Pkg + name: Test runs-on: - self-hosted - linux @@ -218,7 +218,7 @@ jobs: !artifacts/salt-*.tar.* report: - name: Test Pkg Reports + name: Report runs-on: - self-hosted - linux diff --git a/tools/ci.py b/tools/ci.py index 066c9a13efa..cc6578be789 100644 --- a/tools/ci.py +++ b/tools/ci.py @@ -768,8 +768,6 @@ def pkg_matrix( "version": version, } ) - if distro_slug.startswith("windows"): - _matrix[-1]["pkg-type"] = pkg_type.upper() ctx.info("Generated matrix:") ctx.print(_matrix, soft_wrap=True) From 4d9f69279493f34a2490d24622afc64e4117e1aa Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 5 Oct 2023 15:41:52 +0100 Subject: [PATCH 083/147] Throttle Builds Signed-off-by: Pedro Algarvio --- .github/workflows/test-action-macos.yml | 6 ++++++ .github/workflows/test-action.yml | 6 ++++++ .github/workflows/test-package-downloads-action-windows.yml | 6 ++++++ .github/workflows/test-packages-action-macos.yml | 6 ++++++ .github/workflows/test-packages-action.yml | 6 ++++++ 5 files changed, 30 insertions(+) diff --git a/.github/workflows/test-action-macos.yml b/.github/workflows/test-action-macos.yml index c332d4a5647..4af38494ff6 100644 --- a/.github/workflows/test-action-macos.yml +++ b/.github/workflows/test-action-macos.yml @@ -101,6 +101,12 @@ jobs: SALT_TRANSPORT: ${{ matrix.transport }} steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" + - name: Checkout Source Code uses: actions/checkout@v4 diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index dccbd3134b6..8ef3ffb8686 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -110,6 +110,12 @@ jobs: TEST_GROUP: ${{ matrix.test-group || 1 }} steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" + - name: Checkout Source Code uses: actions/checkout@v4 diff --git a/.github/workflows/test-package-downloads-action-windows.yml b/.github/workflows/test-package-downloads-action-windows.yml index 60d8b1be9aa..686c93af68f 100644 --- a/.github/workflows/test-package-downloads-action-windows.yml +++ b/.github/workflows/test-package-downloads-action-windows.yml @@ -91,6 +91,12 @@ jobs: - ${{ inputs.pkg-type }} steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" + - name: Checkout Source Code uses: actions/checkout@v4 diff --git a/.github/workflows/test-packages-action-macos.yml b/.github/workflows/test-packages-action-macos.yml index a84edb76b8c..5a6ac846fb8 100644 --- a/.github/workflows/test-packages-action-macos.yml +++ b/.github/workflows/test-packages-action-macos.yml @@ -104,6 +104,12 @@ jobs: include: ${{ fromJSON(needs.generate-matrix.outputs.pkg-matrix-include) }} steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" + - name: Checkout Source Code uses: actions/checkout@v4 diff --git a/.github/workflows/test-packages-action.yml b/.github/workflows/test-packages-action.yml index b38efca107f..1418bc93e30 100644 --- a/.github/workflows/test-packages-action.yml +++ b/.github/workflows/test-packages-action.yml @@ -112,6 +112,12 @@ jobs: include: ${{ fromJSON(needs.generate-matrix.outputs.pkg-matrix-include) }} steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" + - name: Checkout Source Code uses: actions/checkout@v4 From a0b24882931e654e64334c7a02784306f9876d72 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 5 Oct 2023 15:49:22 +0100 Subject: [PATCH 084/147] Stricter timeouts Signed-off-by: Pedro Algarvio --- .github/workflows/test-action-macos.yml | 4 +++- .github/workflows/test-action.yml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-action-macos.yml b/.github/workflows/test-action-macos.yml index 4af38494ff6..0457e0acebe 100644 --- a/.github/workflows/test-action-macos.yml +++ b/.github/workflows/test-action-macos.yml @@ -90,7 +90,9 @@ jobs: test: name: Test runs-on: ${{ inputs.distro-slug }} - timeout-minutes: 360 # 6 Hours + # Full test runs. Each chunk should never take more than 2 hours. + # Partial test runs(no chunk parallelization), 5 Hours + timeout-minutes: ${{ fromJSON(inputs.testrun)['type'] == 'full' && 120 || 300 }} needs: - generate-matrix strategy: diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index 8ef3ffb8686..562b29e7c4c 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -98,7 +98,9 @@ jobs: - self-hosted - linux - bastion - timeout-minutes: 300 # 5 Hours - More than this and something is wrong + # Full test runs. Each chunk should never take more than 2 hours. + # Partial test runs(no chunk parallelization), 5 Hours + timeout-minutes: ${{ fromJSON(inputs.testrun)['type'] == 'full' && 120 || 300 }} needs: - generate-matrix strategy: From 65ee4641a6e6ae60505694e579e30b11621828ab Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 5 Oct 2023 16:25:22 +0100 Subject: [PATCH 085/147] Always download the test run artifacts(namely logs) These help debugging failed builds Signed-off-by: Pedro Algarvio --- .github/workflows/test-action-macos.yml | 8 ++++---- .github/workflows/test-action.yml | 10 +++++----- .../workflows/test-package-downloads-action-linux.yml | 5 +++++ .../workflows/test-package-downloads-action-macos.yml | 4 ++-- .../test-package-downloads-action-windows.yml | 5 +++++ .github/workflows/test-packages-action-macos.yml | 4 ++-- 6 files changed, 23 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test-action-macos.yml b/.github/workflows/test-action-macos.yml index 0457e0acebe..360e5eaded8 100644 --- a/.github/workflows/test-action-macos.yml +++ b/.github/workflows/test-action-macos.yml @@ -318,13 +318,13 @@ jobs: sudo chown -R "$(id -un)" . - name: Combine Coverage Reports - if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' + if: always() && inputs.skip-code-coverage == false run: | nox -e combine-coverage - name: Prepare Test Run Artifacts id: download-artifacts-from-vm - if: always() && job.status != 'cancelled' + if: always() run: | # Delete the salt onedir, we won't need it anymore and it will prevent # from it showing in the tree command below @@ -351,7 +351,7 @@ jobs: artifacts/coverage/ - name: Upload JUnit XML Test Run Artifacts - if: always() && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + if: always() && steps.download-artifacts-from-vm.outcome == 'success' uses: actions/upload-artifact@v3 with: name: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-${{ matrix.transport }} @@ -359,7 +359,7 @@ jobs: artifacts/xml-unittests-output/ - name: Upload Test Run Log Artifacts - if: always() && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + if: always() && steps.download-artifacts-from-vm.outcome == 'success' uses: actions/upload-artifact@v3 with: name: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-${{ matrix.transport }} diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index 562b29e7c4c..c84d717f949 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -261,13 +261,13 @@ jobs: --test-group-count=${{ matrix.test-group-count || 1 }} --test-group=${{ matrix.test-group || 1 }} - name: Combine Coverage Reports - if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' + if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' run: | tools --timestamps vm combine-coverage ${{ inputs.distro-slug }} - name: Download Test Run Artifacts id: download-artifacts-from-vm - if: always() && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' + if: always() && steps.spin-up-vm.outcome == 'success' run: | tools --timestamps vm download-artifacts ${{ inputs.distro-slug }} # Delete the salt onedir, we won't need it anymore and it will prevent @@ -300,7 +300,7 @@ jobs: artifacts/coverage/ - name: Upload JUnit XML Test Run Artifacts - if: always() && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + if: always() && steps.download-artifacts-from-vm.outcome == 'success' uses: actions/upload-artifact@v3 with: name: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-${{ matrix.transport }} @@ -308,7 +308,7 @@ jobs: artifacts/xml-unittests-output/ - name: Upload Test Run Log Artifacts - if: always() && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + if: always() && steps.download-artifacts-from-vm.outcome == 'success' uses: actions/upload-artifact@v3 with: name: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-${{ matrix.transport }} @@ -318,7 +318,7 @@ jobs: - name: Publish Test Report uses: mikepenz/action-junit-report@v3 # always run even if the previous steps fails - if: always() && inputs.skip-junit-reports == false + if: always() && inputs.skip-junit-reports == false && job.status != 'cancelled' with: check_name: Test Results(${{ inputs.distro-slug }}, transport=${{ matrix.transport }}, tests-chunk=${{ matrix.tests-chunk }}, group=${{ matrix.test-group || '1' }}) report_paths: 'artifacts/xml-unittests-output/*.xml' diff --git a/.github/workflows/test-package-downloads-action-linux.yml b/.github/workflows/test-package-downloads-action-linux.yml index a1bf24ece8a..a828a631e8c 100644 --- a/.github/workflows/test-package-downloads-action-linux.yml +++ b/.github/workflows/test-package-downloads-action-linux.yml @@ -180,6 +180,11 @@ jobs: -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ inputs.distro-slug }} -- download-pkgs + - name: Combine Coverage Reports + if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' + run: | + tools --timestamps vm combine-coverage ${{ inputs.distro-slug }} + - name: Create XML Coverage Reports if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' run: | diff --git a/.github/workflows/test-package-downloads-action-macos.yml b/.github/workflows/test-package-downloads-action-macos.yml index e6f4573a2b2..706b0284a01 100644 --- a/.github/workflows/test-package-downloads-action-macos.yml +++ b/.github/workflows/test-package-downloads-action-macos.yml @@ -180,7 +180,7 @@ jobs: - name: Prepare Test Run Artifacts id: download-artifacts-from-vm - if: always() && job.status != 'cancelled' + if: always() run: | # Delete the salt onedir, we won't need it anymore and it will prevent # from it showing in the tree command below @@ -258,7 +258,7 @@ jobs: fi - name: Upload Test Run Artifacts - if: always() && job.status != 'cancelled' + if: always() uses: actions/upload-artifact@v3 with: name: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.arch }} diff --git a/.github/workflows/test-package-downloads-action-windows.yml b/.github/workflows/test-package-downloads-action-windows.yml index 686c93af68f..c3bf59a8add 100644 --- a/.github/workflows/test-package-downloads-action-windows.yml +++ b/.github/workflows/test-package-downloads-action-windows.yml @@ -185,6 +185,11 @@ jobs: -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ inputs.distro-slug }} -- download-pkgs + - name: Combine Coverage Reports + if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' + run: | + tools --timestamps vm combine-coverage ${{ inputs.distro-slug }} + - name: Create XML Coverage Reports if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' run: | diff --git a/.github/workflows/test-packages-action-macos.yml b/.github/workflows/test-packages-action-macos.yml index 5a6ac846fb8..41048bd4e34 100644 --- a/.github/workflows/test-packages-action-macos.yml +++ b/.github/workflows/test-packages-action-macos.yml @@ -195,7 +195,7 @@ jobs: - name: Prepare Test Run Artifacts id: download-artifacts-from-vm - if: always() && job.status != 'cancelled' + if: always() run: | # Delete the salt onedir, we won't need it anymore and it will prevent # from it showing in the tree command below @@ -203,7 +203,7 @@ jobs: tree -a artifacts - name: Upload Test Run Artifacts - if: always() && job.status != 'cancelled' + if: always() uses: actions/upload-artifact@v3 with: name: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ matrix.test-chunk }} From 834bb2d9e6674a5ba1fcb647f92b11a68b9793ee Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 5 Oct 2023 18:17:05 +0100 Subject: [PATCH 086/147] The `build-onedir-repo` job needs to depend on `build-salt-onedir-{linux,macos,windows}` jobs Signed-off-by: Pedro Algarvio --- .github/workflows/nightly.yml | 3 +++ .github/workflows/staging.yml | 3 +++ .github/workflows/templates/build-repos.yml.jinja | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index dc54c93db45..914804ef073 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -2838,6 +2838,9 @@ jobs: - repo-nightly needs: - prepare-workflow + - build-salt-onedir-linux + - build-salt-onedir-macos + - build-salt-onedir-windows steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index ef40f32310b..4f7e567e94d 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -2696,6 +2696,9 @@ jobs: - repo-staging needs: - prepare-workflow + - build-salt-onedir-linux + - build-salt-onedir-macos + - build-salt-onedir-windows steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/templates/build-repos.yml.jinja b/.github/workflows/templates/build-repos.yml.jinja index 8aa147ce40b..da05231fdb5 100644 --- a/.github/workflows/templates/build-repos.yml.jinja +++ b/.github/workflows/templates/build-repos.yml.jinja @@ -23,6 +23,10 @@ - build-<{ type }>-pkgs-onedir <%- elif platform %> - build-salt-onedir-<{ platform }> + <%- elif type == 'onedir' %> + - build-salt-onedir-linux + - build-salt-onedir-macos + - build-salt-onedir-windows <%- endif %> <%- include "build-{}-repo.yml.jinja".format(type) %> From 72cb90835d92925654734cec95d51ee0ab58b46d Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 6 Oct 2023 08:17:24 +0100 Subject: [PATCH 087/147] Update to the latest golden images Signed-off-by: Pedro Algarvio --- cicd/golden-images.json | 164 ++++++++++++++++++++-------------------- pkg/tests/conftest.py | 12 --- 2 files changed, 82 insertions(+), 94 deletions(-) diff --git a/cicd/golden-images.json b/cicd/golden-images.json index 9a3f06f705a..962af9809e6 100644 --- a/cicd/golden-images.json +++ b/cicd/golden-images.json @@ -1,8 +1,8 @@ { "almalinux-8-arm64": { - "ami": "ami-0f08fc00f1689a8ec", + "ami": "ami-04c86a9990a3836b9", "ami_description": "CI Image of AlmaLinux 8 arm64", - "ami_name": "salt-project/ci/almalinux/8/arm64/20231003.2057", + "ami_name": "salt-project/ci/almalinux/8/arm64/20231005.1556", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -10,9 +10,9 @@ "ssh_username": "ec2-user" }, "almalinux-8": { - "ami": "ami-08f648e0e6fa619c2", + "ami": "ami-059ed5c00c02c564b", "ami_description": "CI Image of AlmaLinux 8 x86_64", - "ami_name": "salt-project/ci/almalinux/8/x86_64/20231003.2058", + "ami_name": "salt-project/ci/almalinux/8/x86_64/20231005.1557", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -20,9 +20,9 @@ "ssh_username": "ec2-user" }, "almalinux-9-arm64": { - "ami": "ami-0394b210e1e09b962", + "ami": "ami-0213f3e31656f7393", "ami_description": "CI Image of AlmaLinux 9 arm64", - "ami_name": "salt-project/ci/almalinux/9/arm64/20231003.2058", + "ami_name": "salt-project/ci/almalinux/9/arm64/20231005.1557", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -30,9 +30,9 @@ "ssh_username": "ec2-user" }, "almalinux-9": { - "ami": "ami-0a909a150cfebea5b", + "ami": "ami-0c4e36d63e728ee21", "ami_description": "CI Image of AlmaLinux 9 x86_64", - "ami_name": "salt-project/ci/almalinux/9/x86_64/20231003.2100", + "ami_name": "salt-project/ci/almalinux/9/x86_64/20231005.1557", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -40,9 +40,9 @@ "ssh_username": "ec2-user" }, "amazonlinux-2-arm64": { - "ami": "ami-038eac6a08feecdb2", + "ami": "ami-010d24ab23bfb0330", "ami_description": "CI Image of AmazonLinux 2 arm64", - "ami_name": "salt-project/ci/amazonlinux/2/arm64/20231003.2104", + "ami_name": "salt-project/ci/amazonlinux/2/arm64/20231005.1614", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -50,9 +50,9 @@ "ssh_username": "ec2-user" }, "amazonlinux-2": { - "ami": "ami-09682e96e7785642d", + "ami": "ami-0ad016fe17f923c6b", "ami_description": "CI Image of AmazonLinux 2 x86_64", - "ami_name": "salt-project/ci/amazonlinux/2/x86_64/20231003.2104", + "ami_name": "salt-project/ci/amazonlinux/2/x86_64/20231005.1614", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -60,9 +60,9 @@ "ssh_username": "ec2-user" }, "amazonlinux-2023.1-arm64": { - "ami": "ami-0e46c84fb43817334", + "ami": "ami-037b7d6177ec8259d", "ami_description": "CI Image of AmazonLinux 2023.1 arm64", - "ami_name": "salt-project/ci/amazonlinux/2023.1/arm64/20231003.2103", + "ami_name": "salt-project/ci/amazonlinux/2023.1/arm64/20231005.1555", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -70,9 +70,9 @@ "ssh_username": "ec2-user" }, "amazonlinux-2023.1": { - "ami": "ami-0ac591368ec230345", + "ami": "ami-08e04f6dd44c858fa", "ami_description": "CI Image of AmazonLinux 2023.1 x86_64", - "ami_name": "salt-project/ci/amazonlinux/2023.1/x86_64/20231003.2103", + "ami_name": "salt-project/ci/amazonlinux/2023.1/x86_64/20231005.1555", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -80,9 +80,9 @@ "ssh_username": "ec2-user" }, "archlinux-lts": { - "ami": "ami-017de6f1e636021a0", + "ami": "ami-0b88ddfb321aff9ba", "ami_description": "CI Image of ArchLinux lts x86_64", - "ami_name": "salt-project/ci/archlinux/lts/x86_64/20231003.2108", + "ami_name": "salt-project/ci/archlinux/lts/x86_64/20231005.1555", "arch": "x86_64", "cloudwatch-agent-available": "false", "instance_type": "t3a.large", @@ -90,9 +90,9 @@ "ssh_username": "arch" }, "centos-7-arm64": { - "ami": "ami-088cb5f3066efa748", + "ami": "ami-01d5ee66081a02154", "ami_description": "CI Image of CentOS 7 arm64", - "ami_name": "salt-project/ci/centos/7/arm64/20231003.2108", + "ami_name": "salt-project/ci/centos/7/arm64/20231005.1617", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -100,9 +100,9 @@ "ssh_username": "centos" }, "centos-7": { - "ami": "ami-05c4056c36cecc136", + "ami": "ami-020fcff1da1f72f27", "ami_description": "CI Image of CentOS 7 x86_64", - "ami_name": "salt-project/ci/centos/7/x86_64/20231003.2107", + "ami_name": "salt-project/ci/centos/7/x86_64/20231005.1616", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -110,9 +110,9 @@ "ssh_username": "centos" }, "centosstream-8-arm64": { - "ami": "ami-0e2a761782490f7c2", + "ami": "ami-0ac6238b6506f7b8f", "ami_description": "CI Image of CentOSStream 8 arm64", - "ami_name": "salt-project/ci/centosstream/8/arm64/20231003.2109", + "ami_name": "salt-project/ci/centosstream/8/arm64/20231005.1614", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -120,9 +120,9 @@ "ssh_username": "centos" }, "centosstream-8": { - "ami": "ami-06178cd094ea71c34", + "ami": "ami-0bfceb03d43d0ba0e", "ami_description": "CI Image of CentOSStream 8 x86_64", - "ami_name": "salt-project/ci/centosstream/8/x86_64/20231003.2108", + "ami_name": "salt-project/ci/centosstream/8/x86_64/20231005.1615", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -130,9 +130,9 @@ "ssh_username": "centos" }, "centosstream-9-arm64": { - "ami": "ami-0ea1025028e6fe700", + "ami": "ami-04db23ba9082a01bf", "ami_description": "CI Image of CentOSStream 9 arm64", - "ami_name": "salt-project/ci/centosstream/9/arm64/20231003.2109", + "ami_name": "salt-project/ci/centosstream/9/arm64/20231005.1615", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -140,9 +140,9 @@ "ssh_username": "ec2-user" }, "centosstream-9": { - "ami": "ami-0f474b360fca72512", + "ami": "ami-0a47f4f785cb7a81c", "ami_description": "CI Image of CentOSStream 9 x86_64", - "ami_name": "salt-project/ci/centosstream/9/x86_64/20231003.2109", + "ami_name": "salt-project/ci/centosstream/9/x86_64/20231005.1615", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -150,9 +150,9 @@ "ssh_username": "ec2-user" }, "debian-10-arm64": { - "ami": "ami-0b9cbee875ae2e145", + "ami": "ami-015d30e48fa213528", "ami_description": "CI Image of Debian 10 arm64", - "ami_name": "salt-project/ci/debian/10/arm64/20231003.2114", + "ami_name": "salt-project/ci/debian/10/arm64/20231005.1601", "arch": "arm64", "cloudwatch-agent-available": "false", "instance_type": "m6g.large", @@ -160,9 +160,9 @@ "ssh_username": "admin" }, "debian-10": { - "ami": "ami-03b713e88ac915c18", + "ami": "ami-0397043698fedfa4c", "ami_description": "CI Image of Debian 10 x86_64", - "ami_name": "salt-project/ci/debian/10/x86_64/20231003.2112", + "ami_name": "salt-project/ci/debian/10/x86_64/20231005.1606", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -170,9 +170,9 @@ "ssh_username": "admin" }, "debian-11-arm64": { - "ami": "ami-0e48f24d9def8d84c", + "ami": "ami-008dbab5525972174", "ami_description": "CI Image of Debian 11 arm64", - "ami_name": "salt-project/ci/debian/11/arm64/20231003.2114", + "ami_name": "salt-project/ci/debian/11/arm64/20231005.1607", "arch": "arm64", "cloudwatch-agent-available": "false", "instance_type": "m6g.large", @@ -180,9 +180,9 @@ "ssh_username": "admin" }, "debian-11": { - "ami": "ami-07a2fb75d29d0d6f7", + "ami": "ami-04fc56501daaf3c94", "ami_description": "CI Image of Debian 11 x86_64", - "ami_name": "salt-project/ci/debian/11/x86_64/20231003.2116", + "ami_name": "salt-project/ci/debian/11/x86_64/20231005.1607", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -190,9 +190,9 @@ "ssh_username": "admin" }, "debian-12-arm64": { - "ami": "ami-027199ded9ce9f659", + "ami": "ami-0956b73228a7368c3", "ami_description": "CI Image of Debian 12 arm64", - "ami_name": "salt-project/ci/debian/12/arm64/20231003.2117", + "ami_name": "salt-project/ci/debian/12/arm64/20231005.1610", "arch": "arm64", "cloudwatch-agent-available": "false", "instance_type": "m6g.large", @@ -200,9 +200,9 @@ "ssh_username": "admin" }, "debian-12": { - "ami": "ami-02156ad853a403599", + "ami": "ami-0d0aa04bb5c49e54f", "ami_description": "CI Image of Debian 12 x86_64", - "ami_name": "salt-project/ci/debian/12/x86_64/20231003.2119", + "ami_name": "salt-project/ci/debian/12/x86_64/20231005.1613", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -210,9 +210,9 @@ "ssh_username": "admin" }, "fedora-37-arm64": { - "ami": "ami-0dfb1b2e3b6cd8847", + "ami": "ami-0201f64fda9f1ca6d", "ami_description": "CI Image of Fedora 37 arm64", - "ami_name": "salt-project/ci/fedora/37/arm64/20231003.2119", + "ami_name": "salt-project/ci/fedora/37/arm64/20231005.1617", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -220,9 +220,9 @@ "ssh_username": "fedora" }, "fedora-37": { - "ami": "ami-0d27e014bf07af18b", + "ami": "ami-02dfc80c8b14fd5bc", "ami_description": "CI Image of Fedora 37 x86_64", - "ami_name": "salt-project/ci/fedora/37/x86_64/20231003.2120", + "ami_name": "salt-project/ci/fedora/37/x86_64/20231005.1618", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -230,9 +230,9 @@ "ssh_username": "fedora" }, "fedora-38-arm64": { - "ami": "ami-04f5a34bae3040974", + "ami": "ami-0b03c270c7f50165d", "ami_description": "CI Image of Fedora 38 arm64", - "ami_name": "salt-project/ci/fedora/38/arm64/20231003.2120", + "ami_name": "salt-project/ci/fedora/38/arm64/20231005.1618", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -240,9 +240,9 @@ "ssh_username": "fedora" }, "fedora-38": { - "ami": "ami-0e69802061ed79891", + "ami": "ami-0927a80620f670c23", "ami_description": "CI Image of Fedora 38 x86_64", - "ami_name": "salt-project/ci/fedora/38/x86_64/20231003.2123", + "ami_name": "salt-project/ci/fedora/38/x86_64/20231005.1626", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -250,9 +250,9 @@ "ssh_username": "fedora" }, "opensuse-15": { - "ami": "ami-0ebb684e16914ad0a", + "ami": "ami-0b51e3479fabb4078", "ami_description": "CI Image of Opensuse 15 x86_64", - "ami_name": "salt-project/ci/opensuse/15/x86_64/20231003.2110", + "ami_name": "salt-project/ci/opensuse/15/x86_64/20231005.1614", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -260,9 +260,9 @@ "ssh_username": "ec2-user" }, "photonos-3-arm64": { - "ami": "ami-054765b3beb6dd97c", + "ami": "ami-0a33037524874686c", "ami_description": "CI Image of PhotonOS 3 arm64", - "ami_name": "salt-project/ci/photonos/3/arm64/20231003.2129", + "ami_name": "salt-project/ci/photonos/3/arm64/20231005.1558", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -270,9 +270,9 @@ "ssh_username": "root" }, "photonos-3": { - "ami": "ami-0224e8a4471113ebb", + "ami": "ami-068c5c07aa91d84d1", "ami_description": "CI Image of PhotonOS 3 x86_64", - "ami_name": "salt-project/ci/photonos/3/x86_64/20231003.2128", + "ami_name": "salt-project/ci/photonos/3/x86_64/20231005.1558", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -280,9 +280,9 @@ "ssh_username": "root" }, "photonos-4-arm64": { - "ami": "ami-091f6d77aa3921394", + "ami": "ami-0f8c72854c5b5679c", "ami_description": "CI Image of PhotonOS 4 arm64", - "ami_name": "salt-project/ci/photonos/4/arm64/20231003.2124", + "ami_name": "salt-project/ci/photonos/4/arm64/20231005.1558", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -290,9 +290,9 @@ "ssh_username": "root" }, "photonos-4": { - "ami": "ami-0714704e9471a8e0c", + "ami": "ami-04b8974b830b5adb0", "ami_description": "CI Image of PhotonOS 4 x86_64", - "ami_name": "salt-project/ci/photonos/4/x86_64/20231003.2130", + "ami_name": "salt-project/ci/photonos/4/x86_64/20231005.1559", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -300,9 +300,9 @@ "ssh_username": "root" }, "photonos-5-arm64": { - "ami": "ami-05ebc5bddb487c20b", + "ami": "ami-0f466b198cbcaf380", "ami_description": "CI Image of PhotonOS 5 arm64", - "ami_name": "salt-project/ci/photonos/5/arm64/20231003.2130", + "ami_name": "salt-project/ci/photonos/5/arm64/20231005.1559", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -310,9 +310,9 @@ "ssh_username": "root" }, "photonos-5": { - "ami": "ami-0b7e17bc1990da3af", + "ami": "ami-01bb09f84464b243e", "ami_description": "CI Image of PhotonOS 5 x86_64", - "ami_name": "salt-project/ci/photonos/5/x86_64/20231003.2131", + "ami_name": "salt-project/ci/photonos/5/x86_64/20231005.1601", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -320,9 +320,9 @@ "ssh_username": "root" }, "ubuntu-20.04-arm64": { - "ami": "ami-09210544c9163df86", + "ami": "ami-06d9a9e3b5ae369c7", "ami_description": "CI Image of Ubuntu 20.04 arm64", - "ami_name": "salt-project/ci/ubuntu/20.04/arm64/20231003.2110", + "ami_name": "salt-project/ci/ubuntu/20.04/arm64/20231005.1555", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -330,9 +330,9 @@ "ssh_username": "ubuntu" }, "ubuntu-20.04": { - "ami": "ami-05894335447f4c052", + "ami": "ami-080a55fb6cb08134d", "ami_description": "CI Image of Ubuntu 20.04 x86_64", - "ami_name": "salt-project/ci/ubuntu/20.04/x86_64/20231003.2110", + "ami_name": "salt-project/ci/ubuntu/20.04/x86_64/20231005.1555", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -340,9 +340,9 @@ "ssh_username": "ubuntu" }, "ubuntu-22.04-arm64": { - "ami": "ami-090423dbe605f6d3e", + "ami": "ami-0c87b8f0b8794f32e", "ami_description": "CI Image of Ubuntu 22.04 arm64", - "ami_name": "salt-project/ci/ubuntu/22.04/arm64/20231003.2111", + "ami_name": "salt-project/ci/ubuntu/22.04/arm64/20231005.1555", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -350,9 +350,9 @@ "ssh_username": "ubuntu" }, "ubuntu-22.04": { - "ami": "ami-0a465357b34ea7fdc", + "ami": "ami-0ce98043f227c9ac0", "ami_description": "CI Image of Ubuntu 22.04 x86_64", - "ami_name": "salt-project/ci/ubuntu/22.04/x86_64/20231003.2111", + "ami_name": "salt-project/ci/ubuntu/22.04/x86_64/20231005.1555", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -360,9 +360,9 @@ "ssh_username": "ubuntu" }, "ubuntu-23.04-arm64": { - "ami": "ami-0ed81524d646f95ee", + "ami": "ami-0519c583e36309fef", "ami_description": "CI Image of Ubuntu 23.04 arm64", - "ami_name": "salt-project/ci/ubuntu/23.04/arm64/20231003.2111", + "ami_name": "salt-project/ci/ubuntu/23.04/arm64/20231005.1555", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -370,9 +370,9 @@ "ssh_username": "ubuntu" }, "ubuntu-23.04": { - "ami": "ami-02c7edd6357be51b6", + "ami": "ami-063ad5dfb49f09182", "ami_description": "CI Image of Ubuntu 23.04 x86_64", - "ami_name": "salt-project/ci/ubuntu/23.04/x86_64/20231003.2112", + "ami_name": "salt-project/ci/ubuntu/23.04/x86_64/20231005.1555", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", @@ -380,9 +380,9 @@ "ssh_username": "ubuntu" }, "windows-2016": { - "ami": "ami-04f113ff291a8953f", + "ami": "ami-0f1ac34593b8b044f", "ami_description": "CI Image of Windows 2016 x86_64", - "ami_name": "salt-project/ci/windows/2016/x86_64/20231003.2104", + "ami_name": "salt-project/ci/windows/2016/x86_64/20231005.1615", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.xlarge", @@ -390,9 +390,9 @@ "ssh_username": "Administrator" }, "windows-2019": { - "ami": "ami-06475f495e0151fc9", + "ami": "ami-09100ff6a103a28ab", "ami_description": "CI Image of Windows 2019 x86_64", - "ami_name": "salt-project/ci/windows/2019/x86_64/20231003.2106", + "ami_name": "salt-project/ci/windows/2019/x86_64/20231005.1615", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.xlarge", @@ -400,9 +400,9 @@ "ssh_username": "Administrator" }, "windows-2022": { - "ami": "ami-0558da89560480f32", + "ami": "ami-0266dc6a12bc9fca6", "ami_description": "CI Image of Windows 2022 x86_64", - "ami_name": "salt-project/ci/windows/2022/x86_64/20231003.2106", + "ami_name": "salt-project/ci/windows/2022/x86_64/20231005.1616", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.xlarge", diff --git a/pkg/tests/conftest.py b/pkg/tests/conftest.py index c618b7ed4bb..36c60b0e57b 100644 --- a/pkg/tests/conftest.py +++ b/pkg/tests/conftest.py @@ -49,18 +49,6 @@ def _system_up_to_date( grains, shell, ): - if grains["os"] == "Ubuntu" and grains["osarch"] == "amd64": - # The grub-efi-amd64-signed package seems to be a problem - # right now when updating the system - env = os.environ.copy() - env["DEBIAN_FRONTEND"] = "noninteractive" - ret = shell.run( - "apt-mark", - "hold", - "grub-efi-amd64-signed", - env=env, - ) - assert ret.returncode == 0 if grains["os_family"] == "Debian": ret = shell.run("apt", "update") assert ret.returncode == 0 From efe18b6f1239b314090fef14c76a18cdc506d31c Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 6 Oct 2023 15:02:48 +0100 Subject: [PATCH 088/147] The XML coverage reports need to be created for Salt and Tests Signed-off-by: Pedro Algarvio --- .github/workflows/test-action-macos.yml | 8 ++++++++ .github/workflows/test-action.yml | 8 ++++++++ .../test-package-downloads-action-linux.yml | 8 ++++++++ .../test-package-downloads-action-macos.yml | 8 ++++++++ .../test-package-downloads-action-windows.yml | 8 ++++++++ noxfile.py | 13 +++++++++++-- 6 files changed, 51 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-action-macos.yml b/.github/workflows/test-action-macos.yml index 360e5eaded8..a9fa7c783ff 100644 --- a/.github/workflows/test-action-macos.yml +++ b/.github/workflows/test-action-macos.yml @@ -430,6 +430,10 @@ jobs: - name: Upload Source Code Coverage To Codecov if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success' && job.status != 'cancelled' run: | + if [ ! -s artifacts/coverage/salt.xml ]; then + echo "The artifacts/coverage/salt.xml file does not exist" + exit 1 + fi # We can't yet use tokenless uploads with the codecov CLI #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ # do-upload --git-service github --sha ${{ github.sha }} \ @@ -458,6 +462,10 @@ jobs: - name: Upload Tests Code Coverage To Codecov if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success' && job.status != 'cancelled' run: | + if [ ! -s artifacts/coverage/tests.xml ]; then + echo "The artifacts/coverage/tests.xml file does not exist" + exit 1 + fi # We can't yet use tokenless uploads with the codecov CLI #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ # do-upload --git-service github --sha ${{ github.sha }} \ diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index c84d717f949..351ba55e5b9 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -377,6 +377,10 @@ jobs: - name: Upload Source Code Coverage To Codecov if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success' && job.status != 'cancelled' run: | + if [ ! -s artifacts/coverage/salt.xml ]; then + echo "The artifacts/coverage/salt.xml file does not exist" + exit 1 + fi # We can't yet use tokenless uploads with the codecov CLI #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ # do-upload --git-service github --sha ${{ github.sha }} \ @@ -405,6 +409,10 @@ jobs: - name: Upload Tests Code Coverage To Codecov if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success' && job.status != 'cancelled' run: | + if [ ! -s artifacts/coverage/tests.xml ]; then + echo "The artifacts/coverage/tests.xml file does not exist" + exit 1 + fi # We can't yet use tokenless uploads with the codecov CLI #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ # do-upload --git-service github --sha ${{ github.sha }} \ diff --git a/.github/workflows/test-package-downloads-action-linux.yml b/.github/workflows/test-package-downloads-action-linux.yml index a828a631e8c..06faeffa002 100644 --- a/.github/workflows/test-package-downloads-action-linux.yml +++ b/.github/workflows/test-package-downloads-action-linux.yml @@ -226,6 +226,10 @@ jobs: - name: Upload Source Code Coverage To Codecov if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' run: | + if [ ! -s artifacts/coverage/salt.xml ]; then + echo "The artifacts/coverage/salt.xml file does not exist" + exit 1 + fi # We can't yet use tokenless uploads with the codecov CLI #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ # do-upload --git-service github --sha ${{ github.sha }} \ @@ -254,6 +258,10 @@ jobs: - name: Upload Tests Code Coverage To Codecov if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' run: | + if [ ! -s artifacts/coverage/tests.xml ]; then + echo "The artifacts/coverage/tests.xml file does not exist" + exit 1 + fi # We can't yet use tokenless uploads with the codecov CLI #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ # do-upload --git-service github --sha ${{ github.sha }} \ diff --git a/.github/workflows/test-package-downloads-action-macos.yml b/.github/workflows/test-package-downloads-action-macos.yml index 706b0284a01..f5e8c2d05c6 100644 --- a/.github/workflows/test-package-downloads-action-macos.yml +++ b/.github/workflows/test-package-downloads-action-macos.yml @@ -204,6 +204,10 @@ jobs: - name: Upload Source Code Coverage To Codecov if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' run: | + if [ ! -s artifacts/coverage/salt.xml ]; then + echo "The artifacts/coverage/salt.xml file does not exist" + exit 1 + fi # We can't yet use tokenless uploads with the codecov CLI #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ # do-upload --git-service github --sha ${{ github.sha }} \ @@ -232,6 +236,10 @@ jobs: - name: Upload Tests Code Coverage To Codecov if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' run: | + if [ ! -s artifacts/coverage/tests.xml ]; then + echo "The artifacts/coverage/tests.xml file does not exist" + exit 1 + fi # We can't yet use tokenless uploads with the codecov CLI #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ # do-upload --git-service github --sha ${{ github.sha }} \ diff --git a/.github/workflows/test-package-downloads-action-windows.yml b/.github/workflows/test-package-downloads-action-windows.yml index c3bf59a8add..704aa962829 100644 --- a/.github/workflows/test-package-downloads-action-windows.yml +++ b/.github/workflows/test-package-downloads-action-windows.yml @@ -231,6 +231,10 @@ jobs: - name: Upload Source Code Coverage To Codecov if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' run: | + if [ ! -s artifacts/coverage/salt.xml ]; then + echo "The artifacts/coverage/salt.xml file does not exist" + exit 1 + fi # We can't yet use tokenless uploads with the codecov CLI #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ # do-upload --git-service github --sha ${{ github.sha }} \ @@ -259,6 +263,10 @@ jobs: - name: Upload Tests Code Coverage To Codecov if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' run: | + if [ ! -s artifacts/coverage/tests.xml ]; then + echo "The artifacts/coverage/tests.xml file does not exist" + exit 1 + fi # We can't yet use tokenless uploads with the codecov CLI #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ # do-upload --git-service github --sha ${{ github.sha }} \ diff --git a/noxfile.py b/noxfile.py index 83dc559a9d5..e6ad8832590 100644 --- a/noxfile.py +++ b/noxfile.py @@ -1357,9 +1357,18 @@ def create_html_coverage_report(session): _report_coverage(session, combine=True, cli_report=False, html_report=True) +def _create_xml_coverage_reports(session): + if session.posargs: + session.error("No arguments are acceptable to this nox session.") + session.posargs.append("salt") + _report_coverage(session, combine=True, cli_report=False, xml_report=True) + session.posargs.append("tests") + _report_coverage(session, combine=True, cli_report=False, xml_report=True) + + @nox.session(python="3", name="create-xml-coverage-reports") def create_xml_coverage_reports(session): - _report_coverage(session, combine=True, cli_report=False, xml_report=True) + _create_xml_coverage_reports(session) @nox.session( @@ -1368,7 +1377,7 @@ def create_xml_coverage_reports(session): venv_params=["--system-site-packages"], ) def create_xml_coverage_reports_onedir(session): - _report_coverage(session, combine=True, cli_report=False, xml_report=True) + _create_xml_coverage_reports(session) @nox.session(python="3", name="create-json-coverage-reports") From efadd88601af564c2bb862bbbea255f74e66de2e Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 6 Oct 2023 10:06:47 +0100 Subject: [PATCH 089/147] Create workflow for each of the supported repositories Signed-off-by: Pedro Algarvio --- ...-deb-repo.yml.jinja => build-deb-repo.yml} | 94 ++- ...os-repo.yml.jinja => build-macos-repo.yml} | 56 +- ...r-repo.yml.jinja => build-onedir-repo.yml} | 67 +- ...-rpm-repo.yml.jinja => build-rpm-repo.yml} | 99 ++- ...-src-repo.yml.jinja => build-src-repo.yml} | 61 +- ...-repo.yml.jinja => build-windows-repo.yml} | 61 +- .github/workflows/nightly.yml | 642 ++--------------- .github/workflows/staging.yml | 644 ++---------------- .../workflows/templates/build-repos.yml.jinja | 36 +- tools/ci.py | 63 ++ 10 files changed, 525 insertions(+), 1298 deletions(-) rename .github/workflows/{templates/build-deb-repo.yml.jinja => build-deb-repo.yml} (55%) rename .github/workflows/{templates/build-macos-repo.yml.jinja => build-macos-repo.yml} (62%) rename .github/workflows/{templates/build-onedir-repo.yml.jinja => build-onedir-repo.yml} (63%) rename .github/workflows/{templates/build-rpm-repo.yml.jinja => build-rpm-repo.yml} (60%) rename .github/workflows/{templates/build-src-repo.yml.jinja => build-src-repo.yml} (63%) rename .github/workflows/{templates/build-windows-repo.yml.jinja => build-windows-repo.yml} (63%) diff --git a/.github/workflows/templates/build-deb-repo.yml.jinja b/.github/workflows/build-deb-repo.yml similarity index 55% rename from .github/workflows/templates/build-deb-repo.yml.jinja rename to .github/workflows/build-deb-repo.yml index a4e3dd8a2aa..1b8233017f1 100644 --- a/.github/workflows/templates/build-deb-repo.yml.jinja +++ b/.github/workflows/build-deb-repo.yml @@ -1,24 +1,78 @@ +--- +name: Build DEB Repository +on: + workflow_call: + inputs: + environment: + type: string + required: true + description: The environment to run against + gpg_key_id: + type: string + required: true + description: The GPG key ID to use + salt-version: + type: string + required: true + description: The Salt version of the packages to install and test + +env: + RELENV_DATA: "${{ github.workspace }}/.relenv" + COLUMNS: 190 + AWS_MAX_ATTEMPTS: "10" + AWS_RETRY_MODE: "adaptive" + PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ + PIP_EXTRA_INDEX_URL: https://pypi.org/simple + +jobs: + + generate-matrix: + name: DEB (matrix) + runs-on: + - self-hosted + - linux + - x86_64 + outputs: + repo-matrix-include: ${{ steps.generate-pkg-repo-matrix.outputs.matrix }} + steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t" + + - name: Checkout Source Code + uses: actions/checkout@v4 + + - name: Setup Python Tools Scripts + uses: ./.github/actions/setup-python-tools-scripts + + - name: Generate Package Repo Matrix + id: generate-pkg-repo-matrix + run: | + tools ci pkg-repo-matrix deb + + build-deb-repo: + name: DEB + environment: ${{ inputs.environment }} + runs-on: + - self-hosted + - linux + - repo-${{ inputs.environment }} + needs: + - generate-matrix strategy: fail-fast: false matrix: - include: - <%- for distro, version, arch in ( - ("debian", "10", "x86_64"), - ("debian", "10", "aarch64"), - ("debian", "11", "x86_64"), - ("debian", "11", "aarch64"), - ("ubuntu", "20.04", "x86_64"), - ("ubuntu", "20.04", "aarch64"), - ("ubuntu", "22.04", "x86_64"), - ("ubuntu", "22.04", "aarch64"), - ) %> - - distro: <{ distro }> - version: "<{ version }>" - arch: <{ arch }> - <%- endfor %> - + include: ${{ fromJSON(needs.generate-matrix.outputs.repo-matrix-include) }} steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" + - uses: actions/checkout@v4 - name: Download System Dependencies @@ -38,7 +92,7 @@ - name: Download DEB Packages uses: actions/download-artifact@v3 with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-${{ matrix.arch }}-deb + name: salt-${{ inputs.salt-version }}-${{ matrix.arch }}-deb path: artifacts/pkgs/incoming - name: Setup GnuPG @@ -76,15 +130,15 @@ - name: Create Repository run: | - tools pkg repo create deb --key-id=<{ gpg_key_id }> --distro-arch=${{ matrix.arch }} <% if gh_environment == 'nightly' -%> --nightly-build-from=${{ github.ref_name }} <%- endif %> \ - --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ + tools pkg repo create deb --key-id=${{ inputs.gpg_key_id }} --distro-arch=${{ matrix.arch }} ${{ inputs.environment == 'nightly' && format('--nightly-build-from={0}', github.ref_name) || '' }} \ + --salt-version=${{ inputs.salt-version }} \ --distro=${{ matrix.distro }} --distro-version=${{ matrix.version }} \ --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo - name: Upload Repository As An Artifact uses: ./.github/actions/upload-artifact with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-<{ gh_environment }>-repo + name: salt-${{ inputs.salt-version }}-${{ inputs.environment }}-repo path: artifacts/pkgs/repo/* retention-days: 7 if-no-files-found: error diff --git a/.github/workflows/templates/build-macos-repo.yml.jinja b/.github/workflows/build-macos-repo.yml similarity index 62% rename from .github/workflows/templates/build-macos-repo.yml.jinja rename to .github/workflows/build-macos-repo.yml index b24e0a9c4a4..26101419913 100644 --- a/.github/workflows/templates/build-macos-repo.yml.jinja +++ b/.github/workflows/build-macos-repo.yml @@ -1,5 +1,52 @@ +--- +name: Build DEB Repository + +on: + workflow_call: + inputs: + environment: + type: string + required: true + description: The environment to run against + gpg_key_id: + type: string + required: true + description: The GPG key ID to use + salt-version: + type: string + required: true + description: The Salt version of the packages to install and test + +env: + RELENV_DATA: "${{ github.workspace }}/.relenv" + COLUMNS: 190 + AWS_MAX_ATTEMPTS: "10" + AWS_RETRY_MODE: "adaptive" + PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ + PIP_EXTRA_INDEX_URL: https://pypi.org/simple + +jobs: + + build-repo: + name: MacOS + environment: ${{ inputs.environment }} + runs-on: + - self-hosted + - linux + - repo-${{ inputs.environment }} + strategy: + fail-fast: false + matrix: + pkg-type: + - macos steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" + - uses: actions/checkout@v4 - name: Setup Python Tools Scripts @@ -14,7 +61,7 @@ - name: Download macOS x86_64 Packages uses: actions/download-artifact@v3 with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-x86_64-macos + name: salt-${{ inputs.salt-version }}-x86_64-macos path: artifacts/pkgs/incoming - name: Setup GnuPG @@ -52,15 +99,14 @@ - name: Create Repository run: | - tools pkg repo create macos --key-id=<{ gpg_key_id }> <% if gh_environment == 'nightly' -%> --nightly-build-from=${{ github.ref_name }} <%- endif %> \ - --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ + tools pkg repo create macos --key-id=${{ inputs.gpg_key_id }} ${{ inputs.environment == 'nightly' && format('--nightly-build-from={0}', github.ref_name) || '' }} \ + --salt-version=${{ inputs.salt-version }} \ --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo - name: Upload Repository As An Artifact uses: ./.github/actions/upload-artifact with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-<{ gh_environment }>-repo + name: salt-${{ inputs.salt-version }}-${{ inputs.environment }}-repo path: artifacts/pkgs/repo/* retention-days: 7 if-no-files-found: error - archive-name: macos-repo diff --git a/.github/workflows/templates/build-onedir-repo.yml.jinja b/.github/workflows/build-onedir-repo.yml similarity index 63% rename from .github/workflows/templates/build-onedir-repo.yml.jinja rename to .github/workflows/build-onedir-repo.yml index 581503ab1eb..a30e4297c3e 100644 --- a/.github/workflows/templates/build-onedir-repo.yml.jinja +++ b/.github/workflows/build-onedir-repo.yml @@ -1,5 +1,52 @@ +--- +name: Build Onedir Repository + +on: + workflow_call: + inputs: + environment: + type: string + required: true + description: The environment to run against + gpg_key_id: + type: string + required: true + description: The GPG key ID to use + salt-version: + type: string + required: true + description: The Salt version of the packages to install and test + +env: + RELENV_DATA: "${{ github.workspace }}/.relenv" + COLUMNS: 190 + AWS_MAX_ATTEMPTS: "10" + AWS_RETRY_MODE: "adaptive" + PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ + PIP_EXTRA_INDEX_URL: https://pypi.org/simple + +jobs: + + build-repo: + name: Onedir + environment: ${{ inputs.environment }} + runs-on: + - self-hosted + - linux + - repo-${{ inputs.environment }} + strategy: + fail-fast: false + matrix: + pkg-type: + - onedir steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" + - uses: actions/checkout@v4 - name: Setup Python Tools Scripts @@ -14,43 +61,43 @@ - name: Download Linux x86_64 Onedir Archive uses: actions/download-artifact@v3 with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-linux-x86_64.tar.xz + name: salt-${{ inputs.salt-version }}-onedir-linux-x86_64.tar.xz path: artifacts/pkgs/incoming - name: Download Linux aarch64 Onedir Archive uses: actions/download-artifact@v3 with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-linux-aarch64.tar.xz + name: salt-${{ inputs.salt-version }}-onedir-linux-aarch64.tar.xz path: artifacts/pkgs/incoming - name: Download macOS x86_64 Onedir Archive uses: actions/download-artifact@v3 with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-darwin-x86_64.tar.xz + name: salt-${{ inputs.salt-version }}-onedir-darwin-x86_64.tar.xz path: artifacts/pkgs/incoming - name: Download Windows amd64 Onedir Archive uses: actions/download-artifact@v3 with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-windows-amd64.tar.xz + name: salt-${{ inputs.salt-version }}-onedir-windows-amd64.tar.xz path: artifacts/pkgs/incoming - name: Download Windows amd64 Onedir Archive(zip) uses: actions/download-artifact@v3 with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-windows-amd64.zip + name: salt-${{ inputs.salt-version }}-onedir-windows-amd64.zip path: artifacts/pkgs/incoming - name: Download Windows x86 Onedir Archive uses: actions/download-artifact@v3 with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-windows-x86.tar.xz + name: salt-${{ inputs.salt-version }}-onedir-windows-x86.tar.xz path: artifacts/pkgs/incoming - name: Download Windows amd64 Onedir Archive(zip) uses: actions/download-artifact@v3 with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-windows-x86.zip + name: salt-${{ inputs.salt-version }}-onedir-windows-x86.zip path: artifacts/pkgs/incoming - name: Setup GnuPG @@ -88,14 +135,14 @@ - name: Create Repository run: | - tools pkg repo create onedir --key-id=<{ gpg_key_id }> <% if gh_environment == 'nightly' -%> --nightly-build-from=${{ github.ref_name }} <%- endif %> \ - --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ + tools pkg repo create onedir --key-id=${{ inputs.gpg_key_id }} ${{ inputs.environment == 'nightly' && format('--nightly-build-from={0}', github.ref_name) || '' }} \ + --salt-version=${{ inputs.salt-version }} \ --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo - name: Upload Repository As An Artifact uses: ./.github/actions/upload-artifact with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-<{ gh_environment }>-repo + name: salt-${{ inputs.salt-version }}-${{ inputs.environment }}-repo path: artifacts/pkgs/repo/* retention-days: 7 if-no-files-found: error diff --git a/.github/workflows/templates/build-rpm-repo.yml.jinja b/.github/workflows/build-rpm-repo.yml similarity index 60% rename from .github/workflows/templates/build-rpm-repo.yml.jinja rename to .github/workflows/build-rpm-repo.yml index ba0702ffc03..83f957de461 100644 --- a/.github/workflows/templates/build-rpm-repo.yml.jinja +++ b/.github/workflows/build-rpm-repo.yml @@ -1,32 +1,71 @@ +--- +name: Build RPM Repository +on: + workflow_call: + inputs: + environment: + type: string + required: true + description: The environment to run against + gpg_key_id: + type: string + required: true + description: The GPG key ID to use + salt-version: + type: string + required: true + description: The Salt version of the packages to install and test + +env: + RELENV_DATA: "${{ github.workspace }}/.relenv" + COLUMNS: 190 + AWS_MAX_ATTEMPTS: "10" + AWS_RETRY_MODE: "adaptive" + PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ + PIP_EXTRA_INDEX_URL: https://pypi.org/simple + +jobs: + + generate-matrix: + name: RPM (matrix) + runs-on: + - self-hosted + - linux + - x86_64 + outputs: + repo-matrix-include: ${{ steps.generate-pkg-repo-matrix.outputs.matrix }} + steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t" + + - name: Checkout Source Code + uses: actions/checkout@v4 + + - name: Setup Python Tools Scripts + uses: ./.github/actions/setup-python-tools-scripts + + - name: Generate Package Repo Matrix + id: generate-pkg-repo-matrix + run: | + tools ci pkg-repo-matrix rpm + + build-repo: + name: RPM + environment: ${{ inputs.environment }} + runs-on: + - self-hosted + - linux + - repo-${{ inputs.environment }} + needs: + - generate-matrix strategy: fail-fast: false matrix: - include: - <%- for distro, version, arch in ( - ("amazon", "2", "x86_64"), - ("amazon", "2", "aarch64"), - ("redhat", "7", "x86_64"), - ("redhat", "7", "aarch64"), - ("redhat", "8", "x86_64"), - ("redhat", "8", "aarch64"), - ("redhat", "9", "x86_64"), - ("redhat", "9", "aarch64"), - ("fedora", "36", "x86_64"), - ("fedora", "36", "aarch64"), - ("fedora", "37", "x86_64"), - ("fedora", "37", "aarch64"), - ("fedora", "38", "x86_64"), - ("fedora", "38", "aarch64"), - ("photon", "3", "x86_64"), - ("photon", "3", "aarch64"), - ("photon", "4", "x86_64"), - ("photon", "4", "aarch64"), - ) %> - - distro: <{ distro }> - version: "<{ version }>" - arch: <{ arch }> - <%- endfor %> + include: ${{ fromJSON(needs.generate-matrix.outputs.repo-matrix-include) }} steps: - uses: actions/checkout@v4 @@ -48,7 +87,7 @@ - name: Download RPM Packages uses: actions/download-artifact@v3 with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-${{ matrix.arch }}-rpm + name: salt-${{ inputs.salt-version }}-${{ matrix.arch }}-rpm path: artifacts/pkgs/incoming - name: Setup GnuPG @@ -86,22 +125,20 @@ - name: Create Repository env: - <%- if gh_environment == 'staging' %> SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} - <%- endif %> SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} run: | - tools pkg repo create rpm --key-id=<{ gpg_key_id }> --distro-arch=${{ matrix.arch }} <% if gh_environment == 'nightly' -%> --nightly-build-from=${{ github.ref_name }} <%- endif %> \ - --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ + tools pkg repo create rpm --key-id=${{ inputs.gpg_key_id }} --distro-arch=${{ matrix.arch }} ${{ inputs.environment == 'nightly' && format('--nightly-build-from={0}', github.ref_name) || '' }} \ + --salt-version=${{ inputs.salt-version }} \ --distro=${{ matrix.distro }} --distro-version=${{ matrix.version }} \ --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo - name: Upload Repository As An Artifact uses: ./.github/actions/upload-artifact with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-<{ gh_environment }>-repo + name: salt-${{ inputs.salt-version }}-${{ inputs.environment }}-repo path: artifacts/pkgs/repo/* retention-days: 7 if-no-files-found: error diff --git a/.github/workflows/templates/build-src-repo.yml.jinja b/.github/workflows/build-src-repo.yml similarity index 63% rename from .github/workflows/templates/build-src-repo.yml.jinja rename to .github/workflows/build-src-repo.yml index 728ed00f093..8e0e37c3d52 100644 --- a/.github/workflows/templates/build-src-repo.yml.jinja +++ b/.github/workflows/build-src-repo.yml @@ -1,5 +1,52 @@ +--- +name: Build Source Repository + +on: + workflow_call: + inputs: + environment: + type: string + required: true + description: The environment to run against + gpg_key_id: + type: string + required: true + description: The GPG key ID to use + salt-version: + type: string + required: true + description: The Salt version of the packages to install and test + +env: + RELENV_DATA: "${{ github.workspace }}/.relenv" + COLUMNS: 190 + AWS_MAX_ATTEMPTS: "10" + AWS_RETRY_MODE: "adaptive" + PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ + PIP_EXTRA_INDEX_URL: https://pypi.org/simple + +jobs: + + build-repo: + name: Source + environment: ${{ inputs.environment }} + runs-on: + - self-hosted + - linux + - repo-${{ inputs.environment }} + strategy: + fail-fast: false + matrix: + pkg-type: + - onedir steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" + - uses: actions/checkout@v4 - name: Setup Python Tools Scripts @@ -14,7 +61,7 @@ - name: Download Source Tarball uses: actions/download-artifact@v3 with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}.tar.gz + name: salt-${{ inputs.salt-version }}.tar.gz path: artifacts/pkgs/incoming - name: Setup GnuPG @@ -52,8 +99,8 @@ - name: Create Repository run: | - tools pkg repo create src --key-id=<{ gpg_key_id }> <% if gh_environment == 'nightly' -%> --nightly-build-from=${{ github.ref_name }} <%- endif %> \ - --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ + tools pkg repo create src --key-id=${{ inputs.gpg_key_id }} ${{ inputs.environment == 'nightly' && format('--nightly-build-from={0}', github.ref_name) || '' }} \ + --salt-version=${{ inputs.salt-version }} \ --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo - name: Copy Files For Source Only Artifact Uploads @@ -64,10 +111,10 @@ - name: Upload Standalone Repository As An Artifact uses: actions/upload-artifact@v3 with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-<{ gh_environment }>-src-repo + name: salt-${{ inputs.salt-version }}-${{ inputs.environment }}-src-repo path: | - artifacts/src/salt-${{ needs.prepare-workflow.outputs.salt-version }}.tar.gz - artifacts/src/salt-${{ needs.prepare-workflow.outputs.salt-version }}.tar.gz.* + artifacts/src/salt-${{ inputs.salt-version }}.tar.gz + artifacts/src/salt-${{ inputs.salt-version }}.tar.gz.* artifacts/src/*-GPG-* retention-days: 7 if-no-files-found: error @@ -75,7 +122,7 @@ - name: Upload Repository As An Artifact uses: ./.github/actions/upload-artifact with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-<{ gh_environment }>-repo + name: salt-${{ inputs.salt-version }}-${{ inputs.environment }}-repo path: artifacts/pkgs/repo/* retention-days: 7 if-no-files-found: error diff --git a/.github/workflows/templates/build-windows-repo.yml.jinja b/.github/workflows/build-windows-repo.yml similarity index 63% rename from .github/workflows/templates/build-windows-repo.yml.jinja rename to .github/workflows/build-windows-repo.yml index d806fd00bb3..f5a0b32ccd2 100644 --- a/.github/workflows/templates/build-windows-repo.yml.jinja +++ b/.github/workflows/build-windows-repo.yml @@ -1,5 +1,52 @@ +--- +name: Build Windows Repository + +on: + workflow_call: + inputs: + environment: + type: string + required: true + description: The environment to run against + gpg_key_id: + type: string + required: true + description: The GPG key ID to use + salt-version: + type: string + required: true + description: The Salt version of the packages to install and test + +env: + RELENV_DATA: "${{ github.workspace }}/.relenv" + COLUMNS: 190 + AWS_MAX_ATTEMPTS: "10" + AWS_RETRY_MODE: "adaptive" + PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ + PIP_EXTRA_INDEX_URL: https://pypi.org/simple + +jobs: + + build-repo: + name: Windows + environment: ${{ inputs.environment }} + runs-on: + - self-hosted + - linux + - repo-${{ inputs.environment }} + strategy: + fail-fast: false + matrix: + pkg-type: + - windows steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" + - uses: actions/checkout@v4 - name: Setup Python Tools Scripts @@ -14,25 +61,25 @@ - name: Download Windows NSIS x86 Packages uses: actions/download-artifact@v3 with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-x86-NSIS + name: salt-${{ inputs.salt-version }}-x86-NSIS path: artifacts/pkgs/incoming - name: Download Windows MSI x86 Packages uses: actions/download-artifact@v3 with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-x86-MSI + name: salt-${{ inputs.salt-version }}-x86-MSI path: artifacts/pkgs/incoming - name: Download Windows NSIS amd64 Packages uses: actions/download-artifact@v3 with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-amd64-NSIS + name: salt-${{ inputs.salt-version }}-amd64-NSIS path: artifacts/pkgs/incoming - name: Download Windows MSI amd64 Packages uses: actions/download-artifact@v3 with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-amd64-MSI + name: salt-${{ inputs.salt-version }}-amd64-MSI path: artifacts/pkgs/incoming - name: Setup GnuPG @@ -70,14 +117,14 @@ - name: Create Repository run: | - tools pkg repo create windows --key-id=<{ gpg_key_id }> <% if gh_environment == 'nightly' -%> --nightly-build-from=${{ github.ref_name }} <%- endif %> \ - --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ + tools pkg repo create windows --key-id=${{ inputs.gpg_key_id }} ${{ inputs.environment == 'nightly' && format('--nightly-build-from={0}', github.ref_name) || '' }} \ + --salt-version=${{ inputs.salt-version }} \ --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo - name: Upload Repository As An Artifact uses: ./.github/actions/upload-artifact with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-<{ gh_environment }>-repo + name: salt-${{ inputs.salt-version }}-${{ inputs.environment }}-repo path: artifacts/pkgs/repo/* retention-days: 7 if-no-files-found: error diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 914804ef073..064a7b30b7f 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -2314,634 +2314,78 @@ jobs: if-no-files-found: error build-src-repo: - name: Build Source Repository - environment: nightly - runs-on: - - self-hosted - - linux - - repo-nightly + name: Build Repository needs: - prepare-workflow - steps: - - uses: actions/checkout@v4 - - - name: Setup Python Tools Scripts - uses: ./.github/actions/setup-python-tools-scripts - - - name: Get Salt Project GitHub Actions Bot Environment - run: | - TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") - SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) - echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" - - - name: Download Source Tarball - uses: actions/download-artifact@v3 - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}.tar.gz - path: artifacts/pkgs/incoming - - - name: Setup GnuPG - run: | - sudo install -d -m 0700 -o "$(id -u)" -g "$(id -g)" /run/gpg - GNUPGHOME="$(mktemp -d -p /run/gpg)" - echo "GNUPGHOME=${GNUPGHOME}" >> "$GITHUB_ENV" - cat < "${GNUPGHOME}/gpg.conf" - batch - no-tty - pinentry-mode loopback - EOF - - - name: Get Secrets - env: - SECRETS_KEY: ${{ secrets.SECRETS_KEY }} - run: | - SECRETS_KEY_FILE=$(mktemp /tmp/output.XXXXXXXXXX) - echo "$SECRETS_KEY" > "$SECRETS_KEY_FILE" - aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ - --query SecretString --output text | jq .default_key -r | base64 -d \ - | gpg --passphrase-file "${SECRETS_KEY_FILE}" -d - \ - | gpg --import - - sync - aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ - --query SecretString --output text| jq .default_passphrase -r | base64 -d \ - | gpg --passphrase-file "${SECRETS_KEY_FILE}" -o "${GNUPGHOME}/passphrase" -d - - sync - rm "$SECRETS_KEY_FILE" - echo "passphrase-file ${GNUPGHOME}/passphrase" >> "${GNUPGHOME}/gpg.conf" - - - name: Create Repository Path - run: | - mkdir -p artifacts/pkgs/repo - - - name: Create Repository - run: | - tools pkg repo create src --key-id=64CBBC8173D76B3F --nightly-build-from=${{ github.ref_name }} \ - --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ - --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo - - - name: Copy Files For Source Only Artifact Uploads - run: | - mkdir artifacts/src - find artifacts/pkgs/repo -type f -print -exec cp {} artifacts/src \; - - - name: Upload Standalone Repository As An Artifact - uses: actions/upload-artifact@v3 - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-nightly-src-repo - path: | - artifacts/src/salt-${{ needs.prepare-workflow.outputs.salt-version }}.tar.gz - artifacts/src/salt-${{ needs.prepare-workflow.outputs.salt-version }}.tar.gz.* - artifacts/src/*-GPG-* - retention-days: 7 - if-no-files-found: error - - - name: Upload Repository As An Artifact - uses: ./.github/actions/upload-artifact - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-nightly-repo - path: artifacts/pkgs/repo/* - retention-days: 7 - if-no-files-found: error - archive-name: src-repo + - build-source-tarball + uses: ./.github/workflows/build-src-repo.yml + with: + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: nightly + gpg_key_id: 64CBBC8173D76B3F + secrets: inherit build-deb-repo: - name: Build DEB Repository - environment: nightly - runs-on: - - self-hosted - - linux - - repo-nightly + name: Build Repository needs: - prepare-workflow - build-deb-pkgs-onedir - strategy: - fail-fast: false - matrix: - include: - - distro: debian - version: "10" - arch: x86_64 - - distro: debian - version: "10" - arch: aarch64 - - distro: debian - version: "11" - arch: x86_64 - - distro: debian - version: "11" - arch: aarch64 - - distro: ubuntu - version: "20.04" - arch: x86_64 - - distro: ubuntu - version: "20.04" - arch: aarch64 - - distro: ubuntu - version: "22.04" - arch: x86_64 - - distro: ubuntu - version: "22.04" - arch: aarch64 - - steps: - - uses: actions/checkout@v4 - - - name: Download System Dependencies - run: | - sudo apt update - sudo apt install -y devscripts apt-utils - - - name: Setup Python Tools Scripts - uses: ./.github/actions/setup-python-tools-scripts - - - name: Get Salt Project GitHub Actions Bot Environment - run: | - TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") - SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) - echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" - - - name: Download DEB Packages - uses: actions/download-artifact@v3 - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-${{ matrix.arch }}-deb - path: artifacts/pkgs/incoming - - - name: Setup GnuPG - run: | - sudo install -d -m 0700 -o "$(id -u)" -g "$(id -g)" /run/gpg - GNUPGHOME="$(mktemp -d -p /run/gpg)" - echo "GNUPGHOME=${GNUPGHOME}" >> "$GITHUB_ENV" - cat < "${GNUPGHOME}/gpg.conf" - batch - no-tty - pinentry-mode loopback - EOF - - - name: Get Secrets - env: - SECRETS_KEY: ${{ secrets.SECRETS_KEY }} - run: | - SECRETS_KEY_FILE=$(mktemp /tmp/output.XXXXXXXXXX) - echo "$SECRETS_KEY" > "$SECRETS_KEY_FILE" - aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ - --query SecretString --output text | jq .default_key -r | base64 -d \ - | gpg --passphrase-file "${SECRETS_KEY_FILE}" -d - \ - | gpg --import - - sync - aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ - --query SecretString --output text| jq .default_passphrase -r | base64 -d \ - | gpg --passphrase-file "${SECRETS_KEY_FILE}" -o "${GNUPGHOME}/passphrase" -d - - sync - rm "$SECRETS_KEY_FILE" - echo "passphrase-file ${GNUPGHOME}/passphrase" >> "${GNUPGHOME}/gpg.conf" - - - name: Create Repository Path - run: | - mkdir -p artifacts/pkgs/repo - - - name: Create Repository - run: | - tools pkg repo create deb --key-id=64CBBC8173D76B3F --distro-arch=${{ matrix.arch }} --nightly-build-from=${{ github.ref_name }} \ - --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ - --distro=${{ matrix.distro }} --distro-version=${{ matrix.version }} \ - --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo - - - name: Upload Repository As An Artifact - uses: ./.github/actions/upload-artifact - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-nightly-repo - path: artifacts/pkgs/repo/* - retention-days: 7 - if-no-files-found: error - archive-name: ${{ matrix.distro }}-${{ matrix.version }}-${{ matrix.arch }}-repo + uses: ./.github/workflows/build-deb-repo.yml + with: + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: nightly + gpg_key_id: 64CBBC8173D76B3F + secrets: inherit build-rpm-repo: - name: Build RPM Repository - environment: nightly - runs-on: - - self-hosted - - linux - - repo-nightly + name: Build Repository needs: - prepare-workflow - build-rpm-pkgs-onedir - strategy: - fail-fast: false - matrix: - include: - - distro: amazon - version: "2" - arch: x86_64 - - distro: amazon - version: "2" - arch: aarch64 - - distro: redhat - version: "7" - arch: x86_64 - - distro: redhat - version: "7" - arch: aarch64 - - distro: redhat - version: "8" - arch: x86_64 - - distro: redhat - version: "8" - arch: aarch64 - - distro: redhat - version: "9" - arch: x86_64 - - distro: redhat - version: "9" - arch: aarch64 - - distro: fedora - version: "36" - arch: x86_64 - - distro: fedora - version: "36" - arch: aarch64 - - distro: fedora - version: "37" - arch: x86_64 - - distro: fedora - version: "37" - arch: aarch64 - - distro: fedora - version: "38" - arch: x86_64 - - distro: fedora - version: "38" - arch: aarch64 - - distro: photon - version: "3" - arch: x86_64 - - distro: photon - version: "3" - arch: aarch64 - - distro: photon - version: "4" - arch: x86_64 - - distro: photon - version: "4" - arch: aarch64 - - steps: - - uses: actions/checkout@v4 - - - name: Download System Dependencies - run: | - sudo apt update - sudo apt install -y rpm - - - name: Setup Python Tools Scripts - uses: ./.github/actions/setup-python-tools-scripts - - - name: Get Salt Project GitHub Actions Bot Environment - run: | - TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") - SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) - echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" - - - name: Download RPM Packages - uses: actions/download-artifact@v3 - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-${{ matrix.arch }}-rpm - path: artifacts/pkgs/incoming - - - name: Setup GnuPG - run: | - sudo install -d -m 0700 -o "$(id -u)" -g "$(id -g)" /run/gpg - GNUPGHOME="$(mktemp -d -p /run/gpg)" - echo "GNUPGHOME=${GNUPGHOME}" >> "$GITHUB_ENV" - cat < "${GNUPGHOME}/gpg.conf" - batch - no-tty - pinentry-mode loopback - EOF - - - name: Get Secrets - env: - SECRETS_KEY: ${{ secrets.SECRETS_KEY }} - run: | - SECRETS_KEY_FILE=$(mktemp /tmp/output.XXXXXXXXXX) - echo "$SECRETS_KEY" > "$SECRETS_KEY_FILE" - aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ - --query SecretString --output text | jq .default_key -r | base64 -d \ - | gpg --passphrase-file "${SECRETS_KEY_FILE}" -d - \ - | gpg --import - - sync - aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ - --query SecretString --output text| jq .default_passphrase -r | base64 -d \ - | gpg --passphrase-file "${SECRETS_KEY_FILE}" -o "${GNUPGHOME}/passphrase" -d - - sync - rm "$SECRETS_KEY_FILE" - echo "passphrase-file ${GNUPGHOME}/passphrase" >> "${GNUPGHOME}/gpg.conf" - - - name: Create Repository Path - run: | - mkdir -p artifacts/pkgs/repo - - - name: Create Repository - env: - SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} - SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} - run: | - tools pkg repo create rpm --key-id=64CBBC8173D76B3F --distro-arch=${{ matrix.arch }} --nightly-build-from=${{ github.ref_name }} \ - --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ - --distro=${{ matrix.distro }} --distro-version=${{ matrix.version }} \ - --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo - - - name: Upload Repository As An Artifact - uses: ./.github/actions/upload-artifact - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-nightly-repo - path: artifacts/pkgs/repo/* - retention-days: 7 - if-no-files-found: error - archive-name: ${{ matrix.distro }}-${{ matrix.version }}-${{ matrix.arch }}-repo + uses: ./.github/workflows/build-rpm-repo.yml + with: + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: nightly + gpg_key_id: 64CBBC8173D76B3F + secrets: inherit build-windows-repo: - name: Build Windows Repository - environment: nightly - runs-on: - - self-hosted - - linux - - repo-nightly + name: Build Repository needs: - prepare-workflow - build-windows-pkgs-onedir - steps: - - uses: actions/checkout@v4 - - - name: Setup Python Tools Scripts - uses: ./.github/actions/setup-python-tools-scripts - - - name: Get Salt Project GitHub Actions Bot Environment - run: | - TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") - SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) - echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" - - - name: Download Windows NSIS x86 Packages - uses: actions/download-artifact@v3 - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-x86-NSIS - path: artifacts/pkgs/incoming - - - name: Download Windows MSI x86 Packages - uses: actions/download-artifact@v3 - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-x86-MSI - path: artifacts/pkgs/incoming - - - name: Download Windows NSIS amd64 Packages - uses: actions/download-artifact@v3 - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-amd64-NSIS - path: artifacts/pkgs/incoming - - - name: Download Windows MSI amd64 Packages - uses: actions/download-artifact@v3 - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-amd64-MSI - path: artifacts/pkgs/incoming - - - name: Setup GnuPG - run: | - sudo install -d -m 0700 -o "$(id -u)" -g "$(id -g)" /run/gpg - GNUPGHOME="$(mktemp -d -p /run/gpg)" - echo "GNUPGHOME=${GNUPGHOME}" >> "$GITHUB_ENV" - cat < "${GNUPGHOME}/gpg.conf" - batch - no-tty - pinentry-mode loopback - EOF - - - name: Get Secrets - env: - SECRETS_KEY: ${{ secrets.SECRETS_KEY }} - run: | - SECRETS_KEY_FILE=$(mktemp /tmp/output.XXXXXXXXXX) - echo "$SECRETS_KEY" > "$SECRETS_KEY_FILE" - aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ - --query SecretString --output text | jq .default_key -r | base64 -d \ - | gpg --passphrase-file "${SECRETS_KEY_FILE}" -d - \ - | gpg --import - - sync - aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ - --query SecretString --output text| jq .default_passphrase -r | base64 -d \ - | gpg --passphrase-file "${SECRETS_KEY_FILE}" -o "${GNUPGHOME}/passphrase" -d - - sync - rm "$SECRETS_KEY_FILE" - echo "passphrase-file ${GNUPGHOME}/passphrase" >> "${GNUPGHOME}/gpg.conf" - - - name: Create Repository Path - run: | - mkdir -p artifacts/pkgs/repo - - - name: Create Repository - run: | - tools pkg repo create windows --key-id=64CBBC8173D76B3F --nightly-build-from=${{ github.ref_name }} \ - --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ - --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo - - - name: Upload Repository As An Artifact - uses: ./.github/actions/upload-artifact - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-nightly-repo - path: artifacts/pkgs/repo/* - retention-days: 7 - if-no-files-found: error - archive-name: windows-repo + uses: ./.github/workflows/build-windows-repo.yml + with: + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: nightly + gpg_key_id: 64CBBC8173D76B3F + secrets: inherit build-macos-repo: - name: Build macOS Repository - environment: nightly - runs-on: - - self-hosted - - linux - - repo-nightly + name: Build Repository needs: - prepare-workflow - build-macos-pkgs-onedir - steps: - - uses: actions/checkout@v4 - - - name: Setup Python Tools Scripts - uses: ./.github/actions/setup-python-tools-scripts - - - name: Get Salt Project GitHub Actions Bot Environment - run: | - TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") - SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) - echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" - - - name: Download macOS x86_64 Packages - uses: actions/download-artifact@v3 - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-x86_64-macos - path: artifacts/pkgs/incoming - - - name: Setup GnuPG - run: | - sudo install -d -m 0700 -o "$(id -u)" -g "$(id -g)" /run/gpg - GNUPGHOME="$(mktemp -d -p /run/gpg)" - echo "GNUPGHOME=${GNUPGHOME}" >> "$GITHUB_ENV" - cat < "${GNUPGHOME}/gpg.conf" - batch - no-tty - pinentry-mode loopback - EOF - - - name: Get Secrets - env: - SECRETS_KEY: ${{ secrets.SECRETS_KEY }} - run: | - SECRETS_KEY_FILE=$(mktemp /tmp/output.XXXXXXXXXX) - echo "$SECRETS_KEY" > "$SECRETS_KEY_FILE" - aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ - --query SecretString --output text | jq .default_key -r | base64 -d \ - | gpg --passphrase-file "${SECRETS_KEY_FILE}" -d - \ - | gpg --import - - sync - aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ - --query SecretString --output text| jq .default_passphrase -r | base64 -d \ - | gpg --passphrase-file "${SECRETS_KEY_FILE}" -o "${GNUPGHOME}/passphrase" -d - - sync - rm "$SECRETS_KEY_FILE" - echo "passphrase-file ${GNUPGHOME}/passphrase" >> "${GNUPGHOME}/gpg.conf" - - - name: Create Repository Path - run: | - mkdir -p artifacts/pkgs/repo - - - name: Create Repository - run: | - tools pkg repo create macos --key-id=64CBBC8173D76B3F --nightly-build-from=${{ github.ref_name }} \ - --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ - --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo - - - name: Upload Repository As An Artifact - uses: ./.github/actions/upload-artifact - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-nightly-repo - path: artifacts/pkgs/repo/* - retention-days: 7 - if-no-files-found: error - archive-name: macos-repo + uses: ./.github/workflows/build-macos-repo.yml + with: + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: nightly + gpg_key_id: 64CBBC8173D76B3F + secrets: inherit build-onedir-repo: - name: Build Onedir Repository - environment: nightly - runs-on: - - self-hosted - - linux - - repo-nightly + name: Build Repository needs: - prepare-workflow - build-salt-onedir-linux - build-salt-onedir-macos - build-salt-onedir-windows - steps: - - uses: actions/checkout@v4 - - - name: Setup Python Tools Scripts - uses: ./.github/actions/setup-python-tools-scripts - - - name: Get Salt Project GitHub Actions Bot Environment - run: | - TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") - SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) - echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" - - - name: Download Linux x86_64 Onedir Archive - uses: actions/download-artifact@v3 - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-linux-x86_64.tar.xz - path: artifacts/pkgs/incoming - - - name: Download Linux aarch64 Onedir Archive - uses: actions/download-artifact@v3 - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-linux-aarch64.tar.xz - path: artifacts/pkgs/incoming - - - name: Download macOS x86_64 Onedir Archive - uses: actions/download-artifact@v3 - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-darwin-x86_64.tar.xz - path: artifacts/pkgs/incoming - - - name: Download Windows amd64 Onedir Archive - uses: actions/download-artifact@v3 - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-windows-amd64.tar.xz - path: artifacts/pkgs/incoming - - - name: Download Windows amd64 Onedir Archive(zip) - uses: actions/download-artifact@v3 - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-windows-amd64.zip - path: artifacts/pkgs/incoming - - - name: Download Windows x86 Onedir Archive - uses: actions/download-artifact@v3 - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-windows-x86.tar.xz - path: artifacts/pkgs/incoming - - - name: Download Windows amd64 Onedir Archive(zip) - uses: actions/download-artifact@v3 - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-windows-x86.zip - path: artifacts/pkgs/incoming - - - name: Setup GnuPG - run: | - sudo install -d -m 0700 -o "$(id -u)" -g "$(id -g)" /run/gpg - GNUPGHOME="$(mktemp -d -p /run/gpg)" - echo "GNUPGHOME=${GNUPGHOME}" >> "$GITHUB_ENV" - cat < "${GNUPGHOME}/gpg.conf" - batch - no-tty - pinentry-mode loopback - EOF - - - name: Get Secrets - env: - SECRETS_KEY: ${{ secrets.SECRETS_KEY }} - run: | - SECRETS_KEY_FILE=$(mktemp /tmp/output.XXXXXXXXXX) - echo "$SECRETS_KEY" > "$SECRETS_KEY_FILE" - aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ - --query SecretString --output text | jq .default_key -r | base64 -d \ - | gpg --passphrase-file "${SECRETS_KEY_FILE}" -d - \ - | gpg --import - - sync - aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ - --query SecretString --output text| jq .default_passphrase -r | base64 -d \ - | gpg --passphrase-file "${SECRETS_KEY_FILE}" -o "${GNUPGHOME}/passphrase" -d - - sync - rm "$SECRETS_KEY_FILE" - echo "passphrase-file ${GNUPGHOME}/passphrase" >> "${GNUPGHOME}/gpg.conf" - - - name: Create Repository Path - run: | - mkdir -p artifacts/pkgs/repo - - - name: Create Repository - run: | - tools pkg repo create onedir --key-id=64CBBC8173D76B3F --nightly-build-from=${{ github.ref_name }} \ - --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ - --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo - - - name: Upload Repository As An Artifact - uses: ./.github/actions/upload-artifact - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-nightly-repo - path: artifacts/pkgs/repo/* - retention-days: 7 - if-no-files-found: error - archive-name: onedir-repo + uses: ./.github/workflows/build-onedir-repo.yml + with: + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: nightly + gpg_key_id: 64CBBC8173D76B3F + secrets: inherit publish-repositories: name: Publish Repositories diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 4f7e567e94d..e1a3c7a087c 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -2170,636 +2170,78 @@ jobs: skip-junit-reports: true build-src-repo: - name: Build Source Repository - environment: staging - runs-on: - - self-hosted - - linux - - repo-staging + name: Build Repository needs: - prepare-workflow - steps: - - uses: actions/checkout@v4 - - - name: Setup Python Tools Scripts - uses: ./.github/actions/setup-python-tools-scripts - - - name: Get Salt Project GitHub Actions Bot Environment - run: | - TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") - SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) - echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" - - - name: Download Source Tarball - uses: actions/download-artifact@v3 - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}.tar.gz - path: artifacts/pkgs/incoming - - - name: Setup GnuPG - run: | - sudo install -d -m 0700 -o "$(id -u)" -g "$(id -g)" /run/gpg - GNUPGHOME="$(mktemp -d -p /run/gpg)" - echo "GNUPGHOME=${GNUPGHOME}" >> "$GITHUB_ENV" - cat < "${GNUPGHOME}/gpg.conf" - batch - no-tty - pinentry-mode loopback - EOF - - - name: Get Secrets - env: - SECRETS_KEY: ${{ secrets.SECRETS_KEY }} - run: | - SECRETS_KEY_FILE=$(mktemp /tmp/output.XXXXXXXXXX) - echo "$SECRETS_KEY" > "$SECRETS_KEY_FILE" - aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ - --query SecretString --output text | jq .default_key -r | base64 -d \ - | gpg --passphrase-file "${SECRETS_KEY_FILE}" -d - \ - | gpg --import - - sync - aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ - --query SecretString --output text| jq .default_passphrase -r | base64 -d \ - | gpg --passphrase-file "${SECRETS_KEY_FILE}" -o "${GNUPGHOME}/passphrase" -d - - sync - rm "$SECRETS_KEY_FILE" - echo "passphrase-file ${GNUPGHOME}/passphrase" >> "${GNUPGHOME}/gpg.conf" - - - name: Create Repository Path - run: | - mkdir -p artifacts/pkgs/repo - - - name: Create Repository - run: | - tools pkg repo create src --key-id=64CBBC8173D76B3F \ - --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ - --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo - - - name: Copy Files For Source Only Artifact Uploads - run: | - mkdir artifacts/src - find artifacts/pkgs/repo -type f -print -exec cp {} artifacts/src \; - - - name: Upload Standalone Repository As An Artifact - uses: actions/upload-artifact@v3 - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-staging-src-repo - path: | - artifacts/src/salt-${{ needs.prepare-workflow.outputs.salt-version }}.tar.gz - artifacts/src/salt-${{ needs.prepare-workflow.outputs.salt-version }}.tar.gz.* - artifacts/src/*-GPG-* - retention-days: 7 - if-no-files-found: error - - - name: Upload Repository As An Artifact - uses: ./.github/actions/upload-artifact - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-staging-repo - path: artifacts/pkgs/repo/* - retention-days: 7 - if-no-files-found: error - archive-name: src-repo + - build-source-tarball + uses: ./.github/workflows/build-src-repo.yml + with: + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + gpg_key_id: 64CBBC8173D76B3F + secrets: inherit build-deb-repo: - name: Build DEB Repository - environment: staging - runs-on: - - self-hosted - - linux - - repo-staging + name: Build Repository needs: - prepare-workflow - build-deb-pkgs-onedir - strategy: - fail-fast: false - matrix: - include: - - distro: debian - version: "10" - arch: x86_64 - - distro: debian - version: "10" - arch: aarch64 - - distro: debian - version: "11" - arch: x86_64 - - distro: debian - version: "11" - arch: aarch64 - - distro: ubuntu - version: "20.04" - arch: x86_64 - - distro: ubuntu - version: "20.04" - arch: aarch64 - - distro: ubuntu - version: "22.04" - arch: x86_64 - - distro: ubuntu - version: "22.04" - arch: aarch64 - - steps: - - uses: actions/checkout@v4 - - - name: Download System Dependencies - run: | - sudo apt update - sudo apt install -y devscripts apt-utils - - - name: Setup Python Tools Scripts - uses: ./.github/actions/setup-python-tools-scripts - - - name: Get Salt Project GitHub Actions Bot Environment - run: | - TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") - SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) - echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" - - - name: Download DEB Packages - uses: actions/download-artifact@v3 - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-${{ matrix.arch }}-deb - path: artifacts/pkgs/incoming - - - name: Setup GnuPG - run: | - sudo install -d -m 0700 -o "$(id -u)" -g "$(id -g)" /run/gpg - GNUPGHOME="$(mktemp -d -p /run/gpg)" - echo "GNUPGHOME=${GNUPGHOME}" >> "$GITHUB_ENV" - cat < "${GNUPGHOME}/gpg.conf" - batch - no-tty - pinentry-mode loopback - EOF - - - name: Get Secrets - env: - SECRETS_KEY: ${{ secrets.SECRETS_KEY }} - run: | - SECRETS_KEY_FILE=$(mktemp /tmp/output.XXXXXXXXXX) - echo "$SECRETS_KEY" > "$SECRETS_KEY_FILE" - aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ - --query SecretString --output text | jq .default_key -r | base64 -d \ - | gpg --passphrase-file "${SECRETS_KEY_FILE}" -d - \ - | gpg --import - - sync - aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ - --query SecretString --output text| jq .default_passphrase -r | base64 -d \ - | gpg --passphrase-file "${SECRETS_KEY_FILE}" -o "${GNUPGHOME}/passphrase" -d - - sync - rm "$SECRETS_KEY_FILE" - echo "passphrase-file ${GNUPGHOME}/passphrase" >> "${GNUPGHOME}/gpg.conf" - - - name: Create Repository Path - run: | - mkdir -p artifacts/pkgs/repo - - - name: Create Repository - run: | - tools pkg repo create deb --key-id=64CBBC8173D76B3F --distro-arch=${{ matrix.arch }} \ - --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ - --distro=${{ matrix.distro }} --distro-version=${{ matrix.version }} \ - --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo - - - name: Upload Repository As An Artifact - uses: ./.github/actions/upload-artifact - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-staging-repo - path: artifacts/pkgs/repo/* - retention-days: 7 - if-no-files-found: error - archive-name: ${{ matrix.distro }}-${{ matrix.version }}-${{ matrix.arch }}-repo + uses: ./.github/workflows/build-deb-repo.yml + with: + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + gpg_key_id: 64CBBC8173D76B3F + secrets: inherit build-rpm-repo: - name: Build RPM Repository - environment: staging - runs-on: - - self-hosted - - linux - - repo-staging + name: Build Repository needs: - prepare-workflow - build-rpm-pkgs-onedir - strategy: - fail-fast: false - matrix: - include: - - distro: amazon - version: "2" - arch: x86_64 - - distro: amazon - version: "2" - arch: aarch64 - - distro: redhat - version: "7" - arch: x86_64 - - distro: redhat - version: "7" - arch: aarch64 - - distro: redhat - version: "8" - arch: x86_64 - - distro: redhat - version: "8" - arch: aarch64 - - distro: redhat - version: "9" - arch: x86_64 - - distro: redhat - version: "9" - arch: aarch64 - - distro: fedora - version: "36" - arch: x86_64 - - distro: fedora - version: "36" - arch: aarch64 - - distro: fedora - version: "37" - arch: x86_64 - - distro: fedora - version: "37" - arch: aarch64 - - distro: fedora - version: "38" - arch: x86_64 - - distro: fedora - version: "38" - arch: aarch64 - - distro: photon - version: "3" - arch: x86_64 - - distro: photon - version: "3" - arch: aarch64 - - distro: photon - version: "4" - arch: x86_64 - - distro: photon - version: "4" - arch: aarch64 - - steps: - - uses: actions/checkout@v4 - - - name: Download System Dependencies - run: | - sudo apt update - sudo apt install -y rpm - - - name: Setup Python Tools Scripts - uses: ./.github/actions/setup-python-tools-scripts - - - name: Get Salt Project GitHub Actions Bot Environment - run: | - TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") - SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) - echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" - - - name: Download RPM Packages - uses: actions/download-artifact@v3 - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-${{ matrix.arch }}-rpm - path: artifacts/pkgs/incoming - - - name: Setup GnuPG - run: | - sudo install -d -m 0700 -o "$(id -u)" -g "$(id -g)" /run/gpg - GNUPGHOME="$(mktemp -d -p /run/gpg)" - echo "GNUPGHOME=${GNUPGHOME}" >> "$GITHUB_ENV" - cat < "${GNUPGHOME}/gpg.conf" - batch - no-tty - pinentry-mode loopback - EOF - - - name: Get Secrets - env: - SECRETS_KEY: ${{ secrets.SECRETS_KEY }} - run: | - SECRETS_KEY_FILE=$(mktemp /tmp/output.XXXXXXXXXX) - echo "$SECRETS_KEY" > "$SECRETS_KEY_FILE" - aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ - --query SecretString --output text | jq .default_key -r | base64 -d \ - | gpg --passphrase-file "${SECRETS_KEY_FILE}" -d - \ - | gpg --import - - sync - aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ - --query SecretString --output text| jq .default_passphrase -r | base64 -d \ - | gpg --passphrase-file "${SECRETS_KEY_FILE}" -o "${GNUPGHOME}/passphrase" -d - - sync - rm "$SECRETS_KEY_FILE" - echo "passphrase-file ${GNUPGHOME}/passphrase" >> "${GNUPGHOME}/gpg.conf" - - - name: Create Repository Path - run: | - mkdir -p artifacts/pkgs/repo - - - name: Create Repository - env: - SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} - SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} - SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} - SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} - run: | - tools pkg repo create rpm --key-id=64CBBC8173D76B3F --distro-arch=${{ matrix.arch }} \ - --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ - --distro=${{ matrix.distro }} --distro-version=${{ matrix.version }} \ - --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo - - - name: Upload Repository As An Artifact - uses: ./.github/actions/upload-artifact - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-staging-repo - path: artifacts/pkgs/repo/* - retention-days: 7 - if-no-files-found: error - archive-name: ${{ matrix.distro }}-${{ matrix.version }}-${{ matrix.arch }}-repo + uses: ./.github/workflows/build-rpm-repo.yml + with: + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + gpg_key_id: 64CBBC8173D76B3F + secrets: inherit build-windows-repo: - name: Build Windows Repository - environment: staging - runs-on: - - self-hosted - - linux - - repo-staging + name: Build Repository needs: - prepare-workflow - build-windows-pkgs-onedir - steps: - - uses: actions/checkout@v4 - - - name: Setup Python Tools Scripts - uses: ./.github/actions/setup-python-tools-scripts - - - name: Get Salt Project GitHub Actions Bot Environment - run: | - TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") - SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) - echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" - - - name: Download Windows NSIS x86 Packages - uses: actions/download-artifact@v3 - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-x86-NSIS - path: artifacts/pkgs/incoming - - - name: Download Windows MSI x86 Packages - uses: actions/download-artifact@v3 - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-x86-MSI - path: artifacts/pkgs/incoming - - - name: Download Windows NSIS amd64 Packages - uses: actions/download-artifact@v3 - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-amd64-NSIS - path: artifacts/pkgs/incoming - - - name: Download Windows MSI amd64 Packages - uses: actions/download-artifact@v3 - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-amd64-MSI - path: artifacts/pkgs/incoming - - - name: Setup GnuPG - run: | - sudo install -d -m 0700 -o "$(id -u)" -g "$(id -g)" /run/gpg - GNUPGHOME="$(mktemp -d -p /run/gpg)" - echo "GNUPGHOME=${GNUPGHOME}" >> "$GITHUB_ENV" - cat < "${GNUPGHOME}/gpg.conf" - batch - no-tty - pinentry-mode loopback - EOF - - - name: Get Secrets - env: - SECRETS_KEY: ${{ secrets.SECRETS_KEY }} - run: | - SECRETS_KEY_FILE=$(mktemp /tmp/output.XXXXXXXXXX) - echo "$SECRETS_KEY" > "$SECRETS_KEY_FILE" - aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ - --query SecretString --output text | jq .default_key -r | base64 -d \ - | gpg --passphrase-file "${SECRETS_KEY_FILE}" -d - \ - | gpg --import - - sync - aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ - --query SecretString --output text| jq .default_passphrase -r | base64 -d \ - | gpg --passphrase-file "${SECRETS_KEY_FILE}" -o "${GNUPGHOME}/passphrase" -d - - sync - rm "$SECRETS_KEY_FILE" - echo "passphrase-file ${GNUPGHOME}/passphrase" >> "${GNUPGHOME}/gpg.conf" - - - name: Create Repository Path - run: | - mkdir -p artifacts/pkgs/repo - - - name: Create Repository - run: | - tools pkg repo create windows --key-id=64CBBC8173D76B3F \ - --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ - --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo - - - name: Upload Repository As An Artifact - uses: ./.github/actions/upload-artifact - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-staging-repo - path: artifacts/pkgs/repo/* - retention-days: 7 - if-no-files-found: error - archive-name: windows-repo + uses: ./.github/workflows/build-windows-repo.yml + with: + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + gpg_key_id: 64CBBC8173D76B3F + secrets: inherit build-macos-repo: - name: Build macOS Repository - environment: staging - runs-on: - - self-hosted - - linux - - repo-staging + name: Build Repository needs: - prepare-workflow - build-macos-pkgs-onedir - steps: - - uses: actions/checkout@v4 - - - name: Setup Python Tools Scripts - uses: ./.github/actions/setup-python-tools-scripts - - - name: Get Salt Project GitHub Actions Bot Environment - run: | - TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") - SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) - echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" - - - name: Download macOS x86_64 Packages - uses: actions/download-artifact@v3 - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-x86_64-macos - path: artifacts/pkgs/incoming - - - name: Setup GnuPG - run: | - sudo install -d -m 0700 -o "$(id -u)" -g "$(id -g)" /run/gpg - GNUPGHOME="$(mktemp -d -p /run/gpg)" - echo "GNUPGHOME=${GNUPGHOME}" >> "$GITHUB_ENV" - cat < "${GNUPGHOME}/gpg.conf" - batch - no-tty - pinentry-mode loopback - EOF - - - name: Get Secrets - env: - SECRETS_KEY: ${{ secrets.SECRETS_KEY }} - run: | - SECRETS_KEY_FILE=$(mktemp /tmp/output.XXXXXXXXXX) - echo "$SECRETS_KEY" > "$SECRETS_KEY_FILE" - aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ - --query SecretString --output text | jq .default_key -r | base64 -d \ - | gpg --passphrase-file "${SECRETS_KEY_FILE}" -d - \ - | gpg --import - - sync - aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ - --query SecretString --output text| jq .default_passphrase -r | base64 -d \ - | gpg --passphrase-file "${SECRETS_KEY_FILE}" -o "${GNUPGHOME}/passphrase" -d - - sync - rm "$SECRETS_KEY_FILE" - echo "passphrase-file ${GNUPGHOME}/passphrase" >> "${GNUPGHOME}/gpg.conf" - - - name: Create Repository Path - run: | - mkdir -p artifacts/pkgs/repo - - - name: Create Repository - run: | - tools pkg repo create macos --key-id=64CBBC8173D76B3F \ - --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ - --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo - - - name: Upload Repository As An Artifact - uses: ./.github/actions/upload-artifact - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-staging-repo - path: artifacts/pkgs/repo/* - retention-days: 7 - if-no-files-found: error - archive-name: macos-repo + uses: ./.github/workflows/build-macos-repo.yml + with: + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + gpg_key_id: 64CBBC8173D76B3F + secrets: inherit build-onedir-repo: - name: Build Onedir Repository - environment: staging - runs-on: - - self-hosted - - linux - - repo-staging + name: Build Repository needs: - prepare-workflow - build-salt-onedir-linux - build-salt-onedir-macos - build-salt-onedir-windows - steps: - - uses: actions/checkout@v4 - - - name: Setup Python Tools Scripts - uses: ./.github/actions/setup-python-tools-scripts - - - name: Get Salt Project GitHub Actions Bot Environment - run: | - TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") - SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) - echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" - - - name: Download Linux x86_64 Onedir Archive - uses: actions/download-artifact@v3 - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-linux-x86_64.tar.xz - path: artifacts/pkgs/incoming - - - name: Download Linux aarch64 Onedir Archive - uses: actions/download-artifact@v3 - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-linux-aarch64.tar.xz - path: artifacts/pkgs/incoming - - - name: Download macOS x86_64 Onedir Archive - uses: actions/download-artifact@v3 - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-darwin-x86_64.tar.xz - path: artifacts/pkgs/incoming - - - name: Download Windows amd64 Onedir Archive - uses: actions/download-artifact@v3 - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-windows-amd64.tar.xz - path: artifacts/pkgs/incoming - - - name: Download Windows amd64 Onedir Archive(zip) - uses: actions/download-artifact@v3 - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-windows-amd64.zip - path: artifacts/pkgs/incoming - - - name: Download Windows x86 Onedir Archive - uses: actions/download-artifact@v3 - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-windows-x86.tar.xz - path: artifacts/pkgs/incoming - - - name: Download Windows amd64 Onedir Archive(zip) - uses: actions/download-artifact@v3 - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-windows-x86.zip - path: artifacts/pkgs/incoming - - - name: Setup GnuPG - run: | - sudo install -d -m 0700 -o "$(id -u)" -g "$(id -g)" /run/gpg - GNUPGHOME="$(mktemp -d -p /run/gpg)" - echo "GNUPGHOME=${GNUPGHOME}" >> "$GITHUB_ENV" - cat < "${GNUPGHOME}/gpg.conf" - batch - no-tty - pinentry-mode loopback - EOF - - - name: Get Secrets - env: - SECRETS_KEY: ${{ secrets.SECRETS_KEY }} - run: | - SECRETS_KEY_FILE=$(mktemp /tmp/output.XXXXXXXXXX) - echo "$SECRETS_KEY" > "$SECRETS_KEY_FILE" - aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ - --query SecretString --output text | jq .default_key -r | base64 -d \ - | gpg --passphrase-file "${SECRETS_KEY_FILE}" -d - \ - | gpg --import - - sync - aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ - --query SecretString --output text| jq .default_passphrase -r | base64 -d \ - | gpg --passphrase-file "${SECRETS_KEY_FILE}" -o "${GNUPGHOME}/passphrase" -d - - sync - rm "$SECRETS_KEY_FILE" - echo "passphrase-file ${GNUPGHOME}/passphrase" >> "${GNUPGHOME}/gpg.conf" - - - name: Create Repository Path - run: | - mkdir -p artifacts/pkgs/repo - - - name: Create Repository - run: | - tools pkg repo create onedir --key-id=64CBBC8173D76B3F \ - --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ - --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo - - - name: Upload Repository As An Artifact - uses: ./.github/actions/upload-artifact - with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-staging-repo - path: artifacts/pkgs/repo/* - retention-days: 7 - if-no-files-found: error - archive-name: onedir-repo + uses: ./.github/workflows/build-onedir-repo.yml + with: + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + gpg_key_id: 64CBBC8173D76B3F + secrets: inherit publish-repositories: name: Publish Repositories diff --git a/.github/workflows/templates/build-repos.yml.jinja b/.github/workflows/templates/build-repos.yml.jinja index da05231fdb5..313a178a093 100644 --- a/.github/workflows/templates/build-repos.yml.jinja +++ b/.github/workflows/templates/build-repos.yml.jinja @@ -1,33 +1,33 @@ -<%- for platform, type, display_name, needs_pkg in ( - (None, "src", "Source", False), - ("linux", "deb", "DEB", True), - ("linux", "rpm", "RPM", True), - ("windows", "windows", "Windows", True), - ("macos", "macos", "macOS", True), - (None, "onedir", "Onedir", False), - ) %> +<%- for type, display_name in ( + ("src", "Source"), + ("deb", "DEB"), + ("rpm", "RPM"), + ("windows", "Windows"), + ("macos", "macOS"), + ("onedir", "Onedir"), + ) %> <%- set job_name = "build-{}-repo".format(type) %> <%- do build_repo_needs.append(job_name) %> <{ job_name }>: - name: Build <{ display_name }> Repository - environment: <{ gh_environment }> - runs-on: - - self-hosted - - linux - - repo-<{ gh_environment }> + name: Build Repository needs: - prepare-workflow - <%- if needs_pkg %> + <%- if type not in ("src", "onedir") %> - build-<{ type }>-pkgs-onedir - <%- elif platform %> - - build-salt-onedir-<{ platform }> <%- elif type == 'onedir' %> - build-salt-onedir-linux - build-salt-onedir-macos - build-salt-onedir-windows + <%- elif type == 'src' %> + - build-source-tarball <%- endif %> - <%- include "build-{}-repo.yml.jinja".format(type) %> + uses: ./.github/workflows/build-<{ type }>-repo.yml + with: + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: <{ gh_environment }> + gpg_key_id: <{ gpg_key_id }> + secrets: inherit <%- endfor %> diff --git a/tools/ci.py b/tools/ci.py index cc6578be789..e9afa16c98c 100644 --- a/tools/ci.py +++ b/tools/ci.py @@ -777,6 +777,69 @@ def pkg_matrix( ctx.exit(0) +@ci.command( + name="pkg-repo-matrix", + arguments={ + "pkg_type": { + "help": "The package type", + }, + }, +) +def pkg_repo_matrix(ctx: Context, pkg_type: str): + """ + Generate the matrix for the package repository builds + """ + _matrix = [] + if pkg_type == "deb": + for distro in ("debian", "ubuntu"): + if distro == "debian": + versions = ["10", "11"] + else: + versions = ["20.04", "22.04"] + for arch in ("x86_64", "aarch64"): + for version in versions: + _matrix.append( + { + "distro": distro, + "version": version, + "arch": arch, + } + ) + elif pkg_type == "rpm": + for distro in ("amazon", "redhat", "fedora", "photon"): + if distro == "amazon": + versions = ["2"] + elif distro == "redhat": + versions = ["7", "8", "9"] + elif distro == "fedora": + versions = ["36", "37", "38"] + elif distro == "photon": + versions = ["3", "4"] + else: + ctx.error(f"Don't know how to handle distro {distro}") + ctx.exit(1) + for arch in ("x86_64", "aarch64"): + for version in versions: + _matrix.append( + { + "distro": distro, + "version": version, + "arch": arch, + } + ) + else: + _matrix.append({"pkg_type": pkg_type}) + + ctx.info("Generated matrix:") + ctx.print(_matrix, soft_wrap=True) + + github_output = os.environ.get("GITHUB_OUTPUT") + if github_output is not None: + with open(github_output, "a", encoding="utf-8") as wfh: + wfh.write(f"matrix={json.dumps(_matrix)}\n") + ctx.exit(0) + + @ci.command( name="get-releases", arguments={ From 13b6b00171e30b36daef5c2faa54c6bf249680bf Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 6 Oct 2023 10:15:34 +0100 Subject: [PATCH 090/147] Revert "Create workflow for each of the supported repositories" This reverts commit 19eb5a8c446e67969e84630c2eb172527348456d. BAH! ``` too many workflows are referenced, total: 21, limit: 20 ``` https://docs.github.com/en/enterprise-cloud@latest/actions/using-workflows/reusing-workflows#limitations --- .github/workflows/nightly.yml | 642 +++++++++++++++-- .github/workflows/staging.yml | 644 ++++++++++++++++-- .../build-deb-repo.yml.jinja} | 94 +-- .../build-macos-repo.yml.jinja} | 56 +- .../build-onedir-repo.yml.jinja} | 67 +- .../workflows/templates/build-repos.yml.jinja | 36 +- .../build-rpm-repo.yml.jinja} | 99 +-- .../build-src-repo.yml.jinja} | 61 +- .../build-windows-repo.yml.jinja} | 61 +- tools/ci.py | 63 -- 10 files changed, 1298 insertions(+), 525 deletions(-) rename .github/workflows/{build-deb-repo.yml => templates/build-deb-repo.yml.jinja} (55%) rename .github/workflows/{build-macos-repo.yml => templates/build-macos-repo.yml.jinja} (62%) rename .github/workflows/{build-onedir-repo.yml => templates/build-onedir-repo.yml.jinja} (63%) rename .github/workflows/{build-rpm-repo.yml => templates/build-rpm-repo.yml.jinja} (60%) rename .github/workflows/{build-src-repo.yml => templates/build-src-repo.yml.jinja} (63%) rename .github/workflows/{build-windows-repo.yml => templates/build-windows-repo.yml.jinja} (63%) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 064a7b30b7f..914804ef073 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -2314,78 +2314,634 @@ jobs: if-no-files-found: error build-src-repo: - name: Build Repository + name: Build Source Repository + environment: nightly + runs-on: + - self-hosted + - linux + - repo-nightly needs: - prepare-workflow - - build-source-tarball - uses: ./.github/workflows/build-src-repo.yml - with: - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: nightly - gpg_key_id: 64CBBC8173D76B3F - secrets: inherit + steps: + - uses: actions/checkout@v4 + + - name: Setup Python Tools Scripts + uses: ./.github/actions/setup-python-tools-scripts + + - name: Get Salt Project GitHub Actions Bot Environment + run: | + TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") + SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) + echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" + + - name: Download Source Tarball + uses: actions/download-artifact@v3 + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}.tar.gz + path: artifacts/pkgs/incoming + + - name: Setup GnuPG + run: | + sudo install -d -m 0700 -o "$(id -u)" -g "$(id -g)" /run/gpg + GNUPGHOME="$(mktemp -d -p /run/gpg)" + echo "GNUPGHOME=${GNUPGHOME}" >> "$GITHUB_ENV" + cat < "${GNUPGHOME}/gpg.conf" + batch + no-tty + pinentry-mode loopback + EOF + + - name: Get Secrets + env: + SECRETS_KEY: ${{ secrets.SECRETS_KEY }} + run: | + SECRETS_KEY_FILE=$(mktemp /tmp/output.XXXXXXXXXX) + echo "$SECRETS_KEY" > "$SECRETS_KEY_FILE" + aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ + --query SecretString --output text | jq .default_key -r | base64 -d \ + | gpg --passphrase-file "${SECRETS_KEY_FILE}" -d - \ + | gpg --import - + sync + aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ + --query SecretString --output text| jq .default_passphrase -r | base64 -d \ + | gpg --passphrase-file "${SECRETS_KEY_FILE}" -o "${GNUPGHOME}/passphrase" -d - + sync + rm "$SECRETS_KEY_FILE" + echo "passphrase-file ${GNUPGHOME}/passphrase" >> "${GNUPGHOME}/gpg.conf" + + - name: Create Repository Path + run: | + mkdir -p artifacts/pkgs/repo + + - name: Create Repository + run: | + tools pkg repo create src --key-id=64CBBC8173D76B3F --nightly-build-from=${{ github.ref_name }} \ + --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ + --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo + + - name: Copy Files For Source Only Artifact Uploads + run: | + mkdir artifacts/src + find artifacts/pkgs/repo -type f -print -exec cp {} artifacts/src \; + + - name: Upload Standalone Repository As An Artifact + uses: actions/upload-artifact@v3 + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-nightly-src-repo + path: | + artifacts/src/salt-${{ needs.prepare-workflow.outputs.salt-version }}.tar.gz + artifacts/src/salt-${{ needs.prepare-workflow.outputs.salt-version }}.tar.gz.* + artifacts/src/*-GPG-* + retention-days: 7 + if-no-files-found: error + + - name: Upload Repository As An Artifact + uses: ./.github/actions/upload-artifact + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-nightly-repo + path: artifacts/pkgs/repo/* + retention-days: 7 + if-no-files-found: error + archive-name: src-repo build-deb-repo: - name: Build Repository + name: Build DEB Repository + environment: nightly + runs-on: + - self-hosted + - linux + - repo-nightly needs: - prepare-workflow - build-deb-pkgs-onedir - uses: ./.github/workflows/build-deb-repo.yml - with: - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: nightly - gpg_key_id: 64CBBC8173D76B3F - secrets: inherit + strategy: + fail-fast: false + matrix: + include: + - distro: debian + version: "10" + arch: x86_64 + - distro: debian + version: "10" + arch: aarch64 + - distro: debian + version: "11" + arch: x86_64 + - distro: debian + version: "11" + arch: aarch64 + - distro: ubuntu + version: "20.04" + arch: x86_64 + - distro: ubuntu + version: "20.04" + arch: aarch64 + - distro: ubuntu + version: "22.04" + arch: x86_64 + - distro: ubuntu + version: "22.04" + arch: aarch64 + + steps: + - uses: actions/checkout@v4 + + - name: Download System Dependencies + run: | + sudo apt update + sudo apt install -y devscripts apt-utils + + - name: Setup Python Tools Scripts + uses: ./.github/actions/setup-python-tools-scripts + + - name: Get Salt Project GitHub Actions Bot Environment + run: | + TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") + SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) + echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" + + - name: Download DEB Packages + uses: actions/download-artifact@v3 + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-${{ matrix.arch }}-deb + path: artifacts/pkgs/incoming + + - name: Setup GnuPG + run: | + sudo install -d -m 0700 -o "$(id -u)" -g "$(id -g)" /run/gpg + GNUPGHOME="$(mktemp -d -p /run/gpg)" + echo "GNUPGHOME=${GNUPGHOME}" >> "$GITHUB_ENV" + cat < "${GNUPGHOME}/gpg.conf" + batch + no-tty + pinentry-mode loopback + EOF + + - name: Get Secrets + env: + SECRETS_KEY: ${{ secrets.SECRETS_KEY }} + run: | + SECRETS_KEY_FILE=$(mktemp /tmp/output.XXXXXXXXXX) + echo "$SECRETS_KEY" > "$SECRETS_KEY_FILE" + aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ + --query SecretString --output text | jq .default_key -r | base64 -d \ + | gpg --passphrase-file "${SECRETS_KEY_FILE}" -d - \ + | gpg --import - + sync + aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ + --query SecretString --output text| jq .default_passphrase -r | base64 -d \ + | gpg --passphrase-file "${SECRETS_KEY_FILE}" -o "${GNUPGHOME}/passphrase" -d - + sync + rm "$SECRETS_KEY_FILE" + echo "passphrase-file ${GNUPGHOME}/passphrase" >> "${GNUPGHOME}/gpg.conf" + + - name: Create Repository Path + run: | + mkdir -p artifacts/pkgs/repo + + - name: Create Repository + run: | + tools pkg repo create deb --key-id=64CBBC8173D76B3F --distro-arch=${{ matrix.arch }} --nightly-build-from=${{ github.ref_name }} \ + --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ + --distro=${{ matrix.distro }} --distro-version=${{ matrix.version }} \ + --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo + + - name: Upload Repository As An Artifact + uses: ./.github/actions/upload-artifact + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-nightly-repo + path: artifacts/pkgs/repo/* + retention-days: 7 + if-no-files-found: error + archive-name: ${{ matrix.distro }}-${{ matrix.version }}-${{ matrix.arch }}-repo build-rpm-repo: - name: Build Repository + name: Build RPM Repository + environment: nightly + runs-on: + - self-hosted + - linux + - repo-nightly needs: - prepare-workflow - build-rpm-pkgs-onedir - uses: ./.github/workflows/build-rpm-repo.yml - with: - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: nightly - gpg_key_id: 64CBBC8173D76B3F - secrets: inherit + strategy: + fail-fast: false + matrix: + include: + - distro: amazon + version: "2" + arch: x86_64 + - distro: amazon + version: "2" + arch: aarch64 + - distro: redhat + version: "7" + arch: x86_64 + - distro: redhat + version: "7" + arch: aarch64 + - distro: redhat + version: "8" + arch: x86_64 + - distro: redhat + version: "8" + arch: aarch64 + - distro: redhat + version: "9" + arch: x86_64 + - distro: redhat + version: "9" + arch: aarch64 + - distro: fedora + version: "36" + arch: x86_64 + - distro: fedora + version: "36" + arch: aarch64 + - distro: fedora + version: "37" + arch: x86_64 + - distro: fedora + version: "37" + arch: aarch64 + - distro: fedora + version: "38" + arch: x86_64 + - distro: fedora + version: "38" + arch: aarch64 + - distro: photon + version: "3" + arch: x86_64 + - distro: photon + version: "3" + arch: aarch64 + - distro: photon + version: "4" + arch: x86_64 + - distro: photon + version: "4" + arch: aarch64 + + steps: + - uses: actions/checkout@v4 + + - name: Download System Dependencies + run: | + sudo apt update + sudo apt install -y rpm + + - name: Setup Python Tools Scripts + uses: ./.github/actions/setup-python-tools-scripts + + - name: Get Salt Project GitHub Actions Bot Environment + run: | + TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") + SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) + echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" + + - name: Download RPM Packages + uses: actions/download-artifact@v3 + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-${{ matrix.arch }}-rpm + path: artifacts/pkgs/incoming + + - name: Setup GnuPG + run: | + sudo install -d -m 0700 -o "$(id -u)" -g "$(id -g)" /run/gpg + GNUPGHOME="$(mktemp -d -p /run/gpg)" + echo "GNUPGHOME=${GNUPGHOME}" >> "$GITHUB_ENV" + cat < "${GNUPGHOME}/gpg.conf" + batch + no-tty + pinentry-mode loopback + EOF + + - name: Get Secrets + env: + SECRETS_KEY: ${{ secrets.SECRETS_KEY }} + run: | + SECRETS_KEY_FILE=$(mktemp /tmp/output.XXXXXXXXXX) + echo "$SECRETS_KEY" > "$SECRETS_KEY_FILE" + aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ + --query SecretString --output text | jq .default_key -r | base64 -d \ + | gpg --passphrase-file "${SECRETS_KEY_FILE}" -d - \ + | gpg --import - + sync + aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ + --query SecretString --output text| jq .default_passphrase -r | base64 -d \ + | gpg --passphrase-file "${SECRETS_KEY_FILE}" -o "${GNUPGHOME}/passphrase" -d - + sync + rm "$SECRETS_KEY_FILE" + echo "passphrase-file ${GNUPGHOME}/passphrase" >> "${GNUPGHOME}/gpg.conf" + + - name: Create Repository Path + run: | + mkdir -p artifacts/pkgs/repo + + - name: Create Repository + env: + SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} + SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} + run: | + tools pkg repo create rpm --key-id=64CBBC8173D76B3F --distro-arch=${{ matrix.arch }} --nightly-build-from=${{ github.ref_name }} \ + --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ + --distro=${{ matrix.distro }} --distro-version=${{ matrix.version }} \ + --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo + + - name: Upload Repository As An Artifact + uses: ./.github/actions/upload-artifact + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-nightly-repo + path: artifacts/pkgs/repo/* + retention-days: 7 + if-no-files-found: error + archive-name: ${{ matrix.distro }}-${{ matrix.version }}-${{ matrix.arch }}-repo build-windows-repo: - name: Build Repository + name: Build Windows Repository + environment: nightly + runs-on: + - self-hosted + - linux + - repo-nightly needs: - prepare-workflow - build-windows-pkgs-onedir - uses: ./.github/workflows/build-windows-repo.yml - with: - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: nightly - gpg_key_id: 64CBBC8173D76B3F - secrets: inherit + steps: + - uses: actions/checkout@v4 + + - name: Setup Python Tools Scripts + uses: ./.github/actions/setup-python-tools-scripts + + - name: Get Salt Project GitHub Actions Bot Environment + run: | + TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") + SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) + echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" + + - name: Download Windows NSIS x86 Packages + uses: actions/download-artifact@v3 + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-x86-NSIS + path: artifacts/pkgs/incoming + + - name: Download Windows MSI x86 Packages + uses: actions/download-artifact@v3 + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-x86-MSI + path: artifacts/pkgs/incoming + + - name: Download Windows NSIS amd64 Packages + uses: actions/download-artifact@v3 + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-amd64-NSIS + path: artifacts/pkgs/incoming + + - name: Download Windows MSI amd64 Packages + uses: actions/download-artifact@v3 + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-amd64-MSI + path: artifacts/pkgs/incoming + + - name: Setup GnuPG + run: | + sudo install -d -m 0700 -o "$(id -u)" -g "$(id -g)" /run/gpg + GNUPGHOME="$(mktemp -d -p /run/gpg)" + echo "GNUPGHOME=${GNUPGHOME}" >> "$GITHUB_ENV" + cat < "${GNUPGHOME}/gpg.conf" + batch + no-tty + pinentry-mode loopback + EOF + + - name: Get Secrets + env: + SECRETS_KEY: ${{ secrets.SECRETS_KEY }} + run: | + SECRETS_KEY_FILE=$(mktemp /tmp/output.XXXXXXXXXX) + echo "$SECRETS_KEY" > "$SECRETS_KEY_FILE" + aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ + --query SecretString --output text | jq .default_key -r | base64 -d \ + | gpg --passphrase-file "${SECRETS_KEY_FILE}" -d - \ + | gpg --import - + sync + aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ + --query SecretString --output text| jq .default_passphrase -r | base64 -d \ + | gpg --passphrase-file "${SECRETS_KEY_FILE}" -o "${GNUPGHOME}/passphrase" -d - + sync + rm "$SECRETS_KEY_FILE" + echo "passphrase-file ${GNUPGHOME}/passphrase" >> "${GNUPGHOME}/gpg.conf" + + - name: Create Repository Path + run: | + mkdir -p artifacts/pkgs/repo + + - name: Create Repository + run: | + tools pkg repo create windows --key-id=64CBBC8173D76B3F --nightly-build-from=${{ github.ref_name }} \ + --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ + --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo + + - name: Upload Repository As An Artifact + uses: ./.github/actions/upload-artifact + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-nightly-repo + path: artifacts/pkgs/repo/* + retention-days: 7 + if-no-files-found: error + archive-name: windows-repo build-macos-repo: - name: Build Repository + name: Build macOS Repository + environment: nightly + runs-on: + - self-hosted + - linux + - repo-nightly needs: - prepare-workflow - build-macos-pkgs-onedir - uses: ./.github/workflows/build-macos-repo.yml - with: - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: nightly - gpg_key_id: 64CBBC8173D76B3F - secrets: inherit + steps: + - uses: actions/checkout@v4 + + - name: Setup Python Tools Scripts + uses: ./.github/actions/setup-python-tools-scripts + + - name: Get Salt Project GitHub Actions Bot Environment + run: | + TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") + SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) + echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" + + - name: Download macOS x86_64 Packages + uses: actions/download-artifact@v3 + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-x86_64-macos + path: artifacts/pkgs/incoming + + - name: Setup GnuPG + run: | + sudo install -d -m 0700 -o "$(id -u)" -g "$(id -g)" /run/gpg + GNUPGHOME="$(mktemp -d -p /run/gpg)" + echo "GNUPGHOME=${GNUPGHOME}" >> "$GITHUB_ENV" + cat < "${GNUPGHOME}/gpg.conf" + batch + no-tty + pinentry-mode loopback + EOF + + - name: Get Secrets + env: + SECRETS_KEY: ${{ secrets.SECRETS_KEY }} + run: | + SECRETS_KEY_FILE=$(mktemp /tmp/output.XXXXXXXXXX) + echo "$SECRETS_KEY" > "$SECRETS_KEY_FILE" + aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ + --query SecretString --output text | jq .default_key -r | base64 -d \ + | gpg --passphrase-file "${SECRETS_KEY_FILE}" -d - \ + | gpg --import - + sync + aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ + --query SecretString --output text| jq .default_passphrase -r | base64 -d \ + | gpg --passphrase-file "${SECRETS_KEY_FILE}" -o "${GNUPGHOME}/passphrase" -d - + sync + rm "$SECRETS_KEY_FILE" + echo "passphrase-file ${GNUPGHOME}/passphrase" >> "${GNUPGHOME}/gpg.conf" + + - name: Create Repository Path + run: | + mkdir -p artifacts/pkgs/repo + + - name: Create Repository + run: | + tools pkg repo create macos --key-id=64CBBC8173D76B3F --nightly-build-from=${{ github.ref_name }} \ + --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ + --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo + + - name: Upload Repository As An Artifact + uses: ./.github/actions/upload-artifact + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-nightly-repo + path: artifacts/pkgs/repo/* + retention-days: 7 + if-no-files-found: error + archive-name: macos-repo build-onedir-repo: - name: Build Repository + name: Build Onedir Repository + environment: nightly + runs-on: + - self-hosted + - linux + - repo-nightly needs: - prepare-workflow - build-salt-onedir-linux - build-salt-onedir-macos - build-salt-onedir-windows - uses: ./.github/workflows/build-onedir-repo.yml - with: - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: nightly - gpg_key_id: 64CBBC8173D76B3F - secrets: inherit + steps: + - uses: actions/checkout@v4 + + - name: Setup Python Tools Scripts + uses: ./.github/actions/setup-python-tools-scripts + + - name: Get Salt Project GitHub Actions Bot Environment + run: | + TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") + SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) + echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" + + - name: Download Linux x86_64 Onedir Archive + uses: actions/download-artifact@v3 + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-linux-x86_64.tar.xz + path: artifacts/pkgs/incoming + + - name: Download Linux aarch64 Onedir Archive + uses: actions/download-artifact@v3 + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-linux-aarch64.tar.xz + path: artifacts/pkgs/incoming + + - name: Download macOS x86_64 Onedir Archive + uses: actions/download-artifact@v3 + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-darwin-x86_64.tar.xz + path: artifacts/pkgs/incoming + + - name: Download Windows amd64 Onedir Archive + uses: actions/download-artifact@v3 + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-windows-amd64.tar.xz + path: artifacts/pkgs/incoming + + - name: Download Windows amd64 Onedir Archive(zip) + uses: actions/download-artifact@v3 + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-windows-amd64.zip + path: artifacts/pkgs/incoming + + - name: Download Windows x86 Onedir Archive + uses: actions/download-artifact@v3 + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-windows-x86.tar.xz + path: artifacts/pkgs/incoming + + - name: Download Windows amd64 Onedir Archive(zip) + uses: actions/download-artifact@v3 + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-windows-x86.zip + path: artifacts/pkgs/incoming + + - name: Setup GnuPG + run: | + sudo install -d -m 0700 -o "$(id -u)" -g "$(id -g)" /run/gpg + GNUPGHOME="$(mktemp -d -p /run/gpg)" + echo "GNUPGHOME=${GNUPGHOME}" >> "$GITHUB_ENV" + cat < "${GNUPGHOME}/gpg.conf" + batch + no-tty + pinentry-mode loopback + EOF + + - name: Get Secrets + env: + SECRETS_KEY: ${{ secrets.SECRETS_KEY }} + run: | + SECRETS_KEY_FILE=$(mktemp /tmp/output.XXXXXXXXXX) + echo "$SECRETS_KEY" > "$SECRETS_KEY_FILE" + aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ + --query SecretString --output text | jq .default_key -r | base64 -d \ + | gpg --passphrase-file "${SECRETS_KEY_FILE}" -d - \ + | gpg --import - + sync + aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ + --query SecretString --output text| jq .default_passphrase -r | base64 -d \ + | gpg --passphrase-file "${SECRETS_KEY_FILE}" -o "${GNUPGHOME}/passphrase" -d - + sync + rm "$SECRETS_KEY_FILE" + echo "passphrase-file ${GNUPGHOME}/passphrase" >> "${GNUPGHOME}/gpg.conf" + + - name: Create Repository Path + run: | + mkdir -p artifacts/pkgs/repo + + - name: Create Repository + run: | + tools pkg repo create onedir --key-id=64CBBC8173D76B3F --nightly-build-from=${{ github.ref_name }} \ + --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ + --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo + + - name: Upload Repository As An Artifact + uses: ./.github/actions/upload-artifact + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-nightly-repo + path: artifacts/pkgs/repo/* + retention-days: 7 + if-no-files-found: error + archive-name: onedir-repo publish-repositories: name: Publish Repositories diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index e1a3c7a087c..4f7e567e94d 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -2170,78 +2170,636 @@ jobs: skip-junit-reports: true build-src-repo: - name: Build Repository + name: Build Source Repository + environment: staging + runs-on: + - self-hosted + - linux + - repo-staging needs: - prepare-workflow - - build-source-tarball - uses: ./.github/workflows/build-src-repo.yml - with: - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - gpg_key_id: 64CBBC8173D76B3F - secrets: inherit + steps: + - uses: actions/checkout@v4 + + - name: Setup Python Tools Scripts + uses: ./.github/actions/setup-python-tools-scripts + + - name: Get Salt Project GitHub Actions Bot Environment + run: | + TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") + SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) + echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" + + - name: Download Source Tarball + uses: actions/download-artifact@v3 + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}.tar.gz + path: artifacts/pkgs/incoming + + - name: Setup GnuPG + run: | + sudo install -d -m 0700 -o "$(id -u)" -g "$(id -g)" /run/gpg + GNUPGHOME="$(mktemp -d -p /run/gpg)" + echo "GNUPGHOME=${GNUPGHOME}" >> "$GITHUB_ENV" + cat < "${GNUPGHOME}/gpg.conf" + batch + no-tty + pinentry-mode loopback + EOF + + - name: Get Secrets + env: + SECRETS_KEY: ${{ secrets.SECRETS_KEY }} + run: | + SECRETS_KEY_FILE=$(mktemp /tmp/output.XXXXXXXXXX) + echo "$SECRETS_KEY" > "$SECRETS_KEY_FILE" + aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ + --query SecretString --output text | jq .default_key -r | base64 -d \ + | gpg --passphrase-file "${SECRETS_KEY_FILE}" -d - \ + | gpg --import - + sync + aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ + --query SecretString --output text| jq .default_passphrase -r | base64 -d \ + | gpg --passphrase-file "${SECRETS_KEY_FILE}" -o "${GNUPGHOME}/passphrase" -d - + sync + rm "$SECRETS_KEY_FILE" + echo "passphrase-file ${GNUPGHOME}/passphrase" >> "${GNUPGHOME}/gpg.conf" + + - name: Create Repository Path + run: | + mkdir -p artifacts/pkgs/repo + + - name: Create Repository + run: | + tools pkg repo create src --key-id=64CBBC8173D76B3F \ + --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ + --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo + + - name: Copy Files For Source Only Artifact Uploads + run: | + mkdir artifacts/src + find artifacts/pkgs/repo -type f -print -exec cp {} artifacts/src \; + + - name: Upload Standalone Repository As An Artifact + uses: actions/upload-artifact@v3 + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-staging-src-repo + path: | + artifacts/src/salt-${{ needs.prepare-workflow.outputs.salt-version }}.tar.gz + artifacts/src/salt-${{ needs.prepare-workflow.outputs.salt-version }}.tar.gz.* + artifacts/src/*-GPG-* + retention-days: 7 + if-no-files-found: error + + - name: Upload Repository As An Artifact + uses: ./.github/actions/upload-artifact + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-staging-repo + path: artifacts/pkgs/repo/* + retention-days: 7 + if-no-files-found: error + archive-name: src-repo build-deb-repo: - name: Build Repository + name: Build DEB Repository + environment: staging + runs-on: + - self-hosted + - linux + - repo-staging needs: - prepare-workflow - build-deb-pkgs-onedir - uses: ./.github/workflows/build-deb-repo.yml - with: - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - gpg_key_id: 64CBBC8173D76B3F - secrets: inherit + strategy: + fail-fast: false + matrix: + include: + - distro: debian + version: "10" + arch: x86_64 + - distro: debian + version: "10" + arch: aarch64 + - distro: debian + version: "11" + arch: x86_64 + - distro: debian + version: "11" + arch: aarch64 + - distro: ubuntu + version: "20.04" + arch: x86_64 + - distro: ubuntu + version: "20.04" + arch: aarch64 + - distro: ubuntu + version: "22.04" + arch: x86_64 + - distro: ubuntu + version: "22.04" + arch: aarch64 + + steps: + - uses: actions/checkout@v4 + + - name: Download System Dependencies + run: | + sudo apt update + sudo apt install -y devscripts apt-utils + + - name: Setup Python Tools Scripts + uses: ./.github/actions/setup-python-tools-scripts + + - name: Get Salt Project GitHub Actions Bot Environment + run: | + TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") + SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) + echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" + + - name: Download DEB Packages + uses: actions/download-artifact@v3 + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-${{ matrix.arch }}-deb + path: artifacts/pkgs/incoming + + - name: Setup GnuPG + run: | + sudo install -d -m 0700 -o "$(id -u)" -g "$(id -g)" /run/gpg + GNUPGHOME="$(mktemp -d -p /run/gpg)" + echo "GNUPGHOME=${GNUPGHOME}" >> "$GITHUB_ENV" + cat < "${GNUPGHOME}/gpg.conf" + batch + no-tty + pinentry-mode loopback + EOF + + - name: Get Secrets + env: + SECRETS_KEY: ${{ secrets.SECRETS_KEY }} + run: | + SECRETS_KEY_FILE=$(mktemp /tmp/output.XXXXXXXXXX) + echo "$SECRETS_KEY" > "$SECRETS_KEY_FILE" + aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ + --query SecretString --output text | jq .default_key -r | base64 -d \ + | gpg --passphrase-file "${SECRETS_KEY_FILE}" -d - \ + | gpg --import - + sync + aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ + --query SecretString --output text| jq .default_passphrase -r | base64 -d \ + | gpg --passphrase-file "${SECRETS_KEY_FILE}" -o "${GNUPGHOME}/passphrase" -d - + sync + rm "$SECRETS_KEY_FILE" + echo "passphrase-file ${GNUPGHOME}/passphrase" >> "${GNUPGHOME}/gpg.conf" + + - name: Create Repository Path + run: | + mkdir -p artifacts/pkgs/repo + + - name: Create Repository + run: | + tools pkg repo create deb --key-id=64CBBC8173D76B3F --distro-arch=${{ matrix.arch }} \ + --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ + --distro=${{ matrix.distro }} --distro-version=${{ matrix.version }} \ + --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo + + - name: Upload Repository As An Artifact + uses: ./.github/actions/upload-artifact + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-staging-repo + path: artifacts/pkgs/repo/* + retention-days: 7 + if-no-files-found: error + archive-name: ${{ matrix.distro }}-${{ matrix.version }}-${{ matrix.arch }}-repo build-rpm-repo: - name: Build Repository + name: Build RPM Repository + environment: staging + runs-on: + - self-hosted + - linux + - repo-staging needs: - prepare-workflow - build-rpm-pkgs-onedir - uses: ./.github/workflows/build-rpm-repo.yml - with: - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - gpg_key_id: 64CBBC8173D76B3F - secrets: inherit + strategy: + fail-fast: false + matrix: + include: + - distro: amazon + version: "2" + arch: x86_64 + - distro: amazon + version: "2" + arch: aarch64 + - distro: redhat + version: "7" + arch: x86_64 + - distro: redhat + version: "7" + arch: aarch64 + - distro: redhat + version: "8" + arch: x86_64 + - distro: redhat + version: "8" + arch: aarch64 + - distro: redhat + version: "9" + arch: x86_64 + - distro: redhat + version: "9" + arch: aarch64 + - distro: fedora + version: "36" + arch: x86_64 + - distro: fedora + version: "36" + arch: aarch64 + - distro: fedora + version: "37" + arch: x86_64 + - distro: fedora + version: "37" + arch: aarch64 + - distro: fedora + version: "38" + arch: x86_64 + - distro: fedora + version: "38" + arch: aarch64 + - distro: photon + version: "3" + arch: x86_64 + - distro: photon + version: "3" + arch: aarch64 + - distro: photon + version: "4" + arch: x86_64 + - distro: photon + version: "4" + arch: aarch64 + + steps: + - uses: actions/checkout@v4 + + - name: Download System Dependencies + run: | + sudo apt update + sudo apt install -y rpm + + - name: Setup Python Tools Scripts + uses: ./.github/actions/setup-python-tools-scripts + + - name: Get Salt Project GitHub Actions Bot Environment + run: | + TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") + SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) + echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" + + - name: Download RPM Packages + uses: actions/download-artifact@v3 + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-${{ matrix.arch }}-rpm + path: artifacts/pkgs/incoming + + - name: Setup GnuPG + run: | + sudo install -d -m 0700 -o "$(id -u)" -g "$(id -g)" /run/gpg + GNUPGHOME="$(mktemp -d -p /run/gpg)" + echo "GNUPGHOME=${GNUPGHOME}" >> "$GITHUB_ENV" + cat < "${GNUPGHOME}/gpg.conf" + batch + no-tty + pinentry-mode loopback + EOF + + - name: Get Secrets + env: + SECRETS_KEY: ${{ secrets.SECRETS_KEY }} + run: | + SECRETS_KEY_FILE=$(mktemp /tmp/output.XXXXXXXXXX) + echo "$SECRETS_KEY" > "$SECRETS_KEY_FILE" + aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ + --query SecretString --output text | jq .default_key -r | base64 -d \ + | gpg --passphrase-file "${SECRETS_KEY_FILE}" -d - \ + | gpg --import - + sync + aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ + --query SecretString --output text| jq .default_passphrase -r | base64 -d \ + | gpg --passphrase-file "${SECRETS_KEY_FILE}" -o "${GNUPGHOME}/passphrase" -d - + sync + rm "$SECRETS_KEY_FILE" + echo "passphrase-file ${GNUPGHOME}/passphrase" >> "${GNUPGHOME}/gpg.conf" + + - name: Create Repository Path + run: | + mkdir -p artifacts/pkgs/repo + + - name: Create Repository + env: + SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} + SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} + SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} + SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} + run: | + tools pkg repo create rpm --key-id=64CBBC8173D76B3F --distro-arch=${{ matrix.arch }} \ + --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ + --distro=${{ matrix.distro }} --distro-version=${{ matrix.version }} \ + --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo + + - name: Upload Repository As An Artifact + uses: ./.github/actions/upload-artifact + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-staging-repo + path: artifacts/pkgs/repo/* + retention-days: 7 + if-no-files-found: error + archive-name: ${{ matrix.distro }}-${{ matrix.version }}-${{ matrix.arch }}-repo build-windows-repo: - name: Build Repository + name: Build Windows Repository + environment: staging + runs-on: + - self-hosted + - linux + - repo-staging needs: - prepare-workflow - build-windows-pkgs-onedir - uses: ./.github/workflows/build-windows-repo.yml - with: - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - gpg_key_id: 64CBBC8173D76B3F - secrets: inherit + steps: + - uses: actions/checkout@v4 + + - name: Setup Python Tools Scripts + uses: ./.github/actions/setup-python-tools-scripts + + - name: Get Salt Project GitHub Actions Bot Environment + run: | + TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") + SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) + echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" + + - name: Download Windows NSIS x86 Packages + uses: actions/download-artifact@v3 + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-x86-NSIS + path: artifacts/pkgs/incoming + + - name: Download Windows MSI x86 Packages + uses: actions/download-artifact@v3 + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-x86-MSI + path: artifacts/pkgs/incoming + + - name: Download Windows NSIS amd64 Packages + uses: actions/download-artifact@v3 + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-amd64-NSIS + path: artifacts/pkgs/incoming + + - name: Download Windows MSI amd64 Packages + uses: actions/download-artifact@v3 + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-amd64-MSI + path: artifacts/pkgs/incoming + + - name: Setup GnuPG + run: | + sudo install -d -m 0700 -o "$(id -u)" -g "$(id -g)" /run/gpg + GNUPGHOME="$(mktemp -d -p /run/gpg)" + echo "GNUPGHOME=${GNUPGHOME}" >> "$GITHUB_ENV" + cat < "${GNUPGHOME}/gpg.conf" + batch + no-tty + pinentry-mode loopback + EOF + + - name: Get Secrets + env: + SECRETS_KEY: ${{ secrets.SECRETS_KEY }} + run: | + SECRETS_KEY_FILE=$(mktemp /tmp/output.XXXXXXXXXX) + echo "$SECRETS_KEY" > "$SECRETS_KEY_FILE" + aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ + --query SecretString --output text | jq .default_key -r | base64 -d \ + | gpg --passphrase-file "${SECRETS_KEY_FILE}" -d - \ + | gpg --import - + sync + aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ + --query SecretString --output text| jq .default_passphrase -r | base64 -d \ + | gpg --passphrase-file "${SECRETS_KEY_FILE}" -o "${GNUPGHOME}/passphrase" -d - + sync + rm "$SECRETS_KEY_FILE" + echo "passphrase-file ${GNUPGHOME}/passphrase" >> "${GNUPGHOME}/gpg.conf" + + - name: Create Repository Path + run: | + mkdir -p artifacts/pkgs/repo + + - name: Create Repository + run: | + tools pkg repo create windows --key-id=64CBBC8173D76B3F \ + --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ + --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo + + - name: Upload Repository As An Artifact + uses: ./.github/actions/upload-artifact + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-staging-repo + path: artifacts/pkgs/repo/* + retention-days: 7 + if-no-files-found: error + archive-name: windows-repo build-macos-repo: - name: Build Repository + name: Build macOS Repository + environment: staging + runs-on: + - self-hosted + - linux + - repo-staging needs: - prepare-workflow - build-macos-pkgs-onedir - uses: ./.github/workflows/build-macos-repo.yml - with: - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - gpg_key_id: 64CBBC8173D76B3F - secrets: inherit + steps: + - uses: actions/checkout@v4 + + - name: Setup Python Tools Scripts + uses: ./.github/actions/setup-python-tools-scripts + + - name: Get Salt Project GitHub Actions Bot Environment + run: | + TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") + SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) + echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" + + - name: Download macOS x86_64 Packages + uses: actions/download-artifact@v3 + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-x86_64-macos + path: artifacts/pkgs/incoming + + - name: Setup GnuPG + run: | + sudo install -d -m 0700 -o "$(id -u)" -g "$(id -g)" /run/gpg + GNUPGHOME="$(mktemp -d -p /run/gpg)" + echo "GNUPGHOME=${GNUPGHOME}" >> "$GITHUB_ENV" + cat < "${GNUPGHOME}/gpg.conf" + batch + no-tty + pinentry-mode loopback + EOF + + - name: Get Secrets + env: + SECRETS_KEY: ${{ secrets.SECRETS_KEY }} + run: | + SECRETS_KEY_FILE=$(mktemp /tmp/output.XXXXXXXXXX) + echo "$SECRETS_KEY" > "$SECRETS_KEY_FILE" + aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ + --query SecretString --output text | jq .default_key -r | base64 -d \ + | gpg --passphrase-file "${SECRETS_KEY_FILE}" -d - \ + | gpg --import - + sync + aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ + --query SecretString --output text| jq .default_passphrase -r | base64 -d \ + | gpg --passphrase-file "${SECRETS_KEY_FILE}" -o "${GNUPGHOME}/passphrase" -d - + sync + rm "$SECRETS_KEY_FILE" + echo "passphrase-file ${GNUPGHOME}/passphrase" >> "${GNUPGHOME}/gpg.conf" + + - name: Create Repository Path + run: | + mkdir -p artifacts/pkgs/repo + + - name: Create Repository + run: | + tools pkg repo create macos --key-id=64CBBC8173D76B3F \ + --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ + --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo + + - name: Upload Repository As An Artifact + uses: ./.github/actions/upload-artifact + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-staging-repo + path: artifacts/pkgs/repo/* + retention-days: 7 + if-no-files-found: error + archive-name: macos-repo build-onedir-repo: - name: Build Repository + name: Build Onedir Repository + environment: staging + runs-on: + - self-hosted + - linux + - repo-staging needs: - prepare-workflow - build-salt-onedir-linux - build-salt-onedir-macos - build-salt-onedir-windows - uses: ./.github/workflows/build-onedir-repo.yml - with: - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - gpg_key_id: 64CBBC8173D76B3F - secrets: inherit + steps: + - uses: actions/checkout@v4 + + - name: Setup Python Tools Scripts + uses: ./.github/actions/setup-python-tools-scripts + + - name: Get Salt Project GitHub Actions Bot Environment + run: | + TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") + SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) + echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" + + - name: Download Linux x86_64 Onedir Archive + uses: actions/download-artifact@v3 + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-linux-x86_64.tar.xz + path: artifacts/pkgs/incoming + + - name: Download Linux aarch64 Onedir Archive + uses: actions/download-artifact@v3 + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-linux-aarch64.tar.xz + path: artifacts/pkgs/incoming + + - name: Download macOS x86_64 Onedir Archive + uses: actions/download-artifact@v3 + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-darwin-x86_64.tar.xz + path: artifacts/pkgs/incoming + + - name: Download Windows amd64 Onedir Archive + uses: actions/download-artifact@v3 + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-windows-amd64.tar.xz + path: artifacts/pkgs/incoming + + - name: Download Windows amd64 Onedir Archive(zip) + uses: actions/download-artifact@v3 + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-windows-amd64.zip + path: artifacts/pkgs/incoming + + - name: Download Windows x86 Onedir Archive + uses: actions/download-artifact@v3 + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-windows-x86.tar.xz + path: artifacts/pkgs/incoming + + - name: Download Windows amd64 Onedir Archive(zip) + uses: actions/download-artifact@v3 + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-windows-x86.zip + path: artifacts/pkgs/incoming + + - name: Setup GnuPG + run: | + sudo install -d -m 0700 -o "$(id -u)" -g "$(id -g)" /run/gpg + GNUPGHOME="$(mktemp -d -p /run/gpg)" + echo "GNUPGHOME=${GNUPGHOME}" >> "$GITHUB_ENV" + cat < "${GNUPGHOME}/gpg.conf" + batch + no-tty + pinentry-mode loopback + EOF + + - name: Get Secrets + env: + SECRETS_KEY: ${{ secrets.SECRETS_KEY }} + run: | + SECRETS_KEY_FILE=$(mktemp /tmp/output.XXXXXXXXXX) + echo "$SECRETS_KEY" > "$SECRETS_KEY_FILE" + aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ + --query SecretString --output text | jq .default_key -r | base64 -d \ + | gpg --passphrase-file "${SECRETS_KEY_FILE}" -d - \ + | gpg --import - + sync + aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ + --query SecretString --output text| jq .default_passphrase -r | base64 -d \ + | gpg --passphrase-file "${SECRETS_KEY_FILE}" -o "${GNUPGHOME}/passphrase" -d - + sync + rm "$SECRETS_KEY_FILE" + echo "passphrase-file ${GNUPGHOME}/passphrase" >> "${GNUPGHOME}/gpg.conf" + + - name: Create Repository Path + run: | + mkdir -p artifacts/pkgs/repo + + - name: Create Repository + run: | + tools pkg repo create onedir --key-id=64CBBC8173D76B3F \ + --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ + --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo + + - name: Upload Repository As An Artifact + uses: ./.github/actions/upload-artifact + with: + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-staging-repo + path: artifacts/pkgs/repo/* + retention-days: 7 + if-no-files-found: error + archive-name: onedir-repo publish-repositories: name: Publish Repositories diff --git a/.github/workflows/build-deb-repo.yml b/.github/workflows/templates/build-deb-repo.yml.jinja similarity index 55% rename from .github/workflows/build-deb-repo.yml rename to .github/workflows/templates/build-deb-repo.yml.jinja index 1b8233017f1..a4e3dd8a2aa 100644 --- a/.github/workflows/build-deb-repo.yml +++ b/.github/workflows/templates/build-deb-repo.yml.jinja @@ -1,78 +1,24 @@ ---- -name: Build DEB Repository -on: - workflow_call: - inputs: - environment: - type: string - required: true - description: The environment to run against - gpg_key_id: - type: string - required: true - description: The GPG key ID to use - salt-version: - type: string - required: true - description: The Salt version of the packages to install and test - -env: - RELENV_DATA: "${{ github.workspace }}/.relenv" - COLUMNS: 190 - AWS_MAX_ATTEMPTS: "10" - AWS_RETRY_MODE: "adaptive" - PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ - PIP_EXTRA_INDEX_URL: https://pypi.org/simple - -jobs: - - generate-matrix: - name: DEB (matrix) - runs-on: - - self-hosted - - linux - - x86_64 - outputs: - repo-matrix-include: ${{ steps.generate-pkg-repo-matrix.outputs.matrix }} - steps: - - - name: "Throttle Builds" - shell: bash - run: | - t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t" - - - name: Checkout Source Code - uses: actions/checkout@v4 - - - name: Setup Python Tools Scripts - uses: ./.github/actions/setup-python-tools-scripts - - - name: Generate Package Repo Matrix - id: generate-pkg-repo-matrix - run: | - tools ci pkg-repo-matrix deb - - build-deb-repo: - name: DEB - environment: ${{ inputs.environment }} - runs-on: - - self-hosted - - linux - - repo-${{ inputs.environment }} - needs: - - generate-matrix strategy: fail-fast: false matrix: - include: ${{ fromJSON(needs.generate-matrix.outputs.repo-matrix-include) }} + include: + <%- for distro, version, arch in ( + ("debian", "10", "x86_64"), + ("debian", "10", "aarch64"), + ("debian", "11", "x86_64"), + ("debian", "11", "aarch64"), + ("ubuntu", "20.04", "x86_64"), + ("ubuntu", "20.04", "aarch64"), + ("ubuntu", "22.04", "x86_64"), + ("ubuntu", "22.04", "aarch64"), + ) %> + - distro: <{ distro }> + version: "<{ version }>" + arch: <{ arch }> + <%- endfor %> + steps: - - - name: "Throttle Builds" - shell: bash - run: | - t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" - - uses: actions/checkout@v4 - name: Download System Dependencies @@ -92,7 +38,7 @@ jobs: - name: Download DEB Packages uses: actions/download-artifact@v3 with: - name: salt-${{ inputs.salt-version }}-${{ matrix.arch }}-deb + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-${{ matrix.arch }}-deb path: artifacts/pkgs/incoming - name: Setup GnuPG @@ -130,15 +76,15 @@ jobs: - name: Create Repository run: | - tools pkg repo create deb --key-id=${{ inputs.gpg_key_id }} --distro-arch=${{ matrix.arch }} ${{ inputs.environment == 'nightly' && format('--nightly-build-from={0}', github.ref_name) || '' }} \ - --salt-version=${{ inputs.salt-version }} \ + tools pkg repo create deb --key-id=<{ gpg_key_id }> --distro-arch=${{ matrix.arch }} <% if gh_environment == 'nightly' -%> --nightly-build-from=${{ github.ref_name }} <%- endif %> \ + --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ --distro=${{ matrix.distro }} --distro-version=${{ matrix.version }} \ --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo - name: Upload Repository As An Artifact uses: ./.github/actions/upload-artifact with: - name: salt-${{ inputs.salt-version }}-${{ inputs.environment }}-repo + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-<{ gh_environment }>-repo path: artifacts/pkgs/repo/* retention-days: 7 if-no-files-found: error diff --git a/.github/workflows/build-macos-repo.yml b/.github/workflows/templates/build-macos-repo.yml.jinja similarity index 62% rename from .github/workflows/build-macos-repo.yml rename to .github/workflows/templates/build-macos-repo.yml.jinja index 26101419913..b24e0a9c4a4 100644 --- a/.github/workflows/build-macos-repo.yml +++ b/.github/workflows/templates/build-macos-repo.yml.jinja @@ -1,52 +1,5 @@ ---- -name: Build DEB Repository - -on: - workflow_call: - inputs: - environment: - type: string - required: true - description: The environment to run against - gpg_key_id: - type: string - required: true - description: The GPG key ID to use - salt-version: - type: string - required: true - description: The Salt version of the packages to install and test - -env: - RELENV_DATA: "${{ github.workspace }}/.relenv" - COLUMNS: 190 - AWS_MAX_ATTEMPTS: "10" - AWS_RETRY_MODE: "adaptive" - PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ - PIP_EXTRA_INDEX_URL: https://pypi.org/simple - -jobs: - - build-repo: - name: MacOS - environment: ${{ inputs.environment }} - runs-on: - - self-hosted - - linux - - repo-${{ inputs.environment }} - strategy: - fail-fast: false - matrix: - pkg-type: - - macos steps: - - - name: "Throttle Builds" - shell: bash - run: | - t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" - - uses: actions/checkout@v4 - name: Setup Python Tools Scripts @@ -61,7 +14,7 @@ jobs: - name: Download macOS x86_64 Packages uses: actions/download-artifact@v3 with: - name: salt-${{ inputs.salt-version }}-x86_64-macos + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-x86_64-macos path: artifacts/pkgs/incoming - name: Setup GnuPG @@ -99,14 +52,15 @@ jobs: - name: Create Repository run: | - tools pkg repo create macos --key-id=${{ inputs.gpg_key_id }} ${{ inputs.environment == 'nightly' && format('--nightly-build-from={0}', github.ref_name) || '' }} \ - --salt-version=${{ inputs.salt-version }} \ + tools pkg repo create macos --key-id=<{ gpg_key_id }> <% if gh_environment == 'nightly' -%> --nightly-build-from=${{ github.ref_name }} <%- endif %> \ + --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo - name: Upload Repository As An Artifact uses: ./.github/actions/upload-artifact with: - name: salt-${{ inputs.salt-version }}-${{ inputs.environment }}-repo + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-<{ gh_environment }>-repo path: artifacts/pkgs/repo/* retention-days: 7 if-no-files-found: error + archive-name: macos-repo diff --git a/.github/workflows/build-onedir-repo.yml b/.github/workflows/templates/build-onedir-repo.yml.jinja similarity index 63% rename from .github/workflows/build-onedir-repo.yml rename to .github/workflows/templates/build-onedir-repo.yml.jinja index a30e4297c3e..581503ab1eb 100644 --- a/.github/workflows/build-onedir-repo.yml +++ b/.github/workflows/templates/build-onedir-repo.yml.jinja @@ -1,52 +1,5 @@ ---- -name: Build Onedir Repository - -on: - workflow_call: - inputs: - environment: - type: string - required: true - description: The environment to run against - gpg_key_id: - type: string - required: true - description: The GPG key ID to use - salt-version: - type: string - required: true - description: The Salt version of the packages to install and test - -env: - RELENV_DATA: "${{ github.workspace }}/.relenv" - COLUMNS: 190 - AWS_MAX_ATTEMPTS: "10" - AWS_RETRY_MODE: "adaptive" - PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ - PIP_EXTRA_INDEX_URL: https://pypi.org/simple - -jobs: - - build-repo: - name: Onedir - environment: ${{ inputs.environment }} - runs-on: - - self-hosted - - linux - - repo-${{ inputs.environment }} - strategy: - fail-fast: false - matrix: - pkg-type: - - onedir steps: - - - name: "Throttle Builds" - shell: bash - run: | - t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" - - uses: actions/checkout@v4 - name: Setup Python Tools Scripts @@ -61,43 +14,43 @@ jobs: - name: Download Linux x86_64 Onedir Archive uses: actions/download-artifact@v3 with: - name: salt-${{ inputs.salt-version }}-onedir-linux-x86_64.tar.xz + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-linux-x86_64.tar.xz path: artifacts/pkgs/incoming - name: Download Linux aarch64 Onedir Archive uses: actions/download-artifact@v3 with: - name: salt-${{ inputs.salt-version }}-onedir-linux-aarch64.tar.xz + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-linux-aarch64.tar.xz path: artifacts/pkgs/incoming - name: Download macOS x86_64 Onedir Archive uses: actions/download-artifact@v3 with: - name: salt-${{ inputs.salt-version }}-onedir-darwin-x86_64.tar.xz + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-darwin-x86_64.tar.xz path: artifacts/pkgs/incoming - name: Download Windows amd64 Onedir Archive uses: actions/download-artifact@v3 with: - name: salt-${{ inputs.salt-version }}-onedir-windows-amd64.tar.xz + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-windows-amd64.tar.xz path: artifacts/pkgs/incoming - name: Download Windows amd64 Onedir Archive(zip) uses: actions/download-artifact@v3 with: - name: salt-${{ inputs.salt-version }}-onedir-windows-amd64.zip + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-windows-amd64.zip path: artifacts/pkgs/incoming - name: Download Windows x86 Onedir Archive uses: actions/download-artifact@v3 with: - name: salt-${{ inputs.salt-version }}-onedir-windows-x86.tar.xz + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-windows-x86.tar.xz path: artifacts/pkgs/incoming - name: Download Windows amd64 Onedir Archive(zip) uses: actions/download-artifact@v3 with: - name: salt-${{ inputs.salt-version }}-onedir-windows-x86.zip + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-windows-x86.zip path: artifacts/pkgs/incoming - name: Setup GnuPG @@ -135,14 +88,14 @@ jobs: - name: Create Repository run: | - tools pkg repo create onedir --key-id=${{ inputs.gpg_key_id }} ${{ inputs.environment == 'nightly' && format('--nightly-build-from={0}', github.ref_name) || '' }} \ - --salt-version=${{ inputs.salt-version }} \ + tools pkg repo create onedir --key-id=<{ gpg_key_id }> <% if gh_environment == 'nightly' -%> --nightly-build-from=${{ github.ref_name }} <%- endif %> \ + --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo - name: Upload Repository As An Artifact uses: ./.github/actions/upload-artifact with: - name: salt-${{ inputs.salt-version }}-${{ inputs.environment }}-repo + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-<{ gh_environment }>-repo path: artifacts/pkgs/repo/* retention-days: 7 if-no-files-found: error diff --git a/.github/workflows/templates/build-repos.yml.jinja b/.github/workflows/templates/build-repos.yml.jinja index 313a178a093..da05231fdb5 100644 --- a/.github/workflows/templates/build-repos.yml.jinja +++ b/.github/workflows/templates/build-repos.yml.jinja @@ -1,33 +1,33 @@ -<%- for type, display_name in ( - ("src", "Source"), - ("deb", "DEB"), - ("rpm", "RPM"), - ("windows", "Windows"), - ("macos", "macOS"), - ("onedir", "Onedir"), - ) %> +<%- for platform, type, display_name, needs_pkg in ( + (None, "src", "Source", False), + ("linux", "deb", "DEB", True), + ("linux", "rpm", "RPM", True), + ("windows", "windows", "Windows", True), + ("macos", "macos", "macOS", True), + (None, "onedir", "Onedir", False), + ) %> <%- set job_name = "build-{}-repo".format(type) %> <%- do build_repo_needs.append(job_name) %> <{ job_name }>: - name: Build Repository + name: Build <{ display_name }> Repository + environment: <{ gh_environment }> + runs-on: + - self-hosted + - linux + - repo-<{ gh_environment }> needs: - prepare-workflow - <%- if type not in ("src", "onedir") %> + <%- if needs_pkg %> - build-<{ type }>-pkgs-onedir + <%- elif platform %> + - build-salt-onedir-<{ platform }> <%- elif type == 'onedir' %> - build-salt-onedir-linux - build-salt-onedir-macos - build-salt-onedir-windows - <%- elif type == 'src' %> - - build-source-tarball <%- endif %> - uses: ./.github/workflows/build-<{ type }>-repo.yml - with: - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: <{ gh_environment }> - gpg_key_id: <{ gpg_key_id }> - secrets: inherit + <%- include "build-{}-repo.yml.jinja".format(type) %> <%- endfor %> diff --git a/.github/workflows/build-rpm-repo.yml b/.github/workflows/templates/build-rpm-repo.yml.jinja similarity index 60% rename from .github/workflows/build-rpm-repo.yml rename to .github/workflows/templates/build-rpm-repo.yml.jinja index 83f957de461..ba0702ffc03 100644 --- a/.github/workflows/build-rpm-repo.yml +++ b/.github/workflows/templates/build-rpm-repo.yml.jinja @@ -1,71 +1,32 @@ ---- -name: Build RPM Repository -on: - workflow_call: - inputs: - environment: - type: string - required: true - description: The environment to run against - gpg_key_id: - type: string - required: true - description: The GPG key ID to use - salt-version: - type: string - required: true - description: The Salt version of the packages to install and test - -env: - RELENV_DATA: "${{ github.workspace }}/.relenv" - COLUMNS: 190 - AWS_MAX_ATTEMPTS: "10" - AWS_RETRY_MODE: "adaptive" - PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ - PIP_EXTRA_INDEX_URL: https://pypi.org/simple - -jobs: - - generate-matrix: - name: RPM (matrix) - runs-on: - - self-hosted - - linux - - x86_64 - outputs: - repo-matrix-include: ${{ steps.generate-pkg-repo-matrix.outputs.matrix }} - steps: - - - name: "Throttle Builds" - shell: bash - run: | - t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t" - - - name: Checkout Source Code - uses: actions/checkout@v4 - - - name: Setup Python Tools Scripts - uses: ./.github/actions/setup-python-tools-scripts - - - name: Generate Package Repo Matrix - id: generate-pkg-repo-matrix - run: | - tools ci pkg-repo-matrix rpm - - build-repo: - name: RPM - environment: ${{ inputs.environment }} - runs-on: - - self-hosted - - linux - - repo-${{ inputs.environment }} - needs: - - generate-matrix strategy: fail-fast: false matrix: - include: ${{ fromJSON(needs.generate-matrix.outputs.repo-matrix-include) }} + include: + <%- for distro, version, arch in ( + ("amazon", "2", "x86_64"), + ("amazon", "2", "aarch64"), + ("redhat", "7", "x86_64"), + ("redhat", "7", "aarch64"), + ("redhat", "8", "x86_64"), + ("redhat", "8", "aarch64"), + ("redhat", "9", "x86_64"), + ("redhat", "9", "aarch64"), + ("fedora", "36", "x86_64"), + ("fedora", "36", "aarch64"), + ("fedora", "37", "x86_64"), + ("fedora", "37", "aarch64"), + ("fedora", "38", "x86_64"), + ("fedora", "38", "aarch64"), + ("photon", "3", "x86_64"), + ("photon", "3", "aarch64"), + ("photon", "4", "x86_64"), + ("photon", "4", "aarch64"), + ) %> + - distro: <{ distro }> + version: "<{ version }>" + arch: <{ arch }> + <%- endfor %> steps: - uses: actions/checkout@v4 @@ -87,7 +48,7 @@ jobs: - name: Download RPM Packages uses: actions/download-artifact@v3 with: - name: salt-${{ inputs.salt-version }}-${{ matrix.arch }}-rpm + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-${{ matrix.arch }}-rpm path: artifacts/pkgs/incoming - name: Setup GnuPG @@ -125,20 +86,22 @@ jobs: - name: Create Repository env: + <%- if gh_environment == 'staging' %> SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} + <%- endif %> SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} run: | - tools pkg repo create rpm --key-id=${{ inputs.gpg_key_id }} --distro-arch=${{ matrix.arch }} ${{ inputs.environment == 'nightly' && format('--nightly-build-from={0}', github.ref_name) || '' }} \ - --salt-version=${{ inputs.salt-version }} \ + tools pkg repo create rpm --key-id=<{ gpg_key_id }> --distro-arch=${{ matrix.arch }} <% if gh_environment == 'nightly' -%> --nightly-build-from=${{ github.ref_name }} <%- endif %> \ + --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ --distro=${{ matrix.distro }} --distro-version=${{ matrix.version }} \ --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo - name: Upload Repository As An Artifact uses: ./.github/actions/upload-artifact with: - name: salt-${{ inputs.salt-version }}-${{ inputs.environment }}-repo + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-<{ gh_environment }>-repo path: artifacts/pkgs/repo/* retention-days: 7 if-no-files-found: error diff --git a/.github/workflows/build-src-repo.yml b/.github/workflows/templates/build-src-repo.yml.jinja similarity index 63% rename from .github/workflows/build-src-repo.yml rename to .github/workflows/templates/build-src-repo.yml.jinja index 8e0e37c3d52..728ed00f093 100644 --- a/.github/workflows/build-src-repo.yml +++ b/.github/workflows/templates/build-src-repo.yml.jinja @@ -1,52 +1,5 @@ ---- -name: Build Source Repository - -on: - workflow_call: - inputs: - environment: - type: string - required: true - description: The environment to run against - gpg_key_id: - type: string - required: true - description: The GPG key ID to use - salt-version: - type: string - required: true - description: The Salt version of the packages to install and test - -env: - RELENV_DATA: "${{ github.workspace }}/.relenv" - COLUMNS: 190 - AWS_MAX_ATTEMPTS: "10" - AWS_RETRY_MODE: "adaptive" - PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ - PIP_EXTRA_INDEX_URL: https://pypi.org/simple - -jobs: - - build-repo: - name: Source - environment: ${{ inputs.environment }} - runs-on: - - self-hosted - - linux - - repo-${{ inputs.environment }} - strategy: - fail-fast: false - matrix: - pkg-type: - - onedir steps: - - - name: "Throttle Builds" - shell: bash - run: | - t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" - - uses: actions/checkout@v4 - name: Setup Python Tools Scripts @@ -61,7 +14,7 @@ jobs: - name: Download Source Tarball uses: actions/download-artifact@v3 with: - name: salt-${{ inputs.salt-version }}.tar.gz + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}.tar.gz path: artifacts/pkgs/incoming - name: Setup GnuPG @@ -99,8 +52,8 @@ jobs: - name: Create Repository run: | - tools pkg repo create src --key-id=${{ inputs.gpg_key_id }} ${{ inputs.environment == 'nightly' && format('--nightly-build-from={0}', github.ref_name) || '' }} \ - --salt-version=${{ inputs.salt-version }} \ + tools pkg repo create src --key-id=<{ gpg_key_id }> <% if gh_environment == 'nightly' -%> --nightly-build-from=${{ github.ref_name }} <%- endif %> \ + --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo - name: Copy Files For Source Only Artifact Uploads @@ -111,10 +64,10 @@ jobs: - name: Upload Standalone Repository As An Artifact uses: actions/upload-artifact@v3 with: - name: salt-${{ inputs.salt-version }}-${{ inputs.environment }}-src-repo + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-<{ gh_environment }>-src-repo path: | - artifacts/src/salt-${{ inputs.salt-version }}.tar.gz - artifacts/src/salt-${{ inputs.salt-version }}.tar.gz.* + artifacts/src/salt-${{ needs.prepare-workflow.outputs.salt-version }}.tar.gz + artifacts/src/salt-${{ needs.prepare-workflow.outputs.salt-version }}.tar.gz.* artifacts/src/*-GPG-* retention-days: 7 if-no-files-found: error @@ -122,7 +75,7 @@ jobs: - name: Upload Repository As An Artifact uses: ./.github/actions/upload-artifact with: - name: salt-${{ inputs.salt-version }}-${{ inputs.environment }}-repo + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-<{ gh_environment }>-repo path: artifacts/pkgs/repo/* retention-days: 7 if-no-files-found: error diff --git a/.github/workflows/build-windows-repo.yml b/.github/workflows/templates/build-windows-repo.yml.jinja similarity index 63% rename from .github/workflows/build-windows-repo.yml rename to .github/workflows/templates/build-windows-repo.yml.jinja index f5a0b32ccd2..d806fd00bb3 100644 --- a/.github/workflows/build-windows-repo.yml +++ b/.github/workflows/templates/build-windows-repo.yml.jinja @@ -1,52 +1,5 @@ ---- -name: Build Windows Repository - -on: - workflow_call: - inputs: - environment: - type: string - required: true - description: The environment to run against - gpg_key_id: - type: string - required: true - description: The GPG key ID to use - salt-version: - type: string - required: true - description: The Salt version of the packages to install and test - -env: - RELENV_DATA: "${{ github.workspace }}/.relenv" - COLUMNS: 190 - AWS_MAX_ATTEMPTS: "10" - AWS_RETRY_MODE: "adaptive" - PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ - PIP_EXTRA_INDEX_URL: https://pypi.org/simple - -jobs: - - build-repo: - name: Windows - environment: ${{ inputs.environment }} - runs-on: - - self-hosted - - linux - - repo-${{ inputs.environment }} - strategy: - fail-fast: false - matrix: - pkg-type: - - windows steps: - - - name: "Throttle Builds" - shell: bash - run: | - t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" - - uses: actions/checkout@v4 - name: Setup Python Tools Scripts @@ -61,25 +14,25 @@ jobs: - name: Download Windows NSIS x86 Packages uses: actions/download-artifact@v3 with: - name: salt-${{ inputs.salt-version }}-x86-NSIS + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-x86-NSIS path: artifacts/pkgs/incoming - name: Download Windows MSI x86 Packages uses: actions/download-artifact@v3 with: - name: salt-${{ inputs.salt-version }}-x86-MSI + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-x86-MSI path: artifacts/pkgs/incoming - name: Download Windows NSIS amd64 Packages uses: actions/download-artifact@v3 with: - name: salt-${{ inputs.salt-version }}-amd64-NSIS + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-amd64-NSIS path: artifacts/pkgs/incoming - name: Download Windows MSI amd64 Packages uses: actions/download-artifact@v3 with: - name: salt-${{ inputs.salt-version }}-amd64-MSI + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-amd64-MSI path: artifacts/pkgs/incoming - name: Setup GnuPG @@ -117,14 +70,14 @@ jobs: - name: Create Repository run: | - tools pkg repo create windows --key-id=${{ inputs.gpg_key_id }} ${{ inputs.environment == 'nightly' && format('--nightly-build-from={0}', github.ref_name) || '' }} \ - --salt-version=${{ inputs.salt-version }} \ + tools pkg repo create windows --key-id=<{ gpg_key_id }> <% if gh_environment == 'nightly' -%> --nightly-build-from=${{ github.ref_name }} <%- endif %> \ + --salt-version=${{ needs.prepare-workflow.outputs.salt-version }} \ --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo - name: Upload Repository As An Artifact uses: ./.github/actions/upload-artifact with: - name: salt-${{ inputs.salt-version }}-${{ inputs.environment }}-repo + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-<{ gh_environment }>-repo path: artifacts/pkgs/repo/* retention-days: 7 if-no-files-found: error diff --git a/tools/ci.py b/tools/ci.py index e9afa16c98c..cc6578be789 100644 --- a/tools/ci.py +++ b/tools/ci.py @@ -777,69 +777,6 @@ def pkg_matrix( ctx.exit(0) -@ci.command( - name="pkg-repo-matrix", - arguments={ - "pkg_type": { - "help": "The package type", - }, - }, -) -def pkg_repo_matrix(ctx: Context, pkg_type: str): - """ - Generate the matrix for the package repository builds - """ - _matrix = [] - if pkg_type == "deb": - for distro in ("debian", "ubuntu"): - if distro == "debian": - versions = ["10", "11"] - else: - versions = ["20.04", "22.04"] - for arch in ("x86_64", "aarch64"): - for version in versions: - _matrix.append( - { - "distro": distro, - "version": version, - "arch": arch, - } - ) - elif pkg_type == "rpm": - for distro in ("amazon", "redhat", "fedora", "photon"): - if distro == "amazon": - versions = ["2"] - elif distro == "redhat": - versions = ["7", "8", "9"] - elif distro == "fedora": - versions = ["36", "37", "38"] - elif distro == "photon": - versions = ["3", "4"] - else: - ctx.error(f"Don't know how to handle distro {distro}") - ctx.exit(1) - for arch in ("x86_64", "aarch64"): - for version in versions: - _matrix.append( - { - "distro": distro, - "version": version, - "arch": arch, - } - ) - else: - _matrix.append({"pkg_type": pkg_type}) - - ctx.info("Generated matrix:") - ctx.print(_matrix, soft_wrap=True) - - github_output = os.environ.get("GITHUB_OUTPUT") - if github_output is not None: - with open(github_output, "a", encoding="utf-8") as wfh: - wfh.write(f"matrix={json.dumps(_matrix)}\n") - ctx.exit(0) - - @ci.command( name="get-releases", arguments={ From a2f06e2153bf07839614d58deb490ef5935cd74c Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 6 Oct 2023 10:31:29 +0100 Subject: [PATCH 091/147] In that case, group under the `Build Repository` display name BAH! ``` too many workflows are referenced, total: 21, limit: 20 ``` https://docs.github.com/en/enterprise-cloud@latest/actions/using-workflows/reusing-workflows#limitations Signed-off-by: Pedro Algarvio --- .github/workflows/nightly.yml | 115 +++++++++++++----- .github/workflows/staging.yml | 115 +++++++++++++----- .../templates/build-deb-repo.yml.jinja | 3 +- .../templates/build-macos-repo.yml.jinja | 6 + .../templates/build-onedir-repo.yml.jinja | 6 + .../workflows/templates/build-repos.yml.jinja | 25 ++-- .../templates/build-rpm-repo.yml.jinja | 3 +- .../templates/build-src-repo.yml.jinja | 6 + .../templates/build-windows-repo.yml.jinja | 6 + 9 files changed, 207 insertions(+), 78 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 914804ef073..6f570114738 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -2314,7 +2314,7 @@ jobs: if-no-files-found: error build-src-repo: - name: Build Source Repository + name: Build Repository environment: nightly runs-on: - self-hosted @@ -2322,6 +2322,13 @@ jobs: - repo-nightly needs: - prepare-workflow + - build-source-tarball + strategy: + fail-fast: false + matrix: + pkg-type: + - src + steps: - uses: actions/checkout@v4 @@ -2405,7 +2412,7 @@ jobs: archive-name: src-repo build-deb-repo: - name: Build DEB Repository + name: Build Repository environment: nightly runs-on: - self-hosted @@ -2418,28 +2425,36 @@ jobs: fail-fast: false matrix: include: - - distro: debian + - pkg-type: deb + distro: debian version: "10" arch: x86_64 - - distro: debian + - pkg-type: deb + distro: debian version: "10" arch: aarch64 - - distro: debian + - pkg-type: deb + distro: debian version: "11" arch: x86_64 - - distro: debian + - pkg-type: deb + distro: debian version: "11" arch: aarch64 - - distro: ubuntu + - pkg-type: deb + distro: ubuntu version: "20.04" arch: x86_64 - - distro: ubuntu + - pkg-type: deb + distro: ubuntu version: "20.04" arch: aarch64 - - distro: ubuntu + - pkg-type: deb + distro: ubuntu version: "22.04" arch: x86_64 - - distro: ubuntu + - pkg-type: deb + distro: ubuntu version: "22.04" arch: aarch64 @@ -2516,7 +2531,7 @@ jobs: archive-name: ${{ matrix.distro }}-${{ matrix.version }}-${{ matrix.arch }}-repo build-rpm-repo: - name: Build RPM Repository + name: Build Repository environment: nightly runs-on: - self-hosted @@ -2529,58 +2544,76 @@ jobs: fail-fast: false matrix: include: - - distro: amazon + - pkg-type: rpm + distro: amazon version: "2" arch: x86_64 - - distro: amazon + - pkg-type: rpm + distro: amazon version: "2" arch: aarch64 - - distro: redhat + - pkg-type: rpm + distro: redhat version: "7" arch: x86_64 - - distro: redhat + - pkg-type: rpm + distro: redhat version: "7" arch: aarch64 - - distro: redhat + - pkg-type: rpm + distro: redhat version: "8" arch: x86_64 - - distro: redhat + - pkg-type: rpm + distro: redhat version: "8" arch: aarch64 - - distro: redhat + - pkg-type: rpm + distro: redhat version: "9" arch: x86_64 - - distro: redhat + - pkg-type: rpm + distro: redhat version: "9" arch: aarch64 - - distro: fedora + - pkg-type: rpm + distro: fedora version: "36" arch: x86_64 - - distro: fedora + - pkg-type: rpm + distro: fedora version: "36" arch: aarch64 - - distro: fedora + - pkg-type: rpm + distro: fedora version: "37" arch: x86_64 - - distro: fedora + - pkg-type: rpm + distro: fedora version: "37" arch: aarch64 - - distro: fedora + - pkg-type: rpm + distro: fedora version: "38" arch: x86_64 - - distro: fedora + - pkg-type: rpm + distro: fedora version: "38" arch: aarch64 - - distro: photon + - pkg-type: rpm + distro: photon version: "3" arch: x86_64 - - distro: photon + - pkg-type: rpm + distro: photon version: "3" arch: aarch64 - - distro: photon + - pkg-type: rpm + distro: photon version: "4" arch: x86_64 - - distro: photon + - pkg-type: rpm + distro: photon version: "4" arch: aarch64 @@ -2660,7 +2693,7 @@ jobs: archive-name: ${{ matrix.distro }}-${{ matrix.version }}-${{ matrix.arch }}-repo build-windows-repo: - name: Build Windows Repository + name: Build Repository environment: nightly runs-on: - self-hosted @@ -2669,6 +2702,12 @@ jobs: needs: - prepare-workflow - build-windows-pkgs-onedir + strategy: + fail-fast: false + matrix: + pkg-type: + - windows + steps: - uses: actions/checkout@v4 @@ -2754,7 +2793,7 @@ jobs: archive-name: windows-repo build-macos-repo: - name: Build macOS Repository + name: Build Repository environment: nightly runs-on: - self-hosted @@ -2763,6 +2802,12 @@ jobs: needs: - prepare-workflow - build-macos-pkgs-onedir + strategy: + fail-fast: false + matrix: + pkg-type: + - macos + steps: - uses: actions/checkout@v4 @@ -2830,7 +2875,7 @@ jobs: archive-name: macos-repo build-onedir-repo: - name: Build Onedir Repository + name: Build Repository environment: nightly runs-on: - self-hosted @@ -2841,6 +2886,12 @@ jobs: - build-salt-onedir-linux - build-salt-onedir-macos - build-salt-onedir-windows + strategy: + fail-fast: false + matrix: + pkg-type: + - onedir + steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 4f7e567e94d..473d45eccce 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -2170,7 +2170,7 @@ jobs: skip-junit-reports: true build-src-repo: - name: Build Source Repository + name: Build Repository environment: staging runs-on: - self-hosted @@ -2178,6 +2178,13 @@ jobs: - repo-staging needs: - prepare-workflow + - build-source-tarball + strategy: + fail-fast: false + matrix: + pkg-type: + - src + steps: - uses: actions/checkout@v4 @@ -2261,7 +2268,7 @@ jobs: archive-name: src-repo build-deb-repo: - name: Build DEB Repository + name: Build Repository environment: staging runs-on: - self-hosted @@ -2274,28 +2281,36 @@ jobs: fail-fast: false matrix: include: - - distro: debian + - pkg-type: deb + distro: debian version: "10" arch: x86_64 - - distro: debian + - pkg-type: deb + distro: debian version: "10" arch: aarch64 - - distro: debian + - pkg-type: deb + distro: debian version: "11" arch: x86_64 - - distro: debian + - pkg-type: deb + distro: debian version: "11" arch: aarch64 - - distro: ubuntu + - pkg-type: deb + distro: ubuntu version: "20.04" arch: x86_64 - - distro: ubuntu + - pkg-type: deb + distro: ubuntu version: "20.04" arch: aarch64 - - distro: ubuntu + - pkg-type: deb + distro: ubuntu version: "22.04" arch: x86_64 - - distro: ubuntu + - pkg-type: deb + distro: ubuntu version: "22.04" arch: aarch64 @@ -2372,7 +2387,7 @@ jobs: archive-name: ${{ matrix.distro }}-${{ matrix.version }}-${{ matrix.arch }}-repo build-rpm-repo: - name: Build RPM Repository + name: Build Repository environment: staging runs-on: - self-hosted @@ -2385,58 +2400,76 @@ jobs: fail-fast: false matrix: include: - - distro: amazon + - pkg-type: rpm + distro: amazon version: "2" arch: x86_64 - - distro: amazon + - pkg-type: rpm + distro: amazon version: "2" arch: aarch64 - - distro: redhat + - pkg-type: rpm + distro: redhat version: "7" arch: x86_64 - - distro: redhat + - pkg-type: rpm + distro: redhat version: "7" arch: aarch64 - - distro: redhat + - pkg-type: rpm + distro: redhat version: "8" arch: x86_64 - - distro: redhat + - pkg-type: rpm + distro: redhat version: "8" arch: aarch64 - - distro: redhat + - pkg-type: rpm + distro: redhat version: "9" arch: x86_64 - - distro: redhat + - pkg-type: rpm + distro: redhat version: "9" arch: aarch64 - - distro: fedora + - pkg-type: rpm + distro: fedora version: "36" arch: x86_64 - - distro: fedora + - pkg-type: rpm + distro: fedora version: "36" arch: aarch64 - - distro: fedora + - pkg-type: rpm + distro: fedora version: "37" arch: x86_64 - - distro: fedora + - pkg-type: rpm + distro: fedora version: "37" arch: aarch64 - - distro: fedora + - pkg-type: rpm + distro: fedora version: "38" arch: x86_64 - - distro: fedora + - pkg-type: rpm + distro: fedora version: "38" arch: aarch64 - - distro: photon + - pkg-type: rpm + distro: photon version: "3" arch: x86_64 - - distro: photon + - pkg-type: rpm + distro: photon version: "3" arch: aarch64 - - distro: photon + - pkg-type: rpm + distro: photon version: "4" arch: x86_64 - - distro: photon + - pkg-type: rpm + distro: photon version: "4" arch: aarch64 @@ -2518,7 +2551,7 @@ jobs: archive-name: ${{ matrix.distro }}-${{ matrix.version }}-${{ matrix.arch }}-repo build-windows-repo: - name: Build Windows Repository + name: Build Repository environment: staging runs-on: - self-hosted @@ -2527,6 +2560,12 @@ jobs: needs: - prepare-workflow - build-windows-pkgs-onedir + strategy: + fail-fast: false + matrix: + pkg-type: + - windows + steps: - uses: actions/checkout@v4 @@ -2612,7 +2651,7 @@ jobs: archive-name: windows-repo build-macos-repo: - name: Build macOS Repository + name: Build Repository environment: staging runs-on: - self-hosted @@ -2621,6 +2660,12 @@ jobs: needs: - prepare-workflow - build-macos-pkgs-onedir + strategy: + fail-fast: false + matrix: + pkg-type: + - macos + steps: - uses: actions/checkout@v4 @@ -2688,7 +2733,7 @@ jobs: archive-name: macos-repo build-onedir-repo: - name: Build Onedir Repository + name: Build Repository environment: staging runs-on: - self-hosted @@ -2699,6 +2744,12 @@ jobs: - build-salt-onedir-linux - build-salt-onedir-macos - build-salt-onedir-windows + strategy: + fail-fast: false + matrix: + pkg-type: + - onedir + steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/templates/build-deb-repo.yml.jinja b/.github/workflows/templates/build-deb-repo.yml.jinja index a4e3dd8a2aa..c2f0c09d0f2 100644 --- a/.github/workflows/templates/build-deb-repo.yml.jinja +++ b/.github/workflows/templates/build-deb-repo.yml.jinja @@ -13,7 +13,8 @@ ("ubuntu", "22.04", "x86_64"), ("ubuntu", "22.04", "aarch64"), ) %> - - distro: <{ distro }> + - pkg-type: deb + distro: <{ distro }> version: "<{ version }>" arch: <{ arch }> <%- endfor %> diff --git a/.github/workflows/templates/build-macos-repo.yml.jinja b/.github/workflows/templates/build-macos-repo.yml.jinja index b24e0a9c4a4..5f9b14a9904 100644 --- a/.github/workflows/templates/build-macos-repo.yml.jinja +++ b/.github/workflows/templates/build-macos-repo.yml.jinja @@ -1,4 +1,10 @@ + strategy: + fail-fast: false + matrix: + pkg-type: + - macos + steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/templates/build-onedir-repo.yml.jinja b/.github/workflows/templates/build-onedir-repo.yml.jinja index 581503ab1eb..70deec70b7d 100644 --- a/.github/workflows/templates/build-onedir-repo.yml.jinja +++ b/.github/workflows/templates/build-onedir-repo.yml.jinja @@ -1,4 +1,10 @@ + strategy: + fail-fast: false + matrix: + pkg-type: + - onedir + steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/templates/build-repos.yml.jinja b/.github/workflows/templates/build-repos.yml.jinja index da05231fdb5..58c413cf547 100644 --- a/.github/workflows/templates/build-repos.yml.jinja +++ b/.github/workflows/templates/build-repos.yml.jinja @@ -1,17 +1,17 @@ -<%- for platform, type, display_name, needs_pkg in ( - (None, "src", "Source", False), - ("linux", "deb", "DEB", True), - ("linux", "rpm", "RPM", True), - ("windows", "windows", "Windows", True), - ("macos", "macos", "macOS", True), - (None, "onedir", "Onedir", False), - ) %> +<%- for type, display_name in ( + ("src", "Source"), + ("deb", "DEB"), + ("rpm", "RPM"), + ("windows", "Windows"), + ("macos", "macOS"), + ("onedir", "Onedir"), + ) %> <%- set job_name = "build-{}-repo".format(type) %> <%- do build_repo_needs.append(job_name) %> <{ job_name }>: - name: Build <{ display_name }> Repository + name: Build Repository environment: <{ gh_environment }> runs-on: - self-hosted @@ -19,15 +19,16 @@ - repo-<{ gh_environment }> needs: - prepare-workflow - <%- if needs_pkg %> + <%- if type not in ("src", "onedir") %> - build-<{ type }>-pkgs-onedir - <%- elif platform %> - - build-salt-onedir-<{ platform }> <%- elif type == 'onedir' %> - build-salt-onedir-linux - build-salt-onedir-macos - build-salt-onedir-windows + <%- elif type == 'src' %> + - build-source-tarball <%- endif %> + <%- include "build-{}-repo.yml.jinja".format(type) %> <%- endfor %> diff --git a/.github/workflows/templates/build-rpm-repo.yml.jinja b/.github/workflows/templates/build-rpm-repo.yml.jinja index ba0702ffc03..238bb00d642 100644 --- a/.github/workflows/templates/build-rpm-repo.yml.jinja +++ b/.github/workflows/templates/build-rpm-repo.yml.jinja @@ -23,7 +23,8 @@ ("photon", "4", "x86_64"), ("photon", "4", "aarch64"), ) %> - - distro: <{ distro }> + - pkg-type: rpm + distro: <{ distro }> version: "<{ version }>" arch: <{ arch }> <%- endfor %> diff --git a/.github/workflows/templates/build-src-repo.yml.jinja b/.github/workflows/templates/build-src-repo.yml.jinja index 728ed00f093..f0c1a82b7c3 100644 --- a/.github/workflows/templates/build-src-repo.yml.jinja +++ b/.github/workflows/templates/build-src-repo.yml.jinja @@ -1,4 +1,10 @@ + strategy: + fail-fast: false + matrix: + pkg-type: + - src + steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/templates/build-windows-repo.yml.jinja b/.github/workflows/templates/build-windows-repo.yml.jinja index d806fd00bb3..dc96a8a2e31 100644 --- a/.github/workflows/templates/build-windows-repo.yml.jinja +++ b/.github/workflows/templates/build-windows-repo.yml.jinja @@ -1,4 +1,10 @@ + strategy: + fail-fast: false + matrix: + pkg-type: + - windows + steps: - uses: actions/checkout@v4 From 1cc07d7bf865bca071fdc855eb083cb3891a70e5 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 6 Oct 2023 17:07:14 +0100 Subject: [PATCH 092/147] Fix the codecov report names Signed-off-by: Pedro Algarvio --- .github/workflows/test-action-macos.yml | 8 ++++---- .github/workflows/test-action.yml | 8 ++++---- .github/workflows/test-package-downloads-action-linux.yml | 8 ++++---- .github/workflows/test-package-downloads-action-macos.yml | 8 ++++---- .../workflows/test-package-downloads-action-windows.yml | 8 ++++---- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/test-action-macos.yml b/.github/workflows/test-action-macos.yml index a9fa7c783ff..5be895a57ca 100644 --- a/.github/workflows/test-action-macos.yml +++ b/.github/workflows/test-action-macos.yml @@ -439,14 +439,14 @@ jobs: # do-upload --git-service github --sha ${{ github.sha }} \ # --file artifacts/coverage/salt.xml \ # --flag salt --flag ${{ inputs.distro-slug }} \ - # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }} + # --name salt.${{ inputs.distro-slug }}.${{ inputs.nox-session }} n=0 until [ "$n" -ge 5 ] do if ./codecov --file artifacts/coverage/salt.xml \ --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ --flags salt,${{ inputs.distro-slug }} \ - --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }} --nonZero; then + --name salt.${{ inputs.distro-slug }}.${{ inputs.nox-session }} --nonZero; then rc=$? break fi @@ -471,14 +471,14 @@ jobs: # do-upload --git-service github --sha ${{ github.sha }} \ # --file artifacts/coverage/tests.xml \ # --flag tests --flag ${{ inputs.distro-slug }} \ - # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }} + # --name tests.${{ inputs.distro-slug }}.${{ inputs.nox-session }} n=0 until [ "$n" -ge 5 ] do if ./codecov --file artifacts/coverage/tests.xml \ --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ --flags tests,${{ inputs.distro-slug }} \ - --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }} --nonZero; then + --name tests.${{ inputs.distro-slug }}.${{ inputs.nox-session }} --nonZero; then rc=$? break fi diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index 351ba55e5b9..f6c5f9e8c57 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -386,14 +386,14 @@ jobs: # do-upload --git-service github --sha ${{ github.sha }} \ # --file artifacts/coverage/salt.xml \ # --flag salt --flag ${{ inputs.distro-slug }} \ - # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }} + # --name salt.${{ inputs.distro-slug }}.${{ inputs.nox-session }} n=0 until [ "$n" -ge 5 ] do if ./codecov --file artifacts/coverage/salt.xml \ --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ --flags salt,${{ inputs.distro-slug }} \ - --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }} --nonZero; then + --name salt.${{ inputs.distro-slug }}.${{ inputs.nox-session }} --nonZero; then rc=$? break fi @@ -418,14 +418,14 @@ jobs: # do-upload --git-service github --sha ${{ github.sha }} \ # --file artifacts/coverage/tests.xml \ # --flag tests --flag ${{ inputs.distro-slug }} \ - # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }} + # --name tests.${{ inputs.distro-slug }}.${{ inputs.nox-session }} n=0 until [ "$n" -ge 5 ] do if ./codecov --file artifacts/coverage/tests.xml \ --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ --flags tests,${{ inputs.distro-slug }} \ - --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }} --nonZero; then + --name tests.${{ inputs.distro-slug }}.${{ inputs.nox-session }} --nonZero; then rc=$? break fi diff --git a/.github/workflows/test-package-downloads-action-linux.yml b/.github/workflows/test-package-downloads-action-linux.yml index 06faeffa002..f94d094d3b7 100644 --- a/.github/workflows/test-package-downloads-action-linux.yml +++ b/.github/workflows/test-package-downloads-action-linux.yml @@ -235,14 +235,14 @@ jobs: # do-upload --git-service github --sha ${{ github.sha }} \ # --file artifacts/coverage/salt.xml \ # --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ - # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + # --name salt.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs n=0 until [ "$n" -ge 5 ] do if ./codecov --file artifacts/coverage/salt.xml \ --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ --flags salt,${{ inputs.distro-slug }},pkg \ - --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + --name salt.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then rc=$? break fi @@ -267,14 +267,14 @@ jobs: # do-upload --git-service github --sha ${{ github.sha }} \ # --file artifacts/coverage/tests.xml \ # --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ - # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + # --name tests.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs n=0 until [ "$n" -ge 5 ] do if ./codecov --file artifacts/coverage/tests.xml \ --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ --flags tests,${{ inputs.distro-slug }},pkg \ - --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + --name tests.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then rc=$? break fi diff --git a/.github/workflows/test-package-downloads-action-macos.yml b/.github/workflows/test-package-downloads-action-macos.yml index f5e8c2d05c6..632a88a7d29 100644 --- a/.github/workflows/test-package-downloads-action-macos.yml +++ b/.github/workflows/test-package-downloads-action-macos.yml @@ -213,14 +213,14 @@ jobs: # do-upload --git-service github --sha ${{ github.sha }} \ # --file artifacts/coverage/salt.xml \ # --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ - # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + # --name salt.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs n=0 until [ "$n" -ge 5 ] do if ./codecov --file artifacts/coverage/salt.xml \ --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ --flags salt,${{ inputs.distro-slug }},pkg \ - --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + --name salt.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then rc=$? break fi @@ -245,14 +245,14 @@ jobs: # do-upload --git-service github --sha ${{ github.sha }} \ # --file artifacts/coverage/tests.xml \ # --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ - # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + # --name tests.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs n=0 until [ "$n" -ge 5 ] do if ./codecov --file artifacts/coverage/tests.xml \ --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ --flags tests,${{ inputs.distro-slug }},pkg \ - --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + --name tests.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then rc=$? break fi diff --git a/.github/workflows/test-package-downloads-action-windows.yml b/.github/workflows/test-package-downloads-action-windows.yml index 704aa962829..beb15893494 100644 --- a/.github/workflows/test-package-downloads-action-windows.yml +++ b/.github/workflows/test-package-downloads-action-windows.yml @@ -240,14 +240,14 @@ jobs: # do-upload --git-service github --sha ${{ github.sha }} \ # --file artifacts/coverage/salt.xml \ # --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ - # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + # --name salt.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs n=0 until [ "$n" -ge 5 ] do if ./codecov --file artifacts/coverage/salt.xml \ --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ --flags salt,${{ inputs.distro-slug }},pkg \ - --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + --name salt.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then rc=$? break fi @@ -272,14 +272,14 @@ jobs: # do-upload --git-service github --sha ${{ github.sha }} \ # --file artifacts/coverage/tests.xml \ # --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ - # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + # --name tests.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs n=0 until [ "$n" -ge 5 ] do if ./codecov --file artifacts/coverage/tests.xml \ --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ --flags tests,${{ inputs.distro-slug }},pkg \ - --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + --name tests.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then rc=$? break fi From 87242a1fd1ea637c1f512d4316a4cdb224451622 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 6 Oct 2023 20:20:38 +0100 Subject: [PATCH 093/147] Do not override code coverage databases when uploading Signed-off-by: Pedro Algarvio --- .github/workflows/test-action-macos.yml | 20 +++++++++++++------- .github/workflows/test-action.yml | 20 +++++++++++++------- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test-action-macos.yml b/.github/workflows/test-action-macos.yml index 5be895a57ca..2b44708b7f2 100644 --- a/.github/workflows/test-action-macos.yml +++ b/.github/workflows/test-action-macos.yml @@ -491,13 +491,6 @@ jobs: exit 1 fi - - name: Upload Code Coverage DB - if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success' - uses: actions/upload-artifact@v3 - with: - name: code-coverage - path: artifacts/coverage - - name: Report Salt Code Coverage if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success' continue-on-error: true @@ -509,3 +502,16 @@ jobs: continue-on-error: true run: | nox --force-color -e report-coverage + + - name: Rename Code Coverage DB + if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success' + continue-on-error: true + run: | + mv artifacts/coverage/.coverage artifacts/coverage/.coverage.${{ inputs.distro-slug }}.${{ inputs.nox-session }} + + - name: Upload Code Coverage DB + if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success' + uses: actions/upload-artifact@v3 + with: + name: code-coverage + path: artifacts/coverage diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index f6c5f9e8c57..04600f5fe27 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -438,13 +438,6 @@ jobs: exit 1 fi - - name: Upload Code Coverage DB - if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success' - uses: actions/upload-artifact@v3 - with: - name: code-coverage - path: artifacts/coverage - - name: Report Salt Code Coverage if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success' continue-on-error: true @@ -456,3 +449,16 @@ jobs: continue-on-error: true run: | nox --force-color -e report-coverage + + - name: Rename Code Coverage DB + if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success' + continue-on-error: true + run: | + mv artifacts/coverage/.coverage artifacts/coverage/.coverage.${{ inputs.distro-slug }}.${{ inputs.nox-session }} + + - name: Upload Code Coverage DB + if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success' + uses: actions/upload-artifact@v3 + with: + name: code-coverage + path: artifacts/coverage From 7fbc2d1e02edf725b49818383826d717ed73e1f7 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 6 Oct 2023 21:56:19 +0100 Subject: [PATCH 094/147] No need to upload coverage DB's twice Signed-off-by: Pedro Algarvio --- .github/workflows/test-action-macos.yml | 10 +--------- .github/workflows/test-action.yml | 10 +--------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/.github/workflows/test-action-macos.yml b/.github/workflows/test-action-macos.yml index 2b44708b7f2..033c3a25e37 100644 --- a/.github/workflows/test-action-macos.yml +++ b/.github/workflows/test-action-macos.yml @@ -342,14 +342,6 @@ jobs: path: | artifacts/coverage/ - - name: Upload All Code Coverage Test Run Artifacts - if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' - uses: actions/upload-artifact@v3 - with: - name: all-testrun-coverage-artifacts - path: | - artifacts/coverage/ - - name: Upload JUnit XML Test Run Artifacts if: always() && steps.download-artifacts-from-vm.outcome == 'success' uses: actions/upload-artifact@v3 @@ -513,5 +505,5 @@ jobs: if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success' uses: actions/upload-artifact@v3 with: - name: code-coverage + name: all-testrun-coverage-artifacts path: artifacts/coverage diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index 04600f5fe27..8268b937dda 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -291,14 +291,6 @@ jobs: path: | artifacts/coverage/ - - name: Upload All Code Coverage Test Run Artifacts - if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' - uses: actions/upload-artifact@v3 - with: - name: all-testrun-coverage-artifacts - path: | - artifacts/coverage/ - - name: Upload JUnit XML Test Run Artifacts if: always() && steps.download-artifacts-from-vm.outcome == 'success' uses: actions/upload-artifact@v3 @@ -460,5 +452,5 @@ jobs: if: always() && inputs.skip-code-coverage == false && steps.download-coverage-artifacts.outcome == 'success' uses: actions/upload-artifact@v3 with: - name: code-coverage + name: all-testrun-coverage-artifacts path: artifacts/coverage From 497036f16b2ba2238514502fc3e93e1eb8797001 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 7 Oct 2023 08:47:03 +0100 Subject: [PATCH 095/147] Run `pygupgrade` against the files changed in the merge-forward Signed-off-by: Pedro Algarvio --- tests/pytests/unit/utils/test_cloud.py | 34 +++++++++++++------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/tests/pytests/unit/utils/test_cloud.py b/tests/pytests/unit/utils/test_cloud.py index ea55af44ef5..2d18d944b33 100644 --- a/tests/pytests/unit/utils/test_cloud.py +++ b/tests/pytests/unit/utils/test_cloud.py @@ -461,8 +461,8 @@ def test_ssh_gateway_arguments_default_alive_args(): server_alive_interval = 60 server_alive_count_max = 3 arguments = ssh_gateway_arguments({"ssh_gateway": "host"}) - assert "-oServerAliveInterval={}".format(server_alive_interval) in arguments - assert "-oServerAliveCountMax={}".format(server_alive_count_max) in arguments + assert f"-oServerAliveInterval={server_alive_interval}" in arguments + assert f"-oServerAliveCountMax={server_alive_count_max}" in arguments def test_ssh_gateway_arguments_alive_args(): @@ -475,8 +475,8 @@ def test_ssh_gateway_arguments_alive_args(): "server_alive_count_max": server_alive_count_max, } ) - assert "-oServerAliveInterval={}".format(server_alive_interval) in arguments - assert "-oServerAliveCountMax={}".format(server_alive_count_max) in arguments + assert f"-oServerAliveInterval={server_alive_interval}" in arguments + assert f"-oServerAliveCountMax={server_alive_count_max}" in arguments def test_wait_for_port_default_alive_args(): @@ -491,8 +491,8 @@ def test_wait_for_port_default_alive_args(): ) assert exec_ssh_cmd.call_count == 2 ssh_call = exec_ssh_cmd.call_args[0][0] - assert "-oServerAliveInterval={}".format(server_alive_interval) in ssh_call - assert "-oServerAliveCountMax={}".format(server_alive_count_max) in ssh_call + assert f"-oServerAliveInterval={server_alive_interval}" in ssh_call + assert f"-oServerAliveCountMax={server_alive_count_max}" in ssh_call def test_wait_for_port_alive_args(): @@ -509,8 +509,8 @@ def test_wait_for_port_alive_args(): ) assert exec_ssh_cmd.call_count == 2 ssh_call = exec_ssh_cmd.call_args[0][0] - assert "-oServerAliveInterval={}".format(server_alive_interval) in ssh_call - assert "-oServerAliveCountMax={}".format(server_alive_count_max) in ssh_call + assert f"-oServerAliveInterval={server_alive_interval}" in ssh_call + assert f"-oServerAliveCountMax={server_alive_count_max}" in ssh_call def test_scp_file_default_alive_args(): @@ -527,8 +527,8 @@ def test_scp_file_default_alive_args(): ) assert exec_ssh_cmd.call_count == 1 ssh_call = exec_ssh_cmd.call_args[0][0] - assert "-oServerAliveInterval={}".format(server_alive_interval) in ssh_call - assert "-oServerAliveCountMax={}".format(server_alive_count_max) in ssh_call + assert f"-oServerAliveInterval={server_alive_interval}" in ssh_call + assert f"-oServerAliveCountMax={server_alive_count_max}" in ssh_call def test_scp_file_alive_args(): @@ -550,8 +550,8 @@ def test_scp_file_alive_args(): ) assert exec_ssh_cmd.call_count == 1 ssh_call = exec_ssh_cmd.call_args[0][0] - assert "-oServerAliveInterval={}".format(server_alive_interval) in ssh_call - assert "-oServerAliveCountMax={}".format(server_alive_count_max) in ssh_call + assert f"-oServerAliveInterval={server_alive_interval}" in ssh_call + assert f"-oServerAliveCountMax={server_alive_count_max}" in ssh_call def test_sftp_file_default_alive_args(): @@ -568,8 +568,8 @@ def test_sftp_file_default_alive_args(): ) assert exec_ssh_cmd.call_count == 1 ssh_call = exec_ssh_cmd.call_args[0][0] - assert "-oServerAliveInterval={}".format(server_alive_interval) in ssh_call - assert "-oServerAliveCountMax={}".format(server_alive_count_max) in ssh_call + assert f"-oServerAliveInterval={server_alive_interval}" in ssh_call + assert f"-oServerAliveCountMax={server_alive_count_max}" in ssh_call def test_sftp_file_alive_args(): @@ -591,8 +591,8 @@ def test_sftp_file_alive_args(): ) assert exec_ssh_cmd.call_count == 1 ssh_call = exec_ssh_cmd.call_args[0][0] - assert "-oServerAliveInterval={}".format(server_alive_interval) in ssh_call - assert "-oServerAliveCountMax={}".format(server_alive_count_max) in ssh_call + assert f"-oServerAliveInterval={server_alive_interval}" in ssh_call + assert f"-oServerAliveCountMax={server_alive_count_max}" in ssh_call def test_deploy_script_ssh_timeout(): @@ -656,7 +656,7 @@ def test_deploy_windows_master(master, expected): ) as mock: cloud.deploy_windows(host="test", win_installer="install.exe", master=master) expected_cmd = "c:\\salttemp\\install.exe" - expected_args = "/S /master={} /minion-name=None".format(expected) + expected_args = f"/S /master={expected} /minion-name=None" assert mock.call_args_list[0].args[0] == expected_cmd assert mock.call_args_list[0].args[1] == expected_args From 701c819fd9bb7783fc643e8829dadac3501e198a Mon Sep 17 00:00:00 2001 From: David Murphy < dmurphy@saltstack.com> Date: Wed, 4 Oct 2023 09:41:42 -0600 Subject: [PATCH 096/147] Add test for pillar.keys to increase code-coverage --- tests/pytests/unit/modules/test_pillar.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tests/pytests/unit/modules/test_pillar.py b/tests/pytests/unit/modules/test_pillar.py index f2b07d74abf..6de7e33d535 100644 --- a/tests/pytests/unit/modules/test_pillar.py +++ b/tests/pytests/unit/modules/test_pillar.py @@ -163,3 +163,20 @@ def test_pillar_get_int_key(): res = pillarmod.get(key=12345, default=default, merge=True) assert {"l2": {"l3": "my_luggage_code"}} == res assert {"l2": {"l3": "your_luggage_code"}} == default + + +def test_pillar_keys(): + """ + Confirm that we can access pillar keys + """ + with patch.dict(pillarmod.__pillar__, {"pkg": {"apache": "httpd"}}): + test_key = "pkg" + assert pillarmod.keys(test_key) == ["apache"] + + with patch.dict( + pillarmod.__pillar__, + {"12345": {"xyz": "my_luggage_code"}, "7": {"11": {"12": "13"}}}, + ): + test_key = "7:11" + res = pillarmod.keys(test_key) + assert res == ["12"] From 277a610300208ebaa6112a468e1dd8cc938ddc36 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 6 Oct 2023 20:02:44 +0100 Subject: [PATCH 097/147] Rework package downloads workflows Signed-off-by: Pedro Algarvio --- .github/workflows/release.yml | 781 +----------------- .github/workflows/staging.yml | 752 +---------------- .../test-salt-pkg-repo-downloads.yml.jinja | 124 +-- .../test-package-downloads-action-linux.yml | 338 -------- .../test-package-downloads-action-macos.yml | 318 ------- .../test-package-downloads-action-windows.yml | 343 -------- .../test-package-downloads-action.yml | 754 +++++++++++++++++ tools/ci.py | 68 ++ 8 files changed, 842 insertions(+), 2636 deletions(-) delete mode 100644 .github/workflows/test-package-downloads-action-linux.yml delete mode 100644 .github/workflows/test-package-downloads-action-macos.yml delete mode 100644 .github/workflows/test-package-downloads-action-windows.yml create mode 100644 .github/workflows/test-package-downloads-action.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ff9535b58d2..07785a31e1e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -223,19 +223,16 @@ jobs: run: | tools pkg repo publish release ${{ needs.prepare-workflow.outputs.salt-version }} - almalinux-8-package-download-tests: - name: Alma Linux 8 Package Download + pkg-download-tests: + name: Package Downloads if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: - prepare-workflow - publish-repositories - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml + uses: ./.github/workflows/test-package-downloads-action.yml with: - distro-slug: almalinux-8 nox-session: ci-test-onedir - platform: linux - arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release @@ -243,743 +240,6 @@ jobs: python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - almalinux-8-arm64-package-download-tests: - name: Alma Linux 8 Arm64 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: almalinux-8-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - almalinux-9-package-download-tests: - name: Alma Linux 9 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: almalinux-9 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - almalinux-9-arm64-package-download-tests: - name: Alma Linux 9 Arm64 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: almalinux-9-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - amazonlinux-2-package-download-tests: - name: Amazon Linux 2 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: amazonlinux-2 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - amazonlinux-2-arm64-package-download-tests: - name: Amazon Linux 2 Arm64 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: amazonlinux-2-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - centos-7-package-download-tests: - name: CentOS 7 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: centos-7 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - centos-7-arm64-package-download-tests: - name: CentOS 7 Arm64 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: centos-7-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - centosstream-8-package-download-tests: - name: CentOS Stream 8 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: centosstream-8 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - centosstream-8-arm64-package-download-tests: - name: CentOS Stream 8 Arm64 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: centosstream-8-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - centosstream-9-package-download-tests: - name: CentOS Stream 9 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: centosstream-9 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - centosstream-9-arm64-package-download-tests: - name: CentOS Stream 9 Arm64 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: centosstream-9-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - debian-10-package-download-tests: - name: Debian 10 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: debian-10 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - debian-11-package-download-tests: - name: Debian 11 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: debian-11 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - debian-11-arm64-package-download-tests: - name: Debian 11 Arm64 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: debian-11-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - fedora-37-package-download-tests: - name: Fedora 37 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: fedora-37 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - fedora-37-arm64-package-download-tests: - name: Fedora 37 Arm64 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: fedora-37-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - fedora-38-package-download-tests: - name: Fedora 38 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: fedora-38 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - fedora-38-arm64-package-download-tests: - name: Fedora 38 Arm64 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: fedora-38-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - photonos-3-package-download-tests: - name: Photon OS 3 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: photonos-3 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - photonos-4-package-download-tests: - name: Photon OS 4 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: photonos-4 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - photonos-4-arm64-package-download-tests: - name: Photon OS 4 Arm64 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: photonos-4-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - ubuntu-2004-package-download-tests: - name: Ubuntu 20.04 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: ubuntu-20.04 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - ubuntu-2004-arm64-package-download-tests: - name: Ubuntu 20.04 Arm64 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: ubuntu-20.04-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - ubuntu-2204-package-download-tests: - name: Ubuntu 22.04 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: ubuntu-22.04 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - ubuntu-2204-arm64-package-download-tests: - name: Ubuntu 22.04 Arm64 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: ubuntu-22.04-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - ubuntu-2204-onedir-download-tests: - name: Ubuntu 22.04 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: ubuntu-22.04 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: onedir - secrets: inherit - - ubuntu-2204-arm64-onedir-download-tests: - name: Ubuntu 22.04 Arm64 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: ubuntu-22.04-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: onedir - secrets: inherit - - macos-12-package-download-tests: - name: macOS 12 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-macos.yml - with: - distro-slug: macos-12 - nox-session: ci-test-onedir - platform: darwin - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - skip-code-coverage: true - nox-version: 2022.8.7 - python-version: "3.10" - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - macos-12-onedir-download-tests: - name: macOS 12 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-macos.yml - with: - distro-slug: macos-12 - nox-session: ci-test-onedir - platform: darwin - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - skip-code-coverage: true - nox-version: 2022.8.7 - python-version: "3.10" - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: onedir - secrets: inherit - - windows-2022-nsis-amd64-download-tests: - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - name: Windows 2022 Package Download - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-windows.yml - with: - distro-slug: windows-2022 - nox-session: ci-test-onedir - platform: windows - arch: amd64 - pkg-type: nsis - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - skip-code-coverage: true - nox-version: 2022.8.7 - python-version: "3.10" - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - secrets: inherit - - windows-2022-msi-amd64-download-tests: - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - name: Windows 2022 Package Download - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-windows.yml - with: - distro-slug: windows-2022 - nox-session: ci-test-onedir - platform: windows - arch: amd64 - pkg-type: msi - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - skip-code-coverage: true - nox-version: 2022.8.7 - python-version: "3.10" - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - secrets: inherit - - windows-2022-onedir-amd64-download-tests: - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - name: Windows 2022 Package Download - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-windows.yml - with: - distro-slug: windows-2022 - nox-session: ci-test-onedir - platform: windows - arch: amd64 - pkg-type: onedir - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - skip-code-coverage: true - nox-version: 2022.8.7 - python-version: "3.10" - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" secrets: inherit release: @@ -993,39 +253,7 @@ jobs: - prepare-workflow - backup - publish-repositories - - almalinux-8-package-download-tests - - almalinux-8-arm64-package-download-tests - - almalinux-9-package-download-tests - - almalinux-9-arm64-package-download-tests - - amazonlinux-2-package-download-tests - - amazonlinux-2-arm64-package-download-tests - - centos-7-package-download-tests - - centos-7-arm64-package-download-tests - - centosstream-8-package-download-tests - - centosstream-8-arm64-package-download-tests - - centosstream-9-package-download-tests - - centosstream-9-arm64-package-download-tests - - debian-10-package-download-tests - - debian-11-package-download-tests - - debian-11-arm64-package-download-tests - - fedora-37-package-download-tests - - fedora-37-arm64-package-download-tests - - fedora-38-package-download-tests - - fedora-38-arm64-package-download-tests - - photonos-3-package-download-tests - - photonos-4-package-download-tests - - photonos-4-arm64-package-download-tests - - ubuntu-2004-package-download-tests - - ubuntu-2004-arm64-package-download-tests - - ubuntu-2204-package-download-tests - - ubuntu-2204-arm64-package-download-tests - - ubuntu-2204-onedir-download-tests - - ubuntu-2204-arm64-onedir-download-tests - - macos-12-package-download-tests - - macos-12-onedir-download-tests - - windows-2022-nsis-amd64-download-tests - - windows-2022-msi-amd64-download-tests - - windows-2022-onedir-amd64-download-tests + - pkg-download-tests environment: release steps: - name: Clone The Salt Repository @@ -1185,6 +413,7 @@ jobs: - check-requirements - prepare-workflow - publish-repositories + - pkg-download-tests - release - publish-pypi steps: diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 473d45eccce..3c88248c6dc 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -2968,18 +2968,18 @@ jobs: retention-days: 7 if-no-files-found: error - almalinux-8-package-download-tests: - name: Alma Linux 8 Package Download + pkg-download-tests: + name: Package Downloads if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml + - build-salt-onedir-linux + - build-salt-onedir-macos + - build-salt-onedir-windows + uses: ./.github/workflows/test-package-downloads-action.yml with: - distro-slug: almalinux-8 nox-session: ci-test-onedir - platform: linux - arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging @@ -2987,711 +2987,6 @@ jobs: python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - almalinux-8-arm64-package-download-tests: - name: Alma Linux 8 Arm64 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: almalinux-8-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - almalinux-9-package-download-tests: - name: Alma Linux 9 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: almalinux-9 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - almalinux-9-arm64-package-download-tests: - name: Alma Linux 9 Arm64 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: almalinux-9-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - amazonlinux-2-package-download-tests: - name: Amazon Linux 2 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: amazonlinux-2 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - amazonlinux-2-arm64-package-download-tests: - name: Amazon Linux 2 Arm64 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: amazonlinux-2-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - centos-7-package-download-tests: - name: CentOS 7 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: centos-7 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - centos-7-arm64-package-download-tests: - name: CentOS 7 Arm64 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: centos-7-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - centosstream-8-package-download-tests: - name: CentOS Stream 8 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: centosstream-8 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - centosstream-8-arm64-package-download-tests: - name: CentOS Stream 8 Arm64 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: centosstream-8-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - centosstream-9-package-download-tests: - name: CentOS Stream 9 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: centosstream-9 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - centosstream-9-arm64-package-download-tests: - name: CentOS Stream 9 Arm64 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: centosstream-9-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - debian-10-package-download-tests: - name: Debian 10 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: debian-10 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - debian-11-package-download-tests: - name: Debian 11 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: debian-11 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - debian-11-arm64-package-download-tests: - name: Debian 11 Arm64 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: debian-11-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - fedora-37-package-download-tests: - name: Fedora 37 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: fedora-37 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - fedora-37-arm64-package-download-tests: - name: Fedora 37 Arm64 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: fedora-37-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - fedora-38-package-download-tests: - name: Fedora 38 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: fedora-38 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - fedora-38-arm64-package-download-tests: - name: Fedora 38 Arm64 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: fedora-38-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - photonos-3-package-download-tests: - name: Photon OS 3 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: photonos-3 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - photonos-4-package-download-tests: - name: Photon OS 4 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: photonos-4 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - photonos-4-arm64-package-download-tests: - name: Photon OS 4 Arm64 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: photonos-4-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - ubuntu-2004-package-download-tests: - name: Ubuntu 20.04 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: ubuntu-20.04 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - ubuntu-2004-arm64-package-download-tests: - name: Ubuntu 20.04 Arm64 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: ubuntu-20.04-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - ubuntu-2204-package-download-tests: - name: Ubuntu 22.04 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: ubuntu-22.04 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - ubuntu-2204-arm64-package-download-tests: - name: Ubuntu 22.04 Arm64 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: ubuntu-22.04-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - ubuntu-2204-onedir-download-tests: - name: Ubuntu 22.04 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: ubuntu-22.04 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: onedir - secrets: inherit - - ubuntu-2204-arm64-onedir-download-tests: - name: Ubuntu 22.04 Arm64 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: ubuntu-22.04-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: onedir - secrets: inherit - - macos-12-package-download-tests: - name: macOS 12 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-macos.yml - with: - distro-slug: macos-12 - nox-session: ci-test-onedir - platform: darwin - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - skip-code-coverage: true - nox-version: 2022.8.7 - python-version: "3.10" - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - macos-12-onedir-download-tests: - name: macOS 12 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-macos.yml - with: - distro-slug: macos-12 - nox-session: ci-test-onedir - platform: darwin - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - skip-code-coverage: true - nox-version: 2022.8.7 - python-version: "3.10" - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: onedir - secrets: inherit - - windows-2022-nsis-amd64-download-tests: - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - name: Windows 2022 Package Download - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-windows.yml - with: - distro-slug: windows-2022 - nox-session: ci-test-onedir - platform: windows - arch: amd64 - pkg-type: nsis - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - skip-code-coverage: true - nox-version: 2022.8.7 - python-version: "3.10" - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - secrets: inherit - - windows-2022-msi-amd64-download-tests: - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - name: Windows 2022 Package Download - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-windows.yml - with: - distro-slug: windows-2022 - nox-session: ci-test-onedir - platform: windows - arch: amd64 - pkg-type: msi - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - skip-code-coverage: true - nox-version: 2022.8.7 - python-version: "3.10" - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - secrets: inherit - - windows-2022-onedir-amd64-download-tests: - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - name: Windows 2022 Package Download - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-windows.yml - with: - distro-slug: windows-2022 - nox-session: ci-test-onedir - platform: windows - arch: amd64 - pkg-type: onedir - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - skip-code-coverage: true - nox-version: 2022.8.7 - python-version: "3.10" - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" secrets: inherit publish-pypi: @@ -3777,39 +3072,7 @@ jobs: - windows-2019-msi-pkg-tests - windows-2022-nsis-pkg-tests - windows-2022-msi-pkg-tests - - almalinux-8-package-download-tests - - almalinux-8-arm64-package-download-tests - - almalinux-9-package-download-tests - - almalinux-9-arm64-package-download-tests - - amazonlinux-2-package-download-tests - - amazonlinux-2-arm64-package-download-tests - - centos-7-package-download-tests - - centos-7-arm64-package-download-tests - - centosstream-8-package-download-tests - - centosstream-8-arm64-package-download-tests - - centosstream-9-package-download-tests - - centosstream-9-arm64-package-download-tests - - debian-10-package-download-tests - - debian-11-package-download-tests - - debian-11-arm64-package-download-tests - - fedora-37-package-download-tests - - fedora-37-arm64-package-download-tests - - fedora-38-package-download-tests - - fedora-38-arm64-package-download-tests - - photonos-3-package-download-tests - - photonos-4-package-download-tests - - photonos-4-arm64-package-download-tests - - ubuntu-2004-package-download-tests - - ubuntu-2004-arm64-package-download-tests - - ubuntu-2204-package-download-tests - - ubuntu-2204-arm64-package-download-tests - - ubuntu-2204-onedir-download-tests - - ubuntu-2204-arm64-onedir-download-tests - - macos-12-package-download-tests - - macos-12-onedir-download-tests - - windows-2022-nsis-amd64-download-tests - - windows-2022-msi-amd64-download-tests - - windows-2022-onedir-amd64-download-tests + - pkg-download-tests environment: staging runs-on: - self-hosted @@ -3881,6 +3144,7 @@ jobs: - build-macos-pkgs-src - publish-repositories - upload-release-artifacts + - pkg-download-tests - publish-pypi steps: - name: Get workflow information diff --git a/.github/workflows/templates/test-salt-pkg-repo-downloads.yml.jinja b/.github/workflows/templates/test-salt-pkg-repo-downloads.yml.jinja index bb6da5a4a05..b84ae581e59 100644 --- a/.github/workflows/templates/test-salt-pkg-repo-downloads.yml.jinja +++ b/.github/workflows/templates/test-salt-pkg-repo-downloads.yml.jinja @@ -1,41 +1,10 @@ - <%- set linux_pkg_tests = ( - ("almalinux-8", "Alma Linux 8", "x86_64", "Package"), - ("almalinux-8-arm64", "Alma Linux 8 Arm64", "aarch64", "Package"), - ("almalinux-9", "Alma Linux 9", "x86_64", "Package"), - ("almalinux-9-arm64", "Alma Linux 9 Arm64", "aarch64", "Package"), - ("amazonlinux-2", "Amazon Linux 2", "x86_64", "Package"), - ("amazonlinux-2-arm64", "Amazon Linux 2 Arm64", "aarch64", "Package"), - ("centos-7", "CentOS 7", "x86_64", "Package"), - ("centos-7-arm64", "CentOS 7 Arm64", "aarch64", "Package"), - ("centosstream-8", "CentOS Stream 8", "x86_64", "Package"), - ("centosstream-8-arm64", "CentOS Stream 8 Arm64", "aarch64", "Package"), - ("centosstream-9", "CentOS Stream 9", "x86_64", "Package"), - ("centosstream-9-arm64", "CentOS Stream 9 Arm64", "aarch64", "Package"), - ("debian-10", "Debian 10", "x86_64", "Package"), - ("debian-11", "Debian 11", "x86_64", "Package"), - ("debian-11-arm64", "Debian 11 Arm64", "aarch64", "Package"), - ("fedora-37", "Fedora 37", "x86_64", "Package"), - ("fedora-37-arm64", "Fedora 37 Arm64", "aarch64", "Package"), - ("fedora-38", "Fedora 38", "x86_64", "Package"), - ("fedora-38-arm64", "Fedora 38 Arm64", "aarch64", "Package"), - ("photonos-3", "Photon OS 3", "x86_64", "Package"), - ("photonos-4", "Photon OS 4", "x86_64", "Package"), - ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64", "Package"), - ("ubuntu-20.04", "Ubuntu 20.04", "x86_64", "Package"), - ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64", "Package"), - ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "Package"), - ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "Package"), - ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "Onedir"), - ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "Onedir") - ) %> - - <%- for slug, display_name, arch, pkg_type in linux_pkg_tests %> - <%- set job_name = "{}-{}-download-tests".format(slug.replace(".", ""), pkg_type.lower()) %> + <%- set job_name = "pkg-download-tests" %> <{ job_name }>: <%- do test_repo_needs.append(job_name) %> - name: <{ display_name }> Package Download + <%- do conclusion_needs.append(job_name) %> + name: Package Downloads <%- if gh_environment == "staging" %> if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} <%- else %> @@ -46,98 +15,19 @@ - publish-repositories <%- if gh_environment == "release" %> - download-onedir-artifact - <%- endif %> - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: <{ slug }> - nox-session: ci-test-onedir - platform: linux - arch: <{ arch }> - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }> - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: <{ gh_environment }> - nox-version: <{ nox_version }> - python-version: "<{ gh_actions_workflows_python_version }>" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: <{ pkg_type.lower() }> - secrets: inherit - - <%- endfor %> - - - <%- for slug, display_name, arch, pkg_type in ( - ("macos-12", "macOS 12", "x86_64", "Package"), - ("macos-12", "macOS 12", "x86_64", "Onedir"), - ) %> - <%- set job_name = "{}-{}-download-tests".format(slug.replace(".", ""), pkg_type.lower()) %> - - <{ job_name }>: - <%- do test_repo_needs.append(job_name) %> - name: <{ display_name }> Package Download - <%- if gh_environment == "staging" %> - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} <%- else %> - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + - build-salt-onedir-linux + - build-salt-onedir-macos + - build-salt-onedir-windows <%- endif %> - needs: - - prepare-workflow - - publish-repositories - <%- if gh_environment == "release" %> - - download-onedir-artifact - <%- endif %> - uses: ./.github/workflows/test-package-downloads-action-macos.yml + uses: ./.github/workflows/test-package-downloads-action.yml with: - distro-slug: <{ slug }> nox-session: ci-test-onedir - platform: darwin - arch: <{ arch }> cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }> salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: <{ gh_environment }> - skip-code-coverage: true nox-version: <{ nox_version }> python-version: "<{ gh_actions_workflows_python_version }>" - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: <{ pkg_type.lower() }> - secrets: inherit - <%- endfor %> - - - <%- for slug, display_name, arch in ( - ("windows-2022", "Windows 2022", "amd64"), - ) %> - <%- for pkg_type in ("NSIS", "MSI", "Onedir") %> - <%- set job_name = "{}-{}-{}-download-tests".format(slug.replace(".", ""), pkg_type.lower(), arch.lower()) %> - - <{ job_name }>: - <%- do test_repo_needs.append(job_name) %> - <%- if gh_environment == "staging" %> - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - <%- else %> - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - <%- endif %> - name: <{ display_name }> Package Download - needs: - - prepare-workflow - - publish-repositories - <%- if gh_environment == "release" %> - - download-onedir-artifact - <%- endif %> - uses: ./.github/workflows/test-package-downloads-action-windows.yml - with: - distro-slug: <{ slug }> - nox-session: ci-test-onedir - platform: windows - arch: <{ arch }> - pkg-type: <{ pkg_type.lower() }> - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }> - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: <{ gh_environment }> skip-code-coverage: true - nox-version: <{ nox_version }> - python-version: "<{ gh_actions_workflows_python_version }>" latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" secrets: inherit - <%- endfor %> - <%- endfor %> diff --git a/.github/workflows/test-package-downloads-action-linux.yml b/.github/workflows/test-package-downloads-action-linux.yml deleted file mode 100644 index f94d094d3b7..00000000000 --- a/.github/workflows/test-package-downloads-action-linux.yml +++ /dev/null @@ -1,338 +0,0 @@ -name: Test Download Packages - -on: - workflow_call: - inputs: - distro-slug: - required: true - type: string - description: The OS slug to run tests against - platform: - required: true - type: string - description: The platform being tested - arch: - required: true - type: string - description: The platform arch being tested - salt-version: - type: string - required: true - description: The Salt version of the packages to install and test - cache-prefix: - required: true - type: string - description: Seed used to invalidate caches - environment: - required: true - type: string - description: The environment to run tests against - latest-release: - required: true - type: string - description: The latest salt release - pkg-type: - required: true - type: string - description: The type of artifact to download - nox-version: - required: true - type: string - description: The nox version to install - python-version: - required: false - type: string - description: The python version to run tests with - default: "3.10" - package-name: - required: false - type: string - description: The onedir package name to use - default: salt - skip-code-coverage: - required: false - type: boolean - description: Skip code coverage - default: false - nox-session: - required: false - type: string - description: The nox session to run - default: ci-test-onedir - -env: - COLUMNS: 190 - AWS_MAX_ATTEMPTS: "10" - AWS_RETRY_MODE: "adaptive" - PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ - PIP_EXTRA_INDEX_URL: https://pypi.org/simple - -jobs: - - test: - name: Test - runs-on: - - self-hosted - - linux - - bastion - environment: ${{ inputs.environment }} - timeout-minutes: 120 # 2 Hours - More than this and something is wrong - strategy: - fail-fast: false - matrix: - arch: - - ${{ inputs.arch }} - pkg-type: - - ${{ inputs.pkg-type }} - - steps: - - - name: "Throttle Builds" - shell: bash - run: | - t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t" - - - name: Checkout Source Code - uses: actions/checkout@v4 - - - name: Download Onedir Tarball as an Artifact - uses: actions/download-artifact@v3 - with: - name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz - path: artifacts/ - - - name: Decompress Onedir Tarball - shell: bash - run: | - python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" - cd artifacts - tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz - - - name: Download cached nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }} - uses: actions/cache@v3 - with: - path: nox.${{ inputs.distro-slug }}.tar.* - key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ - hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') - }} - # If we get a cache miss here it means the dependencies step failed to save the cache - fail-on-cache-miss: true - - - name: Setup Python Tools Scripts - uses: ./.github/actions/setup-python-tools-scripts - - - name: Get Salt Project GitHub Actions Bot Environment - run: | - TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") - SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) - echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" - - - name: Start VM - id: spin-up-vm - run: | - tools --timestamps vm create --environment "${SPB_ENVIRONMENT}" --retries=2 ${{ inputs.distro-slug }} - - - name: List Free Space - run: | - tools --timestamps vm ssh ${{ inputs.distro-slug }} -- df -h || true - - - name: Upload Checkout To VM - run: | - tools --timestamps vm rsync ${{ inputs.distro-slug }} - - - name: Decompress .nox Directory - run: | - tools --timestamps vm decompress-dependencies ${{ inputs.distro-slug }} - - - name: Show System Info & Test Plan - env: - SALT_RELEASE: "${{ inputs.salt-version }}" - SALT_REPO_ARCH: ${{ inputs.arch }} - SALT_REPO_TYPE: ${{ inputs.environment }} - SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} - SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} - SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} - SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} - SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" - LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" - DOWNLOAD_TEST_PACKAGE_TYPE: ${{ inputs.pkg-type }} - run: | - tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ - -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ - -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ - --nox-session=${{ inputs.nox-session }}-pkgs ${{ inputs.distro-slug }} -- download-pkgs - - - name: Run Package Download Tests - env: - SALT_RELEASE: "${{ inputs.salt-version }}" - SALT_REPO_ARCH: ${{ inputs.arch }} - SALT_REPO_TYPE: ${{ inputs.environment }} - SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} - SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} - SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} - SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} - SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" - LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" - DOWNLOAD_TEST_PACKAGE_TYPE: ${{ inputs.pkg-type }} - run: | - tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ - -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ - -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ - --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ inputs.distro-slug }} -- download-pkgs - - - name: Combine Coverage Reports - if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' - run: | - tools --timestamps vm combine-coverage ${{ inputs.distro-slug }} - - - name: Create XML Coverage Reports - if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' - run: | - tools --timestamps vm create-xml-coverage-reports ${{ inputs.distro-slug }} - - - name: Download Test Run Artifacts - id: download-artifacts-from-vm - if: always() && steps.spin-up-vm.outcome == 'success' - run: | - tools --timestamps vm download-artifacts ${{ inputs.distro-slug }} - # Delete the salt onedir, we won't need it anymore and it will prevent - # from it showing in the tree command below - rm -rf artifacts/salt* - tree -a artifacts - - - name: Destroy VM - if: always() - run: | - tools --timestamps vm destroy --no-wait ${{ inputs.distro-slug }} || true - - - name: Fix file ownership - run: | - sudo chown -R "$(id -un)" . - - - name: Install Codecov CLI - if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' - run: | - # We can't yet use tokenless uploads with the codecov CLI - # python3 -m pip install codecov-cli - # - curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import - curl -Os https://uploader.codecov.io/latest/linux/codecov - curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM - curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig - gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM - shasum -a 256 -c codecov.SHA256SUM - chmod +x codecov - - - name: Upload Source Code Coverage To Codecov - if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' - run: | - if [ ! -s artifacts/coverage/salt.xml ]; then - echo "The artifacts/coverage/salt.xml file does not exist" - exit 1 - fi - # We can't yet use tokenless uploads with the codecov CLI - #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/salt.xml \ - # --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ - # --name salt.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - n=0 - until [ "$n" -ge 5 ] - do - if ./codecov --file artifacts/coverage/salt.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags salt,${{ inputs.distro-slug }},pkg \ - --name salt.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then - rc=$? - break - fi - rc=$? - n=$((n+1)) - sleep 15 - done - if [ "$rc" -ne 0 ]; then - echo "Failed to upload codecov stats" - exit 1 - fi - - - name: Upload Tests Code Coverage To Codecov - if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' - run: | - if [ ! -s artifacts/coverage/tests.xml ]; then - echo "The artifacts/coverage/tests.xml file does not exist" - exit 1 - fi - # We can't yet use tokenless uploads with the codecov CLI - #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/tests.xml \ - # --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ - # --name tests.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - n=0 - until [ "$n" -ge 5 ] - do - if ./codecov --file artifacts/coverage/tests.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags tests,${{ inputs.distro-slug }},pkg \ - --name tests.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then - rc=$? - break - fi - rc=$? - n=$((n+1)) - sleep 15 - done - if [ "$rc" -ne 0 ]; then - echo "Failed to upload codecov stats" - exit 1 - fi - - - name: Upload Test Run Artifacts - if: always() && steps.download-artifacts-from-vm.outcome == 'success' - uses: actions/upload-artifact@v3 - with: - name: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.arch }} - path: | - artifacts - !artifacts/salt/* - !artifacts/salt-*.tar.* - - report: - name: Test Pkg Download Reports - runs-on: - - self-hosted - - linux - - x86_64 - environment: ${{ inputs.environment }} - if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped' - needs: - - test - - steps: - - name: Checkout Source Code - uses: actions/checkout@v4 - - - name: Download Test Run Artifacts - id: download-test-run-artifacts - uses: actions/download-artifact@v3 - with: - name: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.arch }} - path: artifacts - - - name: Show Test Run Artifacts - if: always() && steps.download-test-run-artifacts.outcome == 'success' - run: | - tree -a artifacts - - - name: Install Nox - run: | - python3 -m pip install 'nox==${{ inputs.nox-version }}' - - - name: Publish Test Report - uses: mikepenz/action-junit-report@v3 - # always run even if the previous steps fails - if: always() && github.event_name == 'push' && steps.download-test-run-artifacts.outcome == 'success' - with: - check_name: Overall Test Results(${{ inputs.distro-slug }} ${{ inputs.arch }}) - report_paths: 'artifacts/xml-unittests-output/*.xml' - annotate_only: true diff --git a/.github/workflows/test-package-downloads-action-macos.yml b/.github/workflows/test-package-downloads-action-macos.yml deleted file mode 100644 index 632a88a7d29..00000000000 --- a/.github/workflows/test-package-downloads-action-macos.yml +++ /dev/null @@ -1,318 +0,0 @@ -name: Test Download Packages - -on: - workflow_call: - inputs: - distro-slug: - required: true - type: string - description: The OS slug to run tests against - platform: - required: true - type: string - description: The platform being tested - arch: - required: true - type: string - description: The platform arch being tested - salt-version: - type: string - required: true - description: The Salt version of the packages to install and test - cache-prefix: - required: true - type: string - description: Seed used to invalidate caches - environment: - required: true - type: string - description: The environment to run tests against - latest-release: - required: true - type: string - description: The latest salt release - pkg-type: - required: true - type: string - description: The type of artifact to download - nox-version: - required: true - type: string - description: The nox version to install - python-version: - required: false - type: string - description: The python version to run tests with - default: "3.11" - package-name: - required: false - type: string - description: The onedir package name to use - default: salt - skip-code-coverage: - required: false - type: boolean - description: Skip code coverage - default: false - nox-session: - required: false - type: string - description: The nox session to run - default: ci-test-onedir - -env: - COLUMNS: 190 - PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ - PIP_EXTRA_INDEX_URL: https://pypi.org/simple - -jobs: - - test: - name: Test - runs-on: ${{ inputs.distro-slug }} - environment: ${{ inputs.environment }} - timeout-minutes: 120 # 2 Hours - More than this and something is wrong - strategy: - fail-fast: false - matrix: - arch: - - ${{ inputs.arch }} - pkg-type: - - ${{ inputs.pkg-type }} - - steps: - - - name: "Throttle Builds" - shell: bash - run: | - t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" - - - name: Checkout Source Code - uses: actions/checkout@v4 - - - name: Download Onedir Tarball as an Artifact - uses: actions/download-artifact@v3 - with: - name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz - path: artifacts/ - - - name: Install System Dependencies - run: | - brew install tree - - - name: Decompress Onedir Tarball - shell: bash - run: | - python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" - cd artifacts - tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz - - - name: Set up Python ${{ inputs.python-version }} - uses: actions/setup-python@v4 - with: - python-version: "${{ inputs.python-version }}" - update-environment: true - - - name: Install Nox - run: | - python3 -m pip install 'nox==${{ inputs.nox-version }}' - - - name: Download cached nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }} - uses: actions/cache@v3 - with: - path: nox.${{ inputs.distro-slug }}.tar.* - key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ - hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') - }} - # If we get a cache miss here it means the dependencies step failed to save the cache - fail-on-cache-miss: true - - - name: Decompress .nox Directory - run: | - nox --force-color -e decompress-dependencies -- ${{ inputs.distro-slug }} - - - name: Show System Info & Test Plan - env: - SALT_RELEASE: "${{ inputs.salt-version }}" - SKIP_REQUIREMENTS_INSTALL: "1" - PRINT_TEST_SELECTION: "1" - PRINT_TEST_PLAN_ONLY: "1" - PRINT_SYSTEM_INFO: "1" - GITHUB_ACTIONS_PIPELINE: "1" - SKIP_INITIAL_GH_ACTIONS_FAILURES: "1" - SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" - LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" - DOWNLOAD_TEST_PACKAGE_TYPE: ${{ inputs.pkg-type }} - run: | - sudo -E nox --force-color -e ${{ inputs.nox-session }}-pkgs -- download-pkgs - - - name: Run Package Download Tests - env: - SKIP_REQUIREMENTS_INSTALL: "1" - PRINT_TEST_SELECTION: "0" - PRINT_TEST_PLAN_ONLY: "0" - PRINT_SYSTEM_INFO: "0" - RERUN_FAILURES: "1" - GITHUB_ACTIONS_PIPELINE: "1" - SKIP_INITIAL_GH_ACTIONS_FAILURES: "1" - SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" - COVERAGE_CONTEXT: ${{ inputs.distro-slug }} - SALT_RELEASE: "${{ inputs.salt-version }}" - SALT_REPO_ARCH: ${{ inputs.arch }} - LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" - SALT_REPO_TYPE: ${{ inputs.environment }} - SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} - SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} - SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} - SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} - DOWNLOAD_TEST_PACKAGE_TYPE: ${{ inputs.pkg-type }} - run: | - sudo -E nox --force-color -e ${{ inputs.nox-session }}-pkgs -- download-pkgs - - - name: Fix file ownership - run: | - sudo chown -R "$(id -un)" . - - - name: Create XML Coverage Reports - if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' - run: | - nox --force-color -e create-xml-coverage-reports - - - name: Prepare Test Run Artifacts - id: download-artifacts-from-vm - if: always() - run: | - # Delete the salt onedir, we won't need it anymore and it will prevent - # from it showing in the tree command below - rm -rf artifacts/salt* - tree -a artifacts - - - name: Install Codecov CLI - if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' - run: | - # We can't yet use tokenless uploads with the codecov CLI - # python3 -m pip install codecov-cli - # - curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import - curl -Os https://uploader.codecov.io/latest/macos/codecov - curl -Os https://uploader.codecov.io/latest/macos/codecov.SHA256SUM - curl -Os https://uploader.codecov.io/latest/macos/codecov.SHA256SUM.sig - gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM - shasum -a 256 -c codecov.SHA256SUM - chmod +x codecov - - - name: Upload Source Code Coverage To Codecov - if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' - run: | - if [ ! -s artifacts/coverage/salt.xml ]; then - echo "The artifacts/coverage/salt.xml file does not exist" - exit 1 - fi - # We can't yet use tokenless uploads with the codecov CLI - #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/salt.xml \ - # --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ - # --name salt.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - n=0 - until [ "$n" -ge 5 ] - do - if ./codecov --file artifacts/coverage/salt.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags salt,${{ inputs.distro-slug }},pkg \ - --name salt.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then - rc=$? - break - fi - rc=$? - n=$((n+1)) - sleep 15 - done - if [ "$rc" -ne 0 ]; then - echo "Failed to upload codecov stats" - exit 1 - fi - - - name: Upload Tests Code Coverage To Codecov - if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' - run: | - if [ ! -s artifacts/coverage/tests.xml ]; then - echo "The artifacts/coverage/tests.xml file does not exist" - exit 1 - fi - # We can't yet use tokenless uploads with the codecov CLI - #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/tests.xml \ - # --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ - # --name tests.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - n=0 - until [ "$n" -ge 5 ] - do - if ./codecov --file artifacts/coverage/tests.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags tests,${{ inputs.distro-slug }},pkg \ - --name tests.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then - rc=$? - break - fi - rc=$? - n=$((n+1)) - sleep 15 - done - if [ "$rc" -ne 0 ]; then - echo "Failed to upload codecov stats" - exit 1 - fi - - - name: Upload Test Run Artifacts - if: always() - uses: actions/upload-artifact@v3 - with: - name: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.arch }} - path: | - artifacts - !artifacts/salt/* - !artifacts/salt-*.tar.* - - report: - name: Test Pkg Download Reports - runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "x86_64"]') || 'ubuntu-latest' }} - environment: ${{ inputs.environment }} - if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped' - needs: - - test - - steps: - - name: Checkout Source Code - uses: actions/checkout@v4 - - - name: Download Test Run Artifacts - id: download-test-run-artifacts - uses: actions/download-artifact@v3 - with: - name: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.arch }} - path: artifacts - - - name: Show Test Run Artifacts - if: always() && steps.download-test-run-artifacts.outcome == 'success' - run: | - tree -a artifacts - - - name: Set up Python ${{ inputs.python-version }} - uses: actions/setup-python@v4 - with: - python-version: "${{ inputs.python-version }}" - - - name: Install Nox - run: | - python3 -m pip install 'nox==${{ inputs.nox-version }}' - - - name: Publish Test Report - uses: mikepenz/action-junit-report@v3 - # always run even if the previous steps fails - if: always() && github.event_name == 'push' && steps.download-test-run-artifacts.outcome == 'success' - with: - check_name: Overall Test Results(${{ inputs.distro-slug }} ${{ inputs.arch }}) - report_paths: 'artifacts/xml-unittests-output/*.xml' - annotate_only: true diff --git a/.github/workflows/test-package-downloads-action-windows.yml b/.github/workflows/test-package-downloads-action-windows.yml deleted file mode 100644 index beb15893494..00000000000 --- a/.github/workflows/test-package-downloads-action-windows.yml +++ /dev/null @@ -1,343 +0,0 @@ -name: Test Download Packages - -on: - workflow_call: - inputs: - distro-slug: - required: true - type: string - description: The OS slug to run tests against - platform: - required: true - type: string - description: The platform being tested - arch: - required: true - type: string - description: The platform arch being tested - pkg-type: - required: true - type: string - description: The platform arch being tested - salt-version: - type: string - required: true - description: The Salt version of the packages to install and test - cache-prefix: - required: true - type: string - description: Seed used to invalidate caches - environment: - required: true - type: string - description: The environment to run tests against - latest-release: - required: true - type: string - description: The latest salt release - nox-version: - required: true - type: string - description: The nox version to install - python-version: - required: false - type: string - description: The python version to run tests with - default: "3.10" - package-name: - required: false - type: string - description: The onedir package name to use - default: salt - nox-session: - required: false - type: string - description: The nox session to run - default: ci-test-onedir - skip-code-coverage: - required: false - type: boolean - description: Skip code coverage - default: false - skip-junit-reports: - required: false - type: boolean - description: Skip Publishing JUnit Reports - default: false - -env: - COLUMNS: 190 - AWS_MAX_ATTEMPTS: "10" - AWS_RETRY_MODE: "adaptive" - PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ - PIP_EXTRA_INDEX_URL: https://pypi.org/simple - -jobs: - - test: - name: Test - runs-on: - - self-hosted - - linux - - bastion - environment: ${{ inputs.environment }} - timeout-minutes: 120 # 2 Hours - More than this and something is wrong - strategy: - fail-fast: false - matrix: - arch: - - ${{ inputs.arch }} - pkg-type: - - ${{ inputs.pkg-type }} - - steps: - - - name: "Throttle Builds" - shell: bash - run: | - t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" - - - name: Checkout Source Code - uses: actions/checkout@v4 - - - name: Download Onedir Tarball as an Artifact - uses: actions/download-artifact@v3 - with: - name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz - path: artifacts/ - - - name: Decompress Onedir Tarball - shell: bash - run: | - python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" - cd artifacts - tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz - - - name: Download cached nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }} - uses: actions/cache@v3 - with: - path: nox.${{ inputs.distro-slug }}.tar.* - key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ - hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') - }} - # If we get a cache miss here it means the dependencies step failed to save the cache - fail-on-cache-miss: true - - - name: Setup Python Tools Scripts - uses: ./.github/actions/setup-python-tools-scripts - - - name: Get Salt Project GitHub Actions Bot Environment - run: | - TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") - SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) - echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" - - - name: Start VM - id: spin-up-vm - run: | - tools --timestamps vm create --environment "${SPB_ENVIRONMENT}" --retries=2 ${{ inputs.distro-slug }} - - - name: List Free Space - run: | - tools --timestamps vm ssh ${{ inputs.distro-slug }} -- df -h || true - - - name: Upload Checkout To VM - run: | - tools --timestamps vm rsync ${{ inputs.distro-slug }} - - - name: Decompress .nox Directory - run: | - tools --timestamps vm decompress-dependencies ${{ inputs.distro-slug }} - - - name: Show System Info & Test Plan - env: - SALT_RELEASE: "${{ inputs.salt-version }}" - SALT_REPO_ARCH: ${{ inputs.arch }} - LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" - SALT_REPO_TYPE: ${{ inputs.environment }} - SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} - SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} - SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} - SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} - SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" - DOWNLOAD_TEST_PACKAGE_TYPE: ${{ inputs.pkg-type }} - run: | - tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ - -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ - -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ - --nox-session=${{ inputs.nox-session }}-pkgs ${{ inputs.distro-slug }} -- download-pkgs - - - name: Run Package Download Tests - env: - SALT_RELEASE: "${{ inputs.salt-version }}" - SALT_REPO_ARCH: ${{ inputs.arch }} - LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" - SALT_REPO_TYPE: ${{ inputs.environment }} - SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} - SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} - SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} - SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} - SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" - DOWNLOAD_TEST_PACKAGE_TYPE: ${{ inputs.pkg-type }} - run: | - tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ - -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ - -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ - --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ inputs.distro-slug }} -- download-pkgs - - - name: Combine Coverage Reports - if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' - run: | - tools --timestamps vm combine-coverage ${{ inputs.distro-slug }} - - - name: Create XML Coverage Reports - if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' - run: | - tools --timestamps vm create-xml-coverage-reports ${{ inputs.distro-slug }} - - - name: Download Test Run Artifacts - id: download-artifacts-from-vm - if: always() && steps.spin-up-vm.outcome == 'success' - run: | - tools --timestamps vm download-artifacts ${{ inputs.distro-slug }} - # Delete the salt onedir, we won't need it anymore and it will prevent - # from it showing in the tree command below - rm -rf artifacts/salt* - tree -a artifacts - - - name: Destroy VM - if: always() - run: | - tools --timestamps vm destroy --no-wait ${{ inputs.distro-slug }} || true - - - name: Fix file ownership - run: | - sudo chown -R "$(id -un)" . - - - name: Install Codecov CLI - if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' - run: | - # We can't yet use tokenless uploads with the codecov CLI - # python3 -m pip install codecov-cli - # - curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import - curl -Os https://uploader.codecov.io/latest/linux/codecov - curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM - curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig - gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM - shasum -a 256 -c codecov.SHA256SUM - chmod +x codecov - - - name: Upload Source Code Coverage To Codecov - if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' - run: | - if [ ! -s artifacts/coverage/salt.xml ]; then - echo "The artifacts/coverage/salt.xml file does not exist" - exit 1 - fi - # We can't yet use tokenless uploads with the codecov CLI - #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/salt.xml \ - # --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ - # --name salt.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - n=0 - until [ "$n" -ge 5 ] - do - if ./codecov --file artifacts/coverage/salt.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags salt,${{ inputs.distro-slug }},pkg \ - --name salt.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then - rc=$? - break - fi - rc=$? - n=$((n+1)) - sleep 15 - done - if [ "$rc" -ne 0 ]; then - echo "Failed to upload codecov stats" - exit 1 - fi - - - name: Upload Tests Code Coverage To Codecov - if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' - run: | - if [ ! -s artifacts/coverage/tests.xml ]; then - echo "The artifacts/coverage/tests.xml file does not exist" - exit 1 - fi - # We can't yet use tokenless uploads with the codecov CLI - #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/tests.xml \ - # --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ - # --name tests.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - n=0 - until [ "$n" -ge 5 ] - do - if ./codecov --file artifacts/coverage/tests.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags tests,${{ inputs.distro-slug }},pkg \ - --name tests.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then - rc=$? - break - fi - rc=$? - n=$((n+1)) - sleep 15 - done - if [ "$rc" -ne 0 ]; then - echo "Failed to upload codecov stats" - exit 1 - fi - - - name: Upload Test Run Artifacts - if: always() && steps.download-artifacts-from-vm.outcome == 'success' - uses: actions/upload-artifact@v3 - with: - name: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.arch }} - path: | - artifacts - !artifacts/salt/* - !artifacts/salt-*.tar.* - - report: - name: Test Pkg Download Reports - runs-on: - - self-hosted - - linux - - x86_64 - environment: ${{ inputs.environment }} - if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped' - needs: - - test - - steps: - - name: Checkout Source Code - uses: actions/checkout@v4 - - - name: Download Test Run Artifacts - id: download-test-run-artifacts - uses: actions/download-artifact@v3 - with: - name: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.arch }} - path: artifacts - - - name: Show Test Run Artifacts - if: always() && steps.download-test-run-artifacts.outcome == 'success' - run: | - tree -a artifacts - - - name: Install Nox - run: | - python3 -m pip install 'nox==${{ inputs.nox-version }}' - - - name: Publish Test Report - uses: mikepenz/action-junit-report@v3 - # always run even if the previous steps fails - if: always() && github.event_name == 'push' && steps.download-test-run-artifacts.outcome == 'success' - with: - check_name: Overall Test Results(${{ inputs.distro-slug }} ${{ inputs.arch }} ${{ inputs.pkg-type }} ) - report_paths: 'artifacts/xml-unittests-output/*.xml' - annotate_only: true diff --git a/.github/workflows/test-package-downloads-action.yml b/.github/workflows/test-package-downloads-action.yml new file mode 100644 index 00000000000..32dcd453a57 --- /dev/null +++ b/.github/workflows/test-package-downloads-action.yml @@ -0,0 +1,754 @@ +name: Test Download Packages + +on: + workflow_call: + inputs: + salt-version: + type: string + required: true + description: The Salt version of the packages to install and test + cache-prefix: + required: true + type: string + description: Seed used to invalidate caches + environment: + required: true + type: string + description: The environment to run tests against + latest-release: + required: true + type: string + description: The latest salt release + nox-version: + required: true + type: string + description: The nox version to install + python-version: + required: false + type: string + description: The python version to run tests with + default: "3.10" + package-name: + required: false + type: string + description: The onedir package name to use + default: salt + skip-code-coverage: + required: false + type: boolean + description: Skip code coverage + default: false + nox-session: + required: false + type: string + description: The nox session to run + default: ci-test-onedir + +env: + COLUMNS: 190 + AWS_MAX_ATTEMPTS: "10" + AWS_RETRY_MODE: "adaptive" + PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ + PIP_EXTRA_INDEX_URL: https://pypi.org/simple + +jobs: + + generate-matrix: + name: Test Matrix + runs-on: + - self-hosted + - linux + - x86_64 + outputs: + matrix-include: ${{ steps.generate-matrix.outputs.matrix }} + steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t" + + - name: Checkout Source Code + uses: actions/checkout@v4 + + - name: Setup Python Tools Scripts + uses: ./.github/actions/setup-python-tools-scripts + + - name: Generate Test Matrix + id: generate-matrix + run: | + tools ci pkg-download-matrix + + linux: + name: Linux + runs-on: + - self-hosted + - linux + - bastion + environment: ${{ inputs.environment }} + timeout-minutes: 120 # 2 Hours - More than this and something is wrong + needs: + - generate-matrix + strategy: + fail-fast: false + matrix: + include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include)['linux'] }} + + steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t" + + - name: Checkout Source Code + uses: actions/checkout@v4 + + - name: Download Onedir Tarball as an Artifact + uses: actions/download-artifact@v3 + with: + name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-linux-${{ matrix.arch }}.tar.xz + path: artifacts/ + + - name: Decompress Onedir Tarball + shell: bash + run: | + python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" + cd artifacts + tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-linux-${{ matrix.arch }}.tar.xz + + - name: Download cached nox.${{ matrix.distro-slug }}.tar.* for session ${{ inputs.nox-session }} + uses: actions/cache@v3 + with: + path: nox.${{ matrix.distro-slug }}.tar.* + key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch }}|${{ matrix.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ + hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') + }} + # If we get a cache miss here it means the dependencies step failed to save the cache + fail-on-cache-miss: true + + - name: Setup Python Tools Scripts + uses: ./.github/actions/setup-python-tools-scripts + + - name: Get Salt Project GitHub Actions Bot Environment + run: | + TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") + SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) + echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" + + - name: Start VM + id: spin-up-vm + run: | + tools --timestamps vm create --environment "${SPB_ENVIRONMENT}" --retries=2 ${{ matrix.distro-slug }} + + - name: List Free Space + run: | + tools --timestamps vm ssh ${{ matrix.distro-slug }} -- df -h || true + + - name: Upload Checkout To VM + run: | + tools --timestamps vm rsync ${{ matrix.distro-slug }} + + - name: Decompress .nox Directory + run: | + tools --timestamps vm decompress-dependencies ${{ matrix.distro-slug }} + + - name: Show System Info & Test Plan + env: + SALT_RELEASE: "${{ inputs.salt-version }}" + SALT_REPO_ARCH: ${{ matrix.arch }} + SALT_REPO_TYPE: ${{ inputs.environment }} + SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} + SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} + SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} + SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} + SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" + LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} + run: | + tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ + -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ + --nox-session=${{ inputs.nox-session }}-pkgs ${{ matrix.distro-slug }} -- download-pkgs + + - name: Run Package Download Tests + env: + SALT_RELEASE: "${{ inputs.salt-version }}" + SALT_REPO_ARCH: ${{ matrix.arch }} + SALT_REPO_TYPE: ${{ inputs.environment }} + SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} + SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} + SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} + SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} + SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" + LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} + run: | + tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ + -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ + --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ matrix.distro-slug }} -- download-pkgs + + - name: Combine Coverage Reports + if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' + run: | + tools --timestamps vm combine-coverage ${{ matrix.distro-slug }} + + - name: Download Test Run Artifacts + id: download-artifacts-from-vm + if: always() && steps.spin-up-vm.outcome == 'success' + run: | + tools --timestamps vm download-artifacts ${{ matrix.distro-slug }} + # Delete the salt onedir, we won't need it anymore and it will prevent + # from it showing in the tree command below + rm -rf artifacts/salt* + tree -a artifacts + + - name: Destroy VM + if: always() + run: | + tools --timestamps vm destroy --no-wait ${{ matrix.distro-slug }} || true + + - name: Fix file ownership + run: | + sudo chown -R "$(id -un)" . + + - name: Install Codecov CLI + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + # We can't yet use tokenless uploads with the codecov CLI + # python3 -m pip install codecov-cli + # + curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import + curl -Os https://uploader.codecov.io/latest/linux/codecov + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig + gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM + shasum -a 256 -c codecov.SHA256SUM + chmod +x codecov + + - name: Upload Source Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + if [ ! -s artifacts/coverage/salt.xml ]; then + echo "The artifacts/coverage/salt.xml file does not exist" + exit 1 + fi + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/salt.xml \ + # --flag salt --flag ${{ matrix.distro-slug }} --flag pkg \ + # --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/salt.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags salt,${{ matrix.distro-slug }},pkg \ + --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi + + - name: Upload Tests Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + if [ ! -s artifacts/coverage/tests.xml ]; then + echo "The artifacts/coverage/tests.xml file does not exist" + exit 1 + fi + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/tests.xml \ + # --flag tests --flag ${{ matrix.distro-slug }} --flag pkg \ + # --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/tests.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags tests,${{ matrix.distro-slug }},pkg \ + --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi + + - name: Upload Test Run Artifacts + if: always() && steps.download-artifacts-from-vm.outcome == 'success' + uses: actions/upload-artifact@v3 + with: + name: pkg-testrun-artifacts-${{ matrix.distro-slug }}-${{ matrix.arch }} + path: | + artifacts + !artifacts/salt/* + !artifacts/salt-*.tar.* + + - name: Publish Test Report + uses: mikepenz/action-junit-report@v3 + # always run even if the previous steps fails + if: always() && job.status != 'cancelled' && steps.download-artifacts-from-vm.outcome == 'success' + with: + check_name: Overall Test Results(${{ matrix.distro-slug }} ${{ matrix.arch }}) + report_paths: 'artifacts/xml-unittests-output/*.xml' + annotate_only: true + + + macos: + name: MacOS + runs-on: ${{ matrix.distro-slug }} + environment: ${{ inputs.environment }} + timeout-minutes: 120 # 2 Hours - More than this and something is wrong + needs: + - generate-matrix + strategy: + fail-fast: false + matrix: + include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include)['macos'] }} + + steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" + + - name: Checkout Source Code + uses: actions/checkout@v4 + + - name: Download Onedir Tarball as an Artifact + uses: actions/download-artifact@v3 + with: + name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz + path: artifacts/ + + - name: Install System Dependencies + run: | + brew install tree + + - name: Decompress Onedir Tarball + shell: bash + run: | + python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" + cd artifacts + tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz + + - name: Set up Python ${{ inputs.python-version }} + uses: actions/setup-python@v4 + with: + python-version: "${{ inputs.python-version }}" + update-environment: true + + - name: Install Nox + run: | + python3 -m pip install 'nox==${{ inputs.nox-version }}' + + - name: Download cached nox.${{ matrix.distro-slug }}.tar.* for session ${{ inputs.nox-session }} + uses: actions/cache@v3 + with: + path: nox.${{ matrix.distro-slug }}.tar.* + key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch }}|${{ matrix.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ + hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') + }} + # If we get a cache miss here it means the dependencies step failed to save the cache + fail-on-cache-miss: true + + - name: Decompress .nox Directory + run: | + nox --force-color -e decompress-dependencies -- ${{ matrix.distro-slug }} + + - name: Show System Info & Test Plan + env: + SALT_RELEASE: "${{ inputs.salt-version }}" + SKIP_REQUIREMENTS_INSTALL: "1" + PRINT_TEST_SELECTION: "1" + PRINT_TEST_PLAN_ONLY: "1" + PRINT_SYSTEM_INFO: "1" + GITHUB_ACTIONS_PIPELINE: "1" + SKIP_INITIAL_GH_ACTIONS_FAILURES: "1" + SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" + LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} + run: | + sudo -E nox --force-color -e ${{ inputs.nox-session }}-pkgs -- download-pkgs + + - name: Run Package Download Tests + env: + SKIP_REQUIREMENTS_INSTALL: "1" + PRINT_TEST_SELECTION: "0" + PRINT_TEST_PLAN_ONLY: "0" + PRINT_SYSTEM_INFO: "0" + RERUN_FAILURES: "1" + GITHUB_ACTIONS_PIPELINE: "1" + SKIP_INITIAL_GH_ACTIONS_FAILURES: "1" + SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" + COVERAGE_CONTEXT: ${{ matrix.distro-slug }} + SALT_RELEASE: "${{ inputs.salt-version }}" + SALT_REPO_ARCH: ${{ matrix.arch }} + LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" + SALT_REPO_TYPE: ${{ inputs.environment }} + SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} + SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} + SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} + SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} + run: | + sudo -E nox --force-color -e ${{ inputs.nox-session }}-pkgs -- download-pkgs + + - name: Fix file ownership + run: | + sudo chown -R "$(id -un)" . + + - name: Combine Coverage Reports + if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' + run: | + nox --force-color -e combine-coverage + + - name: Prepare Test Run Artifacts + id: download-artifacts-from-vm + if: always() && job.status != 'cancelled' + run: | + # Delete the salt onedir, we won't need it anymore and it will prevent + # from it showing in the tree command below + rm -rf artifacts/salt* + tree -a artifacts + + - name: Install Codecov CLI + if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' + run: | + # We can't yet use tokenless uploads with the codecov CLI + # python3 -m pip install codecov-cli + # + curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import + curl -Os https://uploader.codecov.io/latest/macos/codecov + curl -Os https://uploader.codecov.io/latest/macos/codecov.SHA256SUM + curl -Os https://uploader.codecov.io/latest/macos/codecov.SHA256SUM.sig + gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM + shasum -a 256 -c codecov.SHA256SUM + chmod +x codecov + + - name: Upload Source Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' + run: | + if [ ! -s artifacts/coverage/salt.xml ]; then + echo "The artifacts/coverage/salt.xml file does not exist" + exit 1 + fi + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/salt.xml \ + # --flag salt --flag ${{ matrix.distro-slug }} --flag pkg \ + # --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/salt.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags salt,${{ matrix.distro-slug }},pkg \ + --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi + + - name: Upload Tests Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' + run: | + if [ ! -s artifacts/coverage/tests.xml ]; then + echo "The artifacts/coverage/tests.xml file does not exist" + exit 1 + fi + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/tests.xml \ + # --flag tests --flag ${{ matrix.distro-slug }} --flag pkg \ + # --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/tests.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags tests,${{ matrix.distro-slug }},pkg \ + --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi + + - name: Upload Test Run Artifacts + if: always() + uses: actions/upload-artifact@v3 + with: + name: pkg-testrun-artifacts-${{ matrix.distro-slug }}-${{ matrix.arch }} + path: | + artifacts + !artifacts/salt/* + !artifacts/salt-*.tar.* + + - name: Publish Test Report + uses: mikepenz/action-junit-report@v3 + # always run even if the previous steps fails + if: always() && job.status != 'cancelled' + with: + check_name: Overall Test Results(${{ matrix.distro-slug }} ${{ matrix.arch }}) + report_paths: 'artifacts/xml-unittests-output/*.xml' + annotate_only: true + + + windows: + name: Windows + runs-on: + - self-hosted + - linux + - bastion + environment: ${{ inputs.environment }} + timeout-minutes: 120 # 2 Hours - More than this and something is wrong + needs: + - generate-matrix + strategy: + fail-fast: false + matrix: + include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include)['windows'] }} + + steps: + - name: Checkout Source Code + uses: actions/checkout@v4 + + - name: Download Onedir Tarball as an Artifact + uses: actions/download-artifact@v3 + with: + name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-windows-${{ matrix.arch }}.tar.xz + path: artifacts/ + + - name: Decompress Onedir Tarball + shell: bash + run: | + python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" + cd artifacts + tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-windows-${{ matrix.arch }}.tar.xz + + - name: Download cached nox.${{ matrix.distro-slug }}.tar.* for session ${{ inputs.nox-session }} + uses: actions/cache@v3 + with: + path: nox.${{ matrix.distro-slug }}.tar.* + key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch }}|${{ matrix.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ + hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') + }} + # If we get a cache miss here it means the dependencies step failed to save the cache + fail-on-cache-miss: true + + - name: Setup Python Tools Scripts + uses: ./.github/actions/setup-python-tools-scripts + + - name: Get Salt Project GitHub Actions Bot Environment + run: | + TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") + SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) + echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" + + - name: Start VM + id: spin-up-vm + run: | + tools --timestamps vm create --environment "${SPB_ENVIRONMENT}" --retries=2 ${{ matrix.distro-slug }} + + - name: List Free Space + run: | + tools --timestamps vm ssh ${{ matrix.distro-slug }} -- df -h || true + + - name: Upload Checkout To VM + run: | + tools --timestamps vm rsync ${{ matrix.distro-slug }} + + - name: Decompress .nox Directory + run: | + tools --timestamps vm decompress-dependencies ${{ matrix.distro-slug }} + + - name: Show System Info & Test Plan + env: + SALT_RELEASE: "${{ inputs.salt-version }}" + SALT_REPO_ARCH: ${{ matrix.arch }} + LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" + SALT_REPO_TYPE: ${{ inputs.environment }} + SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} + SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} + SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} + SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} + SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} + run: | + tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ + -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ + --nox-session=${{ inputs.nox-session }}-pkgs ${{ matrix.distro-slug }} -- download-pkgs + + - name: Run Package Download Tests + env: + SALT_RELEASE: "${{ inputs.salt-version }}" + SALT_REPO_ARCH: ${{ matrix.arch }} + LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" + SALT_REPO_TYPE: ${{ inputs.environment }} + SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} + SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} + SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} + SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} + SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} + run: | + tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ + -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ + --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ matrix.distro-slug }} -- download-pkgs + + - name: Combine Coverage Reports + if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' + run: | + tools --timestamps vm combine-coverage ${{ matrix.distro-slug }} + + - name: Download Test Run Artifacts + id: download-artifacts-from-vm + if: always() && steps.spin-up-vm.outcome == 'success' + run: | + tools --timestamps vm download-artifacts ${{ matrix.distro-slug }} + # Delete the salt onedir, we won't need it anymore and it will prevent + # from it showing in the tree command below + rm -rf artifacts/salt* + tree -a artifacts + + - name: Destroy VM + if: always() + run: | + tools --timestamps vm destroy --no-wait ${{ matrix.distro-slug }} || true + + - name: Fix file ownership + run: | + sudo chown -R "$(id -un)" . + + - name: Install Codecov CLI + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + # We can't yet use tokenless uploads with the codecov CLI + # python3 -m pip install codecov-cli + # + curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import + curl -Os https://uploader.codecov.io/latest/linux/codecov + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig + gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM + shasum -a 256 -c codecov.SHA256SUM + chmod +x codecov + + - name: Upload Source Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + if [ ! -s artifacts/coverage/salt.xml ]; then + echo "The artifacts/coverage/salt.xml file does not exist" + exit 1 + fi + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/salt.xml \ + # --flag salt --flag ${{ matrix.distro-slug }} --flag pkg \ + # --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/salt.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags salt,${{ matrix.distro-slug }},pkg \ + --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi + + - name: Upload Tests Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + if [ ! -s artifacts/coverage/tests.xml ]; then + echo "The artifacts/coverage/tests.xml file does not exist" + exit 1 + fi + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/tests.xml \ + # --flag tests --flag ${{ matrix.distro-slug }} --flag pkg \ + # --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/tests.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags tests,${{ matrix.distro-slug }},pkg \ + --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi + + - name: Upload Test Run Artifacts + if: always() && steps.download-artifacts-from-vm.outcome == 'success' + uses: actions/upload-artifact@v3 + with: + name: pkg-testrun-artifacts-${{ matrix.distro-slug }}-${{ matrix.arch }} + path: | + artifacts + !artifacts/salt/* + !artifacts/salt-*.tar.* + + - name: Publish Test Report + uses: mikepenz/action-junit-report@v3 + # always run even if the previous steps fails + if: always() && job.status != 'cancelled' && steps.download-artifacts-from-vm.outcome == 'success' + with: + check_name: Overall Test Results(${{ matrix.distro-slug }} ${{ matrix.arch }} ${{ matrix.pkg-type }} ) + report_paths: 'artifacts/xml-unittests-output/*.xml' + annotate_only: true diff --git a/tools/ci.py b/tools/ci.py index cc6578be789..5cebdef78b2 100644 --- a/tools/ci.py +++ b/tools/ci.py @@ -777,6 +777,74 @@ def pkg_matrix( ctx.exit(0) +@ci.command( + name="pkg-download-matrix", + arguments={}, +) +def pkg_download_matrix(ctx: Context): + """ + Generate the test matrix. + """ + _platforms = {} + linux_entries = ( + ("almalinux-8", "Alma Linux 8", "x86_64", "package"), + ("almalinux-8-arm64", "Alma Linux 8 Arm64", "aarch64", "package"), + ("almalinux-9", "Alma Linux 9", "x86_64", "package"), + ("almalinux-9-arm64", "Alma Linux 9 Arm64", "aarch64", "package"), + ("amazonlinux-2", "Amazon Linux 2", "x86_64", "package"), + ("amazonlinux-2-arm64", "Amazon Linux 2 Arm64", "aarch64", "package"), + ("centos-7", "CentOS 7", "x86_64", "package"), + ("centos-7-arm64", "CentOS 7 Arm64", "aarch64", "package"), + ("centosstream-8", "CentOS Stream 8", "x86_64", "package"), + ("centosstream-8-arm64", "CentOS Stream 8 Arm64", "aarch64", "package"), + ("centosstream-9", "CentOS Stream 9", "x86_64", "package"), + ("centosstream-9-arm64", "CentOS Stream 9 Arm64", "aarch64", "package"), + ("debian-10", "Debian 10", "x86_64", "package"), + ("debian-11", "Debian 11", "x86_64", "package"), + ("debian-11-arm64", "Debian 11 Arm64", "aarch64", "package"), + ("fedora-37", "Fedora 37", "x86_64", "package"), + ("fedora-37-arm64", "Fedora 37 Arm64", "aarch64", "package"), + ("fedora-38", "Fedora 38", "x86_64", "package"), + ("fedora-38-arm64", "Fedora 38 Arm64", "aarch64", "package"), + ("photonos-3", "Photon OS 3", "x86_64", "package"), + ("photonos-4", "Photon OS 4", "x86_64", "package"), + ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64", "package"), + ("ubuntu-20.04", "Ubuntu 20.04", "x86_64", "package"), + ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64", "package"), + ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "package"), + ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "package"), + ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "onedir"), + ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "onedir"), + ) + macos_entries = ( + ("macos-12", "macOS 12", "x86_64", "Package"), + ("macos-12", "macOS 12", "x86_64", "Onedir"), + ) + windows_entries = (("windows-2022", "Windows 2022", "amd64"),) + _matrix = [] + for distro, display_name, arch, pkg_type in linux_entries: + _matrix.append({"distro-slug": distro, "arch": arch, "pkg_type": pkg_type}) + _platforms["linux"] = _matrix + _matrix = [] + for distro, display_name, arch, pkg_type in macos_entries: + _matrix.append({"distro-slug": distro, "arch": arch, "pkg_type": pkg_type}) + _platforms["macos"] = _matrix + _matrix = [] + for distro, display_name, arch in windows_entries: + for pkg_type in ("nsis", "msi", "onedir"): + _matrix.append({"distro-slug": distro, "arch": arch, "pkg_type": pkg_type}) + _platforms["windows"] = _matrix + + ctx.info("Generated matrix:") + ctx.print(_platforms, soft_wrap=True) + + github_output = os.environ.get("GITHUB_OUTPUT") + if github_output is not None: + with open(github_output, "a", encoding="utf-8") as wfh: + wfh.write(f"matrix={json.dumps(_platforms)}\n") + ctx.exit(0) + + @ci.command( name="get-releases", arguments={ From 27768ab509c77ad8982a61e417632b66c3083a7f Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 8 Oct 2023 11:40:50 +0100 Subject: [PATCH 098/147] Define a `deps` job type Signed-off-by: Pedro Algarvio --- .github/workflows/ci.yml | 64 +++++++++---------- .github/workflows/nightly.yml | 64 +++++++++---------- .github/workflows/scheduled.yml | 64 +++++++++---------- .github/workflows/staging.yml | 64 +++++++++---------- .../templates/build-ci-deps.yml.jinja | 6 +- .github/workflows/templates/ci.yml.jinja | 2 +- tools/ci.py | 6 ++ 7 files changed, 138 insertions(+), 132 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cabeaf684cb..3aae43dbef4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -629,7 +629,7 @@ jobs: windows-2016-ci-deps: name: Windows 2016 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -646,7 +646,7 @@ jobs: windows-2019-ci-deps: name: Windows 2019 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -663,7 +663,7 @@ jobs: windows-2022-ci-deps: name: Windows 2022 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -680,7 +680,7 @@ jobs: macos-12-ci-deps: name: macOS 12 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - build-salt-onedir-macos @@ -697,7 +697,7 @@ jobs: almalinux-8-ci-deps: name: Alma Linux 8 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -714,7 +714,7 @@ jobs: almalinux-8-arm64-ci-deps: name: Alma Linux 8 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -731,7 +731,7 @@ jobs: almalinux-9-ci-deps: name: Alma Linux 9 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -748,7 +748,7 @@ jobs: almalinux-9-arm64-ci-deps: name: Alma Linux 9 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -765,7 +765,7 @@ jobs: amazonlinux-2-ci-deps: name: Amazon Linux 2 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -782,7 +782,7 @@ jobs: amazonlinux-2-arm64-ci-deps: name: Amazon Linux 2 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -799,7 +799,7 @@ jobs: archlinux-lts-ci-deps: name: Arch Linux LTS - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -816,7 +816,7 @@ jobs: centos-7-ci-deps: name: CentOS 7 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -833,7 +833,7 @@ jobs: centos-7-arm64-ci-deps: name: CentOS 7 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -850,7 +850,7 @@ jobs: centosstream-8-ci-deps: name: CentOS Stream 8 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -867,7 +867,7 @@ jobs: centosstream-8-arm64-ci-deps: name: CentOS Stream 8 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -884,7 +884,7 @@ jobs: centosstream-9-ci-deps: name: CentOS Stream 9 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -901,7 +901,7 @@ jobs: centosstream-9-arm64-ci-deps: name: CentOS Stream 9 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -918,7 +918,7 @@ jobs: debian-10-ci-deps: name: Debian 10 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -935,7 +935,7 @@ jobs: debian-11-ci-deps: name: Debian 11 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -952,7 +952,7 @@ jobs: debian-11-arm64-ci-deps: name: Debian 11 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -969,7 +969,7 @@ jobs: fedora-37-ci-deps: name: Fedora 37 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -986,7 +986,7 @@ jobs: fedora-37-arm64-ci-deps: name: Fedora 37 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1003,7 +1003,7 @@ jobs: fedora-38-ci-deps: name: Fedora 38 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1020,7 +1020,7 @@ jobs: fedora-38-arm64-ci-deps: name: Fedora 38 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1037,7 +1037,7 @@ jobs: opensuse-15-ci-deps: name: Opensuse 15 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1054,7 +1054,7 @@ jobs: photonos-3-ci-deps: name: Photon OS 3 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1071,7 +1071,7 @@ jobs: photonos-4-ci-deps: name: Photon OS 4 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1088,7 +1088,7 @@ jobs: photonos-4-arm64-ci-deps: name: Photon OS 4 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1105,7 +1105,7 @@ jobs: ubuntu-2004-ci-deps: name: Ubuntu 20.04 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1122,7 +1122,7 @@ jobs: ubuntu-2004-arm64-ci-deps: name: Ubuntu 20.04 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1139,7 +1139,7 @@ jobs: ubuntu-2204-ci-deps: name: Ubuntu 22.04 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1156,7 +1156,7 @@ jobs: ubuntu-2204-arm64-ci-deps: name: Ubuntu 22.04 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 6f570114738..b4aed92fe91 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -690,7 +690,7 @@ jobs: windows-2016-ci-deps: name: Windows 2016 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -707,7 +707,7 @@ jobs: windows-2019-ci-deps: name: Windows 2019 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -724,7 +724,7 @@ jobs: windows-2022-ci-deps: name: Windows 2022 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -741,7 +741,7 @@ jobs: macos-12-ci-deps: name: macOS 12 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - build-salt-onedir-macos @@ -758,7 +758,7 @@ jobs: almalinux-8-ci-deps: name: Alma Linux 8 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -775,7 +775,7 @@ jobs: almalinux-8-arm64-ci-deps: name: Alma Linux 8 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -792,7 +792,7 @@ jobs: almalinux-9-ci-deps: name: Alma Linux 9 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -809,7 +809,7 @@ jobs: almalinux-9-arm64-ci-deps: name: Alma Linux 9 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -826,7 +826,7 @@ jobs: amazonlinux-2-ci-deps: name: Amazon Linux 2 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -843,7 +843,7 @@ jobs: amazonlinux-2-arm64-ci-deps: name: Amazon Linux 2 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -860,7 +860,7 @@ jobs: archlinux-lts-ci-deps: name: Arch Linux LTS - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -877,7 +877,7 @@ jobs: centos-7-ci-deps: name: CentOS 7 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -894,7 +894,7 @@ jobs: centos-7-arm64-ci-deps: name: CentOS 7 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -911,7 +911,7 @@ jobs: centosstream-8-ci-deps: name: CentOS Stream 8 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -928,7 +928,7 @@ jobs: centosstream-8-arm64-ci-deps: name: CentOS Stream 8 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -945,7 +945,7 @@ jobs: centosstream-9-ci-deps: name: CentOS Stream 9 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -962,7 +962,7 @@ jobs: centosstream-9-arm64-ci-deps: name: CentOS Stream 9 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -979,7 +979,7 @@ jobs: debian-10-ci-deps: name: Debian 10 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -996,7 +996,7 @@ jobs: debian-11-ci-deps: name: Debian 11 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1013,7 +1013,7 @@ jobs: debian-11-arm64-ci-deps: name: Debian 11 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1030,7 +1030,7 @@ jobs: fedora-37-ci-deps: name: Fedora 37 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1047,7 +1047,7 @@ jobs: fedora-37-arm64-ci-deps: name: Fedora 37 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1064,7 +1064,7 @@ jobs: fedora-38-ci-deps: name: Fedora 38 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1081,7 +1081,7 @@ jobs: fedora-38-arm64-ci-deps: name: Fedora 38 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1098,7 +1098,7 @@ jobs: opensuse-15-ci-deps: name: Opensuse 15 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1115,7 +1115,7 @@ jobs: photonos-3-ci-deps: name: Photon OS 3 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1132,7 +1132,7 @@ jobs: photonos-4-ci-deps: name: Photon OS 4 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1149,7 +1149,7 @@ jobs: photonos-4-arm64-ci-deps: name: Photon OS 4 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1166,7 +1166,7 @@ jobs: ubuntu-2004-ci-deps: name: Ubuntu 20.04 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1183,7 +1183,7 @@ jobs: ubuntu-2004-arm64-ci-deps: name: Ubuntu 20.04 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1200,7 +1200,7 @@ jobs: ubuntu-2204-ci-deps: name: Ubuntu 22.04 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1217,7 +1217,7 @@ jobs: ubuntu-2204-arm64-ci-deps: name: Ubuntu 22.04 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index f0adb6704ba..ceecd84ad02 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -663,7 +663,7 @@ jobs: windows-2016-ci-deps: name: Windows 2016 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -680,7 +680,7 @@ jobs: windows-2019-ci-deps: name: Windows 2019 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -697,7 +697,7 @@ jobs: windows-2022-ci-deps: name: Windows 2022 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -714,7 +714,7 @@ jobs: macos-12-ci-deps: name: macOS 12 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - build-salt-onedir-macos @@ -731,7 +731,7 @@ jobs: almalinux-8-ci-deps: name: Alma Linux 8 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -748,7 +748,7 @@ jobs: almalinux-8-arm64-ci-deps: name: Alma Linux 8 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -765,7 +765,7 @@ jobs: almalinux-9-ci-deps: name: Alma Linux 9 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -782,7 +782,7 @@ jobs: almalinux-9-arm64-ci-deps: name: Alma Linux 9 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -799,7 +799,7 @@ jobs: amazonlinux-2-ci-deps: name: Amazon Linux 2 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -816,7 +816,7 @@ jobs: amazonlinux-2-arm64-ci-deps: name: Amazon Linux 2 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -833,7 +833,7 @@ jobs: archlinux-lts-ci-deps: name: Arch Linux LTS - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -850,7 +850,7 @@ jobs: centos-7-ci-deps: name: CentOS 7 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -867,7 +867,7 @@ jobs: centos-7-arm64-ci-deps: name: CentOS 7 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -884,7 +884,7 @@ jobs: centosstream-8-ci-deps: name: CentOS Stream 8 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -901,7 +901,7 @@ jobs: centosstream-8-arm64-ci-deps: name: CentOS Stream 8 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -918,7 +918,7 @@ jobs: centosstream-9-ci-deps: name: CentOS Stream 9 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -935,7 +935,7 @@ jobs: centosstream-9-arm64-ci-deps: name: CentOS Stream 9 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -952,7 +952,7 @@ jobs: debian-10-ci-deps: name: Debian 10 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -969,7 +969,7 @@ jobs: debian-11-ci-deps: name: Debian 11 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -986,7 +986,7 @@ jobs: debian-11-arm64-ci-deps: name: Debian 11 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1003,7 +1003,7 @@ jobs: fedora-37-ci-deps: name: Fedora 37 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1020,7 +1020,7 @@ jobs: fedora-37-arm64-ci-deps: name: Fedora 37 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1037,7 +1037,7 @@ jobs: fedora-38-ci-deps: name: Fedora 38 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1054,7 +1054,7 @@ jobs: fedora-38-arm64-ci-deps: name: Fedora 38 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1071,7 +1071,7 @@ jobs: opensuse-15-ci-deps: name: Opensuse 15 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1088,7 +1088,7 @@ jobs: photonos-3-ci-deps: name: Photon OS 3 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1105,7 +1105,7 @@ jobs: photonos-4-ci-deps: name: Photon OS 4 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1122,7 +1122,7 @@ jobs: photonos-4-arm64-ci-deps: name: Photon OS 4 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1139,7 +1139,7 @@ jobs: ubuntu-2004-ci-deps: name: Ubuntu 20.04 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1156,7 +1156,7 @@ jobs: ubuntu-2004-arm64-ci-deps: name: Ubuntu 20.04 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1173,7 +1173,7 @@ jobs: ubuntu-2204-ci-deps: name: Ubuntu 22.04 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1190,7 +1190,7 @@ jobs: ubuntu-2204-arm64-ci-deps: name: Ubuntu 22.04 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 3c88248c6dc..66b4edacbb7 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -685,7 +685,7 @@ jobs: windows-2016-ci-deps: name: Windows 2016 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -702,7 +702,7 @@ jobs: windows-2019-ci-deps: name: Windows 2019 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -719,7 +719,7 @@ jobs: windows-2022-ci-deps: name: Windows 2022 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -736,7 +736,7 @@ jobs: macos-12-ci-deps: name: macOS 12 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - build-salt-onedir-macos @@ -753,7 +753,7 @@ jobs: almalinux-8-ci-deps: name: Alma Linux 8 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -770,7 +770,7 @@ jobs: almalinux-8-arm64-ci-deps: name: Alma Linux 8 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -787,7 +787,7 @@ jobs: almalinux-9-ci-deps: name: Alma Linux 9 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -804,7 +804,7 @@ jobs: almalinux-9-arm64-ci-deps: name: Alma Linux 9 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -821,7 +821,7 @@ jobs: amazonlinux-2-ci-deps: name: Amazon Linux 2 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -838,7 +838,7 @@ jobs: amazonlinux-2-arm64-ci-deps: name: Amazon Linux 2 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -855,7 +855,7 @@ jobs: archlinux-lts-ci-deps: name: Arch Linux LTS - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -872,7 +872,7 @@ jobs: centos-7-ci-deps: name: CentOS 7 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -889,7 +889,7 @@ jobs: centos-7-arm64-ci-deps: name: CentOS 7 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -906,7 +906,7 @@ jobs: centosstream-8-ci-deps: name: CentOS Stream 8 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -923,7 +923,7 @@ jobs: centosstream-8-arm64-ci-deps: name: CentOS Stream 8 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -940,7 +940,7 @@ jobs: centosstream-9-ci-deps: name: CentOS Stream 9 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -957,7 +957,7 @@ jobs: centosstream-9-arm64-ci-deps: name: CentOS Stream 9 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -974,7 +974,7 @@ jobs: debian-10-ci-deps: name: Debian 10 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -991,7 +991,7 @@ jobs: debian-11-ci-deps: name: Debian 11 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1008,7 +1008,7 @@ jobs: debian-11-arm64-ci-deps: name: Debian 11 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1025,7 +1025,7 @@ jobs: fedora-37-ci-deps: name: Fedora 37 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1042,7 +1042,7 @@ jobs: fedora-37-arm64-ci-deps: name: Fedora 37 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1059,7 +1059,7 @@ jobs: fedora-38-ci-deps: name: Fedora 38 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1076,7 +1076,7 @@ jobs: fedora-38-arm64-ci-deps: name: Fedora 38 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1093,7 +1093,7 @@ jobs: opensuse-15-ci-deps: name: Opensuse 15 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1110,7 +1110,7 @@ jobs: photonos-3-ci-deps: name: Photon OS 3 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1127,7 +1127,7 @@ jobs: photonos-4-ci-deps: name: Photon OS 4 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1144,7 +1144,7 @@ jobs: photonos-4-arm64-ci-deps: name: Photon OS 4 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1161,7 +1161,7 @@ jobs: ubuntu-2004-ci-deps: name: Ubuntu 20.04 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1178,7 +1178,7 @@ jobs: ubuntu-2004-arm64-ci-deps: name: Ubuntu 20.04 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1195,7 +1195,7 @@ jobs: ubuntu-2204-ci-deps: name: Ubuntu 22.04 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1212,7 +1212,7 @@ jobs: ubuntu-2204-arm64-ci-deps: name: Ubuntu 22.04 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux diff --git a/.github/workflows/templates/build-ci-deps.yml.jinja b/.github/workflows/templates/build-ci-deps.yml.jinja index 7faabaee761..93feecd994e 100644 --- a/.github/workflows/templates/build-ci-deps.yml.jinja +++ b/.github/workflows/templates/build-ci-deps.yml.jinja @@ -6,7 +6,7 @@ <{ slug.replace(".", "") }>-ci-deps: <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> name: <{ display_name }> - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -28,7 +28,7 @@ <{ slug.replace(".", "") }>-ci-deps: <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> name: <{ display_name }> - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - build-salt-onedir-macos @@ -77,7 +77,7 @@ <{ slug.replace(".", "") }>-ci-deps: <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> name: <{ display_name }> - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux diff --git a/.github/workflows/templates/ci.yml.jinja b/.github/workflows/templates/ci.yml.jinja index e40a65b956a..d757c5558e2 100644 --- a/.github/workflows/templates/ci.yml.jinja +++ b/.github/workflows/templates/ci.yml.jinja @@ -309,7 +309,7 @@ <%- set pkg_tests_job_name = "pkg-tests" %> <%- set salt_tests_job_name = "salt-tests" %> - <%- if includes.get(pkg_tests_job_name, True) or includes.get(salt_tests_job_name, True) %> + <%- if includes.get(pkg_tests_job_name, True) or includes.get(salt_tests_job_name, True) or includes.get("test-pkg-downloads", True) %> <%- include "build-ci-deps.yml.jinja" %> <%- endif %> diff --git a/tools/ci.py b/tools/ci.py index 5cebdef78b2..8e5143fa010 100644 --- a/tools/ci.py +++ b/tools/ci.py @@ -276,6 +276,7 @@ def define_jobs( jobs = { "lint": True, + "deps": True, "test": True, "test-pkg": True, "test-pkg-download": True, @@ -294,6 +295,11 @@ def define_jobs( if skip_pkg_download_tests: jobs["test-pkg-download"] = False + if {skip_tests, skip_pkg_tests, skip_pkg_download_tests} == {False}: + with open(github_step_summary, "a", encoding="utf-8") as wfh: + wfh.write("De-selecting the 'deps' job.\n") + jobs["deps"] = False + if event_name != "pull_request": # In this case, all defined jobs should run ctx.info("Writing 'jobs' to the github outputs file") From 19c4a350216af40d90dfbe26d934adbcb37a56e0 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 8 Oct 2023 11:42:35 +0100 Subject: [PATCH 099/147] Move the test salt listing to `tools/pre_commit.py` Signed-off-by: Pedro Algarvio --- .../workflows/templates/test-salt.yml.jinja | 29 +++-------------- tools/pre_commit.py | 31 +++++++++++++++++++ 2 files changed, 36 insertions(+), 24 deletions(-) diff --git a/.github/workflows/templates/test-salt.yml.jinja b/.github/workflows/templates/test-salt.yml.jinja index 688d9df5263..91e222aaccc 100644 --- a/.github/workflows/templates/test-salt.yml.jinja +++ b/.github/workflows/templates/test-salt.yml.jinja @@ -1,7 +1,5 @@ - <%- for slug, display_name, arch in (("windows-2016", "Windows 2016", "amd64"), - ("windows-2019", "Windows 2019", "amd64"), - ("windows-2022", "Windows 2022", "amd64")) %> + <%- for slug, display_name, arch in test_salt_listing["windows"] %> <{ slug.replace(".", "") }>: <%- do test_salt_needs.append(slug.replace(".", "")) %> @@ -26,7 +24,8 @@ <%- endfor %> - <%- for slug, display_name, arch in (("macos-12", "macOS 12", "x86_64"),) %> + + <%- for slug, display_name, arch in test_salt_listing["macos"] %> <{ slug.replace(".", "") }>: <%- do test_salt_needs.append(slug.replace(".", "")) %> @@ -51,26 +50,8 @@ <%- endfor %> - <%- for slug, display_name, arch in (("almalinux-8", "Alma Linux 8", "x86_64"), - ("almalinux-9", "Alma Linux 9", "x86_64"), - ("amazonlinux-2", "Amazon Linux 2", "x86_64"), - ("archlinux-lts", "Arch Linux LTS", "x86_64"), - ("centos-7", "CentOS 7", "x86_64"), - ("centosstream-8", "CentOS Stream 8", "x86_64"), - ("centosstream-9", "CentOS Stream 9", "x86_64"), - ("debian-10", "Debian 10", "x86_64"), - ("debian-11", "Debian 11", "x86_64"), - ("debian-11-arm64", "Debian 11 Arm64", "aarch64"), - ("fedora-37", "Fedora 37", "x86_64"), - ("fedora-38", "Fedora 38", "x86_64"), - ("opensuse-15", "Opensuse 15", "x86_64"), - ("photonos-3", "Photon OS 3", "x86_64"), - ("photonos-4", "Photon OS 4", "x86_64"), - ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64"), - ("ubuntu-20.04", "Ubuntu 20.04", "x86_64"), - ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64"), - ("ubuntu-22.04", "Ubuntu 22.04", "x86_64"), - ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64")) %> + + <%- for slug, display_name, arch in test_salt_listing["linux"] %> <{ slug.replace(".", "") }>: <%- do test_salt_needs.append(slug.replace(".", "")) %> diff --git a/tools/pre_commit.py b/tools/pre_commit.py index af054876d80..fc92769e095 100644 --- a/tools/pre_commit.py +++ b/tools/pre_commit.py @@ -81,6 +81,36 @@ def generate_workflows(ctx: Context): }, }, } + test_salt_listing = { + "linux": ( + ("almalinux-8", "Alma Linux 8", "x86_64"), + ("almalinux-9", "Alma Linux 9", "x86_64"), + ("amazonlinux-2", "Amazon Linux 2", "x86_64"), + ("archlinux-lts", "Arch Linux LTS", "x86_64"), + ("centos-7", "CentOS 7", "x86_64"), + ("centosstream-8", "CentOS Stream 8", "x86_64"), + ("centosstream-9", "CentOS Stream 9", "x86_64"), + ("debian-10", "Debian 10", "x86_64"), + ("debian-11", "Debian 11", "x86_64"), + ("debian-11-arm64", "Debian 11 Arm64", "aarch64"), + ("fedora-37", "Fedora 37", "x86_64"), + ("fedora-38", "Fedora 38", "x86_64"), + ("opensuse-15", "Opensuse 15", "x86_64"), + ("photonos-3", "Photon OS 3", "x86_64"), + ("photonos-4", "Photon OS 4", "x86_64"), + ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64"), + ("ubuntu-20.04", "Ubuntu 20.04", "x86_64"), + ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64"), + ("ubuntu-22.04", "Ubuntu 22.04", "x86_64"), + ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64"), + ), + "macos": (("macos-12", "macOS 12", "x86_64"),), + "windows": ( + ("windows-2016", "Windows 2016", "amd64"), + ("windows-2019", "Windows 2019", "amd64"), + ("windows-2022", "Windows 2022", "amd64"), + ), + } env = Environment( block_start_string="<%", block_end_string="%>", @@ -115,6 +145,7 @@ def generate_workflows(ctx: Context): "test_repo_needs": NeedsTracker(), "prepare_workflow_needs": NeedsTracker(), "build_repo_needs": NeedsTracker(), + "test_salt_listing": test_salt_listing, } shared_context_file = ( tools.utils.REPO_ROOT / "cicd" / "shared-gh-workflows-context.yml" From e0a0cbea281fd8c6a49891687189893f270761ef Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 8 Oct 2023 11:54:51 +0100 Subject: [PATCH 100/147] Move the test salt pkg listing to `tools/pre_commit.py` Signed-off-by: Pedro Algarvio --- .../templates/test-salt-pkg.yml.jinja | 43 ++----------------- tools/pre_commit.py | 25 +++++++++++ 2 files changed, 28 insertions(+), 40 deletions(-) diff --git a/.github/workflows/templates/test-salt-pkg.yml.jinja b/.github/workflows/templates/test-salt-pkg.yml.jinja index d078bea80e2..64617d7054d 100644 --- a/.github/workflows/templates/test-salt-pkg.yml.jinja +++ b/.github/workflows/templates/test-salt-pkg.yml.jinja @@ -1,39 +1,4 @@ - <%- set linux_pkg_tests = ( - ("almalinux-8", "Alma Linux 8", "x86_64", "rpm"), - ("almalinux-9", "Alma Linux 9", "x86_64", "rpm"), - ("amazonlinux-2", "Amazon Linux 2", "x86_64", "rpm"), - ("centos-7", "CentOS 7", "x86_64", "rpm"), - ("centosstream-8", "CentOS Stream 8", "x86_64", "rpm"), - ("centosstream-9", "CentOS Stream 9", "x86_64", "rpm"), - ("debian-10", "Debian 10", "x86_64", "deb"), - ("debian-11", "Debian 11", "x86_64", "deb"), - ("debian-11-arm64", "Debian 11 Arm64", "aarch64", "deb"), - ("fedora-37", "Fedora 37", "x86_64", "rpm"), - ("fedora-38", "Fedora 38", "x86_64", "rpm"), - ("ubuntu-20.04", "Ubuntu 20.04", "x86_64", "deb"), - ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64", "deb"), - ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "deb"), - ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "deb") - ) %> - - <%- set linux_pkg_tests = ( - ("amazonlinux-2", "Amazon Linux 2", "x86_64", "rpm"), - ("centos-7", "CentOS 7", "x86_64", "rpm"), - ("centosstream-8", "CentOS Stream 8", "x86_64", "rpm"), - ("centosstream-9", "CentOS Stream 9", "x86_64", "rpm"), - ("debian-10", "Debian 10", "x86_64", "deb"), - ("debian-11", "Debian 11", "x86_64", "deb"), - ("debian-11-arm64", "Debian 11 Arm64", "aarch64", "deb"), - ("photonos-3", "Photon OS 3", "x86_64", "rpm"), - ("photonos-4", "Photon OS 4", "x86_64", "rpm"), - ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64", "rpm"), - ("ubuntu-20.04", "Ubuntu 20.04", "x86_64", "deb"), - ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64", "deb"), - ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "deb"), - ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "deb") - ) %> - - <%- for slug, display_name, arch, pkg_type in linux_pkg_tests %> + <%- for slug, display_name, arch, pkg_type in test_salt_pkg_listing["linux"] %> <%- set job_name = "{}-pkg-tests".format(slug.replace(".", "")) %> <{ job_name }>: @@ -63,7 +28,7 @@ - <%- for slug, display_name, arch in (("macos-12", "macOS 12", "x86_64"),) %> + <%- for slug, display_name, arch in test_salt_pkg_listing["macos"] %> <%- set job_name = "{}-pkg-tests".format(slug.replace(".", "")) %> <{ job_name }>: @@ -92,9 +57,7 @@ <%- endfor %> - <%- for slug, display_name, arch in (("windows-2016", "Windows 2016", "amd64"), - ("windows-2019", "Windows 2019", "amd64"), - ("windows-2022", "Windows 2022", "amd64")) %> + <%- for slug, display_name, arch in test_salt_pkg_listing["windows"] %> <%- for pkg_type in ("NSIS", "MSI") %> <%- set job_name = "{}-{}-pkg-tests".format(slug.replace(".", ""), pkg_type.lower()) %> diff --git a/tools/pre_commit.py b/tools/pre_commit.py index fc92769e095..647a6ed07c1 100644 --- a/tools/pre_commit.py +++ b/tools/pre_commit.py @@ -111,6 +111,30 @@ def generate_workflows(ctx: Context): ("windows-2022", "Windows 2022", "amd64"), ), } + test_salt_pkg_listing = { + "linux": ( + ("amazonlinux-2", "Amazon Linux 2", "x86_64", "rpm"), + ("centos-7", "CentOS 7", "x86_64", "rpm"), + ("centosstream-8", "CentOS Stream 8", "x86_64", "rpm"), + ("centosstream-9", "CentOS Stream 9", "x86_64", "rpm"), + ("debian-10", "Debian 10", "x86_64", "deb"), + ("debian-11", "Debian 11", "x86_64", "deb"), + ("debian-11-arm64", "Debian 11 Arm64", "aarch64", "deb"), + ("photonos-3", "Photon OS 3", "x86_64", "rpm"), + ("photonos-4", "Photon OS 4", "x86_64", "rpm"), + ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64", "rpm"), + ("ubuntu-20.04", "Ubuntu 20.04", "x86_64", "deb"), + ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64", "deb"), + ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "deb"), + ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "deb"), + ), + "macos": (("macos-12", "macOS 12", "x86_64"),), + "windows": ( + ("windows-2016", "Windows 2016", "amd64"), + ("windows-2019", "Windows 2019", "amd64"), + ("windows-2022", "Windows 2022", "amd64"), + ), + } env = Environment( block_start_string="<%", block_end_string="%>", @@ -146,6 +170,7 @@ def generate_workflows(ctx: Context): "prepare_workflow_needs": NeedsTracker(), "build_repo_needs": NeedsTracker(), "test_salt_listing": test_salt_listing, + "test_salt_pkg_listing": test_salt_pkg_listing, } shared_context_file = ( tools.utils.REPO_ROOT / "cicd" / "shared-gh-workflows-context.yml" From 8abb6c9099d99a2720456c081928c46caba7ce59 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 8 Oct 2023 12:04:35 +0100 Subject: [PATCH 101/147] Move the build ci deps listing to `tools/pre_commit.py` Signed-off-by: Pedro Algarvio --- .../templates/build-ci-deps.yml.jinja | 37 +++--------------- tools/pre_commit.py | 39 +++++++++++++++++++ 2 files changed, 44 insertions(+), 32 deletions(-) diff --git a/.github/workflows/templates/build-ci-deps.yml.jinja b/.github/workflows/templates/build-ci-deps.yml.jinja index 93feecd994e..1a5402d80ce 100644 --- a/.github/workflows/templates/build-ci-deps.yml.jinja +++ b/.github/workflows/templates/build-ci-deps.yml.jinja @@ -1,7 +1,5 @@ - <%- for slug, display_name, arch in (("windows-2016", "Windows 2016", "amd64"), - ("windows-2019", "Windows 2019", "amd64"), - ("windows-2022", "Windows 2022", "amd64")) %> + <%- for slug, display_name, arch in build_ci_deps_listing["windows"] %> <{ slug.replace(".", "") }>-ci-deps: <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> @@ -23,7 +21,8 @@ <%- endfor %> - <%- for slug, display_name, arch in (("macos-12", "macOS 12", "x86_64"),) %> + + <%- for slug, display_name, arch in build_ci_deps_listing["macos"] %> <{ slug.replace(".", "") }>-ci-deps: <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> @@ -45,34 +44,8 @@ <%- endfor %> - <%- for slug, display_name, arch in (("almalinux-8", "Alma Linux 8", "x86_64"), - ("almalinux-8-arm64", "Alma Linux 8 Arm64", "aarch64"), - ("almalinux-9", "Alma Linux 9", "x86_64"), - ("almalinux-9-arm64", "Alma Linux 9 Arm64", "aarch64"), - ("amazonlinux-2", "Amazon Linux 2", "x86_64"), - ("amazonlinux-2-arm64", "Amazon Linux 2 Arm64", "aarch64"), - ("archlinux-lts", "Arch Linux LTS", "x86_64"), - ("centos-7", "CentOS 7", "x86_64"), - ("centos-7-arm64", "CentOS 7 Arm64", "aarch64"), - ("centosstream-8", "CentOS Stream 8", "x86_64"), - ("centosstream-8-arm64", "CentOS Stream 8 Arm64", "aarch64"), - ("centosstream-9", "CentOS Stream 9", "x86_64"), - ("centosstream-9-arm64", "CentOS Stream 9 Arm64", "aarch64"), - ("debian-10", "Debian 10", "x86_64"), - ("debian-11", "Debian 11", "x86_64"), - ("debian-11-arm64", "Debian 11 Arm64", "aarch64"), - ("fedora-37", "Fedora 37", "x86_64"), - ("fedora-37-arm64", "Fedora 37 Arm64", "aarch64"), - ("fedora-38", "Fedora 38", "x86_64"), - ("fedora-38-arm64", "Fedora 38 Arm64", "aarch64"), - ("opensuse-15", "Opensuse 15", "x86_64"), - ("photonos-3", "Photon OS 3", "x86_64"), - ("photonos-4", "Photon OS 4", "x86_64"), - ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64"), - ("ubuntu-20.04", "Ubuntu 20.04", "x86_64"), - ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64"), - ("ubuntu-22.04", "Ubuntu 22.04", "x86_64"), - ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64")) %> + + <%- for slug, display_name, arch in build_ci_deps_listing["linux"] %> <{ slug.replace(".", "") }>-ci-deps: <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> diff --git a/tools/pre_commit.py b/tools/pre_commit.py index 647a6ed07c1..e4738445606 100644 --- a/tools/pre_commit.py +++ b/tools/pre_commit.py @@ -135,6 +135,44 @@ def generate_workflows(ctx: Context): ("windows-2022", "Windows 2022", "amd64"), ), } + build_ci_deps_listing = { + "linux": ( + ("almalinux-8", "Alma Linux 8", "x86_64"), + ("almalinux-8-arm64", "Alma Linux 8 Arm64", "aarch64"), + ("almalinux-9", "Alma Linux 9", "x86_64"), + ("almalinux-9-arm64", "Alma Linux 9 Arm64", "aarch64"), + ("amazonlinux-2", "Amazon Linux 2", "x86_64"), + ("amazonlinux-2-arm64", "Amazon Linux 2 Arm64", "aarch64"), + ("archlinux-lts", "Arch Linux LTS", "x86_64"), + ("centos-7", "CentOS 7", "x86_64"), + ("centos-7-arm64", "CentOS 7 Arm64", "aarch64"), + ("centosstream-8", "CentOS Stream 8", "x86_64"), + ("centosstream-8-arm64", "CentOS Stream 8 Arm64", "aarch64"), + ("centosstream-9", "CentOS Stream 9", "x86_64"), + ("centosstream-9-arm64", "CentOS Stream 9 Arm64", "aarch64"), + ("debian-10", "Debian 10", "x86_64"), + ("debian-11", "Debian 11", "x86_64"), + ("debian-11-arm64", "Debian 11 Arm64", "aarch64"), + ("fedora-37", "Fedora 37", "x86_64"), + ("fedora-37-arm64", "Fedora 37 Arm64", "aarch64"), + ("fedora-38", "Fedora 38", "x86_64"), + ("fedora-38-arm64", "Fedora 38 Arm64", "aarch64"), + ("opensuse-15", "Opensuse 15", "x86_64"), + ("photonos-3", "Photon OS 3", "x86_64"), + ("photonos-4", "Photon OS 4", "x86_64"), + ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64"), + ("ubuntu-20.04", "Ubuntu 20.04", "x86_64"), + ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64"), + ("ubuntu-22.04", "Ubuntu 22.04", "x86_64"), + ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64"), + ), + "macos": (("macos-12", "macOS 12", "x86_64"),), + "windows": ( + ("windows-2016", "Windows 2016", "amd64"), + ("windows-2019", "Windows 2019", "amd64"), + ("windows-2022", "Windows 2022", "amd64"), + ), + } env = Environment( block_start_string="<%", block_end_string="%>", @@ -171,6 +209,7 @@ def generate_workflows(ctx: Context): "build_repo_needs": NeedsTracker(), "test_salt_listing": test_salt_listing, "test_salt_pkg_listing": test_salt_pkg_listing, + "build_ci_deps_listing": build_ci_deps_listing, } shared_context_file = ( tools.utils.REPO_ROOT / "cicd" / "shared-gh-workflows-context.yml" From fa1f0dac52ceaa7ba4b31202bc2ef91394b8079a Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 8 Oct 2023 13:15:03 +0100 Subject: [PATCH 102/147] Even the release workflow should be working now Signed-off-by: Pedro Algarvio --- .github/workflows/release.yml | 574 +++++++++++++- .github/workflows/staging.yml | 28 + .../templates/build-ci-deps.yml.jinja | 18 + .github/workflows/templates/release.yml.jinja | 4 +- .../test-package-downloads-action.yml.jinja | 737 ++++++++++++++++++ .../test-salt-pkg-repo-downloads.yml.jinja | 3 + .../test-package-downloads-action.yml | 209 ++++- tools/ci.py | 68 -- tools/pre_commit.py | 41 +- 9 files changed, 1572 insertions(+), 110 deletions(-) create mode 100644 .github/workflows/templates/test-package-downloads-action.yml.jinja diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 07785a31e1e..700659a301f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -112,7 +112,7 @@ jobs: - name: Set Cache Seed Output id: set-cache-seed run: | - echo "cache-seed=${{ env.CACHE_SEED }}" >> "$GITHUB_OUTPUT" + tools ci define-cache-seed ${{ env.CACHE_SEED }} download-onedir-artifact: name: Download Staging Onedir Artifact @@ -162,6 +162,518 @@ jobs: retention-days: 7 if-no-files-found: error + windows-2016-ci-deps: + name: Windows 2016 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: windows-2016 + nox-session: ci-test-onedir + platform: windows + arch: amd64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + windows-2019-ci-deps: + name: Windows 2019 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: windows-2019 + nox-session: ci-test-onedir + platform: windows + arch: amd64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + windows-2022-ci-deps: + name: Windows 2022 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: windows-2022 + nox-session: ci-test-onedir + platform: windows + arch: amd64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + macos-12-ci-deps: + name: macOS 12 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action-macos.yml + with: + distro-slug: macos-12 + nox-session: ci-test-onedir + platform: darwin + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + almalinux-8-ci-deps: + name: Alma Linux 8 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: almalinux-8 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + almalinux-8-arm64-ci-deps: + name: Alma Linux 8 Arm64 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: almalinux-8-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + almalinux-9-ci-deps: + name: Alma Linux 9 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: almalinux-9 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + almalinux-9-arm64-ci-deps: + name: Alma Linux 9 Arm64 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: almalinux-9-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + amazonlinux-2-ci-deps: + name: Amazon Linux 2 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: amazonlinux-2 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + amazonlinux-2-arm64-ci-deps: + name: Amazon Linux 2 Arm64 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: amazonlinux-2-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + archlinux-lts-ci-deps: + name: Arch Linux LTS + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: archlinux-lts + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centos-7-ci-deps: + name: CentOS 7 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centos-7 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centos-7-arm64-ci-deps: + name: CentOS 7 Arm64 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centos-7-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centosstream-8-ci-deps: + name: CentOS Stream 8 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centosstream-8 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centosstream-8-arm64-ci-deps: + name: CentOS Stream 8 Arm64 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centosstream-8-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centosstream-9-ci-deps: + name: CentOS Stream 9 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centosstream-9 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centosstream-9-arm64-ci-deps: + name: CentOS Stream 9 Arm64 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centosstream-9-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + debian-10-ci-deps: + name: Debian 10 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: debian-10 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + debian-11-ci-deps: + name: Debian 11 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: debian-11 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + debian-11-arm64-ci-deps: + name: Debian 11 Arm64 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: debian-11-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + fedora-37-ci-deps: + name: Fedora 37 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: fedora-37 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + fedora-37-arm64-ci-deps: + name: Fedora 37 Arm64 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: fedora-37-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + fedora-38-ci-deps: + name: Fedora 38 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: fedora-38 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + fedora-38-arm64-ci-deps: + name: Fedora 38 Arm64 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: fedora-38-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + opensuse-15-ci-deps: + name: Opensuse 15 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: opensuse-15 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + photonos-3-ci-deps: + name: Photon OS 3 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: photonos-3 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + photonos-4-ci-deps: + name: Photon OS 4 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: photonos-4 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + photonos-4-arm64-ci-deps: + name: Photon OS 4 Arm64 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: photonos-4-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + ubuntu-2004-ci-deps: + name: Ubuntu 20.04 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: ubuntu-20.04 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + ubuntu-2004-arm64-ci-deps: + name: Ubuntu 20.04 Arm64 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: ubuntu-20.04-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + ubuntu-2204-ci-deps: + name: Ubuntu 22.04 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: ubuntu-22.04 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + ubuntu-2204-arm64-ci-deps: + name: Ubuntu 22.04 Arm64 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: ubuntu-22.04-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + backup: name: Backup runs-on: @@ -229,6 +741,34 @@ jobs: needs: - prepare-workflow - publish-repositories + - almalinux-8-arm64-ci-deps + - almalinux-8-ci-deps + - almalinux-9-arm64-ci-deps + - almalinux-9-ci-deps + - amazonlinux-2-arm64-ci-deps + - amazonlinux-2-ci-deps + - centos-7-arm64-ci-deps + - centos-7-ci-deps + - centosstream-8-arm64-ci-deps + - centosstream-8-ci-deps + - centosstream-9-arm64-ci-deps + - centosstream-9-ci-deps + - debian-10-ci-deps + - debian-11-arm64-ci-deps + - debian-11-ci-deps + - fedora-37-arm64-ci-deps + - fedora-37-ci-deps + - fedora-38-arm64-ci-deps + - fedora-38-ci-deps + - macos-12-ci-deps + - photonos-3-ci-deps + - photonos-4-arm64-ci-deps + - photonos-4-ci-deps + - ubuntu-2004-arm64-ci-deps + - ubuntu-2004-ci-deps + - ubuntu-2204-arm64-ci-deps + - ubuntu-2204-ci-deps + - windows-2022-ci-deps - download-onedir-artifact uses: ./.github/workflows/test-package-downloads-action.yml with: @@ -416,6 +956,38 @@ jobs: - pkg-download-tests - release - publish-pypi + - windows-2016-ci-deps + - windows-2019-ci-deps + - windows-2022-ci-deps + - macos-12-ci-deps + - almalinux-8-ci-deps + - almalinux-8-arm64-ci-deps + - almalinux-9-ci-deps + - almalinux-9-arm64-ci-deps + - amazonlinux-2-ci-deps + - amazonlinux-2-arm64-ci-deps + - archlinux-lts-ci-deps + - centos-7-ci-deps + - centos-7-arm64-ci-deps + - centosstream-8-ci-deps + - centosstream-8-arm64-ci-deps + - centosstream-9-ci-deps + - centosstream-9-arm64-ci-deps + - debian-10-ci-deps + - debian-11-ci-deps + - debian-11-arm64-ci-deps + - fedora-37-ci-deps + - fedora-37-arm64-ci-deps + - fedora-38-ci-deps + - fedora-38-arm64-ci-deps + - opensuse-15-ci-deps + - photonos-3-ci-deps + - photonos-4-ci-deps + - photonos-4-arm64-ci-deps + - ubuntu-2004-ci-deps + - ubuntu-2004-arm64-ci-deps + - ubuntu-2204-ci-deps + - ubuntu-2204-arm64-ci-deps steps: - name: Get workflow information id: get-workflow-info diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 66b4edacbb7..fe53449c2ae 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -2974,6 +2974,34 @@ jobs: needs: - prepare-workflow - publish-repositories + - almalinux-8-arm64-ci-deps + - almalinux-8-ci-deps + - almalinux-9-arm64-ci-deps + - almalinux-9-ci-deps + - amazonlinux-2-arm64-ci-deps + - amazonlinux-2-ci-deps + - centos-7-arm64-ci-deps + - centos-7-ci-deps + - centosstream-8-arm64-ci-deps + - centosstream-8-ci-deps + - centosstream-9-arm64-ci-deps + - centosstream-9-ci-deps + - debian-10-ci-deps + - debian-11-arm64-ci-deps + - debian-11-ci-deps + - fedora-37-arm64-ci-deps + - fedora-37-ci-deps + - fedora-38-arm64-ci-deps + - fedora-38-ci-deps + - macos-12-ci-deps + - photonos-3-ci-deps + - photonos-4-arm64-ci-deps + - photonos-4-ci-deps + - ubuntu-2004-arm64-ci-deps + - ubuntu-2004-ci-deps + - ubuntu-2204-arm64-ci-deps + - ubuntu-2204-ci-deps + - windows-2022-ci-deps - build-salt-onedir-linux - build-salt-onedir-macos - build-salt-onedir-windows diff --git a/.github/workflows/templates/build-ci-deps.yml.jinja b/.github/workflows/templates/build-ci-deps.yml.jinja index 1a5402d80ce..fd6d7d46422 100644 --- a/.github/workflows/templates/build-ci-deps.yml.jinja +++ b/.github/workflows/templates/build-ci-deps.yml.jinja @@ -4,10 +4,16 @@ <{ slug.replace(".", "") }>-ci-deps: <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> name: <{ display_name }> + <%- if workflow_slug != 'release' %> if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + <%- endif %> needs: - prepare-workflow + <%- if workflow_slug != 'release' %> - build-salt-onedir-windows + <%- else %> + - download-onedir-artifact + <%- endif %> uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: <{ slug }> @@ -27,10 +33,16 @@ <{ slug.replace(".", "") }>-ci-deps: <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> name: <{ display_name }> + <%- if workflow_slug != 'release' %> if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + <%- endif %> needs: - prepare-workflow + <%- if workflow_slug != 'release' %> - build-salt-onedir-macos + <%- else %> + - download-onedir-artifact + <%- endif %> uses: ./.github/workflows/build-deps-ci-action-macos.yml with: distro-slug: <{ slug }> @@ -50,10 +62,16 @@ <{ slug.replace(".", "") }>-ci-deps: <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> name: <{ display_name }> + <%- if workflow_slug != 'release' %> if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + <%- endif %> needs: - prepare-workflow + <%- if workflow_slug != 'release' %> - build-salt-onedir-linux + <%- else %> + - download-onedir-artifact + <%- endif %> uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: <{ slug }> diff --git a/.github/workflows/templates/release.yml.jinja b/.github/workflows/templates/release.yml.jinja index 4e109f90463..c79fa26d02f 100644 --- a/.github/workflows/templates/release.yml.jinja +++ b/.github/workflows/templates/release.yml.jinja @@ -140,7 +140,7 @@ permissions: - name: Set Cache Seed Output id: set-cache-seed run: | - echo "cache-seed=${{ env.CACHE_SEED }}" >> "$GITHUB_OUTPUT" + tools ci define-cache-seed ${{ env.CACHE_SEED }} <%- endblock prepare_workflow_job %> <%- endif %> @@ -196,6 +196,8 @@ permissions: retention-days: 7 if-no-files-found: error + <%- include "build-ci-deps.yml.jinja" %> + backup: name: Backup runs-on: diff --git a/.github/workflows/templates/test-package-downloads-action.yml.jinja b/.github/workflows/templates/test-package-downloads-action.yml.jinja new file mode 100644 index 00000000000..ac66c8d8c1f --- /dev/null +++ b/.github/workflows/templates/test-package-downloads-action.yml.jinja @@ -0,0 +1,737 @@ +name: Test Download Packages + +on: + workflow_call: + inputs: + salt-version: + type: string + required: true + description: The Salt version of the packages to install and test + cache-prefix: + required: true + type: string + description: Seed used to invalidate caches + environment: + required: true + type: string + description: The environment to run tests against + latest-release: + required: true + type: string + description: The latest salt release + nox-version: + required: true + type: string + description: The nox version to install + python-version: + required: false + type: string + description: The python version to run tests with + default: "3.10" + package-name: + required: false + type: string + description: The onedir package name to use + default: salt + skip-code-coverage: + required: false + type: boolean + description: Skip code coverage + default: false + nox-session: + required: false + type: string + description: The nox session to run + default: ci-test-onedir + +env: + COLUMNS: 190 + AWS_MAX_ATTEMPTS: "10" + AWS_RETRY_MODE: "adaptive" + PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ + PIP_EXTRA_INDEX_URL: https://pypi.org/simple + +jobs: + + linux: + name: Linux + runs-on: + - self-hosted + - linux + - bastion + environment: ${{ inputs.environment }} + timeout-minutes: 120 # 2 Hours - More than this and something is wrong + strategy: + fail-fast: false + matrix: + include: + <%- for slug, arch, pkg_type in test_salt_pkg_downloads_listing["linux"] %> + - distro-slug: <{ slug }> + arch: <{ arch }> + pkg-type: <{ pkg_type }> + <%- endfor %> + + steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t" + + - name: Checkout Source Code + uses: actions/checkout@v4 + + - name: Download Onedir Tarball as an Artifact + uses: actions/download-artifact@v3 + with: + name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-linux-${{ matrix.arch }}.tar.xz + path: artifacts/ + + - name: Decompress Onedir Tarball + shell: bash + run: | + python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" + cd artifacts + tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-linux-${{ matrix.arch }}.tar.xz + + - name: Download cached nox.${{ matrix.distro-slug }}.tar.* for session ${{ inputs.nox-session }} + uses: actions/cache@v3 + with: + path: nox.${{ matrix.distro-slug }}.tar.* + key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch }}|${{ matrix.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ + hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') + }} + # If we get a cache miss here it means the dependencies step failed to save the cache + fail-on-cache-miss: true + + - name: Setup Python Tools Scripts + uses: ./.github/actions/setup-python-tools-scripts + + - name: Get Salt Project GitHub Actions Bot Environment + run: | + TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") + SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) + echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" + + - name: Start VM + id: spin-up-vm + run: | + tools --timestamps vm create --environment "${SPB_ENVIRONMENT}" --retries=2 ${{ matrix.distro-slug }} + + - name: List Free Space + run: | + tools --timestamps vm ssh ${{ matrix.distro-slug }} -- df -h || true + + - name: Upload Checkout To VM + run: | + tools --timestamps vm rsync ${{ matrix.distro-slug }} + + - name: Decompress .nox Directory + run: | + tools --timestamps vm decompress-dependencies ${{ matrix.distro-slug }} + + - name: Show System Info & Test Plan + env: + SALT_RELEASE: "${{ inputs.salt-version }}" + SALT_REPO_ARCH: ${{ matrix.arch }} + SALT_REPO_TYPE: ${{ inputs.environment }} + SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} + SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} + SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} + SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} + SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" + LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} + run: | + tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ + -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ + --nox-session=${{ inputs.nox-session }}-pkgs ${{ matrix.distro-slug }} -- download-pkgs + + - name: Run Package Download Tests + env: + SALT_RELEASE: "${{ inputs.salt-version }}" + SALT_REPO_ARCH: ${{ matrix.arch }} + SALT_REPO_TYPE: ${{ inputs.environment }} + SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} + SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} + SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} + SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} + SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" + LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} + run: | + tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ + -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ + --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ matrix.distro-slug }} -- download-pkgs + + - name: Combine Coverage Reports + if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' + run: | + tools --timestamps vm combine-coverage ${{ matrix.distro-slug }} + + - name: Download Test Run Artifacts + id: download-artifacts-from-vm + if: always() && steps.spin-up-vm.outcome == 'success' + run: | + tools --timestamps vm download-artifacts ${{ matrix.distro-slug }} + # Delete the salt onedir, we won't need it anymore and it will prevent + # from it showing in the tree command below + rm -rf artifacts/salt* + tree -a artifacts + + - name: Destroy VM + if: always() + run: | + tools --timestamps vm destroy --no-wait ${{ matrix.distro-slug }} || true + + - name: Fix file ownership + run: | + sudo chown -R "$(id -un)" . + + - name: Install Codecov CLI + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + # We can't yet use tokenless uploads with the codecov CLI + # python3 -m pip install codecov-cli + # + curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import + curl -Os https://uploader.codecov.io/latest/linux/codecov + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig + gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM + shasum -a 256 -c codecov.SHA256SUM + chmod +x codecov + + - name: Upload Source Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + if [ ! -s artifacts/coverage/salt.xml ]; then + echo "The artifacts/coverage/salt.xml file does not exist" + exit 1 + fi + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/salt.xml \ + # --flag salt --flag ${{ matrix.distro-slug }} --flag pkg \ + # --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/salt.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags salt,${{ matrix.distro-slug }},pkg \ + --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi + + - name: Upload Tests Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + if [ ! -s artifacts/coverage/tests.xml ]; then + echo "The artifacts/coverage/tests.xml file does not exist" + exit 1 + fi + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/tests.xml \ + # --flag tests --flag ${{ matrix.distro-slug }} --flag pkg \ + # --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/tests.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags tests,${{ matrix.distro-slug }},pkg \ + --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi + + - name: Upload Test Run Artifacts + if: always() && steps.download-artifacts-from-vm.outcome == 'success' + uses: actions/upload-artifact@v3 + with: + name: pkg-testrun-artifacts-${{ matrix.distro-slug }}-${{ matrix.arch }} + path: | + artifacts + !artifacts/salt/* + !artifacts/salt-*.tar.* + + - name: Publish Test Report + uses: mikepenz/action-junit-report@v3 + # always run even if the previous steps fails + if: always() && job.status != 'cancelled' && steps.download-artifacts-from-vm.outcome == 'success' + with: + check_name: Overall Test Results(${{ matrix.distro-slug }} ${{ matrix.arch }}) + report_paths: 'artifacts/xml-unittests-output/*.xml' + annotate_only: true + + + macos: + name: MacOS + runs-on: ${{ matrix.distro-slug }} + environment: ${{ inputs.environment }} + timeout-minutes: 120 # 2 Hours - More than this and something is wrong + strategy: + fail-fast: false + matrix: + include: + <%- for slug, arch, pkg_type in test_salt_pkg_downloads_listing["macos"] %> + - distro-slug: <{ slug }> + arch: <{ arch }> + pkg-type: <{ pkg_type }> + <%- endfor %> + + steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" + + - name: Checkout Source Code + uses: actions/checkout@v4 + + - name: Download Onedir Tarball as an Artifact + uses: actions/download-artifact@v3 + with: + name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz + path: artifacts/ + + - name: Install System Dependencies + run: | + brew install tree + + - name: Decompress Onedir Tarball + shell: bash + run: | + python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" + cd artifacts + tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz + + - name: Set up Python ${{ inputs.python-version }} + uses: actions/setup-python@v4 + with: + python-version: "${{ inputs.python-version }}" + update-environment: true + + - name: Install Nox + run: | + python3 -m pip install 'nox==${{ inputs.nox-version }}' + + - name: Download cached nox.${{ matrix.distro-slug }}.tar.* for session ${{ inputs.nox-session }} + uses: actions/cache@v3 + with: + path: nox.${{ matrix.distro-slug }}.tar.* + key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch }}|${{ matrix.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ + hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') + }} + # If we get a cache miss here it means the dependencies step failed to save the cache + fail-on-cache-miss: true + + - name: Decompress .nox Directory + run: | + nox --force-color -e decompress-dependencies -- ${{ matrix.distro-slug }} + + - name: Show System Info & Test Plan + env: + SALT_RELEASE: "${{ inputs.salt-version }}" + SKIP_REQUIREMENTS_INSTALL: "1" + PRINT_TEST_SELECTION: "1" + PRINT_TEST_PLAN_ONLY: "1" + PRINT_SYSTEM_INFO: "1" + GITHUB_ACTIONS_PIPELINE: "1" + SKIP_INITIAL_GH_ACTIONS_FAILURES: "1" + SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" + LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} + run: | + sudo -E nox --force-color -e ${{ inputs.nox-session }}-pkgs -- download-pkgs + + - name: Run Package Download Tests + env: + SKIP_REQUIREMENTS_INSTALL: "1" + PRINT_TEST_SELECTION: "0" + PRINT_TEST_PLAN_ONLY: "0" + PRINT_SYSTEM_INFO: "0" + RERUN_FAILURES: "1" + GITHUB_ACTIONS_PIPELINE: "1" + SKIP_INITIAL_GH_ACTIONS_FAILURES: "1" + SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" + COVERAGE_CONTEXT: ${{ matrix.distro-slug }} + SALT_RELEASE: "${{ inputs.salt-version }}" + SALT_REPO_ARCH: ${{ matrix.arch }} + LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" + SALT_REPO_TYPE: ${{ inputs.environment }} + SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} + SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} + SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} + SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} + run: | + sudo -E nox --force-color -e ${{ inputs.nox-session }}-pkgs -- download-pkgs + + - name: Fix file ownership + run: | + sudo chown -R "$(id -un)" . + + - name: Combine Coverage Reports + if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' + run: | + nox --force-color -e combine-coverage + + - name: Prepare Test Run Artifacts + id: download-artifacts-from-vm + if: always() && job.status != 'cancelled' + run: | + # Delete the salt onedir, we won't need it anymore and it will prevent + # from it showing in the tree command below + rm -rf artifacts/salt* + tree -a artifacts + + - name: Install Codecov CLI + if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' + run: | + # We can't yet use tokenless uploads with the codecov CLI + # python3 -m pip install codecov-cli + # + curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import + curl -Os https://uploader.codecov.io/latest/macos/codecov + curl -Os https://uploader.codecov.io/latest/macos/codecov.SHA256SUM + curl -Os https://uploader.codecov.io/latest/macos/codecov.SHA256SUM.sig + gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM + shasum -a 256 -c codecov.SHA256SUM + chmod +x codecov + + - name: Upload Source Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' + run: | + if [ ! -s artifacts/coverage/salt.xml ]; then + echo "The artifacts/coverage/salt.xml file does not exist" + exit 1 + fi + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/salt.xml \ + # --flag salt --flag ${{ matrix.distro-slug }} --flag pkg \ + # --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/salt.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags salt,${{ matrix.distro-slug }},pkg \ + --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi + + - name: Upload Tests Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' + run: | + if [ ! -s artifacts/coverage/tests.xml ]; then + echo "The artifacts/coverage/tests.xml file does not exist" + exit 1 + fi + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/tests.xml \ + # --flag tests --flag ${{ matrix.distro-slug }} --flag pkg \ + # --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/tests.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags tests,${{ matrix.distro-slug }},pkg \ + --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi + + - name: Upload Test Run Artifacts + if: always() + uses: actions/upload-artifact@v3 + with: + name: pkg-testrun-artifacts-${{ matrix.distro-slug }}-${{ matrix.arch }} + path: | + artifacts + !artifacts/salt/* + !artifacts/salt-*.tar.* + + - name: Publish Test Report + uses: mikepenz/action-junit-report@v3 + # always run even if the previous steps fails + if: always() && job.status != 'cancelled' + with: + check_name: Overall Test Results(${{ matrix.distro-slug }} ${{ matrix.arch }}) + report_paths: 'artifacts/xml-unittests-output/*.xml' + annotate_only: true + + + windows: + name: Windows + runs-on: + - self-hosted + - linux + - bastion + environment: ${{ inputs.environment }} + timeout-minutes: 120 # 2 Hours - More than this and something is wrong + strategy: + fail-fast: false + matrix: + include: + <%- for slug, arch, pkg_type in test_salt_pkg_downloads_listing["windows"] %> + - distro-slug: <{ slug }> + arch: <{ arch }> + pkg-type: <{ pkg_type }> + <%- endfor %> + + steps: + - name: Checkout Source Code + uses: actions/checkout@v4 + + - name: Download Onedir Tarball as an Artifact + uses: actions/download-artifact@v3 + with: + name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-windows-${{ matrix.arch }}.tar.xz + path: artifacts/ + + - name: Decompress Onedir Tarball + shell: bash + run: | + python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" + cd artifacts + tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-windows-${{ matrix.arch }}.tar.xz + + - name: Download cached nox.${{ matrix.distro-slug }}.tar.* for session ${{ inputs.nox-session }} + uses: actions/cache@v3 + with: + path: nox.${{ matrix.distro-slug }}.tar.* + key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch }}|${{ matrix.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ + hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') + }} + # If we get a cache miss here it means the dependencies step failed to save the cache + fail-on-cache-miss: true + + - name: Setup Python Tools Scripts + uses: ./.github/actions/setup-python-tools-scripts + + - name: Get Salt Project GitHub Actions Bot Environment + run: | + TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") + SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) + echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" + + - name: Start VM + id: spin-up-vm + run: | + tools --timestamps vm create --environment "${SPB_ENVIRONMENT}" --retries=2 ${{ matrix.distro-slug }} + + - name: List Free Space + run: | + tools --timestamps vm ssh ${{ matrix.distro-slug }} -- df -h || true + + - name: Upload Checkout To VM + run: | + tools --timestamps vm rsync ${{ matrix.distro-slug }} + + - name: Decompress .nox Directory + run: | + tools --timestamps vm decompress-dependencies ${{ matrix.distro-slug }} + + - name: Show System Info & Test Plan + env: + SALT_RELEASE: "${{ inputs.salt-version }}" + SALT_REPO_ARCH: ${{ matrix.arch }} + LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" + SALT_REPO_TYPE: ${{ inputs.environment }} + SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} + SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} + SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} + SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} + SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} + run: | + tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ + -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ + --nox-session=${{ inputs.nox-session }}-pkgs ${{ matrix.distro-slug }} -- download-pkgs + + - name: Run Package Download Tests + env: + SALT_RELEASE: "${{ inputs.salt-version }}" + SALT_REPO_ARCH: ${{ matrix.arch }} + LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" + SALT_REPO_TYPE: ${{ inputs.environment }} + SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} + SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} + SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} + SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} + SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} + run: | + tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ + -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ + --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ matrix.distro-slug }} -- download-pkgs + + - name: Combine Coverage Reports + if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' + run: | + tools --timestamps vm combine-coverage ${{ matrix.distro-slug }} + + - name: Download Test Run Artifacts + id: download-artifacts-from-vm + if: always() && steps.spin-up-vm.outcome == 'success' + run: | + tools --timestamps vm download-artifacts ${{ matrix.distro-slug }} + # Delete the salt onedir, we won't need it anymore and it will prevent + # from it showing in the tree command below + rm -rf artifacts/salt* + tree -a artifacts + + - name: Destroy VM + if: always() + run: | + tools --timestamps vm destroy --no-wait ${{ matrix.distro-slug }} || true + + - name: Fix file ownership + run: | + sudo chown -R "$(id -un)" . + + - name: Install Codecov CLI + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + # We can't yet use tokenless uploads with the codecov CLI + # python3 -m pip install codecov-cli + # + curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import + curl -Os https://uploader.codecov.io/latest/linux/codecov + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig + gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM + shasum -a 256 -c codecov.SHA256SUM + chmod +x codecov + + - name: Upload Source Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + if [ ! -s artifacts/coverage/salt.xml ]; then + echo "The artifacts/coverage/salt.xml file does not exist" + exit 1 + fi + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/salt.xml \ + # --flag salt --flag ${{ matrix.distro-slug }} --flag pkg \ + # --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/salt.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags salt,${{ matrix.distro-slug }},pkg \ + --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi + + - name: Upload Tests Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + if [ ! -s artifacts/coverage/tests.xml ]; then + echo "The artifacts/coverage/tests.xml file does not exist" + exit 1 + fi + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/tests.xml \ + # --flag tests --flag ${{ matrix.distro-slug }} --flag pkg \ + # --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/tests.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags tests,${{ matrix.distro-slug }},pkg \ + --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi + + - name: Upload Test Run Artifacts + if: always() && steps.download-artifacts-from-vm.outcome == 'success' + uses: actions/upload-artifact@v3 + with: + name: pkg-testrun-artifacts-${{ matrix.distro-slug }}-${{ matrix.arch }} + path: | + artifacts + !artifacts/salt/* + !artifacts/salt-*.tar.* + + - name: Publish Test Report + uses: mikepenz/action-junit-report@v3 + # always run even if the previous steps fails + if: always() && job.status != 'cancelled' && steps.download-artifacts-from-vm.outcome == 'success' + with: + check_name: Overall Test Results(${{ matrix.distro-slug }} ${{ matrix.arch }} ${{ matrix.pkg-type }} ) + report_paths: 'artifacts/xml-unittests-output/*.xml' + annotate_only: true diff --git a/.github/workflows/templates/test-salt-pkg-repo-downloads.yml.jinja b/.github/workflows/templates/test-salt-pkg-repo-downloads.yml.jinja index b84ae581e59..005c5272ac3 100644 --- a/.github/workflows/templates/test-salt-pkg-repo-downloads.yml.jinja +++ b/.github/workflows/templates/test-salt-pkg-repo-downloads.yml.jinja @@ -13,6 +13,9 @@ needs: - prepare-workflow - publish-repositories + <%- for slug in test_salt_pkg_downloads_needs_slugs %> + - <{ slug }> + <%- endfor %> <%- if gh_environment == "release" %> - download-onedir-artifact <%- else %> diff --git a/.github/workflows/test-package-downloads-action.yml b/.github/workflows/test-package-downloads-action.yml index 32dcd453a57..245ed6f09d0 100644 --- a/.github/workflows/test-package-downloads-action.yml +++ b/.github/workflows/test-package-downloads-action.yml @@ -53,32 +53,6 @@ env: jobs: - generate-matrix: - name: Test Matrix - runs-on: - - self-hosted - - linux - - x86_64 - outputs: - matrix-include: ${{ steps.generate-matrix.outputs.matrix }} - steps: - - - name: "Throttle Builds" - shell: bash - run: | - t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t" - - - name: Checkout Source Code - uses: actions/checkout@v4 - - - name: Setup Python Tools Scripts - uses: ./.github/actions/setup-python-tools-scripts - - - name: Generate Test Matrix - id: generate-matrix - run: | - tools ci pkg-download-matrix - linux: name: Linux runs-on: @@ -87,12 +61,166 @@ jobs: - bastion environment: ${{ inputs.environment }} timeout-minutes: 120 # 2 Hours - More than this and something is wrong - needs: - - generate-matrix strategy: fail-fast: false matrix: - include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include)['linux'] }} + include: + - distro-slug: almalinux-8 + arch: x86_64 + pkg-type: package + - distro-slug: almalinux-8 + arch: x86_64 + pkg-type: onedir + - distro-slug: almalinux-8-arm64 + arch: aarch64 + pkg-type: package + - distro-slug: almalinux-8-arm64 + arch: aarch64 + pkg-type: onedir + - distro-slug: almalinux-9 + arch: x86_64 + pkg-type: package + - distro-slug: almalinux-9 + arch: x86_64 + pkg-type: onedir + - distro-slug: almalinux-9-arm64 + arch: aarch64 + pkg-type: package + - distro-slug: almalinux-9-arm64 + arch: aarch64 + pkg-type: onedir + - distro-slug: amazonlinux-2 + arch: x86_64 + pkg-type: package + - distro-slug: amazonlinux-2 + arch: x86_64 + pkg-type: onedir + - distro-slug: amazonlinux-2-arm64 + arch: aarch64 + pkg-type: package + - distro-slug: amazonlinux-2-arm64 + arch: aarch64 + pkg-type: onedir + - distro-slug: centos-7 + arch: x86_64 + pkg-type: package + - distro-slug: centos-7 + arch: x86_64 + pkg-type: onedir + - distro-slug: centos-7-arm64 + arch: aarch64 + pkg-type: package + - distro-slug: centos-7-arm64 + arch: aarch64 + pkg-type: onedir + - distro-slug: centosstream-8 + arch: x86_64 + pkg-type: package + - distro-slug: centosstream-8 + arch: x86_64 + pkg-type: onedir + - distro-slug: centosstream-8-arm64 + arch: aarch64 + pkg-type: package + - distro-slug: centosstream-8-arm64 + arch: aarch64 + pkg-type: onedir + - distro-slug: centosstream-9 + arch: x86_64 + pkg-type: package + - distro-slug: centosstream-9 + arch: x86_64 + pkg-type: onedir + - distro-slug: centosstream-9-arm64 + arch: aarch64 + pkg-type: package + - distro-slug: centosstream-9-arm64 + arch: aarch64 + pkg-type: onedir + - distro-slug: debian-10 + arch: x86_64 + pkg-type: package + - distro-slug: debian-10 + arch: x86_64 + pkg-type: onedir + - distro-slug: debian-11 + arch: x86_64 + pkg-type: package + - distro-slug: debian-11 + arch: x86_64 + pkg-type: onedir + - distro-slug: debian-11-arm64 + arch: aarch64 + pkg-type: package + - distro-slug: debian-11-arm64 + arch: aarch64 + pkg-type: onedir + - distro-slug: fedora-37 + arch: x86_64 + pkg-type: package + - distro-slug: fedora-37 + arch: x86_64 + pkg-type: onedir + - distro-slug: fedora-37-arm64 + arch: aarch64 + pkg-type: package + - distro-slug: fedora-37-arm64 + arch: aarch64 + pkg-type: onedir + - distro-slug: fedora-38 + arch: x86_64 + pkg-type: package + - distro-slug: fedora-38 + arch: x86_64 + pkg-type: onedir + - distro-slug: fedora-38-arm64 + arch: aarch64 + pkg-type: package + - distro-slug: fedora-38-arm64 + arch: aarch64 + pkg-type: onedir + - distro-slug: photonos-3 + arch: x86_64 + pkg-type: package + - distro-slug: photonos-3 + arch: x86_64 + pkg-type: onedir + - distro-slug: photonos-4 + arch: x86_64 + pkg-type: package + - distro-slug: photonos-4 + arch: x86_64 + pkg-type: onedir + - distro-slug: photonos-4-arm64 + arch: aarch64 + pkg-type: package + - distro-slug: photonos-4-arm64 + arch: aarch64 + pkg-type: onedir + - distro-slug: ubuntu-20.04 + arch: x86_64 + pkg-type: package + - distro-slug: ubuntu-20.04 + arch: x86_64 + pkg-type: onedir + - distro-slug: ubuntu-20.04-arm64 + arch: aarch64 + pkg-type: package + - distro-slug: ubuntu-20.04-arm64 + arch: aarch64 + pkg-type: onedir + - distro-slug: ubuntu-22.04 + arch: x86_64 + pkg-type: package + - distro-slug: ubuntu-22.04 + arch: x86_64 + pkg-type: onedir + - distro-slug: ubuntu-22.04-arm64 + arch: aarch64 + pkg-type: package + - distro-slug: ubuntu-22.04-arm64 + arch: aarch64 + pkg-type: onedir steps: @@ -316,12 +444,16 @@ jobs: runs-on: ${{ matrix.distro-slug }} environment: ${{ inputs.environment }} timeout-minutes: 120 # 2 Hours - More than this and something is wrong - needs: - - generate-matrix strategy: fail-fast: false matrix: - include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include)['macos'] }} + include: + - distro-slug: macos-12 + arch: x86_64 + pkg-type: package + - distro-slug: macos-12 + arch: x86_64 + pkg-type: onedir steps: @@ -536,12 +668,19 @@ jobs: - bastion environment: ${{ inputs.environment }} timeout-minutes: 120 # 2 Hours - More than this and something is wrong - needs: - - generate-matrix strategy: fail-fast: false matrix: - include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include)['windows'] }} + include: + - distro-slug: windows-2022 + arch: amd64 + pkg-type: nsis + - distro-slug: windows-2022 + arch: amd64 + pkg-type: msi + - distro-slug: windows-2022 + arch: amd64 + pkg-type: onedir steps: - name: Checkout Source Code diff --git a/tools/ci.py b/tools/ci.py index 8e5143fa010..d2c55eb3f79 100644 --- a/tools/ci.py +++ b/tools/ci.py @@ -783,74 +783,6 @@ def pkg_matrix( ctx.exit(0) -@ci.command( - name="pkg-download-matrix", - arguments={}, -) -def pkg_download_matrix(ctx: Context): - """ - Generate the test matrix. - """ - _platforms = {} - linux_entries = ( - ("almalinux-8", "Alma Linux 8", "x86_64", "package"), - ("almalinux-8-arm64", "Alma Linux 8 Arm64", "aarch64", "package"), - ("almalinux-9", "Alma Linux 9", "x86_64", "package"), - ("almalinux-9-arm64", "Alma Linux 9 Arm64", "aarch64", "package"), - ("amazonlinux-2", "Amazon Linux 2", "x86_64", "package"), - ("amazonlinux-2-arm64", "Amazon Linux 2 Arm64", "aarch64", "package"), - ("centos-7", "CentOS 7", "x86_64", "package"), - ("centos-7-arm64", "CentOS 7 Arm64", "aarch64", "package"), - ("centosstream-8", "CentOS Stream 8", "x86_64", "package"), - ("centosstream-8-arm64", "CentOS Stream 8 Arm64", "aarch64", "package"), - ("centosstream-9", "CentOS Stream 9", "x86_64", "package"), - ("centosstream-9-arm64", "CentOS Stream 9 Arm64", "aarch64", "package"), - ("debian-10", "Debian 10", "x86_64", "package"), - ("debian-11", "Debian 11", "x86_64", "package"), - ("debian-11-arm64", "Debian 11 Arm64", "aarch64", "package"), - ("fedora-37", "Fedora 37", "x86_64", "package"), - ("fedora-37-arm64", "Fedora 37 Arm64", "aarch64", "package"), - ("fedora-38", "Fedora 38", "x86_64", "package"), - ("fedora-38-arm64", "Fedora 38 Arm64", "aarch64", "package"), - ("photonos-3", "Photon OS 3", "x86_64", "package"), - ("photonos-4", "Photon OS 4", "x86_64", "package"), - ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64", "package"), - ("ubuntu-20.04", "Ubuntu 20.04", "x86_64", "package"), - ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64", "package"), - ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "package"), - ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "package"), - ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "onedir"), - ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "onedir"), - ) - macos_entries = ( - ("macos-12", "macOS 12", "x86_64", "Package"), - ("macos-12", "macOS 12", "x86_64", "Onedir"), - ) - windows_entries = (("windows-2022", "Windows 2022", "amd64"),) - _matrix = [] - for distro, display_name, arch, pkg_type in linux_entries: - _matrix.append({"distro-slug": distro, "arch": arch, "pkg_type": pkg_type}) - _platforms["linux"] = _matrix - _matrix = [] - for distro, display_name, arch, pkg_type in macos_entries: - _matrix.append({"distro-slug": distro, "arch": arch, "pkg_type": pkg_type}) - _platforms["macos"] = _matrix - _matrix = [] - for distro, display_name, arch in windows_entries: - for pkg_type in ("nsis", "msi", "onedir"): - _matrix.append({"distro-slug": distro, "arch": arch, "pkg_type": pkg_type}) - _platforms["windows"] = _matrix - - ctx.info("Generated matrix:") - ctx.print(_platforms, soft_wrap=True) - - github_output = os.environ.get("GITHUB_OUTPUT") - if github_output is not None: - with open(github_output, "a", encoding="utf-8") as wfh: - wfh.write(f"matrix={json.dumps(_platforms)}\n") - ctx.exit(0) - - @ci.command( name="get-releases", arguments={ diff --git a/tools/pre_commit.py b/tools/pre_commit.py index e4738445606..be773de4217 100644 --- a/tools/pre_commit.py +++ b/tools/pre_commit.py @@ -80,6 +80,9 @@ def generate_workflows(ctx: Context): "test-pkg-downloads": True, }, }, + "Test Package Downloads": { + "template": "test-package-downloads-action.yml", + }, } test_salt_listing = { "linux": ( @@ -136,7 +139,7 @@ def generate_workflows(ctx: Context): ), } build_ci_deps_listing = { - "linux": ( + "linux": [ ("almalinux-8", "Alma Linux 8", "x86_64"), ("almalinux-8-arm64", "Alma Linux 8 Arm64", "aarch64"), ("almalinux-9", "Alma Linux 9", "x86_64"), @@ -165,14 +168,38 @@ def generate_workflows(ctx: Context): ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64"), ("ubuntu-22.04", "Ubuntu 22.04", "x86_64"), ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64"), - ), - "macos": (("macos-12", "macOS 12", "x86_64"),), - "windows": ( + ], + "macos": [ + ("macos-12", "macOS 12", "x86_64"), + ], + "windows": [ ("windows-2016", "Windows 2016", "amd64"), ("windows-2019", "Windows 2019", "amd64"), ("windows-2022", "Windows 2022", "amd64"), - ), + ], } + test_salt_pkg_downloads_listing: dict[str, list[tuple[str, str, str]]] = { + "linux": [], + "macos": [], + "windows": [], + } + for slug, display_name, arch in build_ci_deps_listing["linux"]: + if slug in ("archlinux-lts", "opensuse-15"): + continue + for pkg_type in ("package", "onedir"): + test_salt_pkg_downloads_listing["linux"].append((slug, arch, pkg_type)) + for slug, display_name, arch in build_ci_deps_listing["macos"]: + for pkg_type in ("package", "onedir"): + test_salt_pkg_downloads_listing["macos"].append((slug, arch, pkg_type)) + for slug, display_name, arch in build_ci_deps_listing["windows"][-1:]: + for pkg_type in ("nsis", "msi", "onedir"): + test_salt_pkg_downloads_listing["windows"].append((slug, arch, pkg_type)) + + test_salt_pkg_downloads_needs_slugs = set() + for platform in test_salt_pkg_downloads_listing: + for slug, _, _ in test_salt_pkg_downloads_listing[platform]: + test_salt_pkg_downloads_needs_slugs.add(f"{slug.replace('.', '')}-ci-deps") + env = Environment( block_start_string="<%", block_end_string="%>", @@ -210,6 +237,10 @@ def generate_workflows(ctx: Context): "test_salt_listing": test_salt_listing, "test_salt_pkg_listing": test_salt_pkg_listing, "build_ci_deps_listing": build_ci_deps_listing, + "test_salt_pkg_downloads_listing": test_salt_pkg_downloads_listing, + "test_salt_pkg_downloads_needs_slugs": sorted( + test_salt_pkg_downloads_needs_slugs + ), } shared_context_file = ( tools.utils.REPO_ROOT / "cicd" / "shared-gh-workflows-context.yml" From 0a5a28547028b6fb31dcf0e381c302ba7965dbb8 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 8 Oct 2023 18:27:32 +0100 Subject: [PATCH 103/147] Not that many `onedir` package download tests Signed-off-by: Pedro Algarvio --- .../test-package-downloads-action.yml | 80 +------------------ tools/pre_commit.py | 12 ++- 2 files changed, 12 insertions(+), 80 deletions(-) diff --git a/.github/workflows/test-package-downloads-action.yml b/.github/workflows/test-package-downloads-action.yml index 245ed6f09d0..6e7b04a7f5f 100644 --- a/.github/workflows/test-package-downloads-action.yml +++ b/.github/workflows/test-package-downloads-action.yml @@ -68,156 +68,84 @@ jobs: - distro-slug: almalinux-8 arch: x86_64 pkg-type: package - - distro-slug: almalinux-8 - arch: x86_64 - pkg-type: onedir - distro-slug: almalinux-8-arm64 arch: aarch64 pkg-type: package - - distro-slug: almalinux-8-arm64 - arch: aarch64 - pkg-type: onedir - distro-slug: almalinux-9 arch: x86_64 pkg-type: package - - distro-slug: almalinux-9 - arch: x86_64 - pkg-type: onedir - distro-slug: almalinux-9-arm64 arch: aarch64 pkg-type: package - - distro-slug: almalinux-9-arm64 - arch: aarch64 - pkg-type: onedir - distro-slug: amazonlinux-2 arch: x86_64 pkg-type: package - - distro-slug: amazonlinux-2 - arch: x86_64 - pkg-type: onedir - distro-slug: amazonlinux-2-arm64 arch: aarch64 pkg-type: package - - distro-slug: amazonlinux-2-arm64 - arch: aarch64 - pkg-type: onedir - distro-slug: centos-7 arch: x86_64 pkg-type: package - - distro-slug: centos-7 - arch: x86_64 - pkg-type: onedir - distro-slug: centos-7-arm64 arch: aarch64 pkg-type: package - - distro-slug: centos-7-arm64 - arch: aarch64 - pkg-type: onedir - distro-slug: centosstream-8 arch: x86_64 pkg-type: package - - distro-slug: centosstream-8 - arch: x86_64 - pkg-type: onedir - distro-slug: centosstream-8-arm64 arch: aarch64 pkg-type: package - - distro-slug: centosstream-8-arm64 - arch: aarch64 - pkg-type: onedir - distro-slug: centosstream-9 arch: x86_64 pkg-type: package - - distro-slug: centosstream-9 - arch: x86_64 - pkg-type: onedir - distro-slug: centosstream-9-arm64 arch: aarch64 pkg-type: package - - distro-slug: centosstream-9-arm64 - arch: aarch64 - pkg-type: onedir - distro-slug: debian-10 arch: x86_64 pkg-type: package - - distro-slug: debian-10 - arch: x86_64 - pkg-type: onedir - - distro-slug: debian-11 - arch: x86_64 - pkg-type: package - distro-slug: debian-11 arch: x86_64 - pkg-type: onedir - - distro-slug: debian-11-arm64 - arch: aarch64 pkg-type: package - distro-slug: debian-11-arm64 arch: aarch64 - pkg-type: onedir - - distro-slug: fedora-37 - arch: x86_64 pkg-type: package - distro-slug: fedora-37 arch: x86_64 - pkg-type: onedir - - distro-slug: fedora-37-arm64 - arch: aarch64 pkg-type: package - distro-slug: fedora-37-arm64 arch: aarch64 - pkg-type: onedir - - distro-slug: fedora-38 - arch: x86_64 pkg-type: package - distro-slug: fedora-38 arch: x86_64 - pkg-type: onedir - - distro-slug: fedora-38-arm64 - arch: aarch64 pkg-type: package - distro-slug: fedora-38-arm64 arch: aarch64 - pkg-type: onedir - - distro-slug: photonos-3 - arch: x86_64 pkg-type: package - distro-slug: photonos-3 - arch: x86_64 - pkg-type: onedir - - distro-slug: photonos-4 arch: x86_64 pkg-type: package - distro-slug: photonos-4 arch: x86_64 - pkg-type: onedir - - distro-slug: photonos-4-arm64 - arch: aarch64 pkg-type: package - distro-slug: photonos-4-arm64 arch: aarch64 - pkg-type: onedir - - distro-slug: ubuntu-20.04 - arch: x86_64 pkg-type: package - distro-slug: ubuntu-20.04 arch: x86_64 - pkg-type: onedir - - distro-slug: ubuntu-20.04-arm64 - arch: aarch64 pkg-type: package - distro-slug: ubuntu-20.04-arm64 arch: aarch64 - pkg-type: onedir - - distro-slug: ubuntu-22.04 - arch: x86_64 pkg-type: package - distro-slug: ubuntu-22.04 arch: x86_64 - pkg-type: onedir + pkg-type: package - distro-slug: ubuntu-22.04-arm64 arch: aarch64 pkg-type: package + - distro-slug: ubuntu-22.04 + arch: x86_64 + pkg-type: onedir - distro-slug: ubuntu-22.04-arm64 arch: aarch64 pkg-type: onedir diff --git a/tools/pre_commit.py b/tools/pre_commit.py index be773de4217..1dfbfb70476 100644 --- a/tools/pre_commit.py +++ b/tools/pre_commit.py @@ -186,11 +186,15 @@ def generate_workflows(ctx: Context): for slug, display_name, arch in build_ci_deps_listing["linux"]: if slug in ("archlinux-lts", "opensuse-15"): continue - for pkg_type in ("package", "onedir"): - test_salt_pkg_downloads_listing["linux"].append((slug, arch, pkg_type)) + test_salt_pkg_downloads_listing["linux"].append((slug, arch, "package")) + for slug, display_name, arch in build_ci_deps_listing["linux"][-2:]: + if slug in ("archlinux-lts", "opensuse-15"): + continue + test_salt_pkg_downloads_listing["linux"].append((slug, arch, "onedir")) for slug, display_name, arch in build_ci_deps_listing["macos"]: - for pkg_type in ("package", "onedir"): - test_salt_pkg_downloads_listing["macos"].append((slug, arch, pkg_type)) + test_salt_pkg_downloads_listing["macos"].append((slug, arch, "package")) + for slug, display_name, arch in build_ci_deps_listing["macos"][-1:]: + test_salt_pkg_downloads_listing["macos"].append((slug, arch, "onedir")) for slug, display_name, arch in build_ci_deps_listing["windows"][-1:]: for pkg_type in ("nsis", "msi", "onedir"): test_salt_pkg_downloads_listing["windows"].append((slug, arch, pkg_type)) From cae38cb324fcb5e92fe4cb9133377fb45a8057b6 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 8 Oct 2023 18:33:13 +0100 Subject: [PATCH 104/147] Remove unnecessary environment variable passing Signed-off-by: Pedro Algarvio --- .../templates/test-package-downloads-action.yml.jinja | 8 ++++---- .github/workflows/test-package-downloads-action.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/templates/test-package-downloads-action.yml.jinja b/.github/workflows/templates/test-package-downloads-action.yml.jinja index ac66c8d8c1f..6c897f81f87 100644 --- a/.github/workflows/templates/test-package-downloads-action.yml.jinja +++ b/.github/workflows/templates/test-package-downloads-action.yml.jinja @@ -144,7 +144,7 @@ jobs: DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} run: | tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ - -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ --nox-session=${{ inputs.nox-session }}-pkgs ${{ matrix.distro-slug }} -- download-pkgs @@ -162,7 +162,7 @@ jobs: DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} run: | tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ - -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ matrix.distro-slug }} -- download-pkgs @@ -593,7 +593,7 @@ jobs: DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} run: | tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ - -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ --nox-session=${{ inputs.nox-session }}-pkgs ${{ matrix.distro-slug }} -- download-pkgs @@ -611,7 +611,7 @@ jobs: DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} run: | tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ - -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ matrix.distro-slug }} -- download-pkgs diff --git a/.github/workflows/test-package-downloads-action.yml b/.github/workflows/test-package-downloads-action.yml index 6e7b04a7f5f..908e064ae85 100644 --- a/.github/workflows/test-package-downloads-action.yml +++ b/.github/workflows/test-package-downloads-action.yml @@ -223,7 +223,7 @@ jobs: DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} run: | tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ - -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ --nox-session=${{ inputs.nox-session }}-pkgs ${{ matrix.distro-slug }} -- download-pkgs @@ -241,7 +241,7 @@ jobs: DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} run: | tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ - -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ matrix.distro-slug }} -- download-pkgs @@ -677,7 +677,7 @@ jobs: DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} run: | tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ - -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ --nox-session=${{ inputs.nox-session }}-pkgs ${{ matrix.distro-slug }} -- download-pkgs @@ -695,7 +695,7 @@ jobs: DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} run: | tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ - -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ matrix.distro-slug }} -- download-pkgs From 09ee7e6fd148ead2276237baf943c47067631877 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 8 Oct 2023 18:38:10 +0100 Subject: [PATCH 105/147] Fix the Onedir Tarball Artifact name Signed-off-by: Pedro Algarvio --- .../templates/test-package-downloads-action.yml.jinja | 4 ++-- .github/workflows/test-package-downloads-action.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/templates/test-package-downloads-action.yml.jinja b/.github/workflows/templates/test-package-downloads-action.yml.jinja index 6c897f81f87..348b0d17227 100644 --- a/.github/workflows/templates/test-package-downloads-action.yml.jinja +++ b/.github/workflows/templates/test-package-downloads-action.yml.jinja @@ -316,7 +316,7 @@ jobs: - name: Download Onedir Tarball as an Artifact uses: actions/download-artifact@v3 with: - name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz + name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-darwin-${{ matrix.arch }}.tar.xz path: artifacts/ - name: Install System Dependencies @@ -328,7 +328,7 @@ jobs: run: | python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" cd artifacts - tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz + tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-darwin-${{ matrix.arch }}.tar.xz - name: Set up Python ${{ inputs.python-version }} uses: actions/setup-python@v4 diff --git a/.github/workflows/test-package-downloads-action.yml b/.github/workflows/test-package-downloads-action.yml index 908e064ae85..5473ebd17ec 100644 --- a/.github/workflows/test-package-downloads-action.yml +++ b/.github/workflows/test-package-downloads-action.yml @@ -396,7 +396,7 @@ jobs: - name: Download Onedir Tarball as an Artifact uses: actions/download-artifact@v3 with: - name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz + name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-darwin-${{ matrix.arch }}.tar.xz path: artifacts/ - name: Install System Dependencies @@ -408,7 +408,7 @@ jobs: run: | python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" cd artifacts - tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz + tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-darwin-${{ matrix.arch }}.tar.xz - name: Set up Python ${{ inputs.python-version }} uses: actions/setup-python@v4 From d9c031de5f932c416bfdb65f33edb757331ce4bf Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 8 Oct 2023 18:43:28 +0100 Subject: [PATCH 106/147] Visual grouping of CI Dependencies install Signed-off-by: Pedro Algarvio --- .../workflows/build-deps-ci-action-macos.yml | 4 +- .github/workflows/build-deps-ci-action.yml | 4 +- .github/workflows/ci.yml | 64 +++++++++---------- .github/workflows/nightly.yml | 64 +++++++++---------- .github/workflows/release.yml | 64 +++++++++---------- .github/workflows/scheduled.yml | 64 +++++++++---------- .github/workflows/staging.yml | 64 +++++++++---------- .../templates/build-ci-deps.yml.jinja | 6 +- 8 files changed, 167 insertions(+), 167 deletions(-) diff --git a/.github/workflows/build-deps-ci-action-macos.yml b/.github/workflows/build-deps-ci-action-macos.yml index ded5ad9c794..350230e9c5c 100644 --- a/.github/workflows/build-deps-ci-action-macos.yml +++ b/.github/workflows/build-deps-ci-action-macos.yml @@ -1,5 +1,5 @@ --- -name: Test Dependencies +name: Install Test Dependencies on: workflow_call: @@ -53,7 +53,7 @@ env: jobs: dependencies: - name: Test Dependencies + name: Install runs-on: ${{ inputs.distro-slug }} timeout-minutes: 90 steps: diff --git a/.github/workflows/build-deps-ci-action.yml b/.github/workflows/build-deps-ci-action.yml index 40c1708c439..4fe391d0384 100644 --- a/.github/workflows/build-deps-ci-action.yml +++ b/.github/workflows/build-deps-ci-action.yml @@ -1,5 +1,5 @@ --- -name: Test Dependencies +name: Install Test Dependencies on: workflow_call: @@ -54,7 +54,7 @@ env: jobs: dependencies: - name: Test Dependencies + name: Install runs-on: - self-hosted - linux diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3aae43dbef4..63c5230f086 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -628,7 +628,7 @@ jobs: source: "src" windows-2016-ci-deps: - name: Windows 2016 + name: Windows 2016 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -645,7 +645,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 windows-2019-ci-deps: - name: Windows 2019 + name: Windows 2019 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -662,7 +662,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 windows-2022-ci-deps: - name: Windows 2022 + name: Windows 2022 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -679,7 +679,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 macos-12-ci-deps: - name: macOS 12 + name: macOS 12 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -696,7 +696,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-8-ci-deps: - name: Alma Linux 8 + name: Alma Linux 8 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -713,7 +713,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-8-arm64-ci-deps: - name: Alma Linux 8 Arm64 + name: Alma Linux 8 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -730,7 +730,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-9-ci-deps: - name: Alma Linux 9 + name: Alma Linux 9 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -747,7 +747,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-9-arm64-ci-deps: - name: Alma Linux 9 Arm64 + name: Alma Linux 9 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -764,7 +764,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-ci-deps: - name: Amazon Linux 2 + name: Amazon Linux 2 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -781,7 +781,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-arm64-ci-deps: - name: Amazon Linux 2 Arm64 + name: Amazon Linux 2 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -798,7 +798,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 archlinux-lts-ci-deps: - name: Arch Linux LTS + name: Arch Linux LTS Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -815,7 +815,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centos-7-ci-deps: - name: CentOS 7 + name: CentOS 7 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -832,7 +832,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centos-7-arm64-ci-deps: - name: CentOS 7 Arm64 + name: CentOS 7 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -849,7 +849,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-8-ci-deps: - name: CentOS Stream 8 + name: CentOS Stream 8 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -866,7 +866,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-8-arm64-ci-deps: - name: CentOS Stream 8 Arm64 + name: CentOS Stream 8 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -883,7 +883,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-9-ci-deps: - name: CentOS Stream 9 + name: CentOS Stream 9 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -900,7 +900,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-9-arm64-ci-deps: - name: CentOS Stream 9 Arm64 + name: CentOS Stream 9 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -917,7 +917,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-10-ci-deps: - name: Debian 10 + name: Debian 10 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -934,7 +934,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-11-ci-deps: - name: Debian 11 + name: Debian 11 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -951,7 +951,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-11-arm64-ci-deps: - name: Debian 11 Arm64 + name: Debian 11 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -968,7 +968,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-37-ci-deps: - name: Fedora 37 + name: Fedora 37 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -985,7 +985,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-37-arm64-ci-deps: - name: Fedora 37 Arm64 + name: Fedora 37 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1002,7 +1002,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-38-ci-deps: - name: Fedora 38 + name: Fedora 38 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1019,7 +1019,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-38-arm64-ci-deps: - name: Fedora 38 Arm64 + name: Fedora 38 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1036,7 +1036,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 opensuse-15-ci-deps: - name: Opensuse 15 + name: Opensuse 15 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1053,7 +1053,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-3-ci-deps: - name: Photon OS 3 + name: Photon OS 3 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1070,7 +1070,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-4-ci-deps: - name: Photon OS 4 + name: Photon OS 4 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1087,7 +1087,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-4-arm64-ci-deps: - name: Photon OS 4 Arm64 + name: Photon OS 4 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1104,7 +1104,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2004-ci-deps: - name: Ubuntu 20.04 + name: Ubuntu 20.04 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1121,7 +1121,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2004-arm64-ci-deps: - name: Ubuntu 20.04 Arm64 + name: Ubuntu 20.04 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1138,7 +1138,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2204-ci-deps: - name: Ubuntu 22.04 + name: Ubuntu 22.04 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1155,7 +1155,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2204-arm64-ci-deps: - name: Ubuntu 22.04 Arm64 + name: Ubuntu 22.04 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index b4aed92fe91..b4f36c0741a 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -689,7 +689,7 @@ jobs: secrets: inherit windows-2016-ci-deps: - name: Windows 2016 + name: Windows 2016 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -706,7 +706,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 windows-2019-ci-deps: - name: Windows 2019 + name: Windows 2019 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -723,7 +723,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 windows-2022-ci-deps: - name: Windows 2022 + name: Windows 2022 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -740,7 +740,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 macos-12-ci-deps: - name: macOS 12 + name: macOS 12 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -757,7 +757,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-8-ci-deps: - name: Alma Linux 8 + name: Alma Linux 8 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -774,7 +774,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-8-arm64-ci-deps: - name: Alma Linux 8 Arm64 + name: Alma Linux 8 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -791,7 +791,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-9-ci-deps: - name: Alma Linux 9 + name: Alma Linux 9 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -808,7 +808,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-9-arm64-ci-deps: - name: Alma Linux 9 Arm64 + name: Alma Linux 9 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -825,7 +825,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-ci-deps: - name: Amazon Linux 2 + name: Amazon Linux 2 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -842,7 +842,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-arm64-ci-deps: - name: Amazon Linux 2 Arm64 + name: Amazon Linux 2 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -859,7 +859,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 archlinux-lts-ci-deps: - name: Arch Linux LTS + name: Arch Linux LTS Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -876,7 +876,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centos-7-ci-deps: - name: CentOS 7 + name: CentOS 7 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -893,7 +893,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centos-7-arm64-ci-deps: - name: CentOS 7 Arm64 + name: CentOS 7 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -910,7 +910,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-8-ci-deps: - name: CentOS Stream 8 + name: CentOS Stream 8 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -927,7 +927,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-8-arm64-ci-deps: - name: CentOS Stream 8 Arm64 + name: CentOS Stream 8 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -944,7 +944,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-9-ci-deps: - name: CentOS Stream 9 + name: CentOS Stream 9 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -961,7 +961,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-9-arm64-ci-deps: - name: CentOS Stream 9 Arm64 + name: CentOS Stream 9 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -978,7 +978,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-10-ci-deps: - name: Debian 10 + name: Debian 10 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -995,7 +995,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-11-ci-deps: - name: Debian 11 + name: Debian 11 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1012,7 +1012,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-11-arm64-ci-deps: - name: Debian 11 Arm64 + name: Debian 11 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1029,7 +1029,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-37-ci-deps: - name: Fedora 37 + name: Fedora 37 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1046,7 +1046,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-37-arm64-ci-deps: - name: Fedora 37 Arm64 + name: Fedora 37 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1063,7 +1063,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-38-ci-deps: - name: Fedora 38 + name: Fedora 38 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1080,7 +1080,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-38-arm64-ci-deps: - name: Fedora 38 Arm64 + name: Fedora 38 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1097,7 +1097,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 opensuse-15-ci-deps: - name: Opensuse 15 + name: Opensuse 15 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1114,7 +1114,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-3-ci-deps: - name: Photon OS 3 + name: Photon OS 3 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1131,7 +1131,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-4-ci-deps: - name: Photon OS 4 + name: Photon OS 4 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1148,7 +1148,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-4-arm64-ci-deps: - name: Photon OS 4 Arm64 + name: Photon OS 4 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1165,7 +1165,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2004-ci-deps: - name: Ubuntu 20.04 + name: Ubuntu 20.04 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1182,7 +1182,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2004-arm64-ci-deps: - name: Ubuntu 20.04 Arm64 + name: Ubuntu 20.04 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1199,7 +1199,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2204-ci-deps: - name: Ubuntu 22.04 + name: Ubuntu 22.04 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1216,7 +1216,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2204-arm64-ci-deps: - name: Ubuntu 22.04 Arm64 + name: Ubuntu 22.04 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 700659a301f..7a0b40d8e4b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -163,7 +163,7 @@ jobs: if-no-files-found: error windows-2016-ci-deps: - name: Windows 2016 + name: Windows 2016 Deps needs: - prepare-workflow - download-onedir-artifact @@ -179,7 +179,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 windows-2019-ci-deps: - name: Windows 2019 + name: Windows 2019 Deps needs: - prepare-workflow - download-onedir-artifact @@ -195,7 +195,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 windows-2022-ci-deps: - name: Windows 2022 + name: Windows 2022 Deps needs: - prepare-workflow - download-onedir-artifact @@ -211,7 +211,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 macos-12-ci-deps: - name: macOS 12 + name: macOS 12 Deps needs: - prepare-workflow - download-onedir-artifact @@ -227,7 +227,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-8-ci-deps: - name: Alma Linux 8 + name: Alma Linux 8 Deps needs: - prepare-workflow - download-onedir-artifact @@ -243,7 +243,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-8-arm64-ci-deps: - name: Alma Linux 8 Arm64 + name: Alma Linux 8 Arm64 Deps needs: - prepare-workflow - download-onedir-artifact @@ -259,7 +259,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-9-ci-deps: - name: Alma Linux 9 + name: Alma Linux 9 Deps needs: - prepare-workflow - download-onedir-artifact @@ -275,7 +275,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-9-arm64-ci-deps: - name: Alma Linux 9 Arm64 + name: Alma Linux 9 Arm64 Deps needs: - prepare-workflow - download-onedir-artifact @@ -291,7 +291,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-ci-deps: - name: Amazon Linux 2 + name: Amazon Linux 2 Deps needs: - prepare-workflow - download-onedir-artifact @@ -307,7 +307,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-arm64-ci-deps: - name: Amazon Linux 2 Arm64 + name: Amazon Linux 2 Arm64 Deps needs: - prepare-workflow - download-onedir-artifact @@ -323,7 +323,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 archlinux-lts-ci-deps: - name: Arch Linux LTS + name: Arch Linux LTS Deps needs: - prepare-workflow - download-onedir-artifact @@ -339,7 +339,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centos-7-ci-deps: - name: CentOS 7 + name: CentOS 7 Deps needs: - prepare-workflow - download-onedir-artifact @@ -355,7 +355,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centos-7-arm64-ci-deps: - name: CentOS 7 Arm64 + name: CentOS 7 Arm64 Deps needs: - prepare-workflow - download-onedir-artifact @@ -371,7 +371,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-8-ci-deps: - name: CentOS Stream 8 + name: CentOS Stream 8 Deps needs: - prepare-workflow - download-onedir-artifact @@ -387,7 +387,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-8-arm64-ci-deps: - name: CentOS Stream 8 Arm64 + name: CentOS Stream 8 Arm64 Deps needs: - prepare-workflow - download-onedir-artifact @@ -403,7 +403,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-9-ci-deps: - name: CentOS Stream 9 + name: CentOS Stream 9 Deps needs: - prepare-workflow - download-onedir-artifact @@ -419,7 +419,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-9-arm64-ci-deps: - name: CentOS Stream 9 Arm64 + name: CentOS Stream 9 Arm64 Deps needs: - prepare-workflow - download-onedir-artifact @@ -435,7 +435,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-10-ci-deps: - name: Debian 10 + name: Debian 10 Deps needs: - prepare-workflow - download-onedir-artifact @@ -451,7 +451,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-11-ci-deps: - name: Debian 11 + name: Debian 11 Deps needs: - prepare-workflow - download-onedir-artifact @@ -467,7 +467,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-11-arm64-ci-deps: - name: Debian 11 Arm64 + name: Debian 11 Arm64 Deps needs: - prepare-workflow - download-onedir-artifact @@ -483,7 +483,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-37-ci-deps: - name: Fedora 37 + name: Fedora 37 Deps needs: - prepare-workflow - download-onedir-artifact @@ -499,7 +499,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-37-arm64-ci-deps: - name: Fedora 37 Arm64 + name: Fedora 37 Arm64 Deps needs: - prepare-workflow - download-onedir-artifact @@ -515,7 +515,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-38-ci-deps: - name: Fedora 38 + name: Fedora 38 Deps needs: - prepare-workflow - download-onedir-artifact @@ -531,7 +531,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-38-arm64-ci-deps: - name: Fedora 38 Arm64 + name: Fedora 38 Arm64 Deps needs: - prepare-workflow - download-onedir-artifact @@ -547,7 +547,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 opensuse-15-ci-deps: - name: Opensuse 15 + name: Opensuse 15 Deps needs: - prepare-workflow - download-onedir-artifact @@ -563,7 +563,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-3-ci-deps: - name: Photon OS 3 + name: Photon OS 3 Deps needs: - prepare-workflow - download-onedir-artifact @@ -579,7 +579,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-4-ci-deps: - name: Photon OS 4 + name: Photon OS 4 Deps needs: - prepare-workflow - download-onedir-artifact @@ -595,7 +595,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-4-arm64-ci-deps: - name: Photon OS 4 Arm64 + name: Photon OS 4 Arm64 Deps needs: - prepare-workflow - download-onedir-artifact @@ -611,7 +611,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2004-ci-deps: - name: Ubuntu 20.04 + name: Ubuntu 20.04 Deps needs: - prepare-workflow - download-onedir-artifact @@ -627,7 +627,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2004-arm64-ci-deps: - name: Ubuntu 20.04 Arm64 + name: Ubuntu 20.04 Arm64 Deps needs: - prepare-workflow - download-onedir-artifact @@ -643,7 +643,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2204-ci-deps: - name: Ubuntu 22.04 + name: Ubuntu 22.04 Deps needs: - prepare-workflow - download-onedir-artifact @@ -659,7 +659,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2204-arm64-ci-deps: - name: Ubuntu 22.04 Arm64 + name: Ubuntu 22.04 Arm64 Deps needs: - prepare-workflow - download-onedir-artifact diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index ceecd84ad02..e5bac3c0aef 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -662,7 +662,7 @@ jobs: source: "src" windows-2016-ci-deps: - name: Windows 2016 + name: Windows 2016 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -679,7 +679,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 windows-2019-ci-deps: - name: Windows 2019 + name: Windows 2019 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -696,7 +696,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 windows-2022-ci-deps: - name: Windows 2022 + name: Windows 2022 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -713,7 +713,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 macos-12-ci-deps: - name: macOS 12 + name: macOS 12 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -730,7 +730,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-8-ci-deps: - name: Alma Linux 8 + name: Alma Linux 8 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -747,7 +747,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-8-arm64-ci-deps: - name: Alma Linux 8 Arm64 + name: Alma Linux 8 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -764,7 +764,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-9-ci-deps: - name: Alma Linux 9 + name: Alma Linux 9 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -781,7 +781,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-9-arm64-ci-deps: - name: Alma Linux 9 Arm64 + name: Alma Linux 9 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -798,7 +798,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-ci-deps: - name: Amazon Linux 2 + name: Amazon Linux 2 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -815,7 +815,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-arm64-ci-deps: - name: Amazon Linux 2 Arm64 + name: Amazon Linux 2 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -832,7 +832,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 archlinux-lts-ci-deps: - name: Arch Linux LTS + name: Arch Linux LTS Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -849,7 +849,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centos-7-ci-deps: - name: CentOS 7 + name: CentOS 7 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -866,7 +866,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centos-7-arm64-ci-deps: - name: CentOS 7 Arm64 + name: CentOS 7 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -883,7 +883,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-8-ci-deps: - name: CentOS Stream 8 + name: CentOS Stream 8 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -900,7 +900,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-8-arm64-ci-deps: - name: CentOS Stream 8 Arm64 + name: CentOS Stream 8 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -917,7 +917,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-9-ci-deps: - name: CentOS Stream 9 + name: CentOS Stream 9 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -934,7 +934,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-9-arm64-ci-deps: - name: CentOS Stream 9 Arm64 + name: CentOS Stream 9 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -951,7 +951,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-10-ci-deps: - name: Debian 10 + name: Debian 10 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -968,7 +968,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-11-ci-deps: - name: Debian 11 + name: Debian 11 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -985,7 +985,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-11-arm64-ci-deps: - name: Debian 11 Arm64 + name: Debian 11 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1002,7 +1002,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-37-ci-deps: - name: Fedora 37 + name: Fedora 37 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1019,7 +1019,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-37-arm64-ci-deps: - name: Fedora 37 Arm64 + name: Fedora 37 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1036,7 +1036,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-38-ci-deps: - name: Fedora 38 + name: Fedora 38 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1053,7 +1053,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-38-arm64-ci-deps: - name: Fedora 38 Arm64 + name: Fedora 38 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1070,7 +1070,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 opensuse-15-ci-deps: - name: Opensuse 15 + name: Opensuse 15 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1087,7 +1087,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-3-ci-deps: - name: Photon OS 3 + name: Photon OS 3 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1104,7 +1104,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-4-ci-deps: - name: Photon OS 4 + name: Photon OS 4 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1121,7 +1121,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-4-arm64-ci-deps: - name: Photon OS 4 Arm64 + name: Photon OS 4 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1138,7 +1138,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2004-ci-deps: - name: Ubuntu 20.04 + name: Ubuntu 20.04 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1155,7 +1155,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2004-arm64-ci-deps: - name: Ubuntu 20.04 Arm64 + name: Ubuntu 20.04 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1172,7 +1172,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2204-ci-deps: - name: Ubuntu 22.04 + name: Ubuntu 22.04 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1189,7 +1189,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2204-arm64-ci-deps: - name: Ubuntu 22.04 Arm64 + name: Ubuntu 22.04 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index fe53449c2ae..4ed079c753e 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -684,7 +684,7 @@ jobs: secrets: inherit windows-2016-ci-deps: - name: Windows 2016 + name: Windows 2016 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -701,7 +701,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 windows-2019-ci-deps: - name: Windows 2019 + name: Windows 2019 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -718,7 +718,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 windows-2022-ci-deps: - name: Windows 2022 + name: Windows 2022 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -735,7 +735,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 macos-12-ci-deps: - name: macOS 12 + name: macOS 12 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -752,7 +752,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-8-ci-deps: - name: Alma Linux 8 + name: Alma Linux 8 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -769,7 +769,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-8-arm64-ci-deps: - name: Alma Linux 8 Arm64 + name: Alma Linux 8 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -786,7 +786,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-9-ci-deps: - name: Alma Linux 9 + name: Alma Linux 9 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -803,7 +803,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-9-arm64-ci-deps: - name: Alma Linux 9 Arm64 + name: Alma Linux 9 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -820,7 +820,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-ci-deps: - name: Amazon Linux 2 + name: Amazon Linux 2 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -837,7 +837,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-arm64-ci-deps: - name: Amazon Linux 2 Arm64 + name: Amazon Linux 2 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -854,7 +854,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 archlinux-lts-ci-deps: - name: Arch Linux LTS + name: Arch Linux LTS Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -871,7 +871,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centos-7-ci-deps: - name: CentOS 7 + name: CentOS 7 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -888,7 +888,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centos-7-arm64-ci-deps: - name: CentOS 7 Arm64 + name: CentOS 7 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -905,7 +905,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-8-ci-deps: - name: CentOS Stream 8 + name: CentOS Stream 8 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -922,7 +922,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-8-arm64-ci-deps: - name: CentOS Stream 8 Arm64 + name: CentOS Stream 8 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -939,7 +939,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-9-ci-deps: - name: CentOS Stream 9 + name: CentOS Stream 9 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -956,7 +956,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-9-arm64-ci-deps: - name: CentOS Stream 9 Arm64 + name: CentOS Stream 9 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -973,7 +973,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-10-ci-deps: - name: Debian 10 + name: Debian 10 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -990,7 +990,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-11-ci-deps: - name: Debian 11 + name: Debian 11 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1007,7 +1007,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-11-arm64-ci-deps: - name: Debian 11 Arm64 + name: Debian 11 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1024,7 +1024,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-37-ci-deps: - name: Fedora 37 + name: Fedora 37 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1041,7 +1041,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-37-arm64-ci-deps: - name: Fedora 37 Arm64 + name: Fedora 37 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1058,7 +1058,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-38-ci-deps: - name: Fedora 38 + name: Fedora 38 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1075,7 +1075,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-38-arm64-ci-deps: - name: Fedora 38 Arm64 + name: Fedora 38 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1092,7 +1092,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 opensuse-15-ci-deps: - name: Opensuse 15 + name: Opensuse 15 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1109,7 +1109,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-3-ci-deps: - name: Photon OS 3 + name: Photon OS 3 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1126,7 +1126,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-4-ci-deps: - name: Photon OS 4 + name: Photon OS 4 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1143,7 +1143,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-4-arm64-ci-deps: - name: Photon OS 4 Arm64 + name: Photon OS 4 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1160,7 +1160,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2004-ci-deps: - name: Ubuntu 20.04 + name: Ubuntu 20.04 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1177,7 +1177,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2004-arm64-ci-deps: - name: Ubuntu 20.04 Arm64 + name: Ubuntu 20.04 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1194,7 +1194,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2204-ci-deps: - name: Ubuntu 22.04 + name: Ubuntu 22.04 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1211,7 +1211,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2204-arm64-ci-deps: - name: Ubuntu 22.04 Arm64 + name: Ubuntu 22.04 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/templates/build-ci-deps.yml.jinja b/.github/workflows/templates/build-ci-deps.yml.jinja index fd6d7d46422..3674949f033 100644 --- a/.github/workflows/templates/build-ci-deps.yml.jinja +++ b/.github/workflows/templates/build-ci-deps.yml.jinja @@ -3,7 +3,7 @@ <{ slug.replace(".", "") }>-ci-deps: <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> - name: <{ display_name }> + name: <{ display_name }> Deps <%- if workflow_slug != 'release' %> if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} <%- endif %> @@ -32,7 +32,7 @@ <{ slug.replace(".", "") }>-ci-deps: <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> - name: <{ display_name }> + name: <{ display_name }> Deps <%- if workflow_slug != 'release' %> if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} <%- endif %> @@ -61,7 +61,7 @@ <{ slug.replace(".", "") }>-ci-deps: <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> - name: <{ display_name }> + name: <{ display_name }> Deps <%- if workflow_slug != 'release' %> if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} <%- endif %> From 0f7d9f937bc9fbdeca359d3ec0f80f88f0dee54e Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 8 Oct 2023 18:45:08 +0100 Subject: [PATCH 107/147] A more explicit test group Signed-off-by: Pedro Algarvio --- .github/workflows/ci.yml | 48 +++++++++---------- .github/workflows/nightly.yml | 48 +++++++++---------- .github/workflows/scheduled.yml | 48 +++++++++---------- .github/workflows/staging.yml | 48 +++++++++---------- .../workflows/templates/test-salt.yml.jinja | 6 +-- 5 files changed, 99 insertions(+), 99 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 63c5230f086..1c843200787 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1634,7 +1634,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016: - name: Windows 2016 + name: Windows 2016 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1654,7 +1654,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} windows-2019: - name: Windows 2019 + name: Windows 2019 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1674,7 +1674,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} windows-2022: - name: Windows 2022 + name: Windows 2022 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1694,7 +1694,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} macos-12: - name: macOS 12 + name: macOS 12 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -1714,7 +1714,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} almalinux-8: - name: Alma Linux 8 + name: Alma Linux 8 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1734,7 +1734,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} almalinux-9: - name: Alma Linux 9 + name: Alma Linux 9 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1754,7 +1754,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} amazonlinux-2: - name: Amazon Linux 2 + name: Amazon Linux 2 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1774,7 +1774,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} archlinux-lts: - name: Arch Linux LTS + name: Arch Linux LTS Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1794,7 +1794,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} centos-7: - name: CentOS 7 + name: CentOS 7 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1814,7 +1814,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} centosstream-8: - name: CentOS Stream 8 + name: CentOS Stream 8 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1834,7 +1834,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} centosstream-9: - name: CentOS Stream 9 + name: CentOS Stream 9 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1854,7 +1854,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} debian-10: - name: Debian 10 + name: Debian 10 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1874,7 +1874,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} debian-11: - name: Debian 11 + name: Debian 11 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1894,7 +1894,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} debian-11-arm64: - name: Debian 11 Arm64 + name: Debian 11 Arm64 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1914,7 +1914,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} fedora-37: - name: Fedora 37 + name: Fedora 37 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1934,7 +1934,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} fedora-38: - name: Fedora 38 + name: Fedora 38 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1954,7 +1954,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} opensuse-15: - name: Opensuse 15 + name: Opensuse 15 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1974,7 +1974,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} photonos-3: - name: Photon OS 3 + name: Photon OS 3 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1994,7 +1994,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} photonos-4: - name: Photon OS 4 + name: Photon OS 4 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2014,7 +2014,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} photonos-4-arm64: - name: Photon OS 4 Arm64 + name: Photon OS 4 Arm64 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2034,7 +2034,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} ubuntu-2004: - name: Ubuntu 20.04 + name: Ubuntu 20.04 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2054,7 +2054,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} ubuntu-2004-arm64: - name: Ubuntu 20.04 Arm64 + name: Ubuntu 20.04 Arm64 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2074,7 +2074,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} ubuntu-2204: - name: Ubuntu 22.04 + name: Ubuntu 22.04 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2094,7 +2094,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} ubuntu-2204-arm64: - name: Ubuntu 22.04 Arm64 + name: Ubuntu 22.04 Arm64 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index b4f36c0741a..3a2767ecdc1 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -1695,7 +1695,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016: - name: Windows 2016 + name: Windows 2016 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1715,7 +1715,7 @@ jobs: skip-junit-reports: false windows-2019: - name: Windows 2019 + name: Windows 2019 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1735,7 +1735,7 @@ jobs: skip-junit-reports: false windows-2022: - name: Windows 2022 + name: Windows 2022 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1755,7 +1755,7 @@ jobs: skip-junit-reports: false macos-12: - name: macOS 12 + name: macOS 12 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -1775,7 +1775,7 @@ jobs: skip-junit-reports: false almalinux-8: - name: Alma Linux 8 + name: Alma Linux 8 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1795,7 +1795,7 @@ jobs: skip-junit-reports: false almalinux-9: - name: Alma Linux 9 + name: Alma Linux 9 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1815,7 +1815,7 @@ jobs: skip-junit-reports: false amazonlinux-2: - name: Amazon Linux 2 + name: Amazon Linux 2 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1835,7 +1835,7 @@ jobs: skip-junit-reports: false archlinux-lts: - name: Arch Linux LTS + name: Arch Linux LTS Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1855,7 +1855,7 @@ jobs: skip-junit-reports: false centos-7: - name: CentOS 7 + name: CentOS 7 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1875,7 +1875,7 @@ jobs: skip-junit-reports: false centosstream-8: - name: CentOS Stream 8 + name: CentOS Stream 8 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1895,7 +1895,7 @@ jobs: skip-junit-reports: false centosstream-9: - name: CentOS Stream 9 + name: CentOS Stream 9 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1915,7 +1915,7 @@ jobs: skip-junit-reports: false debian-10: - name: Debian 10 + name: Debian 10 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1935,7 +1935,7 @@ jobs: skip-junit-reports: false debian-11: - name: Debian 11 + name: Debian 11 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1955,7 +1955,7 @@ jobs: skip-junit-reports: false debian-11-arm64: - name: Debian 11 Arm64 + name: Debian 11 Arm64 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1975,7 +1975,7 @@ jobs: skip-junit-reports: false fedora-37: - name: Fedora 37 + name: Fedora 37 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1995,7 +1995,7 @@ jobs: skip-junit-reports: false fedora-38: - name: Fedora 38 + name: Fedora 38 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2015,7 +2015,7 @@ jobs: skip-junit-reports: false opensuse-15: - name: Opensuse 15 + name: Opensuse 15 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2035,7 +2035,7 @@ jobs: skip-junit-reports: false photonos-3: - name: Photon OS 3 + name: Photon OS 3 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2055,7 +2055,7 @@ jobs: skip-junit-reports: false photonos-4: - name: Photon OS 4 + name: Photon OS 4 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2075,7 +2075,7 @@ jobs: skip-junit-reports: false photonos-4-arm64: - name: Photon OS 4 Arm64 + name: Photon OS 4 Arm64 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2095,7 +2095,7 @@ jobs: skip-junit-reports: false ubuntu-2004: - name: Ubuntu 20.04 + name: Ubuntu 20.04 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2115,7 +2115,7 @@ jobs: skip-junit-reports: false ubuntu-2004-arm64: - name: Ubuntu 20.04 Arm64 + name: Ubuntu 20.04 Arm64 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2135,7 +2135,7 @@ jobs: skip-junit-reports: false ubuntu-2204: - name: Ubuntu 22.04 + name: Ubuntu 22.04 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2155,7 +2155,7 @@ jobs: skip-junit-reports: false ubuntu-2204-arm64: - name: Ubuntu 22.04 Arm64 + name: Ubuntu 22.04 Arm64 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index e5bac3c0aef..2f0496407d1 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -1668,7 +1668,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016: - name: Windows 2016 + name: Windows 2016 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1688,7 +1688,7 @@ jobs: skip-junit-reports: false windows-2019: - name: Windows 2019 + name: Windows 2019 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1708,7 +1708,7 @@ jobs: skip-junit-reports: false windows-2022: - name: Windows 2022 + name: Windows 2022 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1728,7 +1728,7 @@ jobs: skip-junit-reports: false macos-12: - name: macOS 12 + name: macOS 12 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -1748,7 +1748,7 @@ jobs: skip-junit-reports: false almalinux-8: - name: Alma Linux 8 + name: Alma Linux 8 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1768,7 +1768,7 @@ jobs: skip-junit-reports: false almalinux-9: - name: Alma Linux 9 + name: Alma Linux 9 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1788,7 +1788,7 @@ jobs: skip-junit-reports: false amazonlinux-2: - name: Amazon Linux 2 + name: Amazon Linux 2 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1808,7 +1808,7 @@ jobs: skip-junit-reports: false archlinux-lts: - name: Arch Linux LTS + name: Arch Linux LTS Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1828,7 +1828,7 @@ jobs: skip-junit-reports: false centos-7: - name: CentOS 7 + name: CentOS 7 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1848,7 +1848,7 @@ jobs: skip-junit-reports: false centosstream-8: - name: CentOS Stream 8 + name: CentOS Stream 8 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1868,7 +1868,7 @@ jobs: skip-junit-reports: false centosstream-9: - name: CentOS Stream 9 + name: CentOS Stream 9 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1888,7 +1888,7 @@ jobs: skip-junit-reports: false debian-10: - name: Debian 10 + name: Debian 10 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1908,7 +1908,7 @@ jobs: skip-junit-reports: false debian-11: - name: Debian 11 + name: Debian 11 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1928,7 +1928,7 @@ jobs: skip-junit-reports: false debian-11-arm64: - name: Debian 11 Arm64 + name: Debian 11 Arm64 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1948,7 +1948,7 @@ jobs: skip-junit-reports: false fedora-37: - name: Fedora 37 + name: Fedora 37 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1968,7 +1968,7 @@ jobs: skip-junit-reports: false fedora-38: - name: Fedora 38 + name: Fedora 38 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1988,7 +1988,7 @@ jobs: skip-junit-reports: false opensuse-15: - name: Opensuse 15 + name: Opensuse 15 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2008,7 +2008,7 @@ jobs: skip-junit-reports: false photonos-3: - name: Photon OS 3 + name: Photon OS 3 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2028,7 +2028,7 @@ jobs: skip-junit-reports: false photonos-4: - name: Photon OS 4 + name: Photon OS 4 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2048,7 +2048,7 @@ jobs: skip-junit-reports: false photonos-4-arm64: - name: Photon OS 4 Arm64 + name: Photon OS 4 Arm64 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2068,7 +2068,7 @@ jobs: skip-junit-reports: false ubuntu-2004: - name: Ubuntu 20.04 + name: Ubuntu 20.04 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2088,7 +2088,7 @@ jobs: skip-junit-reports: false ubuntu-2004-arm64: - name: Ubuntu 20.04 Arm64 + name: Ubuntu 20.04 Arm64 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2108,7 +2108,7 @@ jobs: skip-junit-reports: false ubuntu-2204: - name: Ubuntu 22.04 + name: Ubuntu 22.04 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2128,7 +2128,7 @@ jobs: skip-junit-reports: false ubuntu-2204-arm64: - name: Ubuntu 22.04 Arm64 + name: Ubuntu 22.04 Arm64 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 4ed079c753e..467015fb027 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -1690,7 +1690,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016: - name: Windows 2016 + name: Windows 2016 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1710,7 +1710,7 @@ jobs: skip-junit-reports: true windows-2019: - name: Windows 2019 + name: Windows 2019 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1730,7 +1730,7 @@ jobs: skip-junit-reports: true windows-2022: - name: Windows 2022 + name: Windows 2022 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1750,7 +1750,7 @@ jobs: skip-junit-reports: true macos-12: - name: macOS 12 + name: macOS 12 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -1770,7 +1770,7 @@ jobs: skip-junit-reports: true almalinux-8: - name: Alma Linux 8 + name: Alma Linux 8 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1790,7 +1790,7 @@ jobs: skip-junit-reports: true almalinux-9: - name: Alma Linux 9 + name: Alma Linux 9 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1810,7 +1810,7 @@ jobs: skip-junit-reports: true amazonlinux-2: - name: Amazon Linux 2 + name: Amazon Linux 2 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1830,7 +1830,7 @@ jobs: skip-junit-reports: true archlinux-lts: - name: Arch Linux LTS + name: Arch Linux LTS Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1850,7 +1850,7 @@ jobs: skip-junit-reports: true centos-7: - name: CentOS 7 + name: CentOS 7 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1870,7 +1870,7 @@ jobs: skip-junit-reports: true centosstream-8: - name: CentOS Stream 8 + name: CentOS Stream 8 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1890,7 +1890,7 @@ jobs: skip-junit-reports: true centosstream-9: - name: CentOS Stream 9 + name: CentOS Stream 9 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1910,7 +1910,7 @@ jobs: skip-junit-reports: true debian-10: - name: Debian 10 + name: Debian 10 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1930,7 +1930,7 @@ jobs: skip-junit-reports: true debian-11: - name: Debian 11 + name: Debian 11 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1950,7 +1950,7 @@ jobs: skip-junit-reports: true debian-11-arm64: - name: Debian 11 Arm64 + name: Debian 11 Arm64 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1970,7 +1970,7 @@ jobs: skip-junit-reports: true fedora-37: - name: Fedora 37 + name: Fedora 37 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1990,7 +1990,7 @@ jobs: skip-junit-reports: true fedora-38: - name: Fedora 38 + name: Fedora 38 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2010,7 +2010,7 @@ jobs: skip-junit-reports: true opensuse-15: - name: Opensuse 15 + name: Opensuse 15 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2030,7 +2030,7 @@ jobs: skip-junit-reports: true photonos-3: - name: Photon OS 3 + name: Photon OS 3 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2050,7 +2050,7 @@ jobs: skip-junit-reports: true photonos-4: - name: Photon OS 4 + name: Photon OS 4 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2070,7 +2070,7 @@ jobs: skip-junit-reports: true photonos-4-arm64: - name: Photon OS 4 Arm64 + name: Photon OS 4 Arm64 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2090,7 +2090,7 @@ jobs: skip-junit-reports: true ubuntu-2004: - name: Ubuntu 20.04 + name: Ubuntu 20.04 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2110,7 +2110,7 @@ jobs: skip-junit-reports: true ubuntu-2004-arm64: - name: Ubuntu 20.04 Arm64 + name: Ubuntu 20.04 Arm64 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2130,7 +2130,7 @@ jobs: skip-junit-reports: true ubuntu-2204: - name: Ubuntu 22.04 + name: Ubuntu 22.04 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2150,7 +2150,7 @@ jobs: skip-junit-reports: true ubuntu-2204-arm64: - name: Ubuntu 22.04 Arm64 + name: Ubuntu 22.04 Arm64 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/templates/test-salt.yml.jinja b/.github/workflows/templates/test-salt.yml.jinja index 91e222aaccc..63834ee10dc 100644 --- a/.github/workflows/templates/test-salt.yml.jinja +++ b/.github/workflows/templates/test-salt.yml.jinja @@ -3,7 +3,7 @@ <{ slug.replace(".", "") }>: <%- do test_salt_needs.append(slug.replace(".", "")) %> - name: <{ display_name }> + name: <{ display_name }> Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -29,7 +29,7 @@ <{ slug.replace(".", "") }>: <%- do test_salt_needs.append(slug.replace(".", "")) %> - name: <{ display_name }> + name: <{ display_name }> Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -55,7 +55,7 @@ <{ slug.replace(".", "") }>: <%- do test_salt_needs.append(slug.replace(".", "")) %> - name: <{ display_name }> + name: <{ display_name }> Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow From c93b8bd7e0304dc37bf1d550a2ac9be5efca6d68 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 9 Oct 2023 09:56:16 +0100 Subject: [PATCH 108/147] Exclude the nightly builds from the backup/restore process Signed-off-by: Pedro Algarvio --- tools/pkg/repo/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/pkg/repo/__init__.py b/tools/pkg/repo/__init__.py index d965fcfd923..5599bfd5722 100644 --- a/tools/pkg/repo/__init__.py +++ b/tools/pkg/repo/__init__.py @@ -91,6 +91,7 @@ def _rclone(ctx: Context, src: str, dst: str): "--transfers=50", "--fast-list", "--verbose", + "--exclude=salt-dev/*", ] if src == tools.utils.RELEASE_BUCKET_NAME: cmdline.append("--s3-storage-class=INTELLIGENT_TIERING") From d750fa3fe02e558b7f526579cc11969586feb81a Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 9 Oct 2023 10:00:24 +0100 Subject: [PATCH 109/147] Minor display name changes Signed-off-by: Pedro Algarvio --- .github/workflows/ci.yml | 42 +++++++++---------- .github/workflows/nightly.yml | 42 +++++++++---------- .github/workflows/scheduled.yml | 42 +++++++++---------- .github/workflows/staging.yml | 42 +++++++++---------- .../templates/test-salt-pkg.yml.jinja | 6 +-- 5 files changed, 87 insertions(+), 87 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1c843200787..668241def81 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1172,7 +1172,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-pkg-tests: - name: Amazon Linux 2 Package + name: Amazon Linux 2 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1194,7 +1194,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centos-7-pkg-tests: - name: CentOS 7 Package + name: CentOS 7 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1216,7 +1216,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-8-pkg-tests: - name: CentOS Stream 8 Package + name: CentOS Stream 8 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1238,7 +1238,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-9-pkg-tests: - name: CentOS Stream 9 Package + name: CentOS Stream 9 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1260,7 +1260,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-10-pkg-tests: - name: Debian 10 Package + name: Debian 10 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1282,7 +1282,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-pkg-tests: - name: Debian 11 Package + name: Debian 11 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1304,7 +1304,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-arm64-pkg-tests: - name: Debian 11 Arm64 Package + name: Debian 11 Arm64 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1326,7 +1326,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-3-pkg-tests: - name: Photon OS 3 Package + name: Photon OS 3 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1348,7 +1348,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-pkg-tests: - name: Photon OS 4 Package + name: Photon OS 4 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1370,7 +1370,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-arm64-pkg-tests: - name: Photon OS 4 Arm64 Package + name: Photon OS 4 Arm64 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1392,7 +1392,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-pkg-tests: - name: Ubuntu 20.04 Package + name: Ubuntu 20.04 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1414,7 +1414,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-arm64-pkg-tests: - name: Ubuntu 20.04 Arm64 Package + name: Ubuntu 20.04 Arm64 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1436,7 +1436,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-pkg-tests: - name: Ubuntu 22.04 Package + name: Ubuntu 22.04 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1458,7 +1458,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-arm64-pkg-tests: - name: Ubuntu 22.04 Arm64 Package + name: Ubuntu 22.04 Arm64 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1480,7 +1480,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} macos-12-pkg-tests: - name: macOS 12 Package + name: macOS 12 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -1502,7 +1502,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-nsis-pkg-tests: - name: Windows 2016 NSIS Package + name: Windows 2016 NSIS Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1524,7 +1524,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-msi-pkg-tests: - name: Windows 2016 MSI Package + name: Windows 2016 MSI Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1546,7 +1546,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-nsis-pkg-tests: - name: Windows 2019 NSIS Package + name: Windows 2019 NSIS Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1568,7 +1568,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-msi-pkg-tests: - name: Windows 2019 MSI Package + name: Windows 2019 MSI Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1590,7 +1590,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-nsis-pkg-tests: - name: Windows 2022 NSIS Package + name: Windows 2022 NSIS Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1612,7 +1612,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-msi-pkg-tests: - name: Windows 2022 MSI Package + name: Windows 2022 MSI Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 3a2767ecdc1..abaf37e6349 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -1233,7 +1233,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-pkg-tests: - name: Amazon Linux 2 Package + name: Amazon Linux 2 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1255,7 +1255,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centos-7-pkg-tests: - name: CentOS 7 Package + name: CentOS 7 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1277,7 +1277,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-8-pkg-tests: - name: CentOS Stream 8 Package + name: CentOS Stream 8 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1299,7 +1299,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-9-pkg-tests: - name: CentOS Stream 9 Package + name: CentOS Stream 9 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1321,7 +1321,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-10-pkg-tests: - name: Debian 10 Package + name: Debian 10 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1343,7 +1343,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-pkg-tests: - name: Debian 11 Package + name: Debian 11 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1365,7 +1365,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-arm64-pkg-tests: - name: Debian 11 Arm64 Package + name: Debian 11 Arm64 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1387,7 +1387,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-3-pkg-tests: - name: Photon OS 3 Package + name: Photon OS 3 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1409,7 +1409,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-pkg-tests: - name: Photon OS 4 Package + name: Photon OS 4 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1431,7 +1431,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-arm64-pkg-tests: - name: Photon OS 4 Arm64 Package + name: Photon OS 4 Arm64 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1453,7 +1453,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-pkg-tests: - name: Ubuntu 20.04 Package + name: Ubuntu 20.04 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1475,7 +1475,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-arm64-pkg-tests: - name: Ubuntu 20.04 Arm64 Package + name: Ubuntu 20.04 Arm64 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1497,7 +1497,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-pkg-tests: - name: Ubuntu 22.04 Package + name: Ubuntu 22.04 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1519,7 +1519,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-arm64-pkg-tests: - name: Ubuntu 22.04 Arm64 Package + name: Ubuntu 22.04 Arm64 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1541,7 +1541,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} macos-12-pkg-tests: - name: macOS 12 Package + name: macOS 12 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -1563,7 +1563,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-nsis-pkg-tests: - name: Windows 2016 NSIS Package + name: Windows 2016 NSIS Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1585,7 +1585,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-msi-pkg-tests: - name: Windows 2016 MSI Package + name: Windows 2016 MSI Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1607,7 +1607,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-nsis-pkg-tests: - name: Windows 2019 NSIS Package + name: Windows 2019 NSIS Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1629,7 +1629,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-msi-pkg-tests: - name: Windows 2019 MSI Package + name: Windows 2019 MSI Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1651,7 +1651,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-nsis-pkg-tests: - name: Windows 2022 NSIS Package + name: Windows 2022 NSIS Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1673,7 +1673,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-msi-pkg-tests: - name: Windows 2022 MSI Package + name: Windows 2022 MSI Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 2f0496407d1..6c46cb9eb6e 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -1206,7 +1206,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-pkg-tests: - name: Amazon Linux 2 Package + name: Amazon Linux 2 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1228,7 +1228,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centos-7-pkg-tests: - name: CentOS 7 Package + name: CentOS 7 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1250,7 +1250,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-8-pkg-tests: - name: CentOS Stream 8 Package + name: CentOS Stream 8 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1272,7 +1272,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-9-pkg-tests: - name: CentOS Stream 9 Package + name: CentOS Stream 9 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1294,7 +1294,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-10-pkg-tests: - name: Debian 10 Package + name: Debian 10 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1316,7 +1316,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-pkg-tests: - name: Debian 11 Package + name: Debian 11 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1338,7 +1338,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-arm64-pkg-tests: - name: Debian 11 Arm64 Package + name: Debian 11 Arm64 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1360,7 +1360,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-3-pkg-tests: - name: Photon OS 3 Package + name: Photon OS 3 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1382,7 +1382,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-pkg-tests: - name: Photon OS 4 Package + name: Photon OS 4 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1404,7 +1404,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-arm64-pkg-tests: - name: Photon OS 4 Arm64 Package + name: Photon OS 4 Arm64 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1426,7 +1426,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-pkg-tests: - name: Ubuntu 20.04 Package + name: Ubuntu 20.04 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1448,7 +1448,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-arm64-pkg-tests: - name: Ubuntu 20.04 Arm64 Package + name: Ubuntu 20.04 Arm64 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1470,7 +1470,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-pkg-tests: - name: Ubuntu 22.04 Package + name: Ubuntu 22.04 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1492,7 +1492,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-arm64-pkg-tests: - name: Ubuntu 22.04 Arm64 Package + name: Ubuntu 22.04 Arm64 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1514,7 +1514,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} macos-12-pkg-tests: - name: macOS 12 Package + name: macOS 12 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -1536,7 +1536,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-nsis-pkg-tests: - name: Windows 2016 NSIS Package + name: Windows 2016 NSIS Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1558,7 +1558,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-msi-pkg-tests: - name: Windows 2016 MSI Package + name: Windows 2016 MSI Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1580,7 +1580,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-nsis-pkg-tests: - name: Windows 2019 NSIS Package + name: Windows 2019 NSIS Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1602,7 +1602,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-msi-pkg-tests: - name: Windows 2019 MSI Package + name: Windows 2019 MSI Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1624,7 +1624,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-nsis-pkg-tests: - name: Windows 2022 NSIS Package + name: Windows 2022 NSIS Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1646,7 +1646,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-msi-pkg-tests: - name: Windows 2022 MSI Package + name: Windows 2022 MSI Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 467015fb027..ca5c110e49c 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -1228,7 +1228,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-pkg-tests: - name: Amazon Linux 2 Package + name: Amazon Linux 2 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1250,7 +1250,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centos-7-pkg-tests: - name: CentOS 7 Package + name: CentOS 7 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1272,7 +1272,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-8-pkg-tests: - name: CentOS Stream 8 Package + name: CentOS Stream 8 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1294,7 +1294,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-9-pkg-tests: - name: CentOS Stream 9 Package + name: CentOS Stream 9 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1316,7 +1316,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-10-pkg-tests: - name: Debian 10 Package + name: Debian 10 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1338,7 +1338,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-pkg-tests: - name: Debian 11 Package + name: Debian 11 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1360,7 +1360,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-arm64-pkg-tests: - name: Debian 11 Arm64 Package + name: Debian 11 Arm64 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1382,7 +1382,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-3-pkg-tests: - name: Photon OS 3 Package + name: Photon OS 3 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1404,7 +1404,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-pkg-tests: - name: Photon OS 4 Package + name: Photon OS 4 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1426,7 +1426,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-arm64-pkg-tests: - name: Photon OS 4 Arm64 Package + name: Photon OS 4 Arm64 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1448,7 +1448,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-pkg-tests: - name: Ubuntu 20.04 Package + name: Ubuntu 20.04 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1470,7 +1470,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-arm64-pkg-tests: - name: Ubuntu 20.04 Arm64 Package + name: Ubuntu 20.04 Arm64 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1492,7 +1492,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-pkg-tests: - name: Ubuntu 22.04 Package + name: Ubuntu 22.04 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1514,7 +1514,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-arm64-pkg-tests: - name: Ubuntu 22.04 Arm64 Package + name: Ubuntu 22.04 Arm64 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1536,7 +1536,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} macos-12-pkg-tests: - name: macOS 12 Package + name: macOS 12 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -1558,7 +1558,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-nsis-pkg-tests: - name: Windows 2016 NSIS Package + name: Windows 2016 NSIS Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1580,7 +1580,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-msi-pkg-tests: - name: Windows 2016 MSI Package + name: Windows 2016 MSI Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1602,7 +1602,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-nsis-pkg-tests: - name: Windows 2019 NSIS Package + name: Windows 2019 NSIS Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1624,7 +1624,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-msi-pkg-tests: - name: Windows 2019 MSI Package + name: Windows 2019 MSI Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1646,7 +1646,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-nsis-pkg-tests: - name: Windows 2022 NSIS Package + name: Windows 2022 NSIS Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1668,7 +1668,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-msi-pkg-tests: - name: Windows 2022 MSI Package + name: Windows 2022 MSI Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/templates/test-salt-pkg.yml.jinja b/.github/workflows/templates/test-salt-pkg.yml.jinja index 64617d7054d..5a674683485 100644 --- a/.github/workflows/templates/test-salt-pkg.yml.jinja +++ b/.github/workflows/templates/test-salt-pkg.yml.jinja @@ -3,7 +3,7 @@ <{ job_name }>: <%- do test_salt_pkg_needs.append(job_name) %> - name: <{ display_name }> Package + name: <{ display_name }> Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -33,7 +33,7 @@ <{ job_name }>: <%- do test_salt_pkg_needs.append(job_name) %> - name: <{ display_name }> Package + name: <{ display_name }> Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -63,7 +63,7 @@ <{ job_name }>: <%- do test_salt_pkg_needs.append(job_name) %> - name: <{ display_name }> <{ pkg_type }> Package + name: <{ display_name }> <{ pkg_type }> Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow From 8a809721ccd48ad71004f9d48f2d898d702d7faa Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 9 Oct 2023 14:36:34 +0100 Subject: [PATCH 110/147] Revert "Minor display name changes" This reverts commit d750fa3fe02e558b7f526579cc11969586feb81a. --- .github/workflows/ci.yml | 42 +++++++++---------- .github/workflows/nightly.yml | 42 +++++++++---------- .github/workflows/scheduled.yml | 42 +++++++++---------- .github/workflows/staging.yml | 42 +++++++++---------- .../templates/test-salt-pkg.yml.jinja | 6 +-- 5 files changed, 87 insertions(+), 87 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 668241def81..1c843200787 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1172,7 +1172,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-pkg-tests: - name: Amazon Linux 2 Package Test + name: Amazon Linux 2 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1194,7 +1194,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centos-7-pkg-tests: - name: CentOS 7 Package Test + name: CentOS 7 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1216,7 +1216,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-8-pkg-tests: - name: CentOS Stream 8 Package Test + name: CentOS Stream 8 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1238,7 +1238,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-9-pkg-tests: - name: CentOS Stream 9 Package Test + name: CentOS Stream 9 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1260,7 +1260,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-10-pkg-tests: - name: Debian 10 Package Test + name: Debian 10 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1282,7 +1282,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-pkg-tests: - name: Debian 11 Package Test + name: Debian 11 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1304,7 +1304,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-arm64-pkg-tests: - name: Debian 11 Arm64 Package Test + name: Debian 11 Arm64 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1326,7 +1326,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-3-pkg-tests: - name: Photon OS 3 Package Test + name: Photon OS 3 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1348,7 +1348,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-pkg-tests: - name: Photon OS 4 Package Test + name: Photon OS 4 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1370,7 +1370,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-arm64-pkg-tests: - name: Photon OS 4 Arm64 Package Test + name: Photon OS 4 Arm64 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1392,7 +1392,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-pkg-tests: - name: Ubuntu 20.04 Package Test + name: Ubuntu 20.04 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1414,7 +1414,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-arm64-pkg-tests: - name: Ubuntu 20.04 Arm64 Package Test + name: Ubuntu 20.04 Arm64 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1436,7 +1436,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-pkg-tests: - name: Ubuntu 22.04 Package Test + name: Ubuntu 22.04 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1458,7 +1458,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-arm64-pkg-tests: - name: Ubuntu 22.04 Arm64 Package Test + name: Ubuntu 22.04 Arm64 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1480,7 +1480,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} macos-12-pkg-tests: - name: macOS 12 Package Test + name: macOS 12 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -1502,7 +1502,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-nsis-pkg-tests: - name: Windows 2016 NSIS Package Test + name: Windows 2016 NSIS Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1524,7 +1524,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-msi-pkg-tests: - name: Windows 2016 MSI Package Test + name: Windows 2016 MSI Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1546,7 +1546,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-nsis-pkg-tests: - name: Windows 2019 NSIS Package Test + name: Windows 2019 NSIS Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1568,7 +1568,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-msi-pkg-tests: - name: Windows 2019 MSI Package Test + name: Windows 2019 MSI Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1590,7 +1590,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-nsis-pkg-tests: - name: Windows 2022 NSIS Package Test + name: Windows 2022 NSIS Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1612,7 +1612,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-msi-pkg-tests: - name: Windows 2022 MSI Package Test + name: Windows 2022 MSI Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index abaf37e6349..3a2767ecdc1 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -1233,7 +1233,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-pkg-tests: - name: Amazon Linux 2 Package Test + name: Amazon Linux 2 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1255,7 +1255,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centos-7-pkg-tests: - name: CentOS 7 Package Test + name: CentOS 7 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1277,7 +1277,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-8-pkg-tests: - name: CentOS Stream 8 Package Test + name: CentOS Stream 8 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1299,7 +1299,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-9-pkg-tests: - name: CentOS Stream 9 Package Test + name: CentOS Stream 9 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1321,7 +1321,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-10-pkg-tests: - name: Debian 10 Package Test + name: Debian 10 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1343,7 +1343,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-pkg-tests: - name: Debian 11 Package Test + name: Debian 11 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1365,7 +1365,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-arm64-pkg-tests: - name: Debian 11 Arm64 Package Test + name: Debian 11 Arm64 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1387,7 +1387,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-3-pkg-tests: - name: Photon OS 3 Package Test + name: Photon OS 3 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1409,7 +1409,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-pkg-tests: - name: Photon OS 4 Package Test + name: Photon OS 4 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1431,7 +1431,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-arm64-pkg-tests: - name: Photon OS 4 Arm64 Package Test + name: Photon OS 4 Arm64 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1453,7 +1453,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-pkg-tests: - name: Ubuntu 20.04 Package Test + name: Ubuntu 20.04 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1475,7 +1475,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-arm64-pkg-tests: - name: Ubuntu 20.04 Arm64 Package Test + name: Ubuntu 20.04 Arm64 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1497,7 +1497,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-pkg-tests: - name: Ubuntu 22.04 Package Test + name: Ubuntu 22.04 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1519,7 +1519,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-arm64-pkg-tests: - name: Ubuntu 22.04 Arm64 Package Test + name: Ubuntu 22.04 Arm64 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1541,7 +1541,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} macos-12-pkg-tests: - name: macOS 12 Package Test + name: macOS 12 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -1563,7 +1563,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-nsis-pkg-tests: - name: Windows 2016 NSIS Package Test + name: Windows 2016 NSIS Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1585,7 +1585,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-msi-pkg-tests: - name: Windows 2016 MSI Package Test + name: Windows 2016 MSI Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1607,7 +1607,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-nsis-pkg-tests: - name: Windows 2019 NSIS Package Test + name: Windows 2019 NSIS Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1629,7 +1629,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-msi-pkg-tests: - name: Windows 2019 MSI Package Test + name: Windows 2019 MSI Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1651,7 +1651,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-nsis-pkg-tests: - name: Windows 2022 NSIS Package Test + name: Windows 2022 NSIS Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1673,7 +1673,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-msi-pkg-tests: - name: Windows 2022 MSI Package Test + name: Windows 2022 MSI Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 6c46cb9eb6e..2f0496407d1 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -1206,7 +1206,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-pkg-tests: - name: Amazon Linux 2 Package Test + name: Amazon Linux 2 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1228,7 +1228,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centos-7-pkg-tests: - name: CentOS 7 Package Test + name: CentOS 7 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1250,7 +1250,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-8-pkg-tests: - name: CentOS Stream 8 Package Test + name: CentOS Stream 8 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1272,7 +1272,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-9-pkg-tests: - name: CentOS Stream 9 Package Test + name: CentOS Stream 9 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1294,7 +1294,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-10-pkg-tests: - name: Debian 10 Package Test + name: Debian 10 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1316,7 +1316,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-pkg-tests: - name: Debian 11 Package Test + name: Debian 11 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1338,7 +1338,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-arm64-pkg-tests: - name: Debian 11 Arm64 Package Test + name: Debian 11 Arm64 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1360,7 +1360,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-3-pkg-tests: - name: Photon OS 3 Package Test + name: Photon OS 3 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1382,7 +1382,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-pkg-tests: - name: Photon OS 4 Package Test + name: Photon OS 4 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1404,7 +1404,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-arm64-pkg-tests: - name: Photon OS 4 Arm64 Package Test + name: Photon OS 4 Arm64 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1426,7 +1426,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-pkg-tests: - name: Ubuntu 20.04 Package Test + name: Ubuntu 20.04 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1448,7 +1448,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-arm64-pkg-tests: - name: Ubuntu 20.04 Arm64 Package Test + name: Ubuntu 20.04 Arm64 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1470,7 +1470,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-pkg-tests: - name: Ubuntu 22.04 Package Test + name: Ubuntu 22.04 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1492,7 +1492,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-arm64-pkg-tests: - name: Ubuntu 22.04 Arm64 Package Test + name: Ubuntu 22.04 Arm64 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1514,7 +1514,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} macos-12-pkg-tests: - name: macOS 12 Package Test + name: macOS 12 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -1536,7 +1536,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-nsis-pkg-tests: - name: Windows 2016 NSIS Package Test + name: Windows 2016 NSIS Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1558,7 +1558,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-msi-pkg-tests: - name: Windows 2016 MSI Package Test + name: Windows 2016 MSI Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1580,7 +1580,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-nsis-pkg-tests: - name: Windows 2019 NSIS Package Test + name: Windows 2019 NSIS Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1602,7 +1602,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-msi-pkg-tests: - name: Windows 2019 MSI Package Test + name: Windows 2019 MSI Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1624,7 +1624,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-nsis-pkg-tests: - name: Windows 2022 NSIS Package Test + name: Windows 2022 NSIS Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1646,7 +1646,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-msi-pkg-tests: - name: Windows 2022 MSI Package Test + name: Windows 2022 MSI Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index ca5c110e49c..467015fb027 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -1228,7 +1228,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-pkg-tests: - name: Amazon Linux 2 Package Test + name: Amazon Linux 2 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1250,7 +1250,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centos-7-pkg-tests: - name: CentOS 7 Package Test + name: CentOS 7 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1272,7 +1272,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-8-pkg-tests: - name: CentOS Stream 8 Package Test + name: CentOS Stream 8 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1294,7 +1294,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-9-pkg-tests: - name: CentOS Stream 9 Package Test + name: CentOS Stream 9 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1316,7 +1316,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-10-pkg-tests: - name: Debian 10 Package Test + name: Debian 10 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1338,7 +1338,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-pkg-tests: - name: Debian 11 Package Test + name: Debian 11 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1360,7 +1360,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-arm64-pkg-tests: - name: Debian 11 Arm64 Package Test + name: Debian 11 Arm64 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1382,7 +1382,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-3-pkg-tests: - name: Photon OS 3 Package Test + name: Photon OS 3 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1404,7 +1404,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-pkg-tests: - name: Photon OS 4 Package Test + name: Photon OS 4 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1426,7 +1426,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-arm64-pkg-tests: - name: Photon OS 4 Arm64 Package Test + name: Photon OS 4 Arm64 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1448,7 +1448,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-pkg-tests: - name: Ubuntu 20.04 Package Test + name: Ubuntu 20.04 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1470,7 +1470,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-arm64-pkg-tests: - name: Ubuntu 20.04 Arm64 Package Test + name: Ubuntu 20.04 Arm64 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1492,7 +1492,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-pkg-tests: - name: Ubuntu 22.04 Package Test + name: Ubuntu 22.04 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1514,7 +1514,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-arm64-pkg-tests: - name: Ubuntu 22.04 Arm64 Package Test + name: Ubuntu 22.04 Arm64 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1536,7 +1536,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} macos-12-pkg-tests: - name: macOS 12 Package Test + name: macOS 12 Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -1558,7 +1558,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-nsis-pkg-tests: - name: Windows 2016 NSIS Package Test + name: Windows 2016 NSIS Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1580,7 +1580,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-msi-pkg-tests: - name: Windows 2016 MSI Package Test + name: Windows 2016 MSI Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1602,7 +1602,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-nsis-pkg-tests: - name: Windows 2019 NSIS Package Test + name: Windows 2019 NSIS Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1624,7 +1624,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-msi-pkg-tests: - name: Windows 2019 MSI Package Test + name: Windows 2019 MSI Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1646,7 +1646,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-nsis-pkg-tests: - name: Windows 2022 NSIS Package Test + name: Windows 2022 NSIS Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1668,7 +1668,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-msi-pkg-tests: - name: Windows 2022 MSI Package Test + name: Windows 2022 MSI Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/templates/test-salt-pkg.yml.jinja b/.github/workflows/templates/test-salt-pkg.yml.jinja index 5a674683485..64617d7054d 100644 --- a/.github/workflows/templates/test-salt-pkg.yml.jinja +++ b/.github/workflows/templates/test-salt-pkg.yml.jinja @@ -3,7 +3,7 @@ <{ job_name }>: <%- do test_salt_pkg_needs.append(job_name) %> - name: <{ display_name }> Package Test + name: <{ display_name }> Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -33,7 +33,7 @@ <{ job_name }>: <%- do test_salt_pkg_needs.append(job_name) %> - name: <{ display_name }> Package Test + name: <{ display_name }> Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -63,7 +63,7 @@ <{ job_name }>: <%- do test_salt_pkg_needs.append(job_name) %> - name: <{ display_name }> <{ pkg_type }> Package Test + name: <{ display_name }> <{ pkg_type }> Package if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow From 1492fc73bff53e9da5b276b5832490bc8501c1af Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 9 Oct 2023 14:36:34 +0100 Subject: [PATCH 111/147] Revert "Exclude the nightly builds from the backup/restore process" This reverts commit c93b8bd7e0304dc37bf1d550a2ac9be5efca6d68. --- tools/pkg/repo/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/pkg/repo/__init__.py b/tools/pkg/repo/__init__.py index 5599bfd5722..d965fcfd923 100644 --- a/tools/pkg/repo/__init__.py +++ b/tools/pkg/repo/__init__.py @@ -91,7 +91,6 @@ def _rclone(ctx: Context, src: str, dst: str): "--transfers=50", "--fast-list", "--verbose", - "--exclude=salt-dev/*", ] if src == tools.utils.RELEASE_BUCKET_NAME: cmdline.append("--s3-storage-class=INTELLIGENT_TIERING") From 8e74912ca44ebf773a6ece58417196ed7f862f97 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 9 Oct 2023 14:36:34 +0100 Subject: [PATCH 112/147] Revert "A more explicit test group" This reverts commit 0f7d9f937bc9fbdeca359d3ec0f80f88f0dee54e. --- .github/workflows/ci.yml | 48 +++++++++---------- .github/workflows/nightly.yml | 48 +++++++++---------- .github/workflows/scheduled.yml | 48 +++++++++---------- .github/workflows/staging.yml | 48 +++++++++---------- .../workflows/templates/test-salt.yml.jinja | 6 +-- 5 files changed, 99 insertions(+), 99 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1c843200787..63c5230f086 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1634,7 +1634,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016: - name: Windows 2016 Test + name: Windows 2016 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1654,7 +1654,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} windows-2019: - name: Windows 2019 Test + name: Windows 2019 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1674,7 +1674,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} windows-2022: - name: Windows 2022 Test + name: Windows 2022 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1694,7 +1694,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} macos-12: - name: macOS 12 Test + name: macOS 12 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -1714,7 +1714,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} almalinux-8: - name: Alma Linux 8 Test + name: Alma Linux 8 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1734,7 +1734,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} almalinux-9: - name: Alma Linux 9 Test + name: Alma Linux 9 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1754,7 +1754,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} amazonlinux-2: - name: Amazon Linux 2 Test + name: Amazon Linux 2 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1774,7 +1774,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} archlinux-lts: - name: Arch Linux LTS Test + name: Arch Linux LTS if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1794,7 +1794,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} centos-7: - name: CentOS 7 Test + name: CentOS 7 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1814,7 +1814,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} centosstream-8: - name: CentOS Stream 8 Test + name: CentOS Stream 8 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1834,7 +1834,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} centosstream-9: - name: CentOS Stream 9 Test + name: CentOS Stream 9 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1854,7 +1854,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} debian-10: - name: Debian 10 Test + name: Debian 10 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1874,7 +1874,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} debian-11: - name: Debian 11 Test + name: Debian 11 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1894,7 +1894,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} debian-11-arm64: - name: Debian 11 Arm64 Test + name: Debian 11 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1914,7 +1914,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} fedora-37: - name: Fedora 37 Test + name: Fedora 37 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1934,7 +1934,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} fedora-38: - name: Fedora 38 Test + name: Fedora 38 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1954,7 +1954,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} opensuse-15: - name: Opensuse 15 Test + name: Opensuse 15 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1974,7 +1974,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} photonos-3: - name: Photon OS 3 Test + name: Photon OS 3 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1994,7 +1994,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} photonos-4: - name: Photon OS 4 Test + name: Photon OS 4 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2014,7 +2014,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} photonos-4-arm64: - name: Photon OS 4 Arm64 Test + name: Photon OS 4 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2034,7 +2034,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} ubuntu-2004: - name: Ubuntu 20.04 Test + name: Ubuntu 20.04 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2054,7 +2054,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} ubuntu-2004-arm64: - name: Ubuntu 20.04 Arm64 Test + name: Ubuntu 20.04 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2074,7 +2074,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} ubuntu-2204: - name: Ubuntu 22.04 Test + name: Ubuntu 22.04 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2094,7 +2094,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} ubuntu-2204-arm64: - name: Ubuntu 22.04 Arm64 Test + name: Ubuntu 22.04 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 3a2767ecdc1..b4f36c0741a 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -1695,7 +1695,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016: - name: Windows 2016 Test + name: Windows 2016 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1715,7 +1715,7 @@ jobs: skip-junit-reports: false windows-2019: - name: Windows 2019 Test + name: Windows 2019 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1735,7 +1735,7 @@ jobs: skip-junit-reports: false windows-2022: - name: Windows 2022 Test + name: Windows 2022 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1755,7 +1755,7 @@ jobs: skip-junit-reports: false macos-12: - name: macOS 12 Test + name: macOS 12 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -1775,7 +1775,7 @@ jobs: skip-junit-reports: false almalinux-8: - name: Alma Linux 8 Test + name: Alma Linux 8 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1795,7 +1795,7 @@ jobs: skip-junit-reports: false almalinux-9: - name: Alma Linux 9 Test + name: Alma Linux 9 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1815,7 +1815,7 @@ jobs: skip-junit-reports: false amazonlinux-2: - name: Amazon Linux 2 Test + name: Amazon Linux 2 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1835,7 +1835,7 @@ jobs: skip-junit-reports: false archlinux-lts: - name: Arch Linux LTS Test + name: Arch Linux LTS if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1855,7 +1855,7 @@ jobs: skip-junit-reports: false centos-7: - name: CentOS 7 Test + name: CentOS 7 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1875,7 +1875,7 @@ jobs: skip-junit-reports: false centosstream-8: - name: CentOS Stream 8 Test + name: CentOS Stream 8 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1895,7 +1895,7 @@ jobs: skip-junit-reports: false centosstream-9: - name: CentOS Stream 9 Test + name: CentOS Stream 9 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1915,7 +1915,7 @@ jobs: skip-junit-reports: false debian-10: - name: Debian 10 Test + name: Debian 10 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1935,7 +1935,7 @@ jobs: skip-junit-reports: false debian-11: - name: Debian 11 Test + name: Debian 11 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1955,7 +1955,7 @@ jobs: skip-junit-reports: false debian-11-arm64: - name: Debian 11 Arm64 Test + name: Debian 11 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1975,7 +1975,7 @@ jobs: skip-junit-reports: false fedora-37: - name: Fedora 37 Test + name: Fedora 37 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1995,7 +1995,7 @@ jobs: skip-junit-reports: false fedora-38: - name: Fedora 38 Test + name: Fedora 38 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2015,7 +2015,7 @@ jobs: skip-junit-reports: false opensuse-15: - name: Opensuse 15 Test + name: Opensuse 15 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2035,7 +2035,7 @@ jobs: skip-junit-reports: false photonos-3: - name: Photon OS 3 Test + name: Photon OS 3 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2055,7 +2055,7 @@ jobs: skip-junit-reports: false photonos-4: - name: Photon OS 4 Test + name: Photon OS 4 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2075,7 +2075,7 @@ jobs: skip-junit-reports: false photonos-4-arm64: - name: Photon OS 4 Arm64 Test + name: Photon OS 4 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2095,7 +2095,7 @@ jobs: skip-junit-reports: false ubuntu-2004: - name: Ubuntu 20.04 Test + name: Ubuntu 20.04 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2115,7 +2115,7 @@ jobs: skip-junit-reports: false ubuntu-2004-arm64: - name: Ubuntu 20.04 Arm64 Test + name: Ubuntu 20.04 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2135,7 +2135,7 @@ jobs: skip-junit-reports: false ubuntu-2204: - name: Ubuntu 22.04 Test + name: Ubuntu 22.04 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2155,7 +2155,7 @@ jobs: skip-junit-reports: false ubuntu-2204-arm64: - name: Ubuntu 22.04 Arm64 Test + name: Ubuntu 22.04 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 2f0496407d1..e5bac3c0aef 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -1668,7 +1668,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016: - name: Windows 2016 Test + name: Windows 2016 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1688,7 +1688,7 @@ jobs: skip-junit-reports: false windows-2019: - name: Windows 2019 Test + name: Windows 2019 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1708,7 +1708,7 @@ jobs: skip-junit-reports: false windows-2022: - name: Windows 2022 Test + name: Windows 2022 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1728,7 +1728,7 @@ jobs: skip-junit-reports: false macos-12: - name: macOS 12 Test + name: macOS 12 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -1748,7 +1748,7 @@ jobs: skip-junit-reports: false almalinux-8: - name: Alma Linux 8 Test + name: Alma Linux 8 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1768,7 +1768,7 @@ jobs: skip-junit-reports: false almalinux-9: - name: Alma Linux 9 Test + name: Alma Linux 9 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1788,7 +1788,7 @@ jobs: skip-junit-reports: false amazonlinux-2: - name: Amazon Linux 2 Test + name: Amazon Linux 2 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1808,7 +1808,7 @@ jobs: skip-junit-reports: false archlinux-lts: - name: Arch Linux LTS Test + name: Arch Linux LTS if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1828,7 +1828,7 @@ jobs: skip-junit-reports: false centos-7: - name: CentOS 7 Test + name: CentOS 7 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1848,7 +1848,7 @@ jobs: skip-junit-reports: false centosstream-8: - name: CentOS Stream 8 Test + name: CentOS Stream 8 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1868,7 +1868,7 @@ jobs: skip-junit-reports: false centosstream-9: - name: CentOS Stream 9 Test + name: CentOS Stream 9 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1888,7 +1888,7 @@ jobs: skip-junit-reports: false debian-10: - name: Debian 10 Test + name: Debian 10 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1908,7 +1908,7 @@ jobs: skip-junit-reports: false debian-11: - name: Debian 11 Test + name: Debian 11 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1928,7 +1928,7 @@ jobs: skip-junit-reports: false debian-11-arm64: - name: Debian 11 Arm64 Test + name: Debian 11 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1948,7 +1948,7 @@ jobs: skip-junit-reports: false fedora-37: - name: Fedora 37 Test + name: Fedora 37 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1968,7 +1968,7 @@ jobs: skip-junit-reports: false fedora-38: - name: Fedora 38 Test + name: Fedora 38 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1988,7 +1988,7 @@ jobs: skip-junit-reports: false opensuse-15: - name: Opensuse 15 Test + name: Opensuse 15 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2008,7 +2008,7 @@ jobs: skip-junit-reports: false photonos-3: - name: Photon OS 3 Test + name: Photon OS 3 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2028,7 +2028,7 @@ jobs: skip-junit-reports: false photonos-4: - name: Photon OS 4 Test + name: Photon OS 4 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2048,7 +2048,7 @@ jobs: skip-junit-reports: false photonos-4-arm64: - name: Photon OS 4 Arm64 Test + name: Photon OS 4 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2068,7 +2068,7 @@ jobs: skip-junit-reports: false ubuntu-2004: - name: Ubuntu 20.04 Test + name: Ubuntu 20.04 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2088,7 +2088,7 @@ jobs: skip-junit-reports: false ubuntu-2004-arm64: - name: Ubuntu 20.04 Arm64 Test + name: Ubuntu 20.04 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2108,7 +2108,7 @@ jobs: skip-junit-reports: false ubuntu-2204: - name: Ubuntu 22.04 Test + name: Ubuntu 22.04 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2128,7 +2128,7 @@ jobs: skip-junit-reports: false ubuntu-2204-arm64: - name: Ubuntu 22.04 Arm64 Test + name: Ubuntu 22.04 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 467015fb027..4ed079c753e 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -1690,7 +1690,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016: - name: Windows 2016 Test + name: Windows 2016 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1710,7 +1710,7 @@ jobs: skip-junit-reports: true windows-2019: - name: Windows 2019 Test + name: Windows 2019 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1730,7 +1730,7 @@ jobs: skip-junit-reports: true windows-2022: - name: Windows 2022 Test + name: Windows 2022 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1750,7 +1750,7 @@ jobs: skip-junit-reports: true macos-12: - name: macOS 12 Test + name: macOS 12 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -1770,7 +1770,7 @@ jobs: skip-junit-reports: true almalinux-8: - name: Alma Linux 8 Test + name: Alma Linux 8 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1790,7 +1790,7 @@ jobs: skip-junit-reports: true almalinux-9: - name: Alma Linux 9 Test + name: Alma Linux 9 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1810,7 +1810,7 @@ jobs: skip-junit-reports: true amazonlinux-2: - name: Amazon Linux 2 Test + name: Amazon Linux 2 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1830,7 +1830,7 @@ jobs: skip-junit-reports: true archlinux-lts: - name: Arch Linux LTS Test + name: Arch Linux LTS if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1850,7 +1850,7 @@ jobs: skip-junit-reports: true centos-7: - name: CentOS 7 Test + name: CentOS 7 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1870,7 +1870,7 @@ jobs: skip-junit-reports: true centosstream-8: - name: CentOS Stream 8 Test + name: CentOS Stream 8 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1890,7 +1890,7 @@ jobs: skip-junit-reports: true centosstream-9: - name: CentOS Stream 9 Test + name: CentOS Stream 9 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1910,7 +1910,7 @@ jobs: skip-junit-reports: true debian-10: - name: Debian 10 Test + name: Debian 10 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1930,7 +1930,7 @@ jobs: skip-junit-reports: true debian-11: - name: Debian 11 Test + name: Debian 11 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1950,7 +1950,7 @@ jobs: skip-junit-reports: true debian-11-arm64: - name: Debian 11 Arm64 Test + name: Debian 11 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1970,7 +1970,7 @@ jobs: skip-junit-reports: true fedora-37: - name: Fedora 37 Test + name: Fedora 37 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1990,7 +1990,7 @@ jobs: skip-junit-reports: true fedora-38: - name: Fedora 38 Test + name: Fedora 38 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2010,7 +2010,7 @@ jobs: skip-junit-reports: true opensuse-15: - name: Opensuse 15 Test + name: Opensuse 15 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2030,7 +2030,7 @@ jobs: skip-junit-reports: true photonos-3: - name: Photon OS 3 Test + name: Photon OS 3 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2050,7 +2050,7 @@ jobs: skip-junit-reports: true photonos-4: - name: Photon OS 4 Test + name: Photon OS 4 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2070,7 +2070,7 @@ jobs: skip-junit-reports: true photonos-4-arm64: - name: Photon OS 4 Arm64 Test + name: Photon OS 4 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2090,7 +2090,7 @@ jobs: skip-junit-reports: true ubuntu-2004: - name: Ubuntu 20.04 Test + name: Ubuntu 20.04 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2110,7 +2110,7 @@ jobs: skip-junit-reports: true ubuntu-2004-arm64: - name: Ubuntu 20.04 Arm64 Test + name: Ubuntu 20.04 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2130,7 +2130,7 @@ jobs: skip-junit-reports: true ubuntu-2204: - name: Ubuntu 22.04 Test + name: Ubuntu 22.04 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2150,7 +2150,7 @@ jobs: skip-junit-reports: true ubuntu-2204-arm64: - name: Ubuntu 22.04 Arm64 Test + name: Ubuntu 22.04 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/templates/test-salt.yml.jinja b/.github/workflows/templates/test-salt.yml.jinja index 63834ee10dc..91e222aaccc 100644 --- a/.github/workflows/templates/test-salt.yml.jinja +++ b/.github/workflows/templates/test-salt.yml.jinja @@ -3,7 +3,7 @@ <{ slug.replace(".", "") }>: <%- do test_salt_needs.append(slug.replace(".", "")) %> - name: <{ display_name }> Test + name: <{ display_name }> if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -29,7 +29,7 @@ <{ slug.replace(".", "") }>: <%- do test_salt_needs.append(slug.replace(".", "")) %> - name: <{ display_name }> Test + name: <{ display_name }> if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -55,7 +55,7 @@ <{ slug.replace(".", "") }>: <%- do test_salt_needs.append(slug.replace(".", "")) %> - name: <{ display_name }> Test + name: <{ display_name }> if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow From 39199a088c095910c25e36a91a9063e80e0e2d5a Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 9 Oct 2023 14:36:34 +0100 Subject: [PATCH 113/147] Revert "Visual grouping of CI Dependencies install" This reverts commit d9c031de5f932c416bfdb65f33edb757331ce4bf. --- .../workflows/build-deps-ci-action-macos.yml | 4 +- .github/workflows/build-deps-ci-action.yml | 4 +- .github/workflows/ci.yml | 64 +++++++++---------- .github/workflows/nightly.yml | 64 +++++++++---------- .github/workflows/release.yml | 64 +++++++++---------- .github/workflows/scheduled.yml | 64 +++++++++---------- .github/workflows/staging.yml | 64 +++++++++---------- .../templates/build-ci-deps.yml.jinja | 6 +- 8 files changed, 167 insertions(+), 167 deletions(-) diff --git a/.github/workflows/build-deps-ci-action-macos.yml b/.github/workflows/build-deps-ci-action-macos.yml index 350230e9c5c..ded5ad9c794 100644 --- a/.github/workflows/build-deps-ci-action-macos.yml +++ b/.github/workflows/build-deps-ci-action-macos.yml @@ -1,5 +1,5 @@ --- -name: Install Test Dependencies +name: Test Dependencies on: workflow_call: @@ -53,7 +53,7 @@ env: jobs: dependencies: - name: Install + name: Test Dependencies runs-on: ${{ inputs.distro-slug }} timeout-minutes: 90 steps: diff --git a/.github/workflows/build-deps-ci-action.yml b/.github/workflows/build-deps-ci-action.yml index 4fe391d0384..40c1708c439 100644 --- a/.github/workflows/build-deps-ci-action.yml +++ b/.github/workflows/build-deps-ci-action.yml @@ -1,5 +1,5 @@ --- -name: Install Test Dependencies +name: Test Dependencies on: workflow_call: @@ -54,7 +54,7 @@ env: jobs: dependencies: - name: Install + name: Test Dependencies runs-on: - self-hosted - linux diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 63c5230f086..3aae43dbef4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -628,7 +628,7 @@ jobs: source: "src" windows-2016-ci-deps: - name: Windows 2016 Deps + name: Windows 2016 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -645,7 +645,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 windows-2019-ci-deps: - name: Windows 2019 Deps + name: Windows 2019 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -662,7 +662,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 windows-2022-ci-deps: - name: Windows 2022 Deps + name: Windows 2022 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -679,7 +679,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 macos-12-ci-deps: - name: macOS 12 Deps + name: macOS 12 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -696,7 +696,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-8-ci-deps: - name: Alma Linux 8 Deps + name: Alma Linux 8 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -713,7 +713,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-8-arm64-ci-deps: - name: Alma Linux 8 Arm64 Deps + name: Alma Linux 8 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -730,7 +730,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-9-ci-deps: - name: Alma Linux 9 Deps + name: Alma Linux 9 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -747,7 +747,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-9-arm64-ci-deps: - name: Alma Linux 9 Arm64 Deps + name: Alma Linux 9 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -764,7 +764,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-ci-deps: - name: Amazon Linux 2 Deps + name: Amazon Linux 2 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -781,7 +781,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-arm64-ci-deps: - name: Amazon Linux 2 Arm64 Deps + name: Amazon Linux 2 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -798,7 +798,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 archlinux-lts-ci-deps: - name: Arch Linux LTS Deps + name: Arch Linux LTS if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -815,7 +815,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centos-7-ci-deps: - name: CentOS 7 Deps + name: CentOS 7 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -832,7 +832,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centos-7-arm64-ci-deps: - name: CentOS 7 Arm64 Deps + name: CentOS 7 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -849,7 +849,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-8-ci-deps: - name: CentOS Stream 8 Deps + name: CentOS Stream 8 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -866,7 +866,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-8-arm64-ci-deps: - name: CentOS Stream 8 Arm64 Deps + name: CentOS Stream 8 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -883,7 +883,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-9-ci-deps: - name: CentOS Stream 9 Deps + name: CentOS Stream 9 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -900,7 +900,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-9-arm64-ci-deps: - name: CentOS Stream 9 Arm64 Deps + name: CentOS Stream 9 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -917,7 +917,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-10-ci-deps: - name: Debian 10 Deps + name: Debian 10 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -934,7 +934,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-11-ci-deps: - name: Debian 11 Deps + name: Debian 11 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -951,7 +951,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-11-arm64-ci-deps: - name: Debian 11 Arm64 Deps + name: Debian 11 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -968,7 +968,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-37-ci-deps: - name: Fedora 37 Deps + name: Fedora 37 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -985,7 +985,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-37-arm64-ci-deps: - name: Fedora 37 Arm64 Deps + name: Fedora 37 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1002,7 +1002,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-38-ci-deps: - name: Fedora 38 Deps + name: Fedora 38 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1019,7 +1019,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-38-arm64-ci-deps: - name: Fedora 38 Arm64 Deps + name: Fedora 38 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1036,7 +1036,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 opensuse-15-ci-deps: - name: Opensuse 15 Deps + name: Opensuse 15 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1053,7 +1053,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-3-ci-deps: - name: Photon OS 3 Deps + name: Photon OS 3 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1070,7 +1070,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-4-ci-deps: - name: Photon OS 4 Deps + name: Photon OS 4 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1087,7 +1087,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-4-arm64-ci-deps: - name: Photon OS 4 Arm64 Deps + name: Photon OS 4 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1104,7 +1104,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2004-ci-deps: - name: Ubuntu 20.04 Deps + name: Ubuntu 20.04 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1121,7 +1121,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2004-arm64-ci-deps: - name: Ubuntu 20.04 Arm64 Deps + name: Ubuntu 20.04 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1138,7 +1138,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2204-ci-deps: - name: Ubuntu 22.04 Deps + name: Ubuntu 22.04 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1155,7 +1155,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2204-arm64-ci-deps: - name: Ubuntu 22.04 Arm64 Deps + name: Ubuntu 22.04 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index b4f36c0741a..b4aed92fe91 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -689,7 +689,7 @@ jobs: secrets: inherit windows-2016-ci-deps: - name: Windows 2016 Deps + name: Windows 2016 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -706,7 +706,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 windows-2019-ci-deps: - name: Windows 2019 Deps + name: Windows 2019 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -723,7 +723,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 windows-2022-ci-deps: - name: Windows 2022 Deps + name: Windows 2022 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -740,7 +740,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 macos-12-ci-deps: - name: macOS 12 Deps + name: macOS 12 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -757,7 +757,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-8-ci-deps: - name: Alma Linux 8 Deps + name: Alma Linux 8 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -774,7 +774,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-8-arm64-ci-deps: - name: Alma Linux 8 Arm64 Deps + name: Alma Linux 8 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -791,7 +791,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-9-ci-deps: - name: Alma Linux 9 Deps + name: Alma Linux 9 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -808,7 +808,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-9-arm64-ci-deps: - name: Alma Linux 9 Arm64 Deps + name: Alma Linux 9 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -825,7 +825,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-ci-deps: - name: Amazon Linux 2 Deps + name: Amazon Linux 2 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -842,7 +842,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-arm64-ci-deps: - name: Amazon Linux 2 Arm64 Deps + name: Amazon Linux 2 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -859,7 +859,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 archlinux-lts-ci-deps: - name: Arch Linux LTS Deps + name: Arch Linux LTS if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -876,7 +876,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centos-7-ci-deps: - name: CentOS 7 Deps + name: CentOS 7 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -893,7 +893,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centos-7-arm64-ci-deps: - name: CentOS 7 Arm64 Deps + name: CentOS 7 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -910,7 +910,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-8-ci-deps: - name: CentOS Stream 8 Deps + name: CentOS Stream 8 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -927,7 +927,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-8-arm64-ci-deps: - name: CentOS Stream 8 Arm64 Deps + name: CentOS Stream 8 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -944,7 +944,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-9-ci-deps: - name: CentOS Stream 9 Deps + name: CentOS Stream 9 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -961,7 +961,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-9-arm64-ci-deps: - name: CentOS Stream 9 Arm64 Deps + name: CentOS Stream 9 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -978,7 +978,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-10-ci-deps: - name: Debian 10 Deps + name: Debian 10 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -995,7 +995,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-11-ci-deps: - name: Debian 11 Deps + name: Debian 11 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1012,7 +1012,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-11-arm64-ci-deps: - name: Debian 11 Arm64 Deps + name: Debian 11 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1029,7 +1029,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-37-ci-deps: - name: Fedora 37 Deps + name: Fedora 37 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1046,7 +1046,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-37-arm64-ci-deps: - name: Fedora 37 Arm64 Deps + name: Fedora 37 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1063,7 +1063,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-38-ci-deps: - name: Fedora 38 Deps + name: Fedora 38 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1080,7 +1080,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-38-arm64-ci-deps: - name: Fedora 38 Arm64 Deps + name: Fedora 38 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1097,7 +1097,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 opensuse-15-ci-deps: - name: Opensuse 15 Deps + name: Opensuse 15 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1114,7 +1114,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-3-ci-deps: - name: Photon OS 3 Deps + name: Photon OS 3 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1131,7 +1131,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-4-ci-deps: - name: Photon OS 4 Deps + name: Photon OS 4 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1148,7 +1148,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-4-arm64-ci-deps: - name: Photon OS 4 Arm64 Deps + name: Photon OS 4 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1165,7 +1165,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2004-ci-deps: - name: Ubuntu 20.04 Deps + name: Ubuntu 20.04 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1182,7 +1182,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2004-arm64-ci-deps: - name: Ubuntu 20.04 Arm64 Deps + name: Ubuntu 20.04 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1199,7 +1199,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2204-ci-deps: - name: Ubuntu 22.04 Deps + name: Ubuntu 22.04 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1216,7 +1216,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2204-arm64-ci-deps: - name: Ubuntu 22.04 Arm64 Deps + name: Ubuntu 22.04 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7a0b40d8e4b..700659a301f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -163,7 +163,7 @@ jobs: if-no-files-found: error windows-2016-ci-deps: - name: Windows 2016 Deps + name: Windows 2016 needs: - prepare-workflow - download-onedir-artifact @@ -179,7 +179,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 windows-2019-ci-deps: - name: Windows 2019 Deps + name: Windows 2019 needs: - prepare-workflow - download-onedir-artifact @@ -195,7 +195,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 windows-2022-ci-deps: - name: Windows 2022 Deps + name: Windows 2022 needs: - prepare-workflow - download-onedir-artifact @@ -211,7 +211,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 macos-12-ci-deps: - name: macOS 12 Deps + name: macOS 12 needs: - prepare-workflow - download-onedir-artifact @@ -227,7 +227,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-8-ci-deps: - name: Alma Linux 8 Deps + name: Alma Linux 8 needs: - prepare-workflow - download-onedir-artifact @@ -243,7 +243,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-8-arm64-ci-deps: - name: Alma Linux 8 Arm64 Deps + name: Alma Linux 8 Arm64 needs: - prepare-workflow - download-onedir-artifact @@ -259,7 +259,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-9-ci-deps: - name: Alma Linux 9 Deps + name: Alma Linux 9 needs: - prepare-workflow - download-onedir-artifact @@ -275,7 +275,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-9-arm64-ci-deps: - name: Alma Linux 9 Arm64 Deps + name: Alma Linux 9 Arm64 needs: - prepare-workflow - download-onedir-artifact @@ -291,7 +291,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-ci-deps: - name: Amazon Linux 2 Deps + name: Amazon Linux 2 needs: - prepare-workflow - download-onedir-artifact @@ -307,7 +307,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-arm64-ci-deps: - name: Amazon Linux 2 Arm64 Deps + name: Amazon Linux 2 Arm64 needs: - prepare-workflow - download-onedir-artifact @@ -323,7 +323,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 archlinux-lts-ci-deps: - name: Arch Linux LTS Deps + name: Arch Linux LTS needs: - prepare-workflow - download-onedir-artifact @@ -339,7 +339,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centos-7-ci-deps: - name: CentOS 7 Deps + name: CentOS 7 needs: - prepare-workflow - download-onedir-artifact @@ -355,7 +355,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centos-7-arm64-ci-deps: - name: CentOS 7 Arm64 Deps + name: CentOS 7 Arm64 needs: - prepare-workflow - download-onedir-artifact @@ -371,7 +371,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-8-ci-deps: - name: CentOS Stream 8 Deps + name: CentOS Stream 8 needs: - prepare-workflow - download-onedir-artifact @@ -387,7 +387,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-8-arm64-ci-deps: - name: CentOS Stream 8 Arm64 Deps + name: CentOS Stream 8 Arm64 needs: - prepare-workflow - download-onedir-artifact @@ -403,7 +403,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-9-ci-deps: - name: CentOS Stream 9 Deps + name: CentOS Stream 9 needs: - prepare-workflow - download-onedir-artifact @@ -419,7 +419,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-9-arm64-ci-deps: - name: CentOS Stream 9 Arm64 Deps + name: CentOS Stream 9 Arm64 needs: - prepare-workflow - download-onedir-artifact @@ -435,7 +435,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-10-ci-deps: - name: Debian 10 Deps + name: Debian 10 needs: - prepare-workflow - download-onedir-artifact @@ -451,7 +451,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-11-ci-deps: - name: Debian 11 Deps + name: Debian 11 needs: - prepare-workflow - download-onedir-artifact @@ -467,7 +467,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-11-arm64-ci-deps: - name: Debian 11 Arm64 Deps + name: Debian 11 Arm64 needs: - prepare-workflow - download-onedir-artifact @@ -483,7 +483,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-37-ci-deps: - name: Fedora 37 Deps + name: Fedora 37 needs: - prepare-workflow - download-onedir-artifact @@ -499,7 +499,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-37-arm64-ci-deps: - name: Fedora 37 Arm64 Deps + name: Fedora 37 Arm64 needs: - prepare-workflow - download-onedir-artifact @@ -515,7 +515,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-38-ci-deps: - name: Fedora 38 Deps + name: Fedora 38 needs: - prepare-workflow - download-onedir-artifact @@ -531,7 +531,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-38-arm64-ci-deps: - name: Fedora 38 Arm64 Deps + name: Fedora 38 Arm64 needs: - prepare-workflow - download-onedir-artifact @@ -547,7 +547,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 opensuse-15-ci-deps: - name: Opensuse 15 Deps + name: Opensuse 15 needs: - prepare-workflow - download-onedir-artifact @@ -563,7 +563,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-3-ci-deps: - name: Photon OS 3 Deps + name: Photon OS 3 needs: - prepare-workflow - download-onedir-artifact @@ -579,7 +579,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-4-ci-deps: - name: Photon OS 4 Deps + name: Photon OS 4 needs: - prepare-workflow - download-onedir-artifact @@ -595,7 +595,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-4-arm64-ci-deps: - name: Photon OS 4 Arm64 Deps + name: Photon OS 4 Arm64 needs: - prepare-workflow - download-onedir-artifact @@ -611,7 +611,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2004-ci-deps: - name: Ubuntu 20.04 Deps + name: Ubuntu 20.04 needs: - prepare-workflow - download-onedir-artifact @@ -627,7 +627,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2004-arm64-ci-deps: - name: Ubuntu 20.04 Arm64 Deps + name: Ubuntu 20.04 Arm64 needs: - prepare-workflow - download-onedir-artifact @@ -643,7 +643,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2204-ci-deps: - name: Ubuntu 22.04 Deps + name: Ubuntu 22.04 needs: - prepare-workflow - download-onedir-artifact @@ -659,7 +659,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2204-arm64-ci-deps: - name: Ubuntu 22.04 Arm64 Deps + name: Ubuntu 22.04 Arm64 needs: - prepare-workflow - download-onedir-artifact diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index e5bac3c0aef..ceecd84ad02 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -662,7 +662,7 @@ jobs: source: "src" windows-2016-ci-deps: - name: Windows 2016 Deps + name: Windows 2016 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -679,7 +679,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 windows-2019-ci-deps: - name: Windows 2019 Deps + name: Windows 2019 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -696,7 +696,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 windows-2022-ci-deps: - name: Windows 2022 Deps + name: Windows 2022 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -713,7 +713,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 macos-12-ci-deps: - name: macOS 12 Deps + name: macOS 12 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -730,7 +730,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-8-ci-deps: - name: Alma Linux 8 Deps + name: Alma Linux 8 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -747,7 +747,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-8-arm64-ci-deps: - name: Alma Linux 8 Arm64 Deps + name: Alma Linux 8 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -764,7 +764,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-9-ci-deps: - name: Alma Linux 9 Deps + name: Alma Linux 9 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -781,7 +781,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-9-arm64-ci-deps: - name: Alma Linux 9 Arm64 Deps + name: Alma Linux 9 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -798,7 +798,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-ci-deps: - name: Amazon Linux 2 Deps + name: Amazon Linux 2 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -815,7 +815,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-arm64-ci-deps: - name: Amazon Linux 2 Arm64 Deps + name: Amazon Linux 2 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -832,7 +832,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 archlinux-lts-ci-deps: - name: Arch Linux LTS Deps + name: Arch Linux LTS if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -849,7 +849,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centos-7-ci-deps: - name: CentOS 7 Deps + name: CentOS 7 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -866,7 +866,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centos-7-arm64-ci-deps: - name: CentOS 7 Arm64 Deps + name: CentOS 7 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -883,7 +883,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-8-ci-deps: - name: CentOS Stream 8 Deps + name: CentOS Stream 8 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -900,7 +900,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-8-arm64-ci-deps: - name: CentOS Stream 8 Arm64 Deps + name: CentOS Stream 8 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -917,7 +917,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-9-ci-deps: - name: CentOS Stream 9 Deps + name: CentOS Stream 9 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -934,7 +934,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-9-arm64-ci-deps: - name: CentOS Stream 9 Arm64 Deps + name: CentOS Stream 9 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -951,7 +951,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-10-ci-deps: - name: Debian 10 Deps + name: Debian 10 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -968,7 +968,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-11-ci-deps: - name: Debian 11 Deps + name: Debian 11 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -985,7 +985,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-11-arm64-ci-deps: - name: Debian 11 Arm64 Deps + name: Debian 11 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1002,7 +1002,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-37-ci-deps: - name: Fedora 37 Deps + name: Fedora 37 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1019,7 +1019,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-37-arm64-ci-deps: - name: Fedora 37 Arm64 Deps + name: Fedora 37 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1036,7 +1036,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-38-ci-deps: - name: Fedora 38 Deps + name: Fedora 38 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1053,7 +1053,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-38-arm64-ci-deps: - name: Fedora 38 Arm64 Deps + name: Fedora 38 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1070,7 +1070,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 opensuse-15-ci-deps: - name: Opensuse 15 Deps + name: Opensuse 15 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1087,7 +1087,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-3-ci-deps: - name: Photon OS 3 Deps + name: Photon OS 3 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1104,7 +1104,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-4-ci-deps: - name: Photon OS 4 Deps + name: Photon OS 4 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1121,7 +1121,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-4-arm64-ci-deps: - name: Photon OS 4 Arm64 Deps + name: Photon OS 4 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1138,7 +1138,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2004-ci-deps: - name: Ubuntu 20.04 Deps + name: Ubuntu 20.04 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1155,7 +1155,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2004-arm64-ci-deps: - name: Ubuntu 20.04 Arm64 Deps + name: Ubuntu 20.04 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1172,7 +1172,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2204-ci-deps: - name: Ubuntu 22.04 Deps + name: Ubuntu 22.04 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1189,7 +1189,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2204-arm64-ci-deps: - name: Ubuntu 22.04 Arm64 Deps + name: Ubuntu 22.04 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 4ed079c753e..fe53449c2ae 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -684,7 +684,7 @@ jobs: secrets: inherit windows-2016-ci-deps: - name: Windows 2016 Deps + name: Windows 2016 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -701,7 +701,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 windows-2019-ci-deps: - name: Windows 2019 Deps + name: Windows 2019 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -718,7 +718,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 windows-2022-ci-deps: - name: Windows 2022 Deps + name: Windows 2022 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -735,7 +735,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 macos-12-ci-deps: - name: macOS 12 Deps + name: macOS 12 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -752,7 +752,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-8-ci-deps: - name: Alma Linux 8 Deps + name: Alma Linux 8 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -769,7 +769,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-8-arm64-ci-deps: - name: Alma Linux 8 Arm64 Deps + name: Alma Linux 8 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -786,7 +786,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-9-ci-deps: - name: Alma Linux 9 Deps + name: Alma Linux 9 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -803,7 +803,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-9-arm64-ci-deps: - name: Alma Linux 9 Arm64 Deps + name: Alma Linux 9 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -820,7 +820,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-ci-deps: - name: Amazon Linux 2 Deps + name: Amazon Linux 2 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -837,7 +837,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-arm64-ci-deps: - name: Amazon Linux 2 Arm64 Deps + name: Amazon Linux 2 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -854,7 +854,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 archlinux-lts-ci-deps: - name: Arch Linux LTS Deps + name: Arch Linux LTS if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -871,7 +871,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centos-7-ci-deps: - name: CentOS 7 Deps + name: CentOS 7 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -888,7 +888,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centos-7-arm64-ci-deps: - name: CentOS 7 Arm64 Deps + name: CentOS 7 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -905,7 +905,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-8-ci-deps: - name: CentOS Stream 8 Deps + name: CentOS Stream 8 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -922,7 +922,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-8-arm64-ci-deps: - name: CentOS Stream 8 Arm64 Deps + name: CentOS Stream 8 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -939,7 +939,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-9-ci-deps: - name: CentOS Stream 9 Deps + name: CentOS Stream 9 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -956,7 +956,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-9-arm64-ci-deps: - name: CentOS Stream 9 Arm64 Deps + name: CentOS Stream 9 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -973,7 +973,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-10-ci-deps: - name: Debian 10 Deps + name: Debian 10 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -990,7 +990,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-11-ci-deps: - name: Debian 11 Deps + name: Debian 11 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1007,7 +1007,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-11-arm64-ci-deps: - name: Debian 11 Arm64 Deps + name: Debian 11 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1024,7 +1024,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-37-ci-deps: - name: Fedora 37 Deps + name: Fedora 37 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1041,7 +1041,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-37-arm64-ci-deps: - name: Fedora 37 Arm64 Deps + name: Fedora 37 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1058,7 +1058,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-38-ci-deps: - name: Fedora 38 Deps + name: Fedora 38 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1075,7 +1075,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-38-arm64-ci-deps: - name: Fedora 38 Arm64 Deps + name: Fedora 38 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1092,7 +1092,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 opensuse-15-ci-deps: - name: Opensuse 15 Deps + name: Opensuse 15 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1109,7 +1109,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-3-ci-deps: - name: Photon OS 3 Deps + name: Photon OS 3 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1126,7 +1126,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-4-ci-deps: - name: Photon OS 4 Deps + name: Photon OS 4 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1143,7 +1143,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-4-arm64-ci-deps: - name: Photon OS 4 Arm64 Deps + name: Photon OS 4 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1160,7 +1160,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2004-ci-deps: - name: Ubuntu 20.04 Deps + name: Ubuntu 20.04 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1177,7 +1177,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2004-arm64-ci-deps: - name: Ubuntu 20.04 Arm64 Deps + name: Ubuntu 20.04 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1194,7 +1194,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2204-ci-deps: - name: Ubuntu 22.04 Deps + name: Ubuntu 22.04 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1211,7 +1211,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2204-arm64-ci-deps: - name: Ubuntu 22.04 Arm64 Deps + name: Ubuntu 22.04 Arm64 if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/templates/build-ci-deps.yml.jinja b/.github/workflows/templates/build-ci-deps.yml.jinja index 3674949f033..fd6d7d46422 100644 --- a/.github/workflows/templates/build-ci-deps.yml.jinja +++ b/.github/workflows/templates/build-ci-deps.yml.jinja @@ -3,7 +3,7 @@ <{ slug.replace(".", "") }>-ci-deps: <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> - name: <{ display_name }> Deps + name: <{ display_name }> <%- if workflow_slug != 'release' %> if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} <%- endif %> @@ -32,7 +32,7 @@ <{ slug.replace(".", "") }>-ci-deps: <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> - name: <{ display_name }> Deps + name: <{ display_name }> <%- if workflow_slug != 'release' %> if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} <%- endif %> @@ -61,7 +61,7 @@ <{ slug.replace(".", "") }>-ci-deps: <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> - name: <{ display_name }> Deps + name: <{ display_name }> <%- if workflow_slug != 'release' %> if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} <%- endif %> From 5be366367e1b808f2597b76ddbb06559032cb2a4 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 9 Oct 2023 14:36:34 +0100 Subject: [PATCH 114/147] Revert "Fix the Onedir Tarball Artifact name" This reverts commit 09ee7e6fd148ead2276237baf943c47067631877. --- .../templates/test-package-downloads-action.yml.jinja | 4 ++-- .github/workflows/test-package-downloads-action.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/templates/test-package-downloads-action.yml.jinja b/.github/workflows/templates/test-package-downloads-action.yml.jinja index 348b0d17227..6c897f81f87 100644 --- a/.github/workflows/templates/test-package-downloads-action.yml.jinja +++ b/.github/workflows/templates/test-package-downloads-action.yml.jinja @@ -316,7 +316,7 @@ jobs: - name: Download Onedir Tarball as an Artifact uses: actions/download-artifact@v3 with: - name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-darwin-${{ matrix.arch }}.tar.xz + name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz path: artifacts/ - name: Install System Dependencies @@ -328,7 +328,7 @@ jobs: run: | python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" cd artifacts - tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-darwin-${{ matrix.arch }}.tar.xz + tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz - name: Set up Python ${{ inputs.python-version }} uses: actions/setup-python@v4 diff --git a/.github/workflows/test-package-downloads-action.yml b/.github/workflows/test-package-downloads-action.yml index 5473ebd17ec..908e064ae85 100644 --- a/.github/workflows/test-package-downloads-action.yml +++ b/.github/workflows/test-package-downloads-action.yml @@ -396,7 +396,7 @@ jobs: - name: Download Onedir Tarball as an Artifact uses: actions/download-artifact@v3 with: - name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-darwin-${{ matrix.arch }}.tar.xz + name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz path: artifacts/ - name: Install System Dependencies @@ -408,7 +408,7 @@ jobs: run: | python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" cd artifacts - tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-darwin-${{ matrix.arch }}.tar.xz + tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz - name: Set up Python ${{ inputs.python-version }} uses: actions/setup-python@v4 From 68d8627b1a22ff0848bc97200bcc0edac69d79d9 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 9 Oct 2023 14:36:34 +0100 Subject: [PATCH 115/147] Revert "Remove unnecessary environment variable passing" This reverts commit cae38cb324fcb5e92fe4cb9133377fb45a8057b6. --- .../templates/test-package-downloads-action.yml.jinja | 8 ++++---- .github/workflows/test-package-downloads-action.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/templates/test-package-downloads-action.yml.jinja b/.github/workflows/templates/test-package-downloads-action.yml.jinja index 6c897f81f87..ac66c8d8c1f 100644 --- a/.github/workflows/templates/test-package-downloads-action.yml.jinja +++ b/.github/workflows/templates/test-package-downloads-action.yml.jinja @@ -144,7 +144,7 @@ jobs: DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} run: | tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ - -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ --nox-session=${{ inputs.nox-session }}-pkgs ${{ matrix.distro-slug }} -- download-pkgs @@ -162,7 +162,7 @@ jobs: DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} run: | tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ - -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ matrix.distro-slug }} -- download-pkgs @@ -593,7 +593,7 @@ jobs: DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} run: | tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ - -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ --nox-session=${{ inputs.nox-session }}-pkgs ${{ matrix.distro-slug }} -- download-pkgs @@ -611,7 +611,7 @@ jobs: DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} run: | tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ - -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ matrix.distro-slug }} -- download-pkgs diff --git a/.github/workflows/test-package-downloads-action.yml b/.github/workflows/test-package-downloads-action.yml index 908e064ae85..6e7b04a7f5f 100644 --- a/.github/workflows/test-package-downloads-action.yml +++ b/.github/workflows/test-package-downloads-action.yml @@ -223,7 +223,7 @@ jobs: DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} run: | tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ - -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ --nox-session=${{ inputs.nox-session }}-pkgs ${{ matrix.distro-slug }} -- download-pkgs @@ -241,7 +241,7 @@ jobs: DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} run: | tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ - -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ matrix.distro-slug }} -- download-pkgs @@ -677,7 +677,7 @@ jobs: DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} run: | tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ - -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ --nox-session=${{ inputs.nox-session }}-pkgs ${{ matrix.distro-slug }} -- download-pkgs @@ -695,7 +695,7 @@ jobs: DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} run: | tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ - -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ matrix.distro-slug }} -- download-pkgs From 3b747ad6670003302691b1f8b8703e5ad7230c09 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 9 Oct 2023 14:36:34 +0100 Subject: [PATCH 116/147] Revert "Not that many `onedir` package download tests" This reverts commit 0a5a28547028b6fb31dcf0e381c302ba7965dbb8. --- .../test-package-downloads-action.yml | 82 +++++++++++++++++-- tools/pre_commit.py | 12 +-- 2 files changed, 81 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test-package-downloads-action.yml b/.github/workflows/test-package-downloads-action.yml index 6e7b04a7f5f..245ed6f09d0 100644 --- a/.github/workflows/test-package-downloads-action.yml +++ b/.github/workflows/test-package-downloads-action.yml @@ -68,84 +68,156 @@ jobs: - distro-slug: almalinux-8 arch: x86_64 pkg-type: package + - distro-slug: almalinux-8 + arch: x86_64 + pkg-type: onedir - distro-slug: almalinux-8-arm64 arch: aarch64 pkg-type: package + - distro-slug: almalinux-8-arm64 + arch: aarch64 + pkg-type: onedir - distro-slug: almalinux-9 arch: x86_64 pkg-type: package + - distro-slug: almalinux-9 + arch: x86_64 + pkg-type: onedir - distro-slug: almalinux-9-arm64 arch: aarch64 pkg-type: package + - distro-slug: almalinux-9-arm64 + arch: aarch64 + pkg-type: onedir - distro-slug: amazonlinux-2 arch: x86_64 pkg-type: package + - distro-slug: amazonlinux-2 + arch: x86_64 + pkg-type: onedir - distro-slug: amazonlinux-2-arm64 arch: aarch64 pkg-type: package + - distro-slug: amazonlinux-2-arm64 + arch: aarch64 + pkg-type: onedir - distro-slug: centos-7 arch: x86_64 pkg-type: package + - distro-slug: centos-7 + arch: x86_64 + pkg-type: onedir - distro-slug: centos-7-arm64 arch: aarch64 pkg-type: package + - distro-slug: centos-7-arm64 + arch: aarch64 + pkg-type: onedir - distro-slug: centosstream-8 arch: x86_64 pkg-type: package + - distro-slug: centosstream-8 + arch: x86_64 + pkg-type: onedir - distro-slug: centosstream-8-arm64 arch: aarch64 pkg-type: package + - distro-slug: centosstream-8-arm64 + arch: aarch64 + pkg-type: onedir - distro-slug: centosstream-9 arch: x86_64 pkg-type: package + - distro-slug: centosstream-9 + arch: x86_64 + pkg-type: onedir - distro-slug: centosstream-9-arm64 arch: aarch64 pkg-type: package + - distro-slug: centosstream-9-arm64 + arch: aarch64 + pkg-type: onedir - distro-slug: debian-10 arch: x86_64 pkg-type: package + - distro-slug: debian-10 + arch: x86_64 + pkg-type: onedir + - distro-slug: debian-11 + arch: x86_64 + pkg-type: package - distro-slug: debian-11 arch: x86_64 - pkg-type: package + pkg-type: onedir - distro-slug: debian-11-arm64 arch: aarch64 pkg-type: package + - distro-slug: debian-11-arm64 + arch: aarch64 + pkg-type: onedir - distro-slug: fedora-37 arch: x86_64 pkg-type: package + - distro-slug: fedora-37 + arch: x86_64 + pkg-type: onedir - distro-slug: fedora-37-arm64 arch: aarch64 pkg-type: package + - distro-slug: fedora-37-arm64 + arch: aarch64 + pkg-type: onedir - distro-slug: fedora-38 arch: x86_64 pkg-type: package + - distro-slug: fedora-38 + arch: x86_64 + pkg-type: onedir - distro-slug: fedora-38-arm64 arch: aarch64 pkg-type: package + - distro-slug: fedora-38-arm64 + arch: aarch64 + pkg-type: onedir - distro-slug: photonos-3 arch: x86_64 pkg-type: package + - distro-slug: photonos-3 + arch: x86_64 + pkg-type: onedir + - distro-slug: photonos-4 + arch: x86_64 + pkg-type: package - distro-slug: photonos-4 arch: x86_64 - pkg-type: package + pkg-type: onedir - distro-slug: photonos-4-arm64 arch: aarch64 pkg-type: package + - distro-slug: photonos-4-arm64 + arch: aarch64 + pkg-type: onedir - distro-slug: ubuntu-20.04 arch: x86_64 pkg-type: package + - distro-slug: ubuntu-20.04 + arch: x86_64 + pkg-type: onedir - distro-slug: ubuntu-20.04-arm64 arch: aarch64 pkg-type: package + - distro-slug: ubuntu-20.04-arm64 + arch: aarch64 + pkg-type: onedir - distro-slug: ubuntu-22.04 arch: x86_64 pkg-type: package - - distro-slug: ubuntu-22.04-arm64 - arch: aarch64 - pkg-type: package - distro-slug: ubuntu-22.04 arch: x86_64 pkg-type: onedir + - distro-slug: ubuntu-22.04-arm64 + arch: aarch64 + pkg-type: package - distro-slug: ubuntu-22.04-arm64 arch: aarch64 pkg-type: onedir diff --git a/tools/pre_commit.py b/tools/pre_commit.py index 1dfbfb70476..be773de4217 100644 --- a/tools/pre_commit.py +++ b/tools/pre_commit.py @@ -186,15 +186,11 @@ def generate_workflows(ctx: Context): for slug, display_name, arch in build_ci_deps_listing["linux"]: if slug in ("archlinux-lts", "opensuse-15"): continue - test_salt_pkg_downloads_listing["linux"].append((slug, arch, "package")) - for slug, display_name, arch in build_ci_deps_listing["linux"][-2:]: - if slug in ("archlinux-lts", "opensuse-15"): - continue - test_salt_pkg_downloads_listing["linux"].append((slug, arch, "onedir")) + for pkg_type in ("package", "onedir"): + test_salt_pkg_downloads_listing["linux"].append((slug, arch, pkg_type)) for slug, display_name, arch in build_ci_deps_listing["macos"]: - test_salt_pkg_downloads_listing["macos"].append((slug, arch, "package")) - for slug, display_name, arch in build_ci_deps_listing["macos"][-1:]: - test_salt_pkg_downloads_listing["macos"].append((slug, arch, "onedir")) + for pkg_type in ("package", "onedir"): + test_salt_pkg_downloads_listing["macos"].append((slug, arch, pkg_type)) for slug, display_name, arch in build_ci_deps_listing["windows"][-1:]: for pkg_type in ("nsis", "msi", "onedir"): test_salt_pkg_downloads_listing["windows"].append((slug, arch, pkg_type)) From 0a8732eac963ab5b7bb80d6fef1f87bf5b6792d8 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 9 Oct 2023 14:36:34 +0100 Subject: [PATCH 117/147] Revert "Even the release workflow should be working now" This reverts commit fa1f0dac52ceaa7ba4b31202bc2ef91394b8079a. --- .github/workflows/release.yml | 574 +------------- .github/workflows/staging.yml | 28 - .../templates/build-ci-deps.yml.jinja | 18 - .github/workflows/templates/release.yml.jinja | 4 +- .../test-package-downloads-action.yml.jinja | 737 ------------------ .../test-salt-pkg-repo-downloads.yml.jinja | 3 - .../test-package-downloads-action.yml | 209 +---- tools/ci.py | 68 ++ tools/pre_commit.py | 41 +- 9 files changed, 110 insertions(+), 1572 deletions(-) delete mode 100644 .github/workflows/templates/test-package-downloads-action.yml.jinja diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 700659a301f..07785a31e1e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -112,7 +112,7 @@ jobs: - name: Set Cache Seed Output id: set-cache-seed run: | - tools ci define-cache-seed ${{ env.CACHE_SEED }} + echo "cache-seed=${{ env.CACHE_SEED }}" >> "$GITHUB_OUTPUT" download-onedir-artifact: name: Download Staging Onedir Artifact @@ -162,518 +162,6 @@ jobs: retention-days: 7 if-no-files-found: error - windows-2016-ci-deps: - name: Windows 2016 - needs: - - prepare-workflow - - download-onedir-artifact - uses: ./.github/workflows/build-deps-ci-action.yml - with: - distro-slug: windows-2016 - nox-session: ci-test-onedir - platform: windows - arch: amd64 - nox-version: 2022.8.7 - python-version: "3.10" - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - - windows-2019-ci-deps: - name: Windows 2019 - needs: - - prepare-workflow - - download-onedir-artifact - uses: ./.github/workflows/build-deps-ci-action.yml - with: - distro-slug: windows-2019 - nox-session: ci-test-onedir - platform: windows - arch: amd64 - nox-version: 2022.8.7 - python-version: "3.10" - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - - windows-2022-ci-deps: - name: Windows 2022 - needs: - - prepare-workflow - - download-onedir-artifact - uses: ./.github/workflows/build-deps-ci-action.yml - with: - distro-slug: windows-2022 - nox-session: ci-test-onedir - platform: windows - arch: amd64 - nox-version: 2022.8.7 - python-version: "3.10" - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - - macos-12-ci-deps: - name: macOS 12 - needs: - - prepare-workflow - - download-onedir-artifact - uses: ./.github/workflows/build-deps-ci-action-macos.yml - with: - distro-slug: macos-12 - nox-session: ci-test-onedir - platform: darwin - arch: x86_64 - nox-version: 2022.8.7 - python-version: "3.10" - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - - almalinux-8-ci-deps: - name: Alma Linux 8 - needs: - - prepare-workflow - - download-onedir-artifact - uses: ./.github/workflows/build-deps-ci-action.yml - with: - distro-slug: almalinux-8 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - nox-version: 2022.8.7 - python-version: "3.10" - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - - almalinux-8-arm64-ci-deps: - name: Alma Linux 8 Arm64 - needs: - - prepare-workflow - - download-onedir-artifact - uses: ./.github/workflows/build-deps-ci-action.yml - with: - distro-slug: almalinux-8-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - nox-version: 2022.8.7 - python-version: "3.10" - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - - almalinux-9-ci-deps: - name: Alma Linux 9 - needs: - - prepare-workflow - - download-onedir-artifact - uses: ./.github/workflows/build-deps-ci-action.yml - with: - distro-slug: almalinux-9 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - nox-version: 2022.8.7 - python-version: "3.10" - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - - almalinux-9-arm64-ci-deps: - name: Alma Linux 9 Arm64 - needs: - - prepare-workflow - - download-onedir-artifact - uses: ./.github/workflows/build-deps-ci-action.yml - with: - distro-slug: almalinux-9-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - nox-version: 2022.8.7 - python-version: "3.10" - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - - amazonlinux-2-ci-deps: - name: Amazon Linux 2 - needs: - - prepare-workflow - - download-onedir-artifact - uses: ./.github/workflows/build-deps-ci-action.yml - with: - distro-slug: amazonlinux-2 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - nox-version: 2022.8.7 - python-version: "3.10" - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - - amazonlinux-2-arm64-ci-deps: - name: Amazon Linux 2 Arm64 - needs: - - prepare-workflow - - download-onedir-artifact - uses: ./.github/workflows/build-deps-ci-action.yml - with: - distro-slug: amazonlinux-2-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - nox-version: 2022.8.7 - python-version: "3.10" - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - - archlinux-lts-ci-deps: - name: Arch Linux LTS - needs: - - prepare-workflow - - download-onedir-artifact - uses: ./.github/workflows/build-deps-ci-action.yml - with: - distro-slug: archlinux-lts - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - nox-version: 2022.8.7 - python-version: "3.10" - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - - centos-7-ci-deps: - name: CentOS 7 - needs: - - prepare-workflow - - download-onedir-artifact - uses: ./.github/workflows/build-deps-ci-action.yml - with: - distro-slug: centos-7 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - nox-version: 2022.8.7 - python-version: "3.10" - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - - centos-7-arm64-ci-deps: - name: CentOS 7 Arm64 - needs: - - prepare-workflow - - download-onedir-artifact - uses: ./.github/workflows/build-deps-ci-action.yml - with: - distro-slug: centos-7-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - nox-version: 2022.8.7 - python-version: "3.10" - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - - centosstream-8-ci-deps: - name: CentOS Stream 8 - needs: - - prepare-workflow - - download-onedir-artifact - uses: ./.github/workflows/build-deps-ci-action.yml - with: - distro-slug: centosstream-8 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - nox-version: 2022.8.7 - python-version: "3.10" - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - - centosstream-8-arm64-ci-deps: - name: CentOS Stream 8 Arm64 - needs: - - prepare-workflow - - download-onedir-artifact - uses: ./.github/workflows/build-deps-ci-action.yml - with: - distro-slug: centosstream-8-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - nox-version: 2022.8.7 - python-version: "3.10" - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - - centosstream-9-ci-deps: - name: CentOS Stream 9 - needs: - - prepare-workflow - - download-onedir-artifact - uses: ./.github/workflows/build-deps-ci-action.yml - with: - distro-slug: centosstream-9 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - nox-version: 2022.8.7 - python-version: "3.10" - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - - centosstream-9-arm64-ci-deps: - name: CentOS Stream 9 Arm64 - needs: - - prepare-workflow - - download-onedir-artifact - uses: ./.github/workflows/build-deps-ci-action.yml - with: - distro-slug: centosstream-9-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - nox-version: 2022.8.7 - python-version: "3.10" - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - - debian-10-ci-deps: - name: Debian 10 - needs: - - prepare-workflow - - download-onedir-artifact - uses: ./.github/workflows/build-deps-ci-action.yml - with: - distro-slug: debian-10 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - nox-version: 2022.8.7 - python-version: "3.10" - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - - debian-11-ci-deps: - name: Debian 11 - needs: - - prepare-workflow - - download-onedir-artifact - uses: ./.github/workflows/build-deps-ci-action.yml - with: - distro-slug: debian-11 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - nox-version: 2022.8.7 - python-version: "3.10" - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - - debian-11-arm64-ci-deps: - name: Debian 11 Arm64 - needs: - - prepare-workflow - - download-onedir-artifact - uses: ./.github/workflows/build-deps-ci-action.yml - with: - distro-slug: debian-11-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - nox-version: 2022.8.7 - python-version: "3.10" - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - - fedora-37-ci-deps: - name: Fedora 37 - needs: - - prepare-workflow - - download-onedir-artifact - uses: ./.github/workflows/build-deps-ci-action.yml - with: - distro-slug: fedora-37 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - nox-version: 2022.8.7 - python-version: "3.10" - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - - fedora-37-arm64-ci-deps: - name: Fedora 37 Arm64 - needs: - - prepare-workflow - - download-onedir-artifact - uses: ./.github/workflows/build-deps-ci-action.yml - with: - distro-slug: fedora-37-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - nox-version: 2022.8.7 - python-version: "3.10" - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - - fedora-38-ci-deps: - name: Fedora 38 - needs: - - prepare-workflow - - download-onedir-artifact - uses: ./.github/workflows/build-deps-ci-action.yml - with: - distro-slug: fedora-38 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - nox-version: 2022.8.7 - python-version: "3.10" - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - - fedora-38-arm64-ci-deps: - name: Fedora 38 Arm64 - needs: - - prepare-workflow - - download-onedir-artifact - uses: ./.github/workflows/build-deps-ci-action.yml - with: - distro-slug: fedora-38-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - nox-version: 2022.8.7 - python-version: "3.10" - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - - opensuse-15-ci-deps: - name: Opensuse 15 - needs: - - prepare-workflow - - download-onedir-artifact - uses: ./.github/workflows/build-deps-ci-action.yml - with: - distro-slug: opensuse-15 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - nox-version: 2022.8.7 - python-version: "3.10" - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - - photonos-3-ci-deps: - name: Photon OS 3 - needs: - - prepare-workflow - - download-onedir-artifact - uses: ./.github/workflows/build-deps-ci-action.yml - with: - distro-slug: photonos-3 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - nox-version: 2022.8.7 - python-version: "3.10" - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - - photonos-4-ci-deps: - name: Photon OS 4 - needs: - - prepare-workflow - - download-onedir-artifact - uses: ./.github/workflows/build-deps-ci-action.yml - with: - distro-slug: photonos-4 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - nox-version: 2022.8.7 - python-version: "3.10" - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - - photonos-4-arm64-ci-deps: - name: Photon OS 4 Arm64 - needs: - - prepare-workflow - - download-onedir-artifact - uses: ./.github/workflows/build-deps-ci-action.yml - with: - distro-slug: photonos-4-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - nox-version: 2022.8.7 - python-version: "3.10" - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - - ubuntu-2004-ci-deps: - name: Ubuntu 20.04 - needs: - - prepare-workflow - - download-onedir-artifact - uses: ./.github/workflows/build-deps-ci-action.yml - with: - distro-slug: ubuntu-20.04 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - nox-version: 2022.8.7 - python-version: "3.10" - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - - ubuntu-2004-arm64-ci-deps: - name: Ubuntu 20.04 Arm64 - needs: - - prepare-workflow - - download-onedir-artifact - uses: ./.github/workflows/build-deps-ci-action.yml - with: - distro-slug: ubuntu-20.04-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - nox-version: 2022.8.7 - python-version: "3.10" - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - - ubuntu-2204-ci-deps: - name: Ubuntu 22.04 - needs: - - prepare-workflow - - download-onedir-artifact - uses: ./.github/workflows/build-deps-ci-action.yml - with: - distro-slug: ubuntu-22.04 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - nox-version: 2022.8.7 - python-version: "3.10" - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - - ubuntu-2204-arm64-ci-deps: - name: Ubuntu 22.04 Arm64 - needs: - - prepare-workflow - - download-onedir-artifact - uses: ./.github/workflows/build-deps-ci-action.yml - with: - distro-slug: ubuntu-22.04-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - nox-version: 2022.8.7 - python-version: "3.10" - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - backup: name: Backup runs-on: @@ -741,34 +229,6 @@ jobs: needs: - prepare-workflow - publish-repositories - - almalinux-8-arm64-ci-deps - - almalinux-8-ci-deps - - almalinux-9-arm64-ci-deps - - almalinux-9-ci-deps - - amazonlinux-2-arm64-ci-deps - - amazonlinux-2-ci-deps - - centos-7-arm64-ci-deps - - centos-7-ci-deps - - centosstream-8-arm64-ci-deps - - centosstream-8-ci-deps - - centosstream-9-arm64-ci-deps - - centosstream-9-ci-deps - - debian-10-ci-deps - - debian-11-arm64-ci-deps - - debian-11-ci-deps - - fedora-37-arm64-ci-deps - - fedora-37-ci-deps - - fedora-38-arm64-ci-deps - - fedora-38-ci-deps - - macos-12-ci-deps - - photonos-3-ci-deps - - photonos-4-arm64-ci-deps - - photonos-4-ci-deps - - ubuntu-2004-arm64-ci-deps - - ubuntu-2004-ci-deps - - ubuntu-2204-arm64-ci-deps - - ubuntu-2204-ci-deps - - windows-2022-ci-deps - download-onedir-artifact uses: ./.github/workflows/test-package-downloads-action.yml with: @@ -956,38 +416,6 @@ jobs: - pkg-download-tests - release - publish-pypi - - windows-2016-ci-deps - - windows-2019-ci-deps - - windows-2022-ci-deps - - macos-12-ci-deps - - almalinux-8-ci-deps - - almalinux-8-arm64-ci-deps - - almalinux-9-ci-deps - - almalinux-9-arm64-ci-deps - - amazonlinux-2-ci-deps - - amazonlinux-2-arm64-ci-deps - - archlinux-lts-ci-deps - - centos-7-ci-deps - - centos-7-arm64-ci-deps - - centosstream-8-ci-deps - - centosstream-8-arm64-ci-deps - - centosstream-9-ci-deps - - centosstream-9-arm64-ci-deps - - debian-10-ci-deps - - debian-11-ci-deps - - debian-11-arm64-ci-deps - - fedora-37-ci-deps - - fedora-37-arm64-ci-deps - - fedora-38-ci-deps - - fedora-38-arm64-ci-deps - - opensuse-15-ci-deps - - photonos-3-ci-deps - - photonos-4-ci-deps - - photonos-4-arm64-ci-deps - - ubuntu-2004-ci-deps - - ubuntu-2004-arm64-ci-deps - - ubuntu-2204-ci-deps - - ubuntu-2204-arm64-ci-deps steps: - name: Get workflow information id: get-workflow-info diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index fe53449c2ae..66b4edacbb7 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -2974,34 +2974,6 @@ jobs: needs: - prepare-workflow - publish-repositories - - almalinux-8-arm64-ci-deps - - almalinux-8-ci-deps - - almalinux-9-arm64-ci-deps - - almalinux-9-ci-deps - - amazonlinux-2-arm64-ci-deps - - amazonlinux-2-ci-deps - - centos-7-arm64-ci-deps - - centos-7-ci-deps - - centosstream-8-arm64-ci-deps - - centosstream-8-ci-deps - - centosstream-9-arm64-ci-deps - - centosstream-9-ci-deps - - debian-10-ci-deps - - debian-11-arm64-ci-deps - - debian-11-ci-deps - - fedora-37-arm64-ci-deps - - fedora-37-ci-deps - - fedora-38-arm64-ci-deps - - fedora-38-ci-deps - - macos-12-ci-deps - - photonos-3-ci-deps - - photonos-4-arm64-ci-deps - - photonos-4-ci-deps - - ubuntu-2004-arm64-ci-deps - - ubuntu-2004-ci-deps - - ubuntu-2204-arm64-ci-deps - - ubuntu-2204-ci-deps - - windows-2022-ci-deps - build-salt-onedir-linux - build-salt-onedir-macos - build-salt-onedir-windows diff --git a/.github/workflows/templates/build-ci-deps.yml.jinja b/.github/workflows/templates/build-ci-deps.yml.jinja index fd6d7d46422..1a5402d80ce 100644 --- a/.github/workflows/templates/build-ci-deps.yml.jinja +++ b/.github/workflows/templates/build-ci-deps.yml.jinja @@ -4,16 +4,10 @@ <{ slug.replace(".", "") }>-ci-deps: <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> name: <{ display_name }> - <%- if workflow_slug != 'release' %> if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - <%- endif %> needs: - prepare-workflow - <%- if workflow_slug != 'release' %> - build-salt-onedir-windows - <%- else %> - - download-onedir-artifact - <%- endif %> uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: <{ slug }> @@ -33,16 +27,10 @@ <{ slug.replace(".", "") }>-ci-deps: <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> name: <{ display_name }> - <%- if workflow_slug != 'release' %> if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} - <%- endif %> needs: - prepare-workflow - <%- if workflow_slug != 'release' %> - build-salt-onedir-macos - <%- else %> - - download-onedir-artifact - <%- endif %> uses: ./.github/workflows/build-deps-ci-action-macos.yml with: distro-slug: <{ slug }> @@ -62,16 +50,10 @@ <{ slug.replace(".", "") }>-ci-deps: <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> name: <{ display_name }> - <%- if workflow_slug != 'release' %> if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - <%- endif %> needs: - prepare-workflow - <%- if workflow_slug != 'release' %> - build-salt-onedir-linux - <%- else %> - - download-onedir-artifact - <%- endif %> uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: <{ slug }> diff --git a/.github/workflows/templates/release.yml.jinja b/.github/workflows/templates/release.yml.jinja index c79fa26d02f..4e109f90463 100644 --- a/.github/workflows/templates/release.yml.jinja +++ b/.github/workflows/templates/release.yml.jinja @@ -140,7 +140,7 @@ permissions: - name: Set Cache Seed Output id: set-cache-seed run: | - tools ci define-cache-seed ${{ env.CACHE_SEED }} + echo "cache-seed=${{ env.CACHE_SEED }}" >> "$GITHUB_OUTPUT" <%- endblock prepare_workflow_job %> <%- endif %> @@ -196,8 +196,6 @@ permissions: retention-days: 7 if-no-files-found: error - <%- include "build-ci-deps.yml.jinja" %> - backup: name: Backup runs-on: diff --git a/.github/workflows/templates/test-package-downloads-action.yml.jinja b/.github/workflows/templates/test-package-downloads-action.yml.jinja deleted file mode 100644 index ac66c8d8c1f..00000000000 --- a/.github/workflows/templates/test-package-downloads-action.yml.jinja +++ /dev/null @@ -1,737 +0,0 @@ -name: Test Download Packages - -on: - workflow_call: - inputs: - salt-version: - type: string - required: true - description: The Salt version of the packages to install and test - cache-prefix: - required: true - type: string - description: Seed used to invalidate caches - environment: - required: true - type: string - description: The environment to run tests against - latest-release: - required: true - type: string - description: The latest salt release - nox-version: - required: true - type: string - description: The nox version to install - python-version: - required: false - type: string - description: The python version to run tests with - default: "3.10" - package-name: - required: false - type: string - description: The onedir package name to use - default: salt - skip-code-coverage: - required: false - type: boolean - description: Skip code coverage - default: false - nox-session: - required: false - type: string - description: The nox session to run - default: ci-test-onedir - -env: - COLUMNS: 190 - AWS_MAX_ATTEMPTS: "10" - AWS_RETRY_MODE: "adaptive" - PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ - PIP_EXTRA_INDEX_URL: https://pypi.org/simple - -jobs: - - linux: - name: Linux - runs-on: - - self-hosted - - linux - - bastion - environment: ${{ inputs.environment }} - timeout-minutes: 120 # 2 Hours - More than this and something is wrong - strategy: - fail-fast: false - matrix: - include: - <%- for slug, arch, pkg_type in test_salt_pkg_downloads_listing["linux"] %> - - distro-slug: <{ slug }> - arch: <{ arch }> - pkg-type: <{ pkg_type }> - <%- endfor %> - - steps: - - - name: "Throttle Builds" - shell: bash - run: | - t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t" - - - name: Checkout Source Code - uses: actions/checkout@v4 - - - name: Download Onedir Tarball as an Artifact - uses: actions/download-artifact@v3 - with: - name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-linux-${{ matrix.arch }}.tar.xz - path: artifacts/ - - - name: Decompress Onedir Tarball - shell: bash - run: | - python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" - cd artifacts - tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-linux-${{ matrix.arch }}.tar.xz - - - name: Download cached nox.${{ matrix.distro-slug }}.tar.* for session ${{ inputs.nox-session }} - uses: actions/cache@v3 - with: - path: nox.${{ matrix.distro-slug }}.tar.* - key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch }}|${{ matrix.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ - hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') - }} - # If we get a cache miss here it means the dependencies step failed to save the cache - fail-on-cache-miss: true - - - name: Setup Python Tools Scripts - uses: ./.github/actions/setup-python-tools-scripts - - - name: Get Salt Project GitHub Actions Bot Environment - run: | - TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") - SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) - echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" - - - name: Start VM - id: spin-up-vm - run: | - tools --timestamps vm create --environment "${SPB_ENVIRONMENT}" --retries=2 ${{ matrix.distro-slug }} - - - name: List Free Space - run: | - tools --timestamps vm ssh ${{ matrix.distro-slug }} -- df -h || true - - - name: Upload Checkout To VM - run: | - tools --timestamps vm rsync ${{ matrix.distro-slug }} - - - name: Decompress .nox Directory - run: | - tools --timestamps vm decompress-dependencies ${{ matrix.distro-slug }} - - - name: Show System Info & Test Plan - env: - SALT_RELEASE: "${{ inputs.salt-version }}" - SALT_REPO_ARCH: ${{ matrix.arch }} - SALT_REPO_TYPE: ${{ inputs.environment }} - SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} - SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} - SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} - SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} - SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" - LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" - DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} - run: | - tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ - -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ - -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ - --nox-session=${{ inputs.nox-session }}-pkgs ${{ matrix.distro-slug }} -- download-pkgs - - - name: Run Package Download Tests - env: - SALT_RELEASE: "${{ inputs.salt-version }}" - SALT_REPO_ARCH: ${{ matrix.arch }} - SALT_REPO_TYPE: ${{ inputs.environment }} - SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} - SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} - SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} - SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} - SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" - LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" - DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} - run: | - tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ - -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ - -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ - --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ matrix.distro-slug }} -- download-pkgs - - - name: Combine Coverage Reports - if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' - run: | - tools --timestamps vm combine-coverage ${{ matrix.distro-slug }} - - - name: Download Test Run Artifacts - id: download-artifacts-from-vm - if: always() && steps.spin-up-vm.outcome == 'success' - run: | - tools --timestamps vm download-artifacts ${{ matrix.distro-slug }} - # Delete the salt onedir, we won't need it anymore and it will prevent - # from it showing in the tree command below - rm -rf artifacts/salt* - tree -a artifacts - - - name: Destroy VM - if: always() - run: | - tools --timestamps vm destroy --no-wait ${{ matrix.distro-slug }} || true - - - name: Fix file ownership - run: | - sudo chown -R "$(id -un)" . - - - name: Install Codecov CLI - if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' - run: | - # We can't yet use tokenless uploads with the codecov CLI - # python3 -m pip install codecov-cli - # - curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import - curl -Os https://uploader.codecov.io/latest/linux/codecov - curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM - curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig - gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM - shasum -a 256 -c codecov.SHA256SUM - chmod +x codecov - - - name: Upload Source Code Coverage To Codecov - if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' - run: | - if [ ! -s artifacts/coverage/salt.xml ]; then - echo "The artifacts/coverage/salt.xml file does not exist" - exit 1 - fi - # We can't yet use tokenless uploads with the codecov CLI - #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/salt.xml \ - # --flag salt --flag ${{ matrix.distro-slug }} --flag pkg \ - # --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - n=0 - until [ "$n" -ge 5 ] - do - if ./codecov --file artifacts/coverage/salt.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags salt,${{ matrix.distro-slug }},pkg \ - --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then - rc=$? - break - fi - rc=$? - n=$((n+1)) - sleep 15 - done - if [ "$rc" -ne 0 ]; then - echo "Failed to upload codecov stats" - exit 1 - fi - - - name: Upload Tests Code Coverage To Codecov - if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' - run: | - if [ ! -s artifacts/coverage/tests.xml ]; then - echo "The artifacts/coverage/tests.xml file does not exist" - exit 1 - fi - # We can't yet use tokenless uploads with the codecov CLI - #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/tests.xml \ - # --flag tests --flag ${{ matrix.distro-slug }} --flag pkg \ - # --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - n=0 - until [ "$n" -ge 5 ] - do - if ./codecov --file artifacts/coverage/tests.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags tests,${{ matrix.distro-slug }},pkg \ - --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then - rc=$? - break - fi - rc=$? - n=$((n+1)) - sleep 15 - done - if [ "$rc" -ne 0 ]; then - echo "Failed to upload codecov stats" - exit 1 - fi - - - name: Upload Test Run Artifacts - if: always() && steps.download-artifacts-from-vm.outcome == 'success' - uses: actions/upload-artifact@v3 - with: - name: pkg-testrun-artifacts-${{ matrix.distro-slug }}-${{ matrix.arch }} - path: | - artifacts - !artifacts/salt/* - !artifacts/salt-*.tar.* - - - name: Publish Test Report - uses: mikepenz/action-junit-report@v3 - # always run even if the previous steps fails - if: always() && job.status != 'cancelled' && steps.download-artifacts-from-vm.outcome == 'success' - with: - check_name: Overall Test Results(${{ matrix.distro-slug }} ${{ matrix.arch }}) - report_paths: 'artifacts/xml-unittests-output/*.xml' - annotate_only: true - - - macos: - name: MacOS - runs-on: ${{ matrix.distro-slug }} - environment: ${{ inputs.environment }} - timeout-minutes: 120 # 2 Hours - More than this and something is wrong - strategy: - fail-fast: false - matrix: - include: - <%- for slug, arch, pkg_type in test_salt_pkg_downloads_listing["macos"] %> - - distro-slug: <{ slug }> - arch: <{ arch }> - pkg-type: <{ pkg_type }> - <%- endfor %> - - steps: - - - name: "Throttle Builds" - shell: bash - run: | - t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" - - - name: Checkout Source Code - uses: actions/checkout@v4 - - - name: Download Onedir Tarball as an Artifact - uses: actions/download-artifact@v3 - with: - name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz - path: artifacts/ - - - name: Install System Dependencies - run: | - brew install tree - - - name: Decompress Onedir Tarball - shell: bash - run: | - python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" - cd artifacts - tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz - - - name: Set up Python ${{ inputs.python-version }} - uses: actions/setup-python@v4 - with: - python-version: "${{ inputs.python-version }}" - update-environment: true - - - name: Install Nox - run: | - python3 -m pip install 'nox==${{ inputs.nox-version }}' - - - name: Download cached nox.${{ matrix.distro-slug }}.tar.* for session ${{ inputs.nox-session }} - uses: actions/cache@v3 - with: - path: nox.${{ matrix.distro-slug }}.tar.* - key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch }}|${{ matrix.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ - hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') - }} - # If we get a cache miss here it means the dependencies step failed to save the cache - fail-on-cache-miss: true - - - name: Decompress .nox Directory - run: | - nox --force-color -e decompress-dependencies -- ${{ matrix.distro-slug }} - - - name: Show System Info & Test Plan - env: - SALT_RELEASE: "${{ inputs.salt-version }}" - SKIP_REQUIREMENTS_INSTALL: "1" - PRINT_TEST_SELECTION: "1" - PRINT_TEST_PLAN_ONLY: "1" - PRINT_SYSTEM_INFO: "1" - GITHUB_ACTIONS_PIPELINE: "1" - SKIP_INITIAL_GH_ACTIONS_FAILURES: "1" - SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" - LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" - DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} - run: | - sudo -E nox --force-color -e ${{ inputs.nox-session }}-pkgs -- download-pkgs - - - name: Run Package Download Tests - env: - SKIP_REQUIREMENTS_INSTALL: "1" - PRINT_TEST_SELECTION: "0" - PRINT_TEST_PLAN_ONLY: "0" - PRINT_SYSTEM_INFO: "0" - RERUN_FAILURES: "1" - GITHUB_ACTIONS_PIPELINE: "1" - SKIP_INITIAL_GH_ACTIONS_FAILURES: "1" - SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" - COVERAGE_CONTEXT: ${{ matrix.distro-slug }} - SALT_RELEASE: "${{ inputs.salt-version }}" - SALT_REPO_ARCH: ${{ matrix.arch }} - LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" - SALT_REPO_TYPE: ${{ inputs.environment }} - SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} - SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} - SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} - SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} - DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} - run: | - sudo -E nox --force-color -e ${{ inputs.nox-session }}-pkgs -- download-pkgs - - - name: Fix file ownership - run: | - sudo chown -R "$(id -un)" . - - - name: Combine Coverage Reports - if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' - run: | - nox --force-color -e combine-coverage - - - name: Prepare Test Run Artifacts - id: download-artifacts-from-vm - if: always() && job.status != 'cancelled' - run: | - # Delete the salt onedir, we won't need it anymore and it will prevent - # from it showing in the tree command below - rm -rf artifacts/salt* - tree -a artifacts - - - name: Install Codecov CLI - if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' - run: | - # We can't yet use tokenless uploads with the codecov CLI - # python3 -m pip install codecov-cli - # - curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import - curl -Os https://uploader.codecov.io/latest/macos/codecov - curl -Os https://uploader.codecov.io/latest/macos/codecov.SHA256SUM - curl -Os https://uploader.codecov.io/latest/macos/codecov.SHA256SUM.sig - gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM - shasum -a 256 -c codecov.SHA256SUM - chmod +x codecov - - - name: Upload Source Code Coverage To Codecov - if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' - run: | - if [ ! -s artifacts/coverage/salt.xml ]; then - echo "The artifacts/coverage/salt.xml file does not exist" - exit 1 - fi - # We can't yet use tokenless uploads with the codecov CLI - #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/salt.xml \ - # --flag salt --flag ${{ matrix.distro-slug }} --flag pkg \ - # --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - n=0 - until [ "$n" -ge 5 ] - do - if ./codecov --file artifacts/coverage/salt.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags salt,${{ matrix.distro-slug }},pkg \ - --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then - rc=$? - break - fi - rc=$? - n=$((n+1)) - sleep 15 - done - if [ "$rc" -ne 0 ]; then - echo "Failed to upload codecov stats" - exit 1 - fi - - - name: Upload Tests Code Coverage To Codecov - if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' - run: | - if [ ! -s artifacts/coverage/tests.xml ]; then - echo "The artifacts/coverage/tests.xml file does not exist" - exit 1 - fi - # We can't yet use tokenless uploads with the codecov CLI - #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/tests.xml \ - # --flag tests --flag ${{ matrix.distro-slug }} --flag pkg \ - # --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - n=0 - until [ "$n" -ge 5 ] - do - if ./codecov --file artifacts/coverage/tests.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags tests,${{ matrix.distro-slug }},pkg \ - --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then - rc=$? - break - fi - rc=$? - n=$((n+1)) - sleep 15 - done - if [ "$rc" -ne 0 ]; then - echo "Failed to upload codecov stats" - exit 1 - fi - - - name: Upload Test Run Artifacts - if: always() - uses: actions/upload-artifact@v3 - with: - name: pkg-testrun-artifacts-${{ matrix.distro-slug }}-${{ matrix.arch }} - path: | - artifacts - !artifacts/salt/* - !artifacts/salt-*.tar.* - - - name: Publish Test Report - uses: mikepenz/action-junit-report@v3 - # always run even if the previous steps fails - if: always() && job.status != 'cancelled' - with: - check_name: Overall Test Results(${{ matrix.distro-slug }} ${{ matrix.arch }}) - report_paths: 'artifacts/xml-unittests-output/*.xml' - annotate_only: true - - - windows: - name: Windows - runs-on: - - self-hosted - - linux - - bastion - environment: ${{ inputs.environment }} - timeout-minutes: 120 # 2 Hours - More than this and something is wrong - strategy: - fail-fast: false - matrix: - include: - <%- for slug, arch, pkg_type in test_salt_pkg_downloads_listing["windows"] %> - - distro-slug: <{ slug }> - arch: <{ arch }> - pkg-type: <{ pkg_type }> - <%- endfor %> - - steps: - - name: Checkout Source Code - uses: actions/checkout@v4 - - - name: Download Onedir Tarball as an Artifact - uses: actions/download-artifact@v3 - with: - name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-windows-${{ matrix.arch }}.tar.xz - path: artifacts/ - - - name: Decompress Onedir Tarball - shell: bash - run: | - python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" - cd artifacts - tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-windows-${{ matrix.arch }}.tar.xz - - - name: Download cached nox.${{ matrix.distro-slug }}.tar.* for session ${{ inputs.nox-session }} - uses: actions/cache@v3 - with: - path: nox.${{ matrix.distro-slug }}.tar.* - key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch }}|${{ matrix.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ - hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') - }} - # If we get a cache miss here it means the dependencies step failed to save the cache - fail-on-cache-miss: true - - - name: Setup Python Tools Scripts - uses: ./.github/actions/setup-python-tools-scripts - - - name: Get Salt Project GitHub Actions Bot Environment - run: | - TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") - SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) - echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" - - - name: Start VM - id: spin-up-vm - run: | - tools --timestamps vm create --environment "${SPB_ENVIRONMENT}" --retries=2 ${{ matrix.distro-slug }} - - - name: List Free Space - run: | - tools --timestamps vm ssh ${{ matrix.distro-slug }} -- df -h || true - - - name: Upload Checkout To VM - run: | - tools --timestamps vm rsync ${{ matrix.distro-slug }} - - - name: Decompress .nox Directory - run: | - tools --timestamps vm decompress-dependencies ${{ matrix.distro-slug }} - - - name: Show System Info & Test Plan - env: - SALT_RELEASE: "${{ inputs.salt-version }}" - SALT_REPO_ARCH: ${{ matrix.arch }} - LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" - SALT_REPO_TYPE: ${{ inputs.environment }} - SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} - SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} - SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} - SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} - SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" - DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} - run: | - tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ - -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ - -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ - --nox-session=${{ inputs.nox-session }}-pkgs ${{ matrix.distro-slug }} -- download-pkgs - - - name: Run Package Download Tests - env: - SALT_RELEASE: "${{ inputs.salt-version }}" - SALT_REPO_ARCH: ${{ matrix.arch }} - LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" - SALT_REPO_TYPE: ${{ inputs.environment }} - SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} - SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} - SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} - SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} - SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" - DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} - run: | - tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ - -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ - -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ - --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ matrix.distro-slug }} -- download-pkgs - - - name: Combine Coverage Reports - if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' - run: | - tools --timestamps vm combine-coverage ${{ matrix.distro-slug }} - - - name: Download Test Run Artifacts - id: download-artifacts-from-vm - if: always() && steps.spin-up-vm.outcome == 'success' - run: | - tools --timestamps vm download-artifacts ${{ matrix.distro-slug }} - # Delete the salt onedir, we won't need it anymore and it will prevent - # from it showing in the tree command below - rm -rf artifacts/salt* - tree -a artifacts - - - name: Destroy VM - if: always() - run: | - tools --timestamps vm destroy --no-wait ${{ matrix.distro-slug }} || true - - - name: Fix file ownership - run: | - sudo chown -R "$(id -un)" . - - - name: Install Codecov CLI - if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' - run: | - # We can't yet use tokenless uploads with the codecov CLI - # python3 -m pip install codecov-cli - # - curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import - curl -Os https://uploader.codecov.io/latest/linux/codecov - curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM - curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig - gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM - shasum -a 256 -c codecov.SHA256SUM - chmod +x codecov - - - name: Upload Source Code Coverage To Codecov - if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' - run: | - if [ ! -s artifacts/coverage/salt.xml ]; then - echo "The artifacts/coverage/salt.xml file does not exist" - exit 1 - fi - # We can't yet use tokenless uploads with the codecov CLI - #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/salt.xml \ - # --flag salt --flag ${{ matrix.distro-slug }} --flag pkg \ - # --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - n=0 - until [ "$n" -ge 5 ] - do - if ./codecov --file artifacts/coverage/salt.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags salt,${{ matrix.distro-slug }},pkg \ - --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then - rc=$? - break - fi - rc=$? - n=$((n+1)) - sleep 15 - done - if [ "$rc" -ne 0 ]; then - echo "Failed to upload codecov stats" - exit 1 - fi - - - name: Upload Tests Code Coverage To Codecov - if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' - run: | - if [ ! -s artifacts/coverage/tests.xml ]; then - echo "The artifacts/coverage/tests.xml file does not exist" - exit 1 - fi - # We can't yet use tokenless uploads with the codecov CLI - #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/tests.xml \ - # --flag tests --flag ${{ matrix.distro-slug }} --flag pkg \ - # --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - n=0 - until [ "$n" -ge 5 ] - do - if ./codecov --file artifacts/coverage/tests.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags tests,${{ matrix.distro-slug }},pkg \ - --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then - rc=$? - break - fi - rc=$? - n=$((n+1)) - sleep 15 - done - if [ "$rc" -ne 0 ]; then - echo "Failed to upload codecov stats" - exit 1 - fi - - - name: Upload Test Run Artifacts - if: always() && steps.download-artifacts-from-vm.outcome == 'success' - uses: actions/upload-artifact@v3 - with: - name: pkg-testrun-artifacts-${{ matrix.distro-slug }}-${{ matrix.arch }} - path: | - artifacts - !artifacts/salt/* - !artifacts/salt-*.tar.* - - - name: Publish Test Report - uses: mikepenz/action-junit-report@v3 - # always run even if the previous steps fails - if: always() && job.status != 'cancelled' && steps.download-artifacts-from-vm.outcome == 'success' - with: - check_name: Overall Test Results(${{ matrix.distro-slug }} ${{ matrix.arch }} ${{ matrix.pkg-type }} ) - report_paths: 'artifacts/xml-unittests-output/*.xml' - annotate_only: true diff --git a/.github/workflows/templates/test-salt-pkg-repo-downloads.yml.jinja b/.github/workflows/templates/test-salt-pkg-repo-downloads.yml.jinja index 005c5272ac3..b84ae581e59 100644 --- a/.github/workflows/templates/test-salt-pkg-repo-downloads.yml.jinja +++ b/.github/workflows/templates/test-salt-pkg-repo-downloads.yml.jinja @@ -13,9 +13,6 @@ needs: - prepare-workflow - publish-repositories - <%- for slug in test_salt_pkg_downloads_needs_slugs %> - - <{ slug }> - <%- endfor %> <%- if gh_environment == "release" %> - download-onedir-artifact <%- else %> diff --git a/.github/workflows/test-package-downloads-action.yml b/.github/workflows/test-package-downloads-action.yml index 245ed6f09d0..32dcd453a57 100644 --- a/.github/workflows/test-package-downloads-action.yml +++ b/.github/workflows/test-package-downloads-action.yml @@ -53,6 +53,32 @@ env: jobs: + generate-matrix: + name: Test Matrix + runs-on: + - self-hosted + - linux + - x86_64 + outputs: + matrix-include: ${{ steps.generate-matrix.outputs.matrix }} + steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t" + + - name: Checkout Source Code + uses: actions/checkout@v4 + + - name: Setup Python Tools Scripts + uses: ./.github/actions/setup-python-tools-scripts + + - name: Generate Test Matrix + id: generate-matrix + run: | + tools ci pkg-download-matrix + linux: name: Linux runs-on: @@ -61,166 +87,12 @@ jobs: - bastion environment: ${{ inputs.environment }} timeout-minutes: 120 # 2 Hours - More than this and something is wrong + needs: + - generate-matrix strategy: fail-fast: false matrix: - include: - - distro-slug: almalinux-8 - arch: x86_64 - pkg-type: package - - distro-slug: almalinux-8 - arch: x86_64 - pkg-type: onedir - - distro-slug: almalinux-8-arm64 - arch: aarch64 - pkg-type: package - - distro-slug: almalinux-8-arm64 - arch: aarch64 - pkg-type: onedir - - distro-slug: almalinux-9 - arch: x86_64 - pkg-type: package - - distro-slug: almalinux-9 - arch: x86_64 - pkg-type: onedir - - distro-slug: almalinux-9-arm64 - arch: aarch64 - pkg-type: package - - distro-slug: almalinux-9-arm64 - arch: aarch64 - pkg-type: onedir - - distro-slug: amazonlinux-2 - arch: x86_64 - pkg-type: package - - distro-slug: amazonlinux-2 - arch: x86_64 - pkg-type: onedir - - distro-slug: amazonlinux-2-arm64 - arch: aarch64 - pkg-type: package - - distro-slug: amazonlinux-2-arm64 - arch: aarch64 - pkg-type: onedir - - distro-slug: centos-7 - arch: x86_64 - pkg-type: package - - distro-slug: centos-7 - arch: x86_64 - pkg-type: onedir - - distro-slug: centos-7-arm64 - arch: aarch64 - pkg-type: package - - distro-slug: centos-7-arm64 - arch: aarch64 - pkg-type: onedir - - distro-slug: centosstream-8 - arch: x86_64 - pkg-type: package - - distro-slug: centosstream-8 - arch: x86_64 - pkg-type: onedir - - distro-slug: centosstream-8-arm64 - arch: aarch64 - pkg-type: package - - distro-slug: centosstream-8-arm64 - arch: aarch64 - pkg-type: onedir - - distro-slug: centosstream-9 - arch: x86_64 - pkg-type: package - - distro-slug: centosstream-9 - arch: x86_64 - pkg-type: onedir - - distro-slug: centosstream-9-arm64 - arch: aarch64 - pkg-type: package - - distro-slug: centosstream-9-arm64 - arch: aarch64 - pkg-type: onedir - - distro-slug: debian-10 - arch: x86_64 - pkg-type: package - - distro-slug: debian-10 - arch: x86_64 - pkg-type: onedir - - distro-slug: debian-11 - arch: x86_64 - pkg-type: package - - distro-slug: debian-11 - arch: x86_64 - pkg-type: onedir - - distro-slug: debian-11-arm64 - arch: aarch64 - pkg-type: package - - distro-slug: debian-11-arm64 - arch: aarch64 - pkg-type: onedir - - distro-slug: fedora-37 - arch: x86_64 - pkg-type: package - - distro-slug: fedora-37 - arch: x86_64 - pkg-type: onedir - - distro-slug: fedora-37-arm64 - arch: aarch64 - pkg-type: package - - distro-slug: fedora-37-arm64 - arch: aarch64 - pkg-type: onedir - - distro-slug: fedora-38 - arch: x86_64 - pkg-type: package - - distro-slug: fedora-38 - arch: x86_64 - pkg-type: onedir - - distro-slug: fedora-38-arm64 - arch: aarch64 - pkg-type: package - - distro-slug: fedora-38-arm64 - arch: aarch64 - pkg-type: onedir - - distro-slug: photonos-3 - arch: x86_64 - pkg-type: package - - distro-slug: photonos-3 - arch: x86_64 - pkg-type: onedir - - distro-slug: photonos-4 - arch: x86_64 - pkg-type: package - - distro-slug: photonos-4 - arch: x86_64 - pkg-type: onedir - - distro-slug: photonos-4-arm64 - arch: aarch64 - pkg-type: package - - distro-slug: photonos-4-arm64 - arch: aarch64 - pkg-type: onedir - - distro-slug: ubuntu-20.04 - arch: x86_64 - pkg-type: package - - distro-slug: ubuntu-20.04 - arch: x86_64 - pkg-type: onedir - - distro-slug: ubuntu-20.04-arm64 - arch: aarch64 - pkg-type: package - - distro-slug: ubuntu-20.04-arm64 - arch: aarch64 - pkg-type: onedir - - distro-slug: ubuntu-22.04 - arch: x86_64 - pkg-type: package - - distro-slug: ubuntu-22.04 - arch: x86_64 - pkg-type: onedir - - distro-slug: ubuntu-22.04-arm64 - arch: aarch64 - pkg-type: package - - distro-slug: ubuntu-22.04-arm64 - arch: aarch64 - pkg-type: onedir + include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include)['linux'] }} steps: @@ -444,16 +316,12 @@ jobs: runs-on: ${{ matrix.distro-slug }} environment: ${{ inputs.environment }} timeout-minutes: 120 # 2 Hours - More than this and something is wrong + needs: + - generate-matrix strategy: fail-fast: false matrix: - include: - - distro-slug: macos-12 - arch: x86_64 - pkg-type: package - - distro-slug: macos-12 - arch: x86_64 - pkg-type: onedir + include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include)['macos'] }} steps: @@ -668,19 +536,12 @@ jobs: - bastion environment: ${{ inputs.environment }} timeout-minutes: 120 # 2 Hours - More than this and something is wrong + needs: + - generate-matrix strategy: fail-fast: false matrix: - include: - - distro-slug: windows-2022 - arch: amd64 - pkg-type: nsis - - distro-slug: windows-2022 - arch: amd64 - pkg-type: msi - - distro-slug: windows-2022 - arch: amd64 - pkg-type: onedir + include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include)['windows'] }} steps: - name: Checkout Source Code diff --git a/tools/ci.py b/tools/ci.py index d2c55eb3f79..8e5143fa010 100644 --- a/tools/ci.py +++ b/tools/ci.py @@ -783,6 +783,74 @@ def pkg_matrix( ctx.exit(0) +@ci.command( + name="pkg-download-matrix", + arguments={}, +) +def pkg_download_matrix(ctx: Context): + """ + Generate the test matrix. + """ + _platforms = {} + linux_entries = ( + ("almalinux-8", "Alma Linux 8", "x86_64", "package"), + ("almalinux-8-arm64", "Alma Linux 8 Arm64", "aarch64", "package"), + ("almalinux-9", "Alma Linux 9", "x86_64", "package"), + ("almalinux-9-arm64", "Alma Linux 9 Arm64", "aarch64", "package"), + ("amazonlinux-2", "Amazon Linux 2", "x86_64", "package"), + ("amazonlinux-2-arm64", "Amazon Linux 2 Arm64", "aarch64", "package"), + ("centos-7", "CentOS 7", "x86_64", "package"), + ("centos-7-arm64", "CentOS 7 Arm64", "aarch64", "package"), + ("centosstream-8", "CentOS Stream 8", "x86_64", "package"), + ("centosstream-8-arm64", "CentOS Stream 8 Arm64", "aarch64", "package"), + ("centosstream-9", "CentOS Stream 9", "x86_64", "package"), + ("centosstream-9-arm64", "CentOS Stream 9 Arm64", "aarch64", "package"), + ("debian-10", "Debian 10", "x86_64", "package"), + ("debian-11", "Debian 11", "x86_64", "package"), + ("debian-11-arm64", "Debian 11 Arm64", "aarch64", "package"), + ("fedora-37", "Fedora 37", "x86_64", "package"), + ("fedora-37-arm64", "Fedora 37 Arm64", "aarch64", "package"), + ("fedora-38", "Fedora 38", "x86_64", "package"), + ("fedora-38-arm64", "Fedora 38 Arm64", "aarch64", "package"), + ("photonos-3", "Photon OS 3", "x86_64", "package"), + ("photonos-4", "Photon OS 4", "x86_64", "package"), + ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64", "package"), + ("ubuntu-20.04", "Ubuntu 20.04", "x86_64", "package"), + ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64", "package"), + ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "package"), + ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "package"), + ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "onedir"), + ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "onedir"), + ) + macos_entries = ( + ("macos-12", "macOS 12", "x86_64", "Package"), + ("macos-12", "macOS 12", "x86_64", "Onedir"), + ) + windows_entries = (("windows-2022", "Windows 2022", "amd64"),) + _matrix = [] + for distro, display_name, arch, pkg_type in linux_entries: + _matrix.append({"distro-slug": distro, "arch": arch, "pkg_type": pkg_type}) + _platforms["linux"] = _matrix + _matrix = [] + for distro, display_name, arch, pkg_type in macos_entries: + _matrix.append({"distro-slug": distro, "arch": arch, "pkg_type": pkg_type}) + _platforms["macos"] = _matrix + _matrix = [] + for distro, display_name, arch in windows_entries: + for pkg_type in ("nsis", "msi", "onedir"): + _matrix.append({"distro-slug": distro, "arch": arch, "pkg_type": pkg_type}) + _platforms["windows"] = _matrix + + ctx.info("Generated matrix:") + ctx.print(_platforms, soft_wrap=True) + + github_output = os.environ.get("GITHUB_OUTPUT") + if github_output is not None: + with open(github_output, "a", encoding="utf-8") as wfh: + wfh.write(f"matrix={json.dumps(_platforms)}\n") + ctx.exit(0) + + @ci.command( name="get-releases", arguments={ diff --git a/tools/pre_commit.py b/tools/pre_commit.py index be773de4217..e4738445606 100644 --- a/tools/pre_commit.py +++ b/tools/pre_commit.py @@ -80,9 +80,6 @@ def generate_workflows(ctx: Context): "test-pkg-downloads": True, }, }, - "Test Package Downloads": { - "template": "test-package-downloads-action.yml", - }, } test_salt_listing = { "linux": ( @@ -139,7 +136,7 @@ def generate_workflows(ctx: Context): ), } build_ci_deps_listing = { - "linux": [ + "linux": ( ("almalinux-8", "Alma Linux 8", "x86_64"), ("almalinux-8-arm64", "Alma Linux 8 Arm64", "aarch64"), ("almalinux-9", "Alma Linux 9", "x86_64"), @@ -168,38 +165,14 @@ def generate_workflows(ctx: Context): ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64"), ("ubuntu-22.04", "Ubuntu 22.04", "x86_64"), ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64"), - ], - "macos": [ - ("macos-12", "macOS 12", "x86_64"), - ], - "windows": [ + ), + "macos": (("macos-12", "macOS 12", "x86_64"),), + "windows": ( ("windows-2016", "Windows 2016", "amd64"), ("windows-2019", "Windows 2019", "amd64"), ("windows-2022", "Windows 2022", "amd64"), - ], + ), } - test_salt_pkg_downloads_listing: dict[str, list[tuple[str, str, str]]] = { - "linux": [], - "macos": [], - "windows": [], - } - for slug, display_name, arch in build_ci_deps_listing["linux"]: - if slug in ("archlinux-lts", "opensuse-15"): - continue - for pkg_type in ("package", "onedir"): - test_salt_pkg_downloads_listing["linux"].append((slug, arch, pkg_type)) - for slug, display_name, arch in build_ci_deps_listing["macos"]: - for pkg_type in ("package", "onedir"): - test_salt_pkg_downloads_listing["macos"].append((slug, arch, pkg_type)) - for slug, display_name, arch in build_ci_deps_listing["windows"][-1:]: - for pkg_type in ("nsis", "msi", "onedir"): - test_salt_pkg_downloads_listing["windows"].append((slug, arch, pkg_type)) - - test_salt_pkg_downloads_needs_slugs = set() - for platform in test_salt_pkg_downloads_listing: - for slug, _, _ in test_salt_pkg_downloads_listing[platform]: - test_salt_pkg_downloads_needs_slugs.add(f"{slug.replace('.', '')}-ci-deps") - env = Environment( block_start_string="<%", block_end_string="%>", @@ -237,10 +210,6 @@ def generate_workflows(ctx: Context): "test_salt_listing": test_salt_listing, "test_salt_pkg_listing": test_salt_pkg_listing, "build_ci_deps_listing": build_ci_deps_listing, - "test_salt_pkg_downloads_listing": test_salt_pkg_downloads_listing, - "test_salt_pkg_downloads_needs_slugs": sorted( - test_salt_pkg_downloads_needs_slugs - ), } shared_context_file = ( tools.utils.REPO_ROOT / "cicd" / "shared-gh-workflows-context.yml" From f6e24b1cec956fc1b7c2084c8207ed00f1514cb0 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 9 Oct 2023 14:36:34 +0100 Subject: [PATCH 118/147] Revert "Move the build ci deps listing to `tools/pre_commit.py`" This reverts commit 8abb6c9099d99a2720456c081928c46caba7ce59. --- .../templates/build-ci-deps.yml.jinja | 37 +++++++++++++++--- tools/pre_commit.py | 39 ------------------- 2 files changed, 32 insertions(+), 44 deletions(-) diff --git a/.github/workflows/templates/build-ci-deps.yml.jinja b/.github/workflows/templates/build-ci-deps.yml.jinja index 1a5402d80ce..93feecd994e 100644 --- a/.github/workflows/templates/build-ci-deps.yml.jinja +++ b/.github/workflows/templates/build-ci-deps.yml.jinja @@ -1,5 +1,7 @@ - <%- for slug, display_name, arch in build_ci_deps_listing["windows"] %> + <%- for slug, display_name, arch in (("windows-2016", "Windows 2016", "amd64"), + ("windows-2019", "Windows 2019", "amd64"), + ("windows-2022", "Windows 2022", "amd64")) %> <{ slug.replace(".", "") }>-ci-deps: <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> @@ -21,8 +23,7 @@ <%- endfor %> - - <%- for slug, display_name, arch in build_ci_deps_listing["macos"] %> + <%- for slug, display_name, arch in (("macos-12", "macOS 12", "x86_64"),) %> <{ slug.replace(".", "") }>-ci-deps: <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> @@ -44,8 +45,34 @@ <%- endfor %> - - <%- for slug, display_name, arch in build_ci_deps_listing["linux"] %> + <%- for slug, display_name, arch in (("almalinux-8", "Alma Linux 8", "x86_64"), + ("almalinux-8-arm64", "Alma Linux 8 Arm64", "aarch64"), + ("almalinux-9", "Alma Linux 9", "x86_64"), + ("almalinux-9-arm64", "Alma Linux 9 Arm64", "aarch64"), + ("amazonlinux-2", "Amazon Linux 2", "x86_64"), + ("amazonlinux-2-arm64", "Amazon Linux 2 Arm64", "aarch64"), + ("archlinux-lts", "Arch Linux LTS", "x86_64"), + ("centos-7", "CentOS 7", "x86_64"), + ("centos-7-arm64", "CentOS 7 Arm64", "aarch64"), + ("centosstream-8", "CentOS Stream 8", "x86_64"), + ("centosstream-8-arm64", "CentOS Stream 8 Arm64", "aarch64"), + ("centosstream-9", "CentOS Stream 9", "x86_64"), + ("centosstream-9-arm64", "CentOS Stream 9 Arm64", "aarch64"), + ("debian-10", "Debian 10", "x86_64"), + ("debian-11", "Debian 11", "x86_64"), + ("debian-11-arm64", "Debian 11 Arm64", "aarch64"), + ("fedora-37", "Fedora 37", "x86_64"), + ("fedora-37-arm64", "Fedora 37 Arm64", "aarch64"), + ("fedora-38", "Fedora 38", "x86_64"), + ("fedora-38-arm64", "Fedora 38 Arm64", "aarch64"), + ("opensuse-15", "Opensuse 15", "x86_64"), + ("photonos-3", "Photon OS 3", "x86_64"), + ("photonos-4", "Photon OS 4", "x86_64"), + ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64"), + ("ubuntu-20.04", "Ubuntu 20.04", "x86_64"), + ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64"), + ("ubuntu-22.04", "Ubuntu 22.04", "x86_64"), + ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64")) %> <{ slug.replace(".", "") }>-ci-deps: <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> diff --git a/tools/pre_commit.py b/tools/pre_commit.py index e4738445606..647a6ed07c1 100644 --- a/tools/pre_commit.py +++ b/tools/pre_commit.py @@ -135,44 +135,6 @@ def generate_workflows(ctx: Context): ("windows-2022", "Windows 2022", "amd64"), ), } - build_ci_deps_listing = { - "linux": ( - ("almalinux-8", "Alma Linux 8", "x86_64"), - ("almalinux-8-arm64", "Alma Linux 8 Arm64", "aarch64"), - ("almalinux-9", "Alma Linux 9", "x86_64"), - ("almalinux-9-arm64", "Alma Linux 9 Arm64", "aarch64"), - ("amazonlinux-2", "Amazon Linux 2", "x86_64"), - ("amazonlinux-2-arm64", "Amazon Linux 2 Arm64", "aarch64"), - ("archlinux-lts", "Arch Linux LTS", "x86_64"), - ("centos-7", "CentOS 7", "x86_64"), - ("centos-7-arm64", "CentOS 7 Arm64", "aarch64"), - ("centosstream-8", "CentOS Stream 8", "x86_64"), - ("centosstream-8-arm64", "CentOS Stream 8 Arm64", "aarch64"), - ("centosstream-9", "CentOS Stream 9", "x86_64"), - ("centosstream-9-arm64", "CentOS Stream 9 Arm64", "aarch64"), - ("debian-10", "Debian 10", "x86_64"), - ("debian-11", "Debian 11", "x86_64"), - ("debian-11-arm64", "Debian 11 Arm64", "aarch64"), - ("fedora-37", "Fedora 37", "x86_64"), - ("fedora-37-arm64", "Fedora 37 Arm64", "aarch64"), - ("fedora-38", "Fedora 38", "x86_64"), - ("fedora-38-arm64", "Fedora 38 Arm64", "aarch64"), - ("opensuse-15", "Opensuse 15", "x86_64"), - ("photonos-3", "Photon OS 3", "x86_64"), - ("photonos-4", "Photon OS 4", "x86_64"), - ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64"), - ("ubuntu-20.04", "Ubuntu 20.04", "x86_64"), - ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64"), - ("ubuntu-22.04", "Ubuntu 22.04", "x86_64"), - ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64"), - ), - "macos": (("macos-12", "macOS 12", "x86_64"),), - "windows": ( - ("windows-2016", "Windows 2016", "amd64"), - ("windows-2019", "Windows 2019", "amd64"), - ("windows-2022", "Windows 2022", "amd64"), - ), - } env = Environment( block_start_string="<%", block_end_string="%>", @@ -209,7 +171,6 @@ def generate_workflows(ctx: Context): "build_repo_needs": NeedsTracker(), "test_salt_listing": test_salt_listing, "test_salt_pkg_listing": test_salt_pkg_listing, - "build_ci_deps_listing": build_ci_deps_listing, } shared_context_file = ( tools.utils.REPO_ROOT / "cicd" / "shared-gh-workflows-context.yml" From 7f083c8006efcec0f20a5350866b6c1b7875af4b Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 9 Oct 2023 14:36:34 +0100 Subject: [PATCH 119/147] Revert "Move the test salt pkg listing to `tools/pre_commit.py`" This reverts commit e0a0cbea281fd8c6a49891687189893f270761ef. --- .../templates/test-salt-pkg.yml.jinja | 43 +++++++++++++++++-- tools/pre_commit.py | 25 ----------- 2 files changed, 40 insertions(+), 28 deletions(-) diff --git a/.github/workflows/templates/test-salt-pkg.yml.jinja b/.github/workflows/templates/test-salt-pkg.yml.jinja index 64617d7054d..d078bea80e2 100644 --- a/.github/workflows/templates/test-salt-pkg.yml.jinja +++ b/.github/workflows/templates/test-salt-pkg.yml.jinja @@ -1,4 +1,39 @@ - <%- for slug, display_name, arch, pkg_type in test_salt_pkg_listing["linux"] %> + <%- set linux_pkg_tests = ( + ("almalinux-8", "Alma Linux 8", "x86_64", "rpm"), + ("almalinux-9", "Alma Linux 9", "x86_64", "rpm"), + ("amazonlinux-2", "Amazon Linux 2", "x86_64", "rpm"), + ("centos-7", "CentOS 7", "x86_64", "rpm"), + ("centosstream-8", "CentOS Stream 8", "x86_64", "rpm"), + ("centosstream-9", "CentOS Stream 9", "x86_64", "rpm"), + ("debian-10", "Debian 10", "x86_64", "deb"), + ("debian-11", "Debian 11", "x86_64", "deb"), + ("debian-11-arm64", "Debian 11 Arm64", "aarch64", "deb"), + ("fedora-37", "Fedora 37", "x86_64", "rpm"), + ("fedora-38", "Fedora 38", "x86_64", "rpm"), + ("ubuntu-20.04", "Ubuntu 20.04", "x86_64", "deb"), + ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64", "deb"), + ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "deb"), + ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "deb") + ) %> + + <%- set linux_pkg_tests = ( + ("amazonlinux-2", "Amazon Linux 2", "x86_64", "rpm"), + ("centos-7", "CentOS 7", "x86_64", "rpm"), + ("centosstream-8", "CentOS Stream 8", "x86_64", "rpm"), + ("centosstream-9", "CentOS Stream 9", "x86_64", "rpm"), + ("debian-10", "Debian 10", "x86_64", "deb"), + ("debian-11", "Debian 11", "x86_64", "deb"), + ("debian-11-arm64", "Debian 11 Arm64", "aarch64", "deb"), + ("photonos-3", "Photon OS 3", "x86_64", "rpm"), + ("photonos-4", "Photon OS 4", "x86_64", "rpm"), + ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64", "rpm"), + ("ubuntu-20.04", "Ubuntu 20.04", "x86_64", "deb"), + ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64", "deb"), + ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "deb"), + ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "deb") + ) %> + + <%- for slug, display_name, arch, pkg_type in linux_pkg_tests %> <%- set job_name = "{}-pkg-tests".format(slug.replace(".", "")) %> <{ job_name }>: @@ -28,7 +63,7 @@ - <%- for slug, display_name, arch in test_salt_pkg_listing["macos"] %> + <%- for slug, display_name, arch in (("macos-12", "macOS 12", "x86_64"),) %> <%- set job_name = "{}-pkg-tests".format(slug.replace(".", "")) %> <{ job_name }>: @@ -57,7 +92,9 @@ <%- endfor %> - <%- for slug, display_name, arch in test_salt_pkg_listing["windows"] %> + <%- for slug, display_name, arch in (("windows-2016", "Windows 2016", "amd64"), + ("windows-2019", "Windows 2019", "amd64"), + ("windows-2022", "Windows 2022", "amd64")) %> <%- for pkg_type in ("NSIS", "MSI") %> <%- set job_name = "{}-{}-pkg-tests".format(slug.replace(".", ""), pkg_type.lower()) %> diff --git a/tools/pre_commit.py b/tools/pre_commit.py index 647a6ed07c1..fc92769e095 100644 --- a/tools/pre_commit.py +++ b/tools/pre_commit.py @@ -111,30 +111,6 @@ def generate_workflows(ctx: Context): ("windows-2022", "Windows 2022", "amd64"), ), } - test_salt_pkg_listing = { - "linux": ( - ("amazonlinux-2", "Amazon Linux 2", "x86_64", "rpm"), - ("centos-7", "CentOS 7", "x86_64", "rpm"), - ("centosstream-8", "CentOS Stream 8", "x86_64", "rpm"), - ("centosstream-9", "CentOS Stream 9", "x86_64", "rpm"), - ("debian-10", "Debian 10", "x86_64", "deb"), - ("debian-11", "Debian 11", "x86_64", "deb"), - ("debian-11-arm64", "Debian 11 Arm64", "aarch64", "deb"), - ("photonos-3", "Photon OS 3", "x86_64", "rpm"), - ("photonos-4", "Photon OS 4", "x86_64", "rpm"), - ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64", "rpm"), - ("ubuntu-20.04", "Ubuntu 20.04", "x86_64", "deb"), - ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64", "deb"), - ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "deb"), - ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "deb"), - ), - "macos": (("macos-12", "macOS 12", "x86_64"),), - "windows": ( - ("windows-2016", "Windows 2016", "amd64"), - ("windows-2019", "Windows 2019", "amd64"), - ("windows-2022", "Windows 2022", "amd64"), - ), - } env = Environment( block_start_string="<%", block_end_string="%>", @@ -170,7 +146,6 @@ def generate_workflows(ctx: Context): "prepare_workflow_needs": NeedsTracker(), "build_repo_needs": NeedsTracker(), "test_salt_listing": test_salt_listing, - "test_salt_pkg_listing": test_salt_pkg_listing, } shared_context_file = ( tools.utils.REPO_ROOT / "cicd" / "shared-gh-workflows-context.yml" From fbf3454c4545df8ceea5b2d65d7a3904b84a2884 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 9 Oct 2023 14:36:34 +0100 Subject: [PATCH 120/147] Revert "Move the test salt listing to `tools/pre_commit.py`" This reverts commit 19c4a350216af40d90dfbe26d934adbcb37a56e0. --- .../workflows/templates/test-salt.yml.jinja | 29 ++++++++++++++--- tools/pre_commit.py | 31 ------------------- 2 files changed, 24 insertions(+), 36 deletions(-) diff --git a/.github/workflows/templates/test-salt.yml.jinja b/.github/workflows/templates/test-salt.yml.jinja index 91e222aaccc..688d9df5263 100644 --- a/.github/workflows/templates/test-salt.yml.jinja +++ b/.github/workflows/templates/test-salt.yml.jinja @@ -1,5 +1,7 @@ - <%- for slug, display_name, arch in test_salt_listing["windows"] %> + <%- for slug, display_name, arch in (("windows-2016", "Windows 2016", "amd64"), + ("windows-2019", "Windows 2019", "amd64"), + ("windows-2022", "Windows 2022", "amd64")) %> <{ slug.replace(".", "") }>: <%- do test_salt_needs.append(slug.replace(".", "")) %> @@ -24,8 +26,7 @@ <%- endfor %> - - <%- for slug, display_name, arch in test_salt_listing["macos"] %> + <%- for slug, display_name, arch in (("macos-12", "macOS 12", "x86_64"),) %> <{ slug.replace(".", "") }>: <%- do test_salt_needs.append(slug.replace(".", "")) %> @@ -50,8 +51,26 @@ <%- endfor %> - - <%- for slug, display_name, arch in test_salt_listing["linux"] %> + <%- for slug, display_name, arch in (("almalinux-8", "Alma Linux 8", "x86_64"), + ("almalinux-9", "Alma Linux 9", "x86_64"), + ("amazonlinux-2", "Amazon Linux 2", "x86_64"), + ("archlinux-lts", "Arch Linux LTS", "x86_64"), + ("centos-7", "CentOS 7", "x86_64"), + ("centosstream-8", "CentOS Stream 8", "x86_64"), + ("centosstream-9", "CentOS Stream 9", "x86_64"), + ("debian-10", "Debian 10", "x86_64"), + ("debian-11", "Debian 11", "x86_64"), + ("debian-11-arm64", "Debian 11 Arm64", "aarch64"), + ("fedora-37", "Fedora 37", "x86_64"), + ("fedora-38", "Fedora 38", "x86_64"), + ("opensuse-15", "Opensuse 15", "x86_64"), + ("photonos-3", "Photon OS 3", "x86_64"), + ("photonos-4", "Photon OS 4", "x86_64"), + ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64"), + ("ubuntu-20.04", "Ubuntu 20.04", "x86_64"), + ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64"), + ("ubuntu-22.04", "Ubuntu 22.04", "x86_64"), + ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64")) %> <{ slug.replace(".", "") }>: <%- do test_salt_needs.append(slug.replace(".", "")) %> diff --git a/tools/pre_commit.py b/tools/pre_commit.py index fc92769e095..af054876d80 100644 --- a/tools/pre_commit.py +++ b/tools/pre_commit.py @@ -81,36 +81,6 @@ def generate_workflows(ctx: Context): }, }, } - test_salt_listing = { - "linux": ( - ("almalinux-8", "Alma Linux 8", "x86_64"), - ("almalinux-9", "Alma Linux 9", "x86_64"), - ("amazonlinux-2", "Amazon Linux 2", "x86_64"), - ("archlinux-lts", "Arch Linux LTS", "x86_64"), - ("centos-7", "CentOS 7", "x86_64"), - ("centosstream-8", "CentOS Stream 8", "x86_64"), - ("centosstream-9", "CentOS Stream 9", "x86_64"), - ("debian-10", "Debian 10", "x86_64"), - ("debian-11", "Debian 11", "x86_64"), - ("debian-11-arm64", "Debian 11 Arm64", "aarch64"), - ("fedora-37", "Fedora 37", "x86_64"), - ("fedora-38", "Fedora 38", "x86_64"), - ("opensuse-15", "Opensuse 15", "x86_64"), - ("photonos-3", "Photon OS 3", "x86_64"), - ("photonos-4", "Photon OS 4", "x86_64"), - ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64"), - ("ubuntu-20.04", "Ubuntu 20.04", "x86_64"), - ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64"), - ("ubuntu-22.04", "Ubuntu 22.04", "x86_64"), - ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64"), - ), - "macos": (("macos-12", "macOS 12", "x86_64"),), - "windows": ( - ("windows-2016", "Windows 2016", "amd64"), - ("windows-2019", "Windows 2019", "amd64"), - ("windows-2022", "Windows 2022", "amd64"), - ), - } env = Environment( block_start_string="<%", block_end_string="%>", @@ -145,7 +115,6 @@ def generate_workflows(ctx: Context): "test_repo_needs": NeedsTracker(), "prepare_workflow_needs": NeedsTracker(), "build_repo_needs": NeedsTracker(), - "test_salt_listing": test_salt_listing, } shared_context_file = ( tools.utils.REPO_ROOT / "cicd" / "shared-gh-workflows-context.yml" From 1a43838ef054c4ee4dd5dceef4140148329431d5 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 9 Oct 2023 14:36:34 +0100 Subject: [PATCH 121/147] Revert "Define a `deps` job type" This reverts commit 27768ab509c77ad8982a61e417632b66c3083a7f. --- .github/workflows/ci.yml | 64 +++++++++---------- .github/workflows/nightly.yml | 64 +++++++++---------- .github/workflows/scheduled.yml | 64 +++++++++---------- .github/workflows/staging.yml | 64 +++++++++---------- .../templates/build-ci-deps.yml.jinja | 6 +- .github/workflows/templates/ci.yml.jinja | 2 +- tools/ci.py | 6 -- 7 files changed, 132 insertions(+), 138 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3aae43dbef4..cabeaf684cb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -629,7 +629,7 @@ jobs: windows-2016-ci-deps: name: Windows 2016 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -646,7 +646,7 @@ jobs: windows-2019-ci-deps: name: Windows 2019 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -663,7 +663,7 @@ jobs: windows-2022-ci-deps: name: Windows 2022 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -680,7 +680,7 @@ jobs: macos-12-ci-deps: name: macOS 12 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - build-salt-onedir-macos @@ -697,7 +697,7 @@ jobs: almalinux-8-ci-deps: name: Alma Linux 8 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -714,7 +714,7 @@ jobs: almalinux-8-arm64-ci-deps: name: Alma Linux 8 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -731,7 +731,7 @@ jobs: almalinux-9-ci-deps: name: Alma Linux 9 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -748,7 +748,7 @@ jobs: almalinux-9-arm64-ci-deps: name: Alma Linux 9 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -765,7 +765,7 @@ jobs: amazonlinux-2-ci-deps: name: Amazon Linux 2 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -782,7 +782,7 @@ jobs: amazonlinux-2-arm64-ci-deps: name: Amazon Linux 2 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -799,7 +799,7 @@ jobs: archlinux-lts-ci-deps: name: Arch Linux LTS - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -816,7 +816,7 @@ jobs: centos-7-ci-deps: name: CentOS 7 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -833,7 +833,7 @@ jobs: centos-7-arm64-ci-deps: name: CentOS 7 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -850,7 +850,7 @@ jobs: centosstream-8-ci-deps: name: CentOS Stream 8 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -867,7 +867,7 @@ jobs: centosstream-8-arm64-ci-deps: name: CentOS Stream 8 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -884,7 +884,7 @@ jobs: centosstream-9-ci-deps: name: CentOS Stream 9 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -901,7 +901,7 @@ jobs: centosstream-9-arm64-ci-deps: name: CentOS Stream 9 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -918,7 +918,7 @@ jobs: debian-10-ci-deps: name: Debian 10 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -935,7 +935,7 @@ jobs: debian-11-ci-deps: name: Debian 11 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -952,7 +952,7 @@ jobs: debian-11-arm64-ci-deps: name: Debian 11 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -969,7 +969,7 @@ jobs: fedora-37-ci-deps: name: Fedora 37 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -986,7 +986,7 @@ jobs: fedora-37-arm64-ci-deps: name: Fedora 37 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1003,7 +1003,7 @@ jobs: fedora-38-ci-deps: name: Fedora 38 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1020,7 +1020,7 @@ jobs: fedora-38-arm64-ci-deps: name: Fedora 38 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1037,7 +1037,7 @@ jobs: opensuse-15-ci-deps: name: Opensuse 15 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1054,7 +1054,7 @@ jobs: photonos-3-ci-deps: name: Photon OS 3 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1071,7 +1071,7 @@ jobs: photonos-4-ci-deps: name: Photon OS 4 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1088,7 +1088,7 @@ jobs: photonos-4-arm64-ci-deps: name: Photon OS 4 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1105,7 +1105,7 @@ jobs: ubuntu-2004-ci-deps: name: Ubuntu 20.04 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1122,7 +1122,7 @@ jobs: ubuntu-2004-arm64-ci-deps: name: Ubuntu 20.04 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1139,7 +1139,7 @@ jobs: ubuntu-2204-ci-deps: name: Ubuntu 22.04 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1156,7 +1156,7 @@ jobs: ubuntu-2204-arm64-ci-deps: name: Ubuntu 22.04 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index b4aed92fe91..6f570114738 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -690,7 +690,7 @@ jobs: windows-2016-ci-deps: name: Windows 2016 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -707,7 +707,7 @@ jobs: windows-2019-ci-deps: name: Windows 2019 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -724,7 +724,7 @@ jobs: windows-2022-ci-deps: name: Windows 2022 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -741,7 +741,7 @@ jobs: macos-12-ci-deps: name: macOS 12 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - build-salt-onedir-macos @@ -758,7 +758,7 @@ jobs: almalinux-8-ci-deps: name: Alma Linux 8 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -775,7 +775,7 @@ jobs: almalinux-8-arm64-ci-deps: name: Alma Linux 8 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -792,7 +792,7 @@ jobs: almalinux-9-ci-deps: name: Alma Linux 9 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -809,7 +809,7 @@ jobs: almalinux-9-arm64-ci-deps: name: Alma Linux 9 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -826,7 +826,7 @@ jobs: amazonlinux-2-ci-deps: name: Amazon Linux 2 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -843,7 +843,7 @@ jobs: amazonlinux-2-arm64-ci-deps: name: Amazon Linux 2 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -860,7 +860,7 @@ jobs: archlinux-lts-ci-deps: name: Arch Linux LTS - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -877,7 +877,7 @@ jobs: centos-7-ci-deps: name: CentOS 7 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -894,7 +894,7 @@ jobs: centos-7-arm64-ci-deps: name: CentOS 7 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -911,7 +911,7 @@ jobs: centosstream-8-ci-deps: name: CentOS Stream 8 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -928,7 +928,7 @@ jobs: centosstream-8-arm64-ci-deps: name: CentOS Stream 8 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -945,7 +945,7 @@ jobs: centosstream-9-ci-deps: name: CentOS Stream 9 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -962,7 +962,7 @@ jobs: centosstream-9-arm64-ci-deps: name: CentOS Stream 9 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -979,7 +979,7 @@ jobs: debian-10-ci-deps: name: Debian 10 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -996,7 +996,7 @@ jobs: debian-11-ci-deps: name: Debian 11 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1013,7 +1013,7 @@ jobs: debian-11-arm64-ci-deps: name: Debian 11 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1030,7 +1030,7 @@ jobs: fedora-37-ci-deps: name: Fedora 37 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1047,7 +1047,7 @@ jobs: fedora-37-arm64-ci-deps: name: Fedora 37 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1064,7 +1064,7 @@ jobs: fedora-38-ci-deps: name: Fedora 38 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1081,7 +1081,7 @@ jobs: fedora-38-arm64-ci-deps: name: Fedora 38 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1098,7 +1098,7 @@ jobs: opensuse-15-ci-deps: name: Opensuse 15 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1115,7 +1115,7 @@ jobs: photonos-3-ci-deps: name: Photon OS 3 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1132,7 +1132,7 @@ jobs: photonos-4-ci-deps: name: Photon OS 4 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1149,7 +1149,7 @@ jobs: photonos-4-arm64-ci-deps: name: Photon OS 4 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1166,7 +1166,7 @@ jobs: ubuntu-2004-ci-deps: name: Ubuntu 20.04 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1183,7 +1183,7 @@ jobs: ubuntu-2004-arm64-ci-deps: name: Ubuntu 20.04 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1200,7 +1200,7 @@ jobs: ubuntu-2204-ci-deps: name: Ubuntu 22.04 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1217,7 +1217,7 @@ jobs: ubuntu-2204-arm64-ci-deps: name: Ubuntu 22.04 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index ceecd84ad02..f0adb6704ba 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -663,7 +663,7 @@ jobs: windows-2016-ci-deps: name: Windows 2016 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -680,7 +680,7 @@ jobs: windows-2019-ci-deps: name: Windows 2019 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -697,7 +697,7 @@ jobs: windows-2022-ci-deps: name: Windows 2022 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -714,7 +714,7 @@ jobs: macos-12-ci-deps: name: macOS 12 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - build-salt-onedir-macos @@ -731,7 +731,7 @@ jobs: almalinux-8-ci-deps: name: Alma Linux 8 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -748,7 +748,7 @@ jobs: almalinux-8-arm64-ci-deps: name: Alma Linux 8 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -765,7 +765,7 @@ jobs: almalinux-9-ci-deps: name: Alma Linux 9 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -782,7 +782,7 @@ jobs: almalinux-9-arm64-ci-deps: name: Alma Linux 9 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -799,7 +799,7 @@ jobs: amazonlinux-2-ci-deps: name: Amazon Linux 2 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -816,7 +816,7 @@ jobs: amazonlinux-2-arm64-ci-deps: name: Amazon Linux 2 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -833,7 +833,7 @@ jobs: archlinux-lts-ci-deps: name: Arch Linux LTS - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -850,7 +850,7 @@ jobs: centos-7-ci-deps: name: CentOS 7 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -867,7 +867,7 @@ jobs: centos-7-arm64-ci-deps: name: CentOS 7 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -884,7 +884,7 @@ jobs: centosstream-8-ci-deps: name: CentOS Stream 8 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -901,7 +901,7 @@ jobs: centosstream-8-arm64-ci-deps: name: CentOS Stream 8 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -918,7 +918,7 @@ jobs: centosstream-9-ci-deps: name: CentOS Stream 9 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -935,7 +935,7 @@ jobs: centosstream-9-arm64-ci-deps: name: CentOS Stream 9 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -952,7 +952,7 @@ jobs: debian-10-ci-deps: name: Debian 10 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -969,7 +969,7 @@ jobs: debian-11-ci-deps: name: Debian 11 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -986,7 +986,7 @@ jobs: debian-11-arm64-ci-deps: name: Debian 11 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1003,7 +1003,7 @@ jobs: fedora-37-ci-deps: name: Fedora 37 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1020,7 +1020,7 @@ jobs: fedora-37-arm64-ci-deps: name: Fedora 37 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1037,7 +1037,7 @@ jobs: fedora-38-ci-deps: name: Fedora 38 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1054,7 +1054,7 @@ jobs: fedora-38-arm64-ci-deps: name: Fedora 38 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1071,7 +1071,7 @@ jobs: opensuse-15-ci-deps: name: Opensuse 15 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1088,7 +1088,7 @@ jobs: photonos-3-ci-deps: name: Photon OS 3 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1105,7 +1105,7 @@ jobs: photonos-4-ci-deps: name: Photon OS 4 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1122,7 +1122,7 @@ jobs: photonos-4-arm64-ci-deps: name: Photon OS 4 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1139,7 +1139,7 @@ jobs: ubuntu-2004-ci-deps: name: Ubuntu 20.04 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1156,7 +1156,7 @@ jobs: ubuntu-2004-arm64-ci-deps: name: Ubuntu 20.04 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1173,7 +1173,7 @@ jobs: ubuntu-2204-ci-deps: name: Ubuntu 22.04 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1190,7 +1190,7 @@ jobs: ubuntu-2204-arm64-ci-deps: name: Ubuntu 22.04 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 66b4edacbb7..3c88248c6dc 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -685,7 +685,7 @@ jobs: windows-2016-ci-deps: name: Windows 2016 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -702,7 +702,7 @@ jobs: windows-2019-ci-deps: name: Windows 2019 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -719,7 +719,7 @@ jobs: windows-2022-ci-deps: name: Windows 2022 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -736,7 +736,7 @@ jobs: macos-12-ci-deps: name: macOS 12 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - build-salt-onedir-macos @@ -753,7 +753,7 @@ jobs: almalinux-8-ci-deps: name: Alma Linux 8 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -770,7 +770,7 @@ jobs: almalinux-8-arm64-ci-deps: name: Alma Linux 8 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -787,7 +787,7 @@ jobs: almalinux-9-ci-deps: name: Alma Linux 9 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -804,7 +804,7 @@ jobs: almalinux-9-arm64-ci-deps: name: Alma Linux 9 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -821,7 +821,7 @@ jobs: amazonlinux-2-ci-deps: name: Amazon Linux 2 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -838,7 +838,7 @@ jobs: amazonlinux-2-arm64-ci-deps: name: Amazon Linux 2 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -855,7 +855,7 @@ jobs: archlinux-lts-ci-deps: name: Arch Linux LTS - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -872,7 +872,7 @@ jobs: centos-7-ci-deps: name: CentOS 7 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -889,7 +889,7 @@ jobs: centos-7-arm64-ci-deps: name: CentOS 7 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -906,7 +906,7 @@ jobs: centosstream-8-ci-deps: name: CentOS Stream 8 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -923,7 +923,7 @@ jobs: centosstream-8-arm64-ci-deps: name: CentOS Stream 8 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -940,7 +940,7 @@ jobs: centosstream-9-ci-deps: name: CentOS Stream 9 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -957,7 +957,7 @@ jobs: centosstream-9-arm64-ci-deps: name: CentOS Stream 9 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -974,7 +974,7 @@ jobs: debian-10-ci-deps: name: Debian 10 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -991,7 +991,7 @@ jobs: debian-11-ci-deps: name: Debian 11 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1008,7 +1008,7 @@ jobs: debian-11-arm64-ci-deps: name: Debian 11 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1025,7 +1025,7 @@ jobs: fedora-37-ci-deps: name: Fedora 37 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1042,7 +1042,7 @@ jobs: fedora-37-arm64-ci-deps: name: Fedora 37 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1059,7 +1059,7 @@ jobs: fedora-38-ci-deps: name: Fedora 38 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1076,7 +1076,7 @@ jobs: fedora-38-arm64-ci-deps: name: Fedora 38 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1093,7 +1093,7 @@ jobs: opensuse-15-ci-deps: name: Opensuse 15 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1110,7 +1110,7 @@ jobs: photonos-3-ci-deps: name: Photon OS 3 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1127,7 +1127,7 @@ jobs: photonos-4-ci-deps: name: Photon OS 4 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1144,7 +1144,7 @@ jobs: photonos-4-arm64-ci-deps: name: Photon OS 4 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1161,7 +1161,7 @@ jobs: ubuntu-2004-ci-deps: name: Ubuntu 20.04 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1178,7 +1178,7 @@ jobs: ubuntu-2004-arm64-ci-deps: name: Ubuntu 20.04 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1195,7 +1195,7 @@ jobs: ubuntu-2204-ci-deps: name: Ubuntu 22.04 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1212,7 +1212,7 @@ jobs: ubuntu-2204-arm64-ci-deps: name: Ubuntu 22.04 Arm64 - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux diff --git a/.github/workflows/templates/build-ci-deps.yml.jinja b/.github/workflows/templates/build-ci-deps.yml.jinja index 93feecd994e..7faabaee761 100644 --- a/.github/workflows/templates/build-ci-deps.yml.jinja +++ b/.github/workflows/templates/build-ci-deps.yml.jinja @@ -6,7 +6,7 @@ <{ slug.replace(".", "") }>-ci-deps: <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> name: <{ display_name }> - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -28,7 +28,7 @@ <{ slug.replace(".", "") }>-ci-deps: <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> name: <{ display_name }> - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - build-salt-onedir-macos @@ -77,7 +77,7 @@ <{ slug.replace(".", "") }>-ci-deps: <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> name: <{ display_name }> - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['deps'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux diff --git a/.github/workflows/templates/ci.yml.jinja b/.github/workflows/templates/ci.yml.jinja index d757c5558e2..e40a65b956a 100644 --- a/.github/workflows/templates/ci.yml.jinja +++ b/.github/workflows/templates/ci.yml.jinja @@ -309,7 +309,7 @@ <%- set pkg_tests_job_name = "pkg-tests" %> <%- set salt_tests_job_name = "salt-tests" %> - <%- if includes.get(pkg_tests_job_name, True) or includes.get(salt_tests_job_name, True) or includes.get("test-pkg-downloads", True) %> + <%- if includes.get(pkg_tests_job_name, True) or includes.get(salt_tests_job_name, True) %> <%- include "build-ci-deps.yml.jinja" %> <%- endif %> diff --git a/tools/ci.py b/tools/ci.py index 8e5143fa010..5cebdef78b2 100644 --- a/tools/ci.py +++ b/tools/ci.py @@ -276,7 +276,6 @@ def define_jobs( jobs = { "lint": True, - "deps": True, "test": True, "test-pkg": True, "test-pkg-download": True, @@ -295,11 +294,6 @@ def define_jobs( if skip_pkg_download_tests: jobs["test-pkg-download"] = False - if {skip_tests, skip_pkg_tests, skip_pkg_download_tests} == {False}: - with open(github_step_summary, "a", encoding="utf-8") as wfh: - wfh.write("De-selecting the 'deps' job.\n") - jobs["deps"] = False - if event_name != "pull_request": # In this case, all defined jobs should run ctx.info("Writing 'jobs' to the github outputs file") From b7658f88f51f7a1f080a6b3d658f22668e80104f Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 9 Oct 2023 14:36:34 +0100 Subject: [PATCH 122/147] Revert "Rework package downloads workflows" This reverts commit 277a610300208ebaa6112a468e1dd8cc938ddc36. --- .github/workflows/release.yml | 781 +++++++++++++++++- .github/workflows/staging.yml | 752 ++++++++++++++++- .../test-salt-pkg-repo-downloads.yml.jinja | 126 ++- .../test-package-downloads-action-linux.yml | 338 ++++++++ .../test-package-downloads-action-macos.yml | 318 +++++++ .../test-package-downloads-action-windows.yml | 343 ++++++++ .../test-package-downloads-action.yml | 754 ----------------- tools/ci.py | 68 -- 8 files changed, 2637 insertions(+), 843 deletions(-) create mode 100644 .github/workflows/test-package-downloads-action-linux.yml create mode 100644 .github/workflows/test-package-downloads-action-macos.yml create mode 100644 .github/workflows/test-package-downloads-action-windows.yml delete mode 100644 .github/workflows/test-package-downloads-action.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 07785a31e1e..ff9535b58d2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -223,16 +223,19 @@ jobs: run: | tools pkg repo publish release ${{ needs.prepare-workflow.outputs.salt-version }} - pkg-download-tests: - name: Package Downloads + almalinux-8-package-download-tests: + name: Alma Linux 8 Package Download if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: - prepare-workflow - publish-repositories - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action.yml + uses: ./.github/workflows/test-package-downloads-action-linux.yml with: + distro-slug: almalinux-8 nox-session: ci-test-onedir + platform: linux + arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release @@ -240,6 +243,743 @@ jobs: python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + almalinux-8-arm64-package-download-tests: + name: Alma Linux 8 Arm64 Package Download + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + needs: + - prepare-workflow + - publish-repositories + - download-onedir-artifact + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: almalinux-8-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: release + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + almalinux-9-package-download-tests: + name: Alma Linux 9 Package Download + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + needs: + - prepare-workflow + - publish-repositories + - download-onedir-artifact + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: almalinux-9 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: release + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + almalinux-9-arm64-package-download-tests: + name: Alma Linux 9 Arm64 Package Download + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + needs: + - prepare-workflow + - publish-repositories + - download-onedir-artifact + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: almalinux-9-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: release + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + amazonlinux-2-package-download-tests: + name: Amazon Linux 2 Package Download + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + needs: + - prepare-workflow + - publish-repositories + - download-onedir-artifact + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: amazonlinux-2 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: release + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + amazonlinux-2-arm64-package-download-tests: + name: Amazon Linux 2 Arm64 Package Download + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + needs: + - prepare-workflow + - publish-repositories + - download-onedir-artifact + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: amazonlinux-2-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: release + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + centos-7-package-download-tests: + name: CentOS 7 Package Download + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + needs: + - prepare-workflow + - publish-repositories + - download-onedir-artifact + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: centos-7 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: release + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + centos-7-arm64-package-download-tests: + name: CentOS 7 Arm64 Package Download + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + needs: + - prepare-workflow + - publish-repositories + - download-onedir-artifact + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: centos-7-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: release + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + centosstream-8-package-download-tests: + name: CentOS Stream 8 Package Download + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + needs: + - prepare-workflow + - publish-repositories + - download-onedir-artifact + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: centosstream-8 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: release + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + centosstream-8-arm64-package-download-tests: + name: CentOS Stream 8 Arm64 Package Download + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + needs: + - prepare-workflow + - publish-repositories + - download-onedir-artifact + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: centosstream-8-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: release + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + centosstream-9-package-download-tests: + name: CentOS Stream 9 Package Download + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + needs: + - prepare-workflow + - publish-repositories + - download-onedir-artifact + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: centosstream-9 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: release + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + centosstream-9-arm64-package-download-tests: + name: CentOS Stream 9 Arm64 Package Download + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + needs: + - prepare-workflow + - publish-repositories + - download-onedir-artifact + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: centosstream-9-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: release + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + debian-10-package-download-tests: + name: Debian 10 Package Download + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + needs: + - prepare-workflow + - publish-repositories + - download-onedir-artifact + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: debian-10 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: release + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + debian-11-package-download-tests: + name: Debian 11 Package Download + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + needs: + - prepare-workflow + - publish-repositories + - download-onedir-artifact + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: debian-11 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: release + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + debian-11-arm64-package-download-tests: + name: Debian 11 Arm64 Package Download + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + needs: + - prepare-workflow + - publish-repositories + - download-onedir-artifact + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: debian-11-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: release + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + fedora-37-package-download-tests: + name: Fedora 37 Package Download + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + needs: + - prepare-workflow + - publish-repositories + - download-onedir-artifact + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: fedora-37 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: release + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + fedora-37-arm64-package-download-tests: + name: Fedora 37 Arm64 Package Download + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + needs: + - prepare-workflow + - publish-repositories + - download-onedir-artifact + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: fedora-37-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: release + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + fedora-38-package-download-tests: + name: Fedora 38 Package Download + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + needs: + - prepare-workflow + - publish-repositories + - download-onedir-artifact + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: fedora-38 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: release + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + fedora-38-arm64-package-download-tests: + name: Fedora 38 Arm64 Package Download + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + needs: + - prepare-workflow + - publish-repositories + - download-onedir-artifact + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: fedora-38-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: release + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + photonos-3-package-download-tests: + name: Photon OS 3 Package Download + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + needs: + - prepare-workflow + - publish-repositories + - download-onedir-artifact + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: photonos-3 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: release + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + photonos-4-package-download-tests: + name: Photon OS 4 Package Download + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + needs: + - prepare-workflow + - publish-repositories + - download-onedir-artifact + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: photonos-4 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: release + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + photonos-4-arm64-package-download-tests: + name: Photon OS 4 Arm64 Package Download + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + needs: + - prepare-workflow + - publish-repositories + - download-onedir-artifact + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: photonos-4-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: release + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + ubuntu-2004-package-download-tests: + name: Ubuntu 20.04 Package Download + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + needs: + - prepare-workflow + - publish-repositories + - download-onedir-artifact + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: ubuntu-20.04 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: release + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + ubuntu-2004-arm64-package-download-tests: + name: Ubuntu 20.04 Arm64 Package Download + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + needs: + - prepare-workflow + - publish-repositories + - download-onedir-artifact + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: ubuntu-20.04-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: release + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + ubuntu-2204-package-download-tests: + name: Ubuntu 22.04 Package Download + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + needs: + - prepare-workflow + - publish-repositories + - download-onedir-artifact + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: ubuntu-22.04 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: release + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + ubuntu-2204-arm64-package-download-tests: + name: Ubuntu 22.04 Arm64 Package Download + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + needs: + - prepare-workflow + - publish-repositories + - download-onedir-artifact + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: ubuntu-22.04-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: release + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + ubuntu-2204-onedir-download-tests: + name: Ubuntu 22.04 Package Download + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + needs: + - prepare-workflow + - publish-repositories + - download-onedir-artifact + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: ubuntu-22.04 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: release + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: onedir + secrets: inherit + + ubuntu-2204-arm64-onedir-download-tests: + name: Ubuntu 22.04 Arm64 Package Download + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + needs: + - prepare-workflow + - publish-repositories + - download-onedir-artifact + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: ubuntu-22.04-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: release + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: onedir + secrets: inherit + + macos-12-package-download-tests: + name: macOS 12 Package Download + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + needs: + - prepare-workflow + - publish-repositories + - download-onedir-artifact + uses: ./.github/workflows/test-package-downloads-action-macos.yml + with: + distro-slug: macos-12 + nox-session: ci-test-onedir + platform: darwin + arch: x86_64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: release + skip-code-coverage: true + nox-version: 2022.8.7 + python-version: "3.10" + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + macos-12-onedir-download-tests: + name: macOS 12 Package Download + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + needs: + - prepare-workflow + - publish-repositories + - download-onedir-artifact + uses: ./.github/workflows/test-package-downloads-action-macos.yml + with: + distro-slug: macos-12 + nox-session: ci-test-onedir + platform: darwin + arch: x86_64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: release + skip-code-coverage: true + nox-version: 2022.8.7 + python-version: "3.10" + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: onedir + secrets: inherit + + windows-2022-nsis-amd64-download-tests: + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + name: Windows 2022 Package Download + needs: + - prepare-workflow + - publish-repositories + - download-onedir-artifact + uses: ./.github/workflows/test-package-downloads-action-windows.yml + with: + distro-slug: windows-2022 + nox-session: ci-test-onedir + platform: windows + arch: amd64 + pkg-type: nsis + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: release + skip-code-coverage: true + nox-version: 2022.8.7 + python-version: "3.10" + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + secrets: inherit + + windows-2022-msi-amd64-download-tests: + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + name: Windows 2022 Package Download + needs: + - prepare-workflow + - publish-repositories + - download-onedir-artifact + uses: ./.github/workflows/test-package-downloads-action-windows.yml + with: + distro-slug: windows-2022 + nox-session: ci-test-onedir + platform: windows + arch: amd64 + pkg-type: msi + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: release + skip-code-coverage: true + nox-version: 2022.8.7 + python-version: "3.10" + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + secrets: inherit + + windows-2022-onedir-amd64-download-tests: + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + name: Windows 2022 Package Download + needs: + - prepare-workflow + - publish-repositories + - download-onedir-artifact + uses: ./.github/workflows/test-package-downloads-action-windows.yml + with: + distro-slug: windows-2022 + nox-session: ci-test-onedir + platform: windows + arch: amd64 + pkg-type: onedir + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: release + skip-code-coverage: true + nox-version: 2022.8.7 + python-version: "3.10" + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" secrets: inherit release: @@ -253,7 +993,39 @@ jobs: - prepare-workflow - backup - publish-repositories - - pkg-download-tests + - almalinux-8-package-download-tests + - almalinux-8-arm64-package-download-tests + - almalinux-9-package-download-tests + - almalinux-9-arm64-package-download-tests + - amazonlinux-2-package-download-tests + - amazonlinux-2-arm64-package-download-tests + - centos-7-package-download-tests + - centos-7-arm64-package-download-tests + - centosstream-8-package-download-tests + - centosstream-8-arm64-package-download-tests + - centosstream-9-package-download-tests + - centosstream-9-arm64-package-download-tests + - debian-10-package-download-tests + - debian-11-package-download-tests + - debian-11-arm64-package-download-tests + - fedora-37-package-download-tests + - fedora-37-arm64-package-download-tests + - fedora-38-package-download-tests + - fedora-38-arm64-package-download-tests + - photonos-3-package-download-tests + - photonos-4-package-download-tests + - photonos-4-arm64-package-download-tests + - ubuntu-2004-package-download-tests + - ubuntu-2004-arm64-package-download-tests + - ubuntu-2204-package-download-tests + - ubuntu-2204-arm64-package-download-tests + - ubuntu-2204-onedir-download-tests + - ubuntu-2204-arm64-onedir-download-tests + - macos-12-package-download-tests + - macos-12-onedir-download-tests + - windows-2022-nsis-amd64-download-tests + - windows-2022-msi-amd64-download-tests + - windows-2022-onedir-amd64-download-tests environment: release steps: - name: Clone The Salt Repository @@ -413,7 +1185,6 @@ jobs: - check-requirements - prepare-workflow - publish-repositories - - pkg-download-tests - release - publish-pypi steps: diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 3c88248c6dc..473d45eccce 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -2968,18 +2968,18 @@ jobs: retention-days: 7 if-no-files-found: error - pkg-download-tests: - name: Package Downloads + almalinux-8-package-download-tests: + name: Alma Linux 8 Package Download if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - publish-repositories - - build-salt-onedir-linux - - build-salt-onedir-macos - - build-salt-onedir-windows - uses: ./.github/workflows/test-package-downloads-action.yml + uses: ./.github/workflows/test-package-downloads-action-linux.yml with: + distro-slug: almalinux-8 nox-session: ci-test-onedir + platform: linux + arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging @@ -2987,6 +2987,711 @@ jobs: python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + almalinux-8-arm64-package-download-tests: + name: Alma Linux 8 Arm64 Package Download + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - publish-repositories + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: almalinux-8-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + almalinux-9-package-download-tests: + name: Alma Linux 9 Package Download + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - publish-repositories + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: almalinux-9 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + almalinux-9-arm64-package-download-tests: + name: Alma Linux 9 Arm64 Package Download + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - publish-repositories + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: almalinux-9-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + amazonlinux-2-package-download-tests: + name: Amazon Linux 2 Package Download + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - publish-repositories + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: amazonlinux-2 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + amazonlinux-2-arm64-package-download-tests: + name: Amazon Linux 2 Arm64 Package Download + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - publish-repositories + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: amazonlinux-2-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + centos-7-package-download-tests: + name: CentOS 7 Package Download + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - publish-repositories + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: centos-7 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + centos-7-arm64-package-download-tests: + name: CentOS 7 Arm64 Package Download + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - publish-repositories + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: centos-7-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + centosstream-8-package-download-tests: + name: CentOS Stream 8 Package Download + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - publish-repositories + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: centosstream-8 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + centosstream-8-arm64-package-download-tests: + name: CentOS Stream 8 Arm64 Package Download + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - publish-repositories + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: centosstream-8-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + centosstream-9-package-download-tests: + name: CentOS Stream 9 Package Download + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - publish-repositories + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: centosstream-9 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + centosstream-9-arm64-package-download-tests: + name: CentOS Stream 9 Arm64 Package Download + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - publish-repositories + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: centosstream-9-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + debian-10-package-download-tests: + name: Debian 10 Package Download + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - publish-repositories + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: debian-10 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + debian-11-package-download-tests: + name: Debian 11 Package Download + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - publish-repositories + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: debian-11 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + debian-11-arm64-package-download-tests: + name: Debian 11 Arm64 Package Download + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - publish-repositories + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: debian-11-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + fedora-37-package-download-tests: + name: Fedora 37 Package Download + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - publish-repositories + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: fedora-37 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + fedora-37-arm64-package-download-tests: + name: Fedora 37 Arm64 Package Download + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - publish-repositories + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: fedora-37-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + fedora-38-package-download-tests: + name: Fedora 38 Package Download + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - publish-repositories + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: fedora-38 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + fedora-38-arm64-package-download-tests: + name: Fedora 38 Arm64 Package Download + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - publish-repositories + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: fedora-38-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + photonos-3-package-download-tests: + name: Photon OS 3 Package Download + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - publish-repositories + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: photonos-3 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + photonos-4-package-download-tests: + name: Photon OS 4 Package Download + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - publish-repositories + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: photonos-4 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + photonos-4-arm64-package-download-tests: + name: Photon OS 4 Arm64 Package Download + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - publish-repositories + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: photonos-4-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + ubuntu-2004-package-download-tests: + name: Ubuntu 20.04 Package Download + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - publish-repositories + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: ubuntu-20.04 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + ubuntu-2004-arm64-package-download-tests: + name: Ubuntu 20.04 Arm64 Package Download + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - publish-repositories + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: ubuntu-20.04-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + ubuntu-2204-package-download-tests: + name: Ubuntu 22.04 Package Download + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - publish-repositories + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: ubuntu-22.04 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + ubuntu-2204-arm64-package-download-tests: + name: Ubuntu 22.04 Arm64 Package Download + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - publish-repositories + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: ubuntu-22.04-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + ubuntu-2204-onedir-download-tests: + name: Ubuntu 22.04 Package Download + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - publish-repositories + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: ubuntu-22.04 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: onedir + secrets: inherit + + ubuntu-2204-arm64-onedir-download-tests: + name: Ubuntu 22.04 Arm64 Package Download + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - publish-repositories + uses: ./.github/workflows/test-package-downloads-action-linux.yml + with: + distro-slug: ubuntu-22.04-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + nox-version: 2022.8.7 + python-version: "3.10" + skip-code-coverage: true + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: onedir + secrets: inherit + + macos-12-package-download-tests: + name: macOS 12 Package Download + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - publish-repositories + uses: ./.github/workflows/test-package-downloads-action-macos.yml + with: + distro-slug: macos-12 + nox-session: ci-test-onedir + platform: darwin + arch: x86_64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + skip-code-coverage: true + nox-version: 2022.8.7 + python-version: "3.10" + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: package + secrets: inherit + + macos-12-onedir-download-tests: + name: macOS 12 Package Download + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - publish-repositories + uses: ./.github/workflows/test-package-downloads-action-macos.yml + with: + distro-slug: macos-12 + nox-session: ci-test-onedir + platform: darwin + arch: x86_64 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + skip-code-coverage: true + nox-version: 2022.8.7 + python-version: "3.10" + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: onedir + secrets: inherit + + windows-2022-nsis-amd64-download-tests: + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + name: Windows 2022 Package Download + needs: + - prepare-workflow + - publish-repositories + uses: ./.github/workflows/test-package-downloads-action-windows.yml + with: + distro-slug: windows-2022 + nox-session: ci-test-onedir + platform: windows + arch: amd64 + pkg-type: nsis + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + skip-code-coverage: true + nox-version: 2022.8.7 + python-version: "3.10" + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + secrets: inherit + + windows-2022-msi-amd64-download-tests: + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + name: Windows 2022 Package Download + needs: + - prepare-workflow + - publish-repositories + uses: ./.github/workflows/test-package-downloads-action-windows.yml + with: + distro-slug: windows-2022 + nox-session: ci-test-onedir + platform: windows + arch: amd64 + pkg-type: msi + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + skip-code-coverage: true + nox-version: 2022.8.7 + python-version: "3.10" + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + secrets: inherit + + windows-2022-onedir-amd64-download-tests: + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + name: Windows 2022 Package Download + needs: + - prepare-workflow + - publish-repositories + uses: ./.github/workflows/test-package-downloads-action-windows.yml + with: + distro-slug: windows-2022 + nox-session: ci-test-onedir + platform: windows + arch: amd64 + pkg-type: onedir + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: staging + skip-code-coverage: true + nox-version: 2022.8.7 + python-version: "3.10" + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" secrets: inherit publish-pypi: @@ -3072,7 +3777,39 @@ jobs: - windows-2019-msi-pkg-tests - windows-2022-nsis-pkg-tests - windows-2022-msi-pkg-tests - - pkg-download-tests + - almalinux-8-package-download-tests + - almalinux-8-arm64-package-download-tests + - almalinux-9-package-download-tests + - almalinux-9-arm64-package-download-tests + - amazonlinux-2-package-download-tests + - amazonlinux-2-arm64-package-download-tests + - centos-7-package-download-tests + - centos-7-arm64-package-download-tests + - centosstream-8-package-download-tests + - centosstream-8-arm64-package-download-tests + - centosstream-9-package-download-tests + - centosstream-9-arm64-package-download-tests + - debian-10-package-download-tests + - debian-11-package-download-tests + - debian-11-arm64-package-download-tests + - fedora-37-package-download-tests + - fedora-37-arm64-package-download-tests + - fedora-38-package-download-tests + - fedora-38-arm64-package-download-tests + - photonos-3-package-download-tests + - photonos-4-package-download-tests + - photonos-4-arm64-package-download-tests + - ubuntu-2004-package-download-tests + - ubuntu-2004-arm64-package-download-tests + - ubuntu-2204-package-download-tests + - ubuntu-2204-arm64-package-download-tests + - ubuntu-2204-onedir-download-tests + - ubuntu-2204-arm64-onedir-download-tests + - macos-12-package-download-tests + - macos-12-onedir-download-tests + - windows-2022-nsis-amd64-download-tests + - windows-2022-msi-amd64-download-tests + - windows-2022-onedir-amd64-download-tests environment: staging runs-on: - self-hosted @@ -3144,7 +3881,6 @@ jobs: - build-macos-pkgs-src - publish-repositories - upload-release-artifacts - - pkg-download-tests - publish-pypi steps: - name: Get workflow information diff --git a/.github/workflows/templates/test-salt-pkg-repo-downloads.yml.jinja b/.github/workflows/templates/test-salt-pkg-repo-downloads.yml.jinja index b84ae581e59..bb6da5a4a05 100644 --- a/.github/workflows/templates/test-salt-pkg-repo-downloads.yml.jinja +++ b/.github/workflows/templates/test-salt-pkg-repo-downloads.yml.jinja @@ -1,10 +1,41 @@ + <%- set linux_pkg_tests = ( + ("almalinux-8", "Alma Linux 8", "x86_64", "Package"), + ("almalinux-8-arm64", "Alma Linux 8 Arm64", "aarch64", "Package"), + ("almalinux-9", "Alma Linux 9", "x86_64", "Package"), + ("almalinux-9-arm64", "Alma Linux 9 Arm64", "aarch64", "Package"), + ("amazonlinux-2", "Amazon Linux 2", "x86_64", "Package"), + ("amazonlinux-2-arm64", "Amazon Linux 2 Arm64", "aarch64", "Package"), + ("centos-7", "CentOS 7", "x86_64", "Package"), + ("centos-7-arm64", "CentOS 7 Arm64", "aarch64", "Package"), + ("centosstream-8", "CentOS Stream 8", "x86_64", "Package"), + ("centosstream-8-arm64", "CentOS Stream 8 Arm64", "aarch64", "Package"), + ("centosstream-9", "CentOS Stream 9", "x86_64", "Package"), + ("centosstream-9-arm64", "CentOS Stream 9 Arm64", "aarch64", "Package"), + ("debian-10", "Debian 10", "x86_64", "Package"), + ("debian-11", "Debian 11", "x86_64", "Package"), + ("debian-11-arm64", "Debian 11 Arm64", "aarch64", "Package"), + ("fedora-37", "Fedora 37", "x86_64", "Package"), + ("fedora-37-arm64", "Fedora 37 Arm64", "aarch64", "Package"), + ("fedora-38", "Fedora 38", "x86_64", "Package"), + ("fedora-38-arm64", "Fedora 38 Arm64", "aarch64", "Package"), + ("photonos-3", "Photon OS 3", "x86_64", "Package"), + ("photonos-4", "Photon OS 4", "x86_64", "Package"), + ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64", "Package"), + ("ubuntu-20.04", "Ubuntu 20.04", "x86_64", "Package"), + ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64", "Package"), + ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "Package"), + ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "Package"), + ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "Onedir"), + ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "Onedir") + ) %> - <%- set job_name = "pkg-download-tests" %> + + <%- for slug, display_name, arch, pkg_type in linux_pkg_tests %> + <%- set job_name = "{}-{}-download-tests".format(slug.replace(".", ""), pkg_type.lower()) %> <{ job_name }>: <%- do test_repo_needs.append(job_name) %> - <%- do conclusion_needs.append(job_name) %> - name: Package Downloads + name: <{ display_name }> Package Download <%- if gh_environment == "staging" %> if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} <%- else %> @@ -15,14 +46,13 @@ - publish-repositories <%- if gh_environment == "release" %> - download-onedir-artifact - <%- else %> - - build-salt-onedir-linux - - build-salt-onedir-macos - - build-salt-onedir-windows <%- endif %> - uses: ./.github/workflows/test-package-downloads-action.yml + uses: ./.github/workflows/test-package-downloads-action-linux.yml with: + distro-slug: <{ slug }> nox-session: ci-test-onedir + platform: linux + arch: <{ arch }> cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }> salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: <{ gh_environment }> @@ -30,4 +60,84 @@ python-version: "<{ gh_actions_workflows_python_version }>" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: <{ pkg_type.lower() }> secrets: inherit + + <%- endfor %> + + + <%- for slug, display_name, arch, pkg_type in ( + ("macos-12", "macOS 12", "x86_64", "Package"), + ("macos-12", "macOS 12", "x86_64", "Onedir"), + ) %> + <%- set job_name = "{}-{}-download-tests".format(slug.replace(".", ""), pkg_type.lower()) %> + + <{ job_name }>: + <%- do test_repo_needs.append(job_name) %> + name: <{ display_name }> Package Download + <%- if gh_environment == "staging" %> + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + <%- else %> + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + <%- endif %> + needs: + - prepare-workflow + - publish-repositories + <%- if gh_environment == "release" %> + - download-onedir-artifact + <%- endif %> + uses: ./.github/workflows/test-package-downloads-action-macos.yml + with: + distro-slug: <{ slug }> + nox-session: ci-test-onedir + platform: darwin + arch: <{ arch }> + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }> + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: <{ gh_environment }> + skip-code-coverage: true + nox-version: <{ nox_version }> + python-version: "<{ gh_actions_workflows_python_version }>" + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + pkg-type: <{ pkg_type.lower() }> + secrets: inherit + <%- endfor %> + + + <%- for slug, display_name, arch in ( + ("windows-2022", "Windows 2022", "amd64"), + ) %> + <%- for pkg_type in ("NSIS", "MSI", "Onedir") %> + <%- set job_name = "{}-{}-{}-download-tests".format(slug.replace(".", ""), pkg_type.lower(), arch.lower()) %> + + <{ job_name }>: + <%- do test_repo_needs.append(job_name) %> + <%- if gh_environment == "staging" %> + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + <%- else %> + if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + <%- endif %> + name: <{ display_name }> Package Download + needs: + - prepare-workflow + - publish-repositories + <%- if gh_environment == "release" %> + - download-onedir-artifact + <%- endif %> + uses: ./.github/workflows/test-package-downloads-action-windows.yml + with: + distro-slug: <{ slug }> + nox-session: ci-test-onedir + platform: windows + arch: <{ arch }> + pkg-type: <{ pkg_type.lower() }> + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }> + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + environment: <{ gh_environment }> + skip-code-coverage: true + nox-version: <{ nox_version }> + python-version: "<{ gh_actions_workflows_python_version }>" + latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" + secrets: inherit + <%- endfor %> + <%- endfor %> diff --git a/.github/workflows/test-package-downloads-action-linux.yml b/.github/workflows/test-package-downloads-action-linux.yml new file mode 100644 index 00000000000..f94d094d3b7 --- /dev/null +++ b/.github/workflows/test-package-downloads-action-linux.yml @@ -0,0 +1,338 @@ +name: Test Download Packages + +on: + workflow_call: + inputs: + distro-slug: + required: true + type: string + description: The OS slug to run tests against + platform: + required: true + type: string + description: The platform being tested + arch: + required: true + type: string + description: The platform arch being tested + salt-version: + type: string + required: true + description: The Salt version of the packages to install and test + cache-prefix: + required: true + type: string + description: Seed used to invalidate caches + environment: + required: true + type: string + description: The environment to run tests against + latest-release: + required: true + type: string + description: The latest salt release + pkg-type: + required: true + type: string + description: The type of artifact to download + nox-version: + required: true + type: string + description: The nox version to install + python-version: + required: false + type: string + description: The python version to run tests with + default: "3.10" + package-name: + required: false + type: string + description: The onedir package name to use + default: salt + skip-code-coverage: + required: false + type: boolean + description: Skip code coverage + default: false + nox-session: + required: false + type: string + description: The nox session to run + default: ci-test-onedir + +env: + COLUMNS: 190 + AWS_MAX_ATTEMPTS: "10" + AWS_RETRY_MODE: "adaptive" + PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ + PIP_EXTRA_INDEX_URL: https://pypi.org/simple + +jobs: + + test: + name: Test + runs-on: + - self-hosted + - linux + - bastion + environment: ${{ inputs.environment }} + timeout-minutes: 120 # 2 Hours - More than this and something is wrong + strategy: + fail-fast: false + matrix: + arch: + - ${{ inputs.arch }} + pkg-type: + - ${{ inputs.pkg-type }} + + steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t" + + - name: Checkout Source Code + uses: actions/checkout@v4 + + - name: Download Onedir Tarball as an Artifact + uses: actions/download-artifact@v3 + with: + name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz + path: artifacts/ + + - name: Decompress Onedir Tarball + shell: bash + run: | + python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" + cd artifacts + tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz + + - name: Download cached nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }} + uses: actions/cache@v3 + with: + path: nox.${{ inputs.distro-slug }}.tar.* + key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ + hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') + }} + # If we get a cache miss here it means the dependencies step failed to save the cache + fail-on-cache-miss: true + + - name: Setup Python Tools Scripts + uses: ./.github/actions/setup-python-tools-scripts + + - name: Get Salt Project GitHub Actions Bot Environment + run: | + TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") + SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) + echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" + + - name: Start VM + id: spin-up-vm + run: | + tools --timestamps vm create --environment "${SPB_ENVIRONMENT}" --retries=2 ${{ inputs.distro-slug }} + + - name: List Free Space + run: | + tools --timestamps vm ssh ${{ inputs.distro-slug }} -- df -h || true + + - name: Upload Checkout To VM + run: | + tools --timestamps vm rsync ${{ inputs.distro-slug }} + + - name: Decompress .nox Directory + run: | + tools --timestamps vm decompress-dependencies ${{ inputs.distro-slug }} + + - name: Show System Info & Test Plan + env: + SALT_RELEASE: "${{ inputs.salt-version }}" + SALT_REPO_ARCH: ${{ inputs.arch }} + SALT_REPO_TYPE: ${{ inputs.environment }} + SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} + SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} + SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} + SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} + SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" + LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ inputs.pkg-type }} + run: | + tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ + -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ + --nox-session=${{ inputs.nox-session }}-pkgs ${{ inputs.distro-slug }} -- download-pkgs + + - name: Run Package Download Tests + env: + SALT_RELEASE: "${{ inputs.salt-version }}" + SALT_REPO_ARCH: ${{ inputs.arch }} + SALT_REPO_TYPE: ${{ inputs.environment }} + SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} + SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} + SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} + SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} + SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" + LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ inputs.pkg-type }} + run: | + tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ + -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ + --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ inputs.distro-slug }} -- download-pkgs + + - name: Combine Coverage Reports + if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' + run: | + tools --timestamps vm combine-coverage ${{ inputs.distro-slug }} + + - name: Create XML Coverage Reports + if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' + run: | + tools --timestamps vm create-xml-coverage-reports ${{ inputs.distro-slug }} + + - name: Download Test Run Artifacts + id: download-artifacts-from-vm + if: always() && steps.spin-up-vm.outcome == 'success' + run: | + tools --timestamps vm download-artifacts ${{ inputs.distro-slug }} + # Delete the salt onedir, we won't need it anymore and it will prevent + # from it showing in the tree command below + rm -rf artifacts/salt* + tree -a artifacts + + - name: Destroy VM + if: always() + run: | + tools --timestamps vm destroy --no-wait ${{ inputs.distro-slug }} || true + + - name: Fix file ownership + run: | + sudo chown -R "$(id -un)" . + + - name: Install Codecov CLI + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + # We can't yet use tokenless uploads with the codecov CLI + # python3 -m pip install codecov-cli + # + curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import + curl -Os https://uploader.codecov.io/latest/linux/codecov + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig + gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM + shasum -a 256 -c codecov.SHA256SUM + chmod +x codecov + + - name: Upload Source Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + if [ ! -s artifacts/coverage/salt.xml ]; then + echo "The artifacts/coverage/salt.xml file does not exist" + exit 1 + fi + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/salt.xml \ + # --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ + # --name salt.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/salt.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags salt,${{ inputs.distro-slug }},pkg \ + --name salt.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi + + - name: Upload Tests Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + if [ ! -s artifacts/coverage/tests.xml ]; then + echo "The artifacts/coverage/tests.xml file does not exist" + exit 1 + fi + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/tests.xml \ + # --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ + # --name tests.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/tests.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags tests,${{ inputs.distro-slug }},pkg \ + --name tests.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi + + - name: Upload Test Run Artifacts + if: always() && steps.download-artifacts-from-vm.outcome == 'success' + uses: actions/upload-artifact@v3 + with: + name: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.arch }} + path: | + artifacts + !artifacts/salt/* + !artifacts/salt-*.tar.* + + report: + name: Test Pkg Download Reports + runs-on: + - self-hosted + - linux + - x86_64 + environment: ${{ inputs.environment }} + if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped' + needs: + - test + + steps: + - name: Checkout Source Code + uses: actions/checkout@v4 + + - name: Download Test Run Artifacts + id: download-test-run-artifacts + uses: actions/download-artifact@v3 + with: + name: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.arch }} + path: artifacts + + - name: Show Test Run Artifacts + if: always() && steps.download-test-run-artifacts.outcome == 'success' + run: | + tree -a artifacts + + - name: Install Nox + run: | + python3 -m pip install 'nox==${{ inputs.nox-version }}' + + - name: Publish Test Report + uses: mikepenz/action-junit-report@v3 + # always run even if the previous steps fails + if: always() && github.event_name == 'push' && steps.download-test-run-artifacts.outcome == 'success' + with: + check_name: Overall Test Results(${{ inputs.distro-slug }} ${{ inputs.arch }}) + report_paths: 'artifacts/xml-unittests-output/*.xml' + annotate_only: true diff --git a/.github/workflows/test-package-downloads-action-macos.yml b/.github/workflows/test-package-downloads-action-macos.yml new file mode 100644 index 00000000000..632a88a7d29 --- /dev/null +++ b/.github/workflows/test-package-downloads-action-macos.yml @@ -0,0 +1,318 @@ +name: Test Download Packages + +on: + workflow_call: + inputs: + distro-slug: + required: true + type: string + description: The OS slug to run tests against + platform: + required: true + type: string + description: The platform being tested + arch: + required: true + type: string + description: The platform arch being tested + salt-version: + type: string + required: true + description: The Salt version of the packages to install and test + cache-prefix: + required: true + type: string + description: Seed used to invalidate caches + environment: + required: true + type: string + description: The environment to run tests against + latest-release: + required: true + type: string + description: The latest salt release + pkg-type: + required: true + type: string + description: The type of artifact to download + nox-version: + required: true + type: string + description: The nox version to install + python-version: + required: false + type: string + description: The python version to run tests with + default: "3.11" + package-name: + required: false + type: string + description: The onedir package name to use + default: salt + skip-code-coverage: + required: false + type: boolean + description: Skip code coverage + default: false + nox-session: + required: false + type: string + description: The nox session to run + default: ci-test-onedir + +env: + COLUMNS: 190 + PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ + PIP_EXTRA_INDEX_URL: https://pypi.org/simple + +jobs: + + test: + name: Test + runs-on: ${{ inputs.distro-slug }} + environment: ${{ inputs.environment }} + timeout-minutes: 120 # 2 Hours - More than this and something is wrong + strategy: + fail-fast: false + matrix: + arch: + - ${{ inputs.arch }} + pkg-type: + - ${{ inputs.pkg-type }} + + steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" + + - name: Checkout Source Code + uses: actions/checkout@v4 + + - name: Download Onedir Tarball as an Artifact + uses: actions/download-artifact@v3 + with: + name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz + path: artifacts/ + + - name: Install System Dependencies + run: | + brew install tree + + - name: Decompress Onedir Tarball + shell: bash + run: | + python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" + cd artifacts + tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz + + - name: Set up Python ${{ inputs.python-version }} + uses: actions/setup-python@v4 + with: + python-version: "${{ inputs.python-version }}" + update-environment: true + + - name: Install Nox + run: | + python3 -m pip install 'nox==${{ inputs.nox-version }}' + + - name: Download cached nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }} + uses: actions/cache@v3 + with: + path: nox.${{ inputs.distro-slug }}.tar.* + key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ + hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') + }} + # If we get a cache miss here it means the dependencies step failed to save the cache + fail-on-cache-miss: true + + - name: Decompress .nox Directory + run: | + nox --force-color -e decompress-dependencies -- ${{ inputs.distro-slug }} + + - name: Show System Info & Test Plan + env: + SALT_RELEASE: "${{ inputs.salt-version }}" + SKIP_REQUIREMENTS_INSTALL: "1" + PRINT_TEST_SELECTION: "1" + PRINT_TEST_PLAN_ONLY: "1" + PRINT_SYSTEM_INFO: "1" + GITHUB_ACTIONS_PIPELINE: "1" + SKIP_INITIAL_GH_ACTIONS_FAILURES: "1" + SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" + LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ inputs.pkg-type }} + run: | + sudo -E nox --force-color -e ${{ inputs.nox-session }}-pkgs -- download-pkgs + + - name: Run Package Download Tests + env: + SKIP_REQUIREMENTS_INSTALL: "1" + PRINT_TEST_SELECTION: "0" + PRINT_TEST_PLAN_ONLY: "0" + PRINT_SYSTEM_INFO: "0" + RERUN_FAILURES: "1" + GITHUB_ACTIONS_PIPELINE: "1" + SKIP_INITIAL_GH_ACTIONS_FAILURES: "1" + SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" + COVERAGE_CONTEXT: ${{ inputs.distro-slug }} + SALT_RELEASE: "${{ inputs.salt-version }}" + SALT_REPO_ARCH: ${{ inputs.arch }} + LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" + SALT_REPO_TYPE: ${{ inputs.environment }} + SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} + SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} + SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} + SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ inputs.pkg-type }} + run: | + sudo -E nox --force-color -e ${{ inputs.nox-session }}-pkgs -- download-pkgs + + - name: Fix file ownership + run: | + sudo chown -R "$(id -un)" . + + - name: Create XML Coverage Reports + if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' + run: | + nox --force-color -e create-xml-coverage-reports + + - name: Prepare Test Run Artifacts + id: download-artifacts-from-vm + if: always() + run: | + # Delete the salt onedir, we won't need it anymore and it will prevent + # from it showing in the tree command below + rm -rf artifacts/salt* + tree -a artifacts + + - name: Install Codecov CLI + if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' + run: | + # We can't yet use tokenless uploads with the codecov CLI + # python3 -m pip install codecov-cli + # + curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import + curl -Os https://uploader.codecov.io/latest/macos/codecov + curl -Os https://uploader.codecov.io/latest/macos/codecov.SHA256SUM + curl -Os https://uploader.codecov.io/latest/macos/codecov.SHA256SUM.sig + gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM + shasum -a 256 -c codecov.SHA256SUM + chmod +x codecov + + - name: Upload Source Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' + run: | + if [ ! -s artifacts/coverage/salt.xml ]; then + echo "The artifacts/coverage/salt.xml file does not exist" + exit 1 + fi + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/salt.xml \ + # --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ + # --name salt.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/salt.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags salt,${{ inputs.distro-slug }},pkg \ + --name salt.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi + + - name: Upload Tests Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' + run: | + if [ ! -s artifacts/coverage/tests.xml ]; then + echo "The artifacts/coverage/tests.xml file does not exist" + exit 1 + fi + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/tests.xml \ + # --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ + # --name tests.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/tests.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags tests,${{ inputs.distro-slug }},pkg \ + --name tests.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi + + - name: Upload Test Run Artifacts + if: always() + uses: actions/upload-artifact@v3 + with: + name: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.arch }} + path: | + artifacts + !artifacts/salt/* + !artifacts/salt-*.tar.* + + report: + name: Test Pkg Download Reports + runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "x86_64"]') || 'ubuntu-latest' }} + environment: ${{ inputs.environment }} + if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped' + needs: + - test + + steps: + - name: Checkout Source Code + uses: actions/checkout@v4 + + - name: Download Test Run Artifacts + id: download-test-run-artifacts + uses: actions/download-artifact@v3 + with: + name: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.arch }} + path: artifacts + + - name: Show Test Run Artifacts + if: always() && steps.download-test-run-artifacts.outcome == 'success' + run: | + tree -a artifacts + + - name: Set up Python ${{ inputs.python-version }} + uses: actions/setup-python@v4 + with: + python-version: "${{ inputs.python-version }}" + + - name: Install Nox + run: | + python3 -m pip install 'nox==${{ inputs.nox-version }}' + + - name: Publish Test Report + uses: mikepenz/action-junit-report@v3 + # always run even if the previous steps fails + if: always() && github.event_name == 'push' && steps.download-test-run-artifacts.outcome == 'success' + with: + check_name: Overall Test Results(${{ inputs.distro-slug }} ${{ inputs.arch }}) + report_paths: 'artifacts/xml-unittests-output/*.xml' + annotate_only: true diff --git a/.github/workflows/test-package-downloads-action-windows.yml b/.github/workflows/test-package-downloads-action-windows.yml new file mode 100644 index 00000000000..beb15893494 --- /dev/null +++ b/.github/workflows/test-package-downloads-action-windows.yml @@ -0,0 +1,343 @@ +name: Test Download Packages + +on: + workflow_call: + inputs: + distro-slug: + required: true + type: string + description: The OS slug to run tests against + platform: + required: true + type: string + description: The platform being tested + arch: + required: true + type: string + description: The platform arch being tested + pkg-type: + required: true + type: string + description: The platform arch being tested + salt-version: + type: string + required: true + description: The Salt version of the packages to install and test + cache-prefix: + required: true + type: string + description: Seed used to invalidate caches + environment: + required: true + type: string + description: The environment to run tests against + latest-release: + required: true + type: string + description: The latest salt release + nox-version: + required: true + type: string + description: The nox version to install + python-version: + required: false + type: string + description: The python version to run tests with + default: "3.10" + package-name: + required: false + type: string + description: The onedir package name to use + default: salt + nox-session: + required: false + type: string + description: The nox session to run + default: ci-test-onedir + skip-code-coverage: + required: false + type: boolean + description: Skip code coverage + default: false + skip-junit-reports: + required: false + type: boolean + description: Skip Publishing JUnit Reports + default: false + +env: + COLUMNS: 190 + AWS_MAX_ATTEMPTS: "10" + AWS_RETRY_MODE: "adaptive" + PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ + PIP_EXTRA_INDEX_URL: https://pypi.org/simple + +jobs: + + test: + name: Test + runs-on: + - self-hosted + - linux + - bastion + environment: ${{ inputs.environment }} + timeout-minutes: 120 # 2 Hours - More than this and something is wrong + strategy: + fail-fast: false + matrix: + arch: + - ${{ inputs.arch }} + pkg-type: + - ${{ inputs.pkg-type }} + + steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" + + - name: Checkout Source Code + uses: actions/checkout@v4 + + - name: Download Onedir Tarball as an Artifact + uses: actions/download-artifact@v3 + with: + name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz + path: artifacts/ + + - name: Decompress Onedir Tarball + shell: bash + run: | + python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" + cd artifacts + tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz + + - name: Download cached nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }} + uses: actions/cache@v3 + with: + path: nox.${{ inputs.distro-slug }}.tar.* + key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ + hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') + }} + # If we get a cache miss here it means the dependencies step failed to save the cache + fail-on-cache-miss: true + + - name: Setup Python Tools Scripts + uses: ./.github/actions/setup-python-tools-scripts + + - name: Get Salt Project GitHub Actions Bot Environment + run: | + TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") + SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) + echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" + + - name: Start VM + id: spin-up-vm + run: | + tools --timestamps vm create --environment "${SPB_ENVIRONMENT}" --retries=2 ${{ inputs.distro-slug }} + + - name: List Free Space + run: | + tools --timestamps vm ssh ${{ inputs.distro-slug }} -- df -h || true + + - name: Upload Checkout To VM + run: | + tools --timestamps vm rsync ${{ inputs.distro-slug }} + + - name: Decompress .nox Directory + run: | + tools --timestamps vm decompress-dependencies ${{ inputs.distro-slug }} + + - name: Show System Info & Test Plan + env: + SALT_RELEASE: "${{ inputs.salt-version }}" + SALT_REPO_ARCH: ${{ inputs.arch }} + LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" + SALT_REPO_TYPE: ${{ inputs.environment }} + SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} + SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} + SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} + SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} + SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ inputs.pkg-type }} + run: | + tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ + -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ + --nox-session=${{ inputs.nox-session }}-pkgs ${{ inputs.distro-slug }} -- download-pkgs + + - name: Run Package Download Tests + env: + SALT_RELEASE: "${{ inputs.salt-version }}" + SALT_REPO_ARCH: ${{ inputs.arch }} + LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" + SALT_REPO_TYPE: ${{ inputs.environment }} + SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} + SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} + SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} + SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} + SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ inputs.pkg-type }} + run: | + tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ + -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ + --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ inputs.distro-slug }} -- download-pkgs + + - name: Combine Coverage Reports + if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' + run: | + tools --timestamps vm combine-coverage ${{ inputs.distro-slug }} + + - name: Create XML Coverage Reports + if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' + run: | + tools --timestamps vm create-xml-coverage-reports ${{ inputs.distro-slug }} + + - name: Download Test Run Artifacts + id: download-artifacts-from-vm + if: always() && steps.spin-up-vm.outcome == 'success' + run: | + tools --timestamps vm download-artifacts ${{ inputs.distro-slug }} + # Delete the salt onedir, we won't need it anymore and it will prevent + # from it showing in the tree command below + rm -rf artifacts/salt* + tree -a artifacts + + - name: Destroy VM + if: always() + run: | + tools --timestamps vm destroy --no-wait ${{ inputs.distro-slug }} || true + + - name: Fix file ownership + run: | + sudo chown -R "$(id -un)" . + + - name: Install Codecov CLI + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + # We can't yet use tokenless uploads with the codecov CLI + # python3 -m pip install codecov-cli + # + curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import + curl -Os https://uploader.codecov.io/latest/linux/codecov + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig + gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM + shasum -a 256 -c codecov.SHA256SUM + chmod +x codecov + + - name: Upload Source Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + if [ ! -s artifacts/coverage/salt.xml ]; then + echo "The artifacts/coverage/salt.xml file does not exist" + exit 1 + fi + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/salt.xml \ + # --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ + # --name salt.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/salt.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags salt,${{ inputs.distro-slug }},pkg \ + --name salt.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi + + - name: Upload Tests Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + if [ ! -s artifacts/coverage/tests.xml ]; then + echo "The artifacts/coverage/tests.xml file does not exist" + exit 1 + fi + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/tests.xml \ + # --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ + # --name tests.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/tests.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags tests,${{ inputs.distro-slug }},pkg \ + --name tests.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi + + - name: Upload Test Run Artifacts + if: always() && steps.download-artifacts-from-vm.outcome == 'success' + uses: actions/upload-artifact@v3 + with: + name: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.arch }} + path: | + artifacts + !artifacts/salt/* + !artifacts/salt-*.tar.* + + report: + name: Test Pkg Download Reports + runs-on: + - self-hosted + - linux + - x86_64 + environment: ${{ inputs.environment }} + if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped' + needs: + - test + + steps: + - name: Checkout Source Code + uses: actions/checkout@v4 + + - name: Download Test Run Artifacts + id: download-test-run-artifacts + uses: actions/download-artifact@v3 + with: + name: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.arch }} + path: artifacts + + - name: Show Test Run Artifacts + if: always() && steps.download-test-run-artifacts.outcome == 'success' + run: | + tree -a artifacts + + - name: Install Nox + run: | + python3 -m pip install 'nox==${{ inputs.nox-version }}' + + - name: Publish Test Report + uses: mikepenz/action-junit-report@v3 + # always run even if the previous steps fails + if: always() && github.event_name == 'push' && steps.download-test-run-artifacts.outcome == 'success' + with: + check_name: Overall Test Results(${{ inputs.distro-slug }} ${{ inputs.arch }} ${{ inputs.pkg-type }} ) + report_paths: 'artifacts/xml-unittests-output/*.xml' + annotate_only: true diff --git a/.github/workflows/test-package-downloads-action.yml b/.github/workflows/test-package-downloads-action.yml deleted file mode 100644 index 32dcd453a57..00000000000 --- a/.github/workflows/test-package-downloads-action.yml +++ /dev/null @@ -1,754 +0,0 @@ -name: Test Download Packages - -on: - workflow_call: - inputs: - salt-version: - type: string - required: true - description: The Salt version of the packages to install and test - cache-prefix: - required: true - type: string - description: Seed used to invalidate caches - environment: - required: true - type: string - description: The environment to run tests against - latest-release: - required: true - type: string - description: The latest salt release - nox-version: - required: true - type: string - description: The nox version to install - python-version: - required: false - type: string - description: The python version to run tests with - default: "3.10" - package-name: - required: false - type: string - description: The onedir package name to use - default: salt - skip-code-coverage: - required: false - type: boolean - description: Skip code coverage - default: false - nox-session: - required: false - type: string - description: The nox session to run - default: ci-test-onedir - -env: - COLUMNS: 190 - AWS_MAX_ATTEMPTS: "10" - AWS_RETRY_MODE: "adaptive" - PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ - PIP_EXTRA_INDEX_URL: https://pypi.org/simple - -jobs: - - generate-matrix: - name: Test Matrix - runs-on: - - self-hosted - - linux - - x86_64 - outputs: - matrix-include: ${{ steps.generate-matrix.outputs.matrix }} - steps: - - - name: "Throttle Builds" - shell: bash - run: | - t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t" - - - name: Checkout Source Code - uses: actions/checkout@v4 - - - name: Setup Python Tools Scripts - uses: ./.github/actions/setup-python-tools-scripts - - - name: Generate Test Matrix - id: generate-matrix - run: | - tools ci pkg-download-matrix - - linux: - name: Linux - runs-on: - - self-hosted - - linux - - bastion - environment: ${{ inputs.environment }} - timeout-minutes: 120 # 2 Hours - More than this and something is wrong - needs: - - generate-matrix - strategy: - fail-fast: false - matrix: - include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include)['linux'] }} - - steps: - - - name: "Throttle Builds" - shell: bash - run: | - t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t" - - - name: Checkout Source Code - uses: actions/checkout@v4 - - - name: Download Onedir Tarball as an Artifact - uses: actions/download-artifact@v3 - with: - name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-linux-${{ matrix.arch }}.tar.xz - path: artifacts/ - - - name: Decompress Onedir Tarball - shell: bash - run: | - python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" - cd artifacts - tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-linux-${{ matrix.arch }}.tar.xz - - - name: Download cached nox.${{ matrix.distro-slug }}.tar.* for session ${{ inputs.nox-session }} - uses: actions/cache@v3 - with: - path: nox.${{ matrix.distro-slug }}.tar.* - key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch }}|${{ matrix.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ - hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') - }} - # If we get a cache miss here it means the dependencies step failed to save the cache - fail-on-cache-miss: true - - - name: Setup Python Tools Scripts - uses: ./.github/actions/setup-python-tools-scripts - - - name: Get Salt Project GitHub Actions Bot Environment - run: | - TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") - SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) - echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" - - - name: Start VM - id: spin-up-vm - run: | - tools --timestamps vm create --environment "${SPB_ENVIRONMENT}" --retries=2 ${{ matrix.distro-slug }} - - - name: List Free Space - run: | - tools --timestamps vm ssh ${{ matrix.distro-slug }} -- df -h || true - - - name: Upload Checkout To VM - run: | - tools --timestamps vm rsync ${{ matrix.distro-slug }} - - - name: Decompress .nox Directory - run: | - tools --timestamps vm decompress-dependencies ${{ matrix.distro-slug }} - - - name: Show System Info & Test Plan - env: - SALT_RELEASE: "${{ inputs.salt-version }}" - SALT_REPO_ARCH: ${{ matrix.arch }} - SALT_REPO_TYPE: ${{ inputs.environment }} - SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} - SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} - SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} - SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} - SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" - LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" - DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} - run: | - tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ - -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ - -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ - --nox-session=${{ inputs.nox-session }}-pkgs ${{ matrix.distro-slug }} -- download-pkgs - - - name: Run Package Download Tests - env: - SALT_RELEASE: "${{ inputs.salt-version }}" - SALT_REPO_ARCH: ${{ matrix.arch }} - SALT_REPO_TYPE: ${{ inputs.environment }} - SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} - SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} - SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} - SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} - SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" - LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" - DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} - run: | - tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ - -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ - -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ - --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ matrix.distro-slug }} -- download-pkgs - - - name: Combine Coverage Reports - if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' - run: | - tools --timestamps vm combine-coverage ${{ matrix.distro-slug }} - - - name: Download Test Run Artifacts - id: download-artifacts-from-vm - if: always() && steps.spin-up-vm.outcome == 'success' - run: | - tools --timestamps vm download-artifacts ${{ matrix.distro-slug }} - # Delete the salt onedir, we won't need it anymore and it will prevent - # from it showing in the tree command below - rm -rf artifacts/salt* - tree -a artifacts - - - name: Destroy VM - if: always() - run: | - tools --timestamps vm destroy --no-wait ${{ matrix.distro-slug }} || true - - - name: Fix file ownership - run: | - sudo chown -R "$(id -un)" . - - - name: Install Codecov CLI - if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' - run: | - # We can't yet use tokenless uploads with the codecov CLI - # python3 -m pip install codecov-cli - # - curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import - curl -Os https://uploader.codecov.io/latest/linux/codecov - curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM - curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig - gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM - shasum -a 256 -c codecov.SHA256SUM - chmod +x codecov - - - name: Upload Source Code Coverage To Codecov - if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' - run: | - if [ ! -s artifacts/coverage/salt.xml ]; then - echo "The artifacts/coverage/salt.xml file does not exist" - exit 1 - fi - # We can't yet use tokenless uploads with the codecov CLI - #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/salt.xml \ - # --flag salt --flag ${{ matrix.distro-slug }} --flag pkg \ - # --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - n=0 - until [ "$n" -ge 5 ] - do - if ./codecov --file artifacts/coverage/salt.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags salt,${{ matrix.distro-slug }},pkg \ - --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then - rc=$? - break - fi - rc=$? - n=$((n+1)) - sleep 15 - done - if [ "$rc" -ne 0 ]; then - echo "Failed to upload codecov stats" - exit 1 - fi - - - name: Upload Tests Code Coverage To Codecov - if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' - run: | - if [ ! -s artifacts/coverage/tests.xml ]; then - echo "The artifacts/coverage/tests.xml file does not exist" - exit 1 - fi - # We can't yet use tokenless uploads with the codecov CLI - #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/tests.xml \ - # --flag tests --flag ${{ matrix.distro-slug }} --flag pkg \ - # --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - n=0 - until [ "$n" -ge 5 ] - do - if ./codecov --file artifacts/coverage/tests.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags tests,${{ matrix.distro-slug }},pkg \ - --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then - rc=$? - break - fi - rc=$? - n=$((n+1)) - sleep 15 - done - if [ "$rc" -ne 0 ]; then - echo "Failed to upload codecov stats" - exit 1 - fi - - - name: Upload Test Run Artifacts - if: always() && steps.download-artifacts-from-vm.outcome == 'success' - uses: actions/upload-artifact@v3 - with: - name: pkg-testrun-artifacts-${{ matrix.distro-slug }}-${{ matrix.arch }} - path: | - artifacts - !artifacts/salt/* - !artifacts/salt-*.tar.* - - - name: Publish Test Report - uses: mikepenz/action-junit-report@v3 - # always run even if the previous steps fails - if: always() && job.status != 'cancelled' && steps.download-artifacts-from-vm.outcome == 'success' - with: - check_name: Overall Test Results(${{ matrix.distro-slug }} ${{ matrix.arch }}) - report_paths: 'artifacts/xml-unittests-output/*.xml' - annotate_only: true - - - macos: - name: MacOS - runs-on: ${{ matrix.distro-slug }} - environment: ${{ inputs.environment }} - timeout-minutes: 120 # 2 Hours - More than this and something is wrong - needs: - - generate-matrix - strategy: - fail-fast: false - matrix: - include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include)['macos'] }} - - steps: - - - name: "Throttle Builds" - shell: bash - run: | - t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" - - - name: Checkout Source Code - uses: actions/checkout@v4 - - - name: Download Onedir Tarball as an Artifact - uses: actions/download-artifact@v3 - with: - name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz - path: artifacts/ - - - name: Install System Dependencies - run: | - brew install tree - - - name: Decompress Onedir Tarball - shell: bash - run: | - python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" - cd artifacts - tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz - - - name: Set up Python ${{ inputs.python-version }} - uses: actions/setup-python@v4 - with: - python-version: "${{ inputs.python-version }}" - update-environment: true - - - name: Install Nox - run: | - python3 -m pip install 'nox==${{ inputs.nox-version }}' - - - name: Download cached nox.${{ matrix.distro-slug }}.tar.* for session ${{ inputs.nox-session }} - uses: actions/cache@v3 - with: - path: nox.${{ matrix.distro-slug }}.tar.* - key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch }}|${{ matrix.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ - hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') - }} - # If we get a cache miss here it means the dependencies step failed to save the cache - fail-on-cache-miss: true - - - name: Decompress .nox Directory - run: | - nox --force-color -e decompress-dependencies -- ${{ matrix.distro-slug }} - - - name: Show System Info & Test Plan - env: - SALT_RELEASE: "${{ inputs.salt-version }}" - SKIP_REQUIREMENTS_INSTALL: "1" - PRINT_TEST_SELECTION: "1" - PRINT_TEST_PLAN_ONLY: "1" - PRINT_SYSTEM_INFO: "1" - GITHUB_ACTIONS_PIPELINE: "1" - SKIP_INITIAL_GH_ACTIONS_FAILURES: "1" - SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" - LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" - DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} - run: | - sudo -E nox --force-color -e ${{ inputs.nox-session }}-pkgs -- download-pkgs - - - name: Run Package Download Tests - env: - SKIP_REQUIREMENTS_INSTALL: "1" - PRINT_TEST_SELECTION: "0" - PRINT_TEST_PLAN_ONLY: "0" - PRINT_SYSTEM_INFO: "0" - RERUN_FAILURES: "1" - GITHUB_ACTIONS_PIPELINE: "1" - SKIP_INITIAL_GH_ACTIONS_FAILURES: "1" - SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" - COVERAGE_CONTEXT: ${{ matrix.distro-slug }} - SALT_RELEASE: "${{ inputs.salt-version }}" - SALT_REPO_ARCH: ${{ matrix.arch }} - LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" - SALT_REPO_TYPE: ${{ inputs.environment }} - SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} - SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} - SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} - SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} - DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} - run: | - sudo -E nox --force-color -e ${{ inputs.nox-session }}-pkgs -- download-pkgs - - - name: Fix file ownership - run: | - sudo chown -R "$(id -un)" . - - - name: Combine Coverage Reports - if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' - run: | - nox --force-color -e combine-coverage - - - name: Prepare Test Run Artifacts - id: download-artifacts-from-vm - if: always() && job.status != 'cancelled' - run: | - # Delete the salt onedir, we won't need it anymore and it will prevent - # from it showing in the tree command below - rm -rf artifacts/salt* - tree -a artifacts - - - name: Install Codecov CLI - if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' - run: | - # We can't yet use tokenless uploads with the codecov CLI - # python3 -m pip install codecov-cli - # - curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import - curl -Os https://uploader.codecov.io/latest/macos/codecov - curl -Os https://uploader.codecov.io/latest/macos/codecov.SHA256SUM - curl -Os https://uploader.codecov.io/latest/macos/codecov.SHA256SUM.sig - gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM - shasum -a 256 -c codecov.SHA256SUM - chmod +x codecov - - - name: Upload Source Code Coverage To Codecov - if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' - run: | - if [ ! -s artifacts/coverage/salt.xml ]; then - echo "The artifacts/coverage/salt.xml file does not exist" - exit 1 - fi - # We can't yet use tokenless uploads with the codecov CLI - #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/salt.xml \ - # --flag salt --flag ${{ matrix.distro-slug }} --flag pkg \ - # --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - n=0 - until [ "$n" -ge 5 ] - do - if ./codecov --file artifacts/coverage/salt.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags salt,${{ matrix.distro-slug }},pkg \ - --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then - rc=$? - break - fi - rc=$? - n=$((n+1)) - sleep 15 - done - if [ "$rc" -ne 0 ]; then - echo "Failed to upload codecov stats" - exit 1 - fi - - - name: Upload Tests Code Coverage To Codecov - if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' - run: | - if [ ! -s artifacts/coverage/tests.xml ]; then - echo "The artifacts/coverage/tests.xml file does not exist" - exit 1 - fi - # We can't yet use tokenless uploads with the codecov CLI - #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/tests.xml \ - # --flag tests --flag ${{ matrix.distro-slug }} --flag pkg \ - # --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - n=0 - until [ "$n" -ge 5 ] - do - if ./codecov --file artifacts/coverage/tests.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags tests,${{ matrix.distro-slug }},pkg \ - --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then - rc=$? - break - fi - rc=$? - n=$((n+1)) - sleep 15 - done - if [ "$rc" -ne 0 ]; then - echo "Failed to upload codecov stats" - exit 1 - fi - - - name: Upload Test Run Artifacts - if: always() - uses: actions/upload-artifact@v3 - with: - name: pkg-testrun-artifacts-${{ matrix.distro-slug }}-${{ matrix.arch }} - path: | - artifacts - !artifacts/salt/* - !artifacts/salt-*.tar.* - - - name: Publish Test Report - uses: mikepenz/action-junit-report@v3 - # always run even if the previous steps fails - if: always() && job.status != 'cancelled' - with: - check_name: Overall Test Results(${{ matrix.distro-slug }} ${{ matrix.arch }}) - report_paths: 'artifacts/xml-unittests-output/*.xml' - annotate_only: true - - - windows: - name: Windows - runs-on: - - self-hosted - - linux - - bastion - environment: ${{ inputs.environment }} - timeout-minutes: 120 # 2 Hours - More than this and something is wrong - needs: - - generate-matrix - strategy: - fail-fast: false - matrix: - include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include)['windows'] }} - - steps: - - name: Checkout Source Code - uses: actions/checkout@v4 - - - name: Download Onedir Tarball as an Artifact - uses: actions/download-artifact@v3 - with: - name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-windows-${{ matrix.arch }}.tar.xz - path: artifacts/ - - - name: Decompress Onedir Tarball - shell: bash - run: | - python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" - cd artifacts - tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-windows-${{ matrix.arch }}.tar.xz - - - name: Download cached nox.${{ matrix.distro-slug }}.tar.* for session ${{ inputs.nox-session }} - uses: actions/cache@v3 - with: - path: nox.${{ matrix.distro-slug }}.tar.* - key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch }}|${{ matrix.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ - hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') - }} - # If we get a cache miss here it means the dependencies step failed to save the cache - fail-on-cache-miss: true - - - name: Setup Python Tools Scripts - uses: ./.github/actions/setup-python-tools-scripts - - - name: Get Salt Project GitHub Actions Bot Environment - run: | - TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") - SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) - echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" - - - name: Start VM - id: spin-up-vm - run: | - tools --timestamps vm create --environment "${SPB_ENVIRONMENT}" --retries=2 ${{ matrix.distro-slug }} - - - name: List Free Space - run: | - tools --timestamps vm ssh ${{ matrix.distro-slug }} -- df -h || true - - - name: Upload Checkout To VM - run: | - tools --timestamps vm rsync ${{ matrix.distro-slug }} - - - name: Decompress .nox Directory - run: | - tools --timestamps vm decompress-dependencies ${{ matrix.distro-slug }} - - - name: Show System Info & Test Plan - env: - SALT_RELEASE: "${{ inputs.salt-version }}" - SALT_REPO_ARCH: ${{ matrix.arch }} - LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" - SALT_REPO_TYPE: ${{ inputs.environment }} - SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} - SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} - SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} - SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} - SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" - DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} - run: | - tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ - -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ - -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ - --nox-session=${{ inputs.nox-session }}-pkgs ${{ matrix.distro-slug }} -- download-pkgs - - - name: Run Package Download Tests - env: - SALT_RELEASE: "${{ inputs.salt-version }}" - SALT_REPO_ARCH: ${{ matrix.arch }} - LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" - SALT_REPO_TYPE: ${{ inputs.environment }} - SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} - SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} - SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} - SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} - SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" - DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} - run: | - tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ - -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ - -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ - --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ matrix.distro-slug }} -- download-pkgs - - - name: Combine Coverage Reports - if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' - run: | - tools --timestamps vm combine-coverage ${{ matrix.distro-slug }} - - - name: Download Test Run Artifacts - id: download-artifacts-from-vm - if: always() && steps.spin-up-vm.outcome == 'success' - run: | - tools --timestamps vm download-artifacts ${{ matrix.distro-slug }} - # Delete the salt onedir, we won't need it anymore and it will prevent - # from it showing in the tree command below - rm -rf artifacts/salt* - tree -a artifacts - - - name: Destroy VM - if: always() - run: | - tools --timestamps vm destroy --no-wait ${{ matrix.distro-slug }} || true - - - name: Fix file ownership - run: | - sudo chown -R "$(id -un)" . - - - name: Install Codecov CLI - if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' - run: | - # We can't yet use tokenless uploads with the codecov CLI - # python3 -m pip install codecov-cli - # - curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import - curl -Os https://uploader.codecov.io/latest/linux/codecov - curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM - curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig - gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM - shasum -a 256 -c codecov.SHA256SUM - chmod +x codecov - - - name: Upload Source Code Coverage To Codecov - if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' - run: | - if [ ! -s artifacts/coverage/salt.xml ]; then - echo "The artifacts/coverage/salt.xml file does not exist" - exit 1 - fi - # We can't yet use tokenless uploads with the codecov CLI - #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/salt.xml \ - # --flag salt --flag ${{ matrix.distro-slug }} --flag pkg \ - # --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - n=0 - until [ "$n" -ge 5 ] - do - if ./codecov --file artifacts/coverage/salt.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags salt,${{ matrix.distro-slug }},pkg \ - --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then - rc=$? - break - fi - rc=$? - n=$((n+1)) - sleep 15 - done - if [ "$rc" -ne 0 ]; then - echo "Failed to upload codecov stats" - exit 1 - fi - - - name: Upload Tests Code Coverage To Codecov - if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' - run: | - if [ ! -s artifacts/coverage/tests.xml ]; then - echo "The artifacts/coverage/tests.xml file does not exist" - exit 1 - fi - # We can't yet use tokenless uploads with the codecov CLI - #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/tests.xml \ - # --flag tests --flag ${{ matrix.distro-slug }} --flag pkg \ - # --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - n=0 - until [ "$n" -ge 5 ] - do - if ./codecov --file artifacts/coverage/tests.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags tests,${{ matrix.distro-slug }},pkg \ - --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then - rc=$? - break - fi - rc=$? - n=$((n+1)) - sleep 15 - done - if [ "$rc" -ne 0 ]; then - echo "Failed to upload codecov stats" - exit 1 - fi - - - name: Upload Test Run Artifacts - if: always() && steps.download-artifacts-from-vm.outcome == 'success' - uses: actions/upload-artifact@v3 - with: - name: pkg-testrun-artifacts-${{ matrix.distro-slug }}-${{ matrix.arch }} - path: | - artifacts - !artifacts/salt/* - !artifacts/salt-*.tar.* - - - name: Publish Test Report - uses: mikepenz/action-junit-report@v3 - # always run even if the previous steps fails - if: always() && job.status != 'cancelled' && steps.download-artifacts-from-vm.outcome == 'success' - with: - check_name: Overall Test Results(${{ matrix.distro-slug }} ${{ matrix.arch }} ${{ matrix.pkg-type }} ) - report_paths: 'artifacts/xml-unittests-output/*.xml' - annotate_only: true diff --git a/tools/ci.py b/tools/ci.py index 5cebdef78b2..cc6578be789 100644 --- a/tools/ci.py +++ b/tools/ci.py @@ -777,74 +777,6 @@ def pkg_matrix( ctx.exit(0) -@ci.command( - name="pkg-download-matrix", - arguments={}, -) -def pkg_download_matrix(ctx: Context): - """ - Generate the test matrix. - """ - _platforms = {} - linux_entries = ( - ("almalinux-8", "Alma Linux 8", "x86_64", "package"), - ("almalinux-8-arm64", "Alma Linux 8 Arm64", "aarch64", "package"), - ("almalinux-9", "Alma Linux 9", "x86_64", "package"), - ("almalinux-9-arm64", "Alma Linux 9 Arm64", "aarch64", "package"), - ("amazonlinux-2", "Amazon Linux 2", "x86_64", "package"), - ("amazonlinux-2-arm64", "Amazon Linux 2 Arm64", "aarch64", "package"), - ("centos-7", "CentOS 7", "x86_64", "package"), - ("centos-7-arm64", "CentOS 7 Arm64", "aarch64", "package"), - ("centosstream-8", "CentOS Stream 8", "x86_64", "package"), - ("centosstream-8-arm64", "CentOS Stream 8 Arm64", "aarch64", "package"), - ("centosstream-9", "CentOS Stream 9", "x86_64", "package"), - ("centosstream-9-arm64", "CentOS Stream 9 Arm64", "aarch64", "package"), - ("debian-10", "Debian 10", "x86_64", "package"), - ("debian-11", "Debian 11", "x86_64", "package"), - ("debian-11-arm64", "Debian 11 Arm64", "aarch64", "package"), - ("fedora-37", "Fedora 37", "x86_64", "package"), - ("fedora-37-arm64", "Fedora 37 Arm64", "aarch64", "package"), - ("fedora-38", "Fedora 38", "x86_64", "package"), - ("fedora-38-arm64", "Fedora 38 Arm64", "aarch64", "package"), - ("photonos-3", "Photon OS 3", "x86_64", "package"), - ("photonos-4", "Photon OS 4", "x86_64", "package"), - ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64", "package"), - ("ubuntu-20.04", "Ubuntu 20.04", "x86_64", "package"), - ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64", "package"), - ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "package"), - ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "package"), - ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "onedir"), - ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "onedir"), - ) - macos_entries = ( - ("macos-12", "macOS 12", "x86_64", "Package"), - ("macos-12", "macOS 12", "x86_64", "Onedir"), - ) - windows_entries = (("windows-2022", "Windows 2022", "amd64"),) - _matrix = [] - for distro, display_name, arch, pkg_type in linux_entries: - _matrix.append({"distro-slug": distro, "arch": arch, "pkg_type": pkg_type}) - _platforms["linux"] = _matrix - _matrix = [] - for distro, display_name, arch, pkg_type in macos_entries: - _matrix.append({"distro-slug": distro, "arch": arch, "pkg_type": pkg_type}) - _platforms["macos"] = _matrix - _matrix = [] - for distro, display_name, arch in windows_entries: - for pkg_type in ("nsis", "msi", "onedir"): - _matrix.append({"distro-slug": distro, "arch": arch, "pkg_type": pkg_type}) - _platforms["windows"] = _matrix - - ctx.info("Generated matrix:") - ctx.print(_platforms, soft_wrap=True) - - github_output = os.environ.get("GITHUB_OUTPUT") - if github_output is not None: - with open(github_output, "a", encoding="utf-8") as wfh: - wfh.write(f"matrix={json.dumps(_platforms)}\n") - ctx.exit(0) - - @ci.command( name="get-releases", arguments={ From 7b9ea0554c07b3229b9d5bf7d7094f19cca3b5fa Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 6 Oct 2023 20:02:44 +0100 Subject: [PATCH 123/147] Rework package downloads workflows Signed-off-by: Pedro Algarvio --- .github/workflows/release.yml | 781 +----------------- .github/workflows/staging.yml | 752 +---------------- .../test-salt-pkg-repo-downloads.yml.jinja | 124 +-- .../test-package-downloads-action-linux.yml | 338 -------- .../test-package-downloads-action-macos.yml | 318 ------- .../test-package-downloads-action-windows.yml | 343 -------- .../test-package-downloads-action.yml | 754 +++++++++++++++++ tools/ci.py | 68 ++ 8 files changed, 842 insertions(+), 2636 deletions(-) delete mode 100644 .github/workflows/test-package-downloads-action-linux.yml delete mode 100644 .github/workflows/test-package-downloads-action-macos.yml delete mode 100644 .github/workflows/test-package-downloads-action-windows.yml create mode 100644 .github/workflows/test-package-downloads-action.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ff9535b58d2..07785a31e1e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -223,19 +223,16 @@ jobs: run: | tools pkg repo publish release ${{ needs.prepare-workflow.outputs.salt-version }} - almalinux-8-package-download-tests: - name: Alma Linux 8 Package Download + pkg-download-tests: + name: Package Downloads if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} needs: - prepare-workflow - publish-repositories - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml + uses: ./.github/workflows/test-package-downloads-action.yml with: - distro-slug: almalinux-8 nox-session: ci-test-onedir - platform: linux - arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release @@ -243,743 +240,6 @@ jobs: python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - almalinux-8-arm64-package-download-tests: - name: Alma Linux 8 Arm64 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: almalinux-8-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - almalinux-9-package-download-tests: - name: Alma Linux 9 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: almalinux-9 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - almalinux-9-arm64-package-download-tests: - name: Alma Linux 9 Arm64 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: almalinux-9-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - amazonlinux-2-package-download-tests: - name: Amazon Linux 2 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: amazonlinux-2 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - amazonlinux-2-arm64-package-download-tests: - name: Amazon Linux 2 Arm64 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: amazonlinux-2-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - centos-7-package-download-tests: - name: CentOS 7 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: centos-7 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - centos-7-arm64-package-download-tests: - name: CentOS 7 Arm64 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: centos-7-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - centosstream-8-package-download-tests: - name: CentOS Stream 8 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: centosstream-8 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - centosstream-8-arm64-package-download-tests: - name: CentOS Stream 8 Arm64 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: centosstream-8-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - centosstream-9-package-download-tests: - name: CentOS Stream 9 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: centosstream-9 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - centosstream-9-arm64-package-download-tests: - name: CentOS Stream 9 Arm64 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: centosstream-9-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - debian-10-package-download-tests: - name: Debian 10 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: debian-10 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - debian-11-package-download-tests: - name: Debian 11 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: debian-11 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - debian-11-arm64-package-download-tests: - name: Debian 11 Arm64 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: debian-11-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - fedora-37-package-download-tests: - name: Fedora 37 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: fedora-37 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - fedora-37-arm64-package-download-tests: - name: Fedora 37 Arm64 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: fedora-37-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - fedora-38-package-download-tests: - name: Fedora 38 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: fedora-38 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - fedora-38-arm64-package-download-tests: - name: Fedora 38 Arm64 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: fedora-38-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - photonos-3-package-download-tests: - name: Photon OS 3 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: photonos-3 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - photonos-4-package-download-tests: - name: Photon OS 4 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: photonos-4 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - photonos-4-arm64-package-download-tests: - name: Photon OS 4 Arm64 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: photonos-4-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - ubuntu-2004-package-download-tests: - name: Ubuntu 20.04 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: ubuntu-20.04 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - ubuntu-2004-arm64-package-download-tests: - name: Ubuntu 20.04 Arm64 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: ubuntu-20.04-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - ubuntu-2204-package-download-tests: - name: Ubuntu 22.04 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: ubuntu-22.04 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - ubuntu-2204-arm64-package-download-tests: - name: Ubuntu 22.04 Arm64 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: ubuntu-22.04-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - ubuntu-2204-onedir-download-tests: - name: Ubuntu 22.04 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: ubuntu-22.04 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: onedir - secrets: inherit - - ubuntu-2204-arm64-onedir-download-tests: - name: Ubuntu 22.04 Arm64 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: ubuntu-22.04-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: onedir - secrets: inherit - - macos-12-package-download-tests: - name: macOS 12 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-macos.yml - with: - distro-slug: macos-12 - nox-session: ci-test-onedir - platform: darwin - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - skip-code-coverage: true - nox-version: 2022.8.7 - python-version: "3.10" - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - macos-12-onedir-download-tests: - name: macOS 12 Package Download - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-macos.yml - with: - distro-slug: macos-12 - nox-session: ci-test-onedir - platform: darwin - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - skip-code-coverage: true - nox-version: 2022.8.7 - python-version: "3.10" - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: onedir - secrets: inherit - - windows-2022-nsis-amd64-download-tests: - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - name: Windows 2022 Package Download - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-windows.yml - with: - distro-slug: windows-2022 - nox-session: ci-test-onedir - platform: windows - arch: amd64 - pkg-type: nsis - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - skip-code-coverage: true - nox-version: 2022.8.7 - python-version: "3.10" - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - secrets: inherit - - windows-2022-msi-amd64-download-tests: - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - name: Windows 2022 Package Download - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-windows.yml - with: - distro-slug: windows-2022 - nox-session: ci-test-onedir - platform: windows - arch: amd64 - pkg-type: msi - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - skip-code-coverage: true - nox-version: 2022.8.7 - python-version: "3.10" - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - secrets: inherit - - windows-2022-onedir-amd64-download-tests: - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - name: Windows 2022 Package Download - needs: - - prepare-workflow - - publish-repositories - - download-onedir-artifact - uses: ./.github/workflows/test-package-downloads-action-windows.yml - with: - distro-slug: windows-2022 - nox-session: ci-test-onedir - platform: windows - arch: amd64 - pkg-type: onedir - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: release - skip-code-coverage: true - nox-version: 2022.8.7 - python-version: "3.10" - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" secrets: inherit release: @@ -993,39 +253,7 @@ jobs: - prepare-workflow - backup - publish-repositories - - almalinux-8-package-download-tests - - almalinux-8-arm64-package-download-tests - - almalinux-9-package-download-tests - - almalinux-9-arm64-package-download-tests - - amazonlinux-2-package-download-tests - - amazonlinux-2-arm64-package-download-tests - - centos-7-package-download-tests - - centos-7-arm64-package-download-tests - - centosstream-8-package-download-tests - - centosstream-8-arm64-package-download-tests - - centosstream-9-package-download-tests - - centosstream-9-arm64-package-download-tests - - debian-10-package-download-tests - - debian-11-package-download-tests - - debian-11-arm64-package-download-tests - - fedora-37-package-download-tests - - fedora-37-arm64-package-download-tests - - fedora-38-package-download-tests - - fedora-38-arm64-package-download-tests - - photonos-3-package-download-tests - - photonos-4-package-download-tests - - photonos-4-arm64-package-download-tests - - ubuntu-2004-package-download-tests - - ubuntu-2004-arm64-package-download-tests - - ubuntu-2204-package-download-tests - - ubuntu-2204-arm64-package-download-tests - - ubuntu-2204-onedir-download-tests - - ubuntu-2204-arm64-onedir-download-tests - - macos-12-package-download-tests - - macos-12-onedir-download-tests - - windows-2022-nsis-amd64-download-tests - - windows-2022-msi-amd64-download-tests - - windows-2022-onedir-amd64-download-tests + - pkg-download-tests environment: release steps: - name: Clone The Salt Repository @@ -1185,6 +413,7 @@ jobs: - check-requirements - prepare-workflow - publish-repositories + - pkg-download-tests - release - publish-pypi steps: diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 473d45eccce..3c88248c6dc 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -2968,18 +2968,18 @@ jobs: retention-days: 7 if-no-files-found: error - almalinux-8-package-download-tests: - name: Alma Linux 8 Package Download + pkg-download-tests: + name: Package Downloads if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml + - build-salt-onedir-linux + - build-salt-onedir-macos + - build-salt-onedir-windows + uses: ./.github/workflows/test-package-downloads-action.yml with: - distro-slug: almalinux-8 nox-session: ci-test-onedir - platform: linux - arch: x86_64 cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging @@ -2987,711 +2987,6 @@ jobs: python-version: "3.10" skip-code-coverage: true latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - almalinux-8-arm64-package-download-tests: - name: Alma Linux 8 Arm64 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: almalinux-8-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - almalinux-9-package-download-tests: - name: Alma Linux 9 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: almalinux-9 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - almalinux-9-arm64-package-download-tests: - name: Alma Linux 9 Arm64 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: almalinux-9-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - amazonlinux-2-package-download-tests: - name: Amazon Linux 2 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: amazonlinux-2 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - amazonlinux-2-arm64-package-download-tests: - name: Amazon Linux 2 Arm64 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: amazonlinux-2-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - centos-7-package-download-tests: - name: CentOS 7 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: centos-7 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - centos-7-arm64-package-download-tests: - name: CentOS 7 Arm64 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: centos-7-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - centosstream-8-package-download-tests: - name: CentOS Stream 8 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: centosstream-8 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - centosstream-8-arm64-package-download-tests: - name: CentOS Stream 8 Arm64 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: centosstream-8-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - centosstream-9-package-download-tests: - name: CentOS Stream 9 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: centosstream-9 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - centosstream-9-arm64-package-download-tests: - name: CentOS Stream 9 Arm64 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: centosstream-9-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - debian-10-package-download-tests: - name: Debian 10 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: debian-10 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - debian-11-package-download-tests: - name: Debian 11 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: debian-11 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - debian-11-arm64-package-download-tests: - name: Debian 11 Arm64 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: debian-11-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - fedora-37-package-download-tests: - name: Fedora 37 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: fedora-37 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - fedora-37-arm64-package-download-tests: - name: Fedora 37 Arm64 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: fedora-37-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - fedora-38-package-download-tests: - name: Fedora 38 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: fedora-38 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - fedora-38-arm64-package-download-tests: - name: Fedora 38 Arm64 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: fedora-38-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - photonos-3-package-download-tests: - name: Photon OS 3 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: photonos-3 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - photonos-4-package-download-tests: - name: Photon OS 4 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: photonos-4 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - photonos-4-arm64-package-download-tests: - name: Photon OS 4 Arm64 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: photonos-4-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - ubuntu-2004-package-download-tests: - name: Ubuntu 20.04 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: ubuntu-20.04 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - ubuntu-2004-arm64-package-download-tests: - name: Ubuntu 20.04 Arm64 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: ubuntu-20.04-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - ubuntu-2204-package-download-tests: - name: Ubuntu 22.04 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: ubuntu-22.04 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - ubuntu-2204-arm64-package-download-tests: - name: Ubuntu 22.04 Arm64 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: ubuntu-22.04-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - ubuntu-2204-onedir-download-tests: - name: Ubuntu 22.04 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: ubuntu-22.04 - nox-session: ci-test-onedir - platform: linux - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: onedir - secrets: inherit - - ubuntu-2204-arm64-onedir-download-tests: - name: Ubuntu 22.04 Arm64 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: ubuntu-22.04-arm64 - nox-session: ci-test-onedir - platform: linux - arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - nox-version: 2022.8.7 - python-version: "3.10" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: onedir - secrets: inherit - - macos-12-package-download-tests: - name: macOS 12 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-macos.yml - with: - distro-slug: macos-12 - nox-session: ci-test-onedir - platform: darwin - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - skip-code-coverage: true - nox-version: 2022.8.7 - python-version: "3.10" - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: package - secrets: inherit - - macos-12-onedir-download-tests: - name: macOS 12 Package Download - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-macos.yml - with: - distro-slug: macos-12 - nox-session: ci-test-onedir - platform: darwin - arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - skip-code-coverage: true - nox-version: 2022.8.7 - python-version: "3.10" - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: onedir - secrets: inherit - - windows-2022-nsis-amd64-download-tests: - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - name: Windows 2022 Package Download - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-windows.yml - with: - distro-slug: windows-2022 - nox-session: ci-test-onedir - platform: windows - arch: amd64 - pkg-type: nsis - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - skip-code-coverage: true - nox-version: 2022.8.7 - python-version: "3.10" - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - secrets: inherit - - windows-2022-msi-amd64-download-tests: - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - name: Windows 2022 Package Download - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-windows.yml - with: - distro-slug: windows-2022 - nox-session: ci-test-onedir - platform: windows - arch: amd64 - pkg-type: msi - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - skip-code-coverage: true - nox-version: 2022.8.7 - python-version: "3.10" - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - secrets: inherit - - windows-2022-onedir-amd64-download-tests: - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - name: Windows 2022 Package Download - needs: - - prepare-workflow - - publish-repositories - uses: ./.github/workflows/test-package-downloads-action-windows.yml - with: - distro-slug: windows-2022 - nox-session: ci-test-onedir - platform: windows - arch: amd64 - pkg-type: onedir - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: staging - skip-code-coverage: true - nox-version: 2022.8.7 - python-version: "3.10" - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" secrets: inherit publish-pypi: @@ -3777,39 +3072,7 @@ jobs: - windows-2019-msi-pkg-tests - windows-2022-nsis-pkg-tests - windows-2022-msi-pkg-tests - - almalinux-8-package-download-tests - - almalinux-8-arm64-package-download-tests - - almalinux-9-package-download-tests - - almalinux-9-arm64-package-download-tests - - amazonlinux-2-package-download-tests - - amazonlinux-2-arm64-package-download-tests - - centos-7-package-download-tests - - centos-7-arm64-package-download-tests - - centosstream-8-package-download-tests - - centosstream-8-arm64-package-download-tests - - centosstream-9-package-download-tests - - centosstream-9-arm64-package-download-tests - - debian-10-package-download-tests - - debian-11-package-download-tests - - debian-11-arm64-package-download-tests - - fedora-37-package-download-tests - - fedora-37-arm64-package-download-tests - - fedora-38-package-download-tests - - fedora-38-arm64-package-download-tests - - photonos-3-package-download-tests - - photonos-4-package-download-tests - - photonos-4-arm64-package-download-tests - - ubuntu-2004-package-download-tests - - ubuntu-2004-arm64-package-download-tests - - ubuntu-2204-package-download-tests - - ubuntu-2204-arm64-package-download-tests - - ubuntu-2204-onedir-download-tests - - ubuntu-2204-arm64-onedir-download-tests - - macos-12-package-download-tests - - macos-12-onedir-download-tests - - windows-2022-nsis-amd64-download-tests - - windows-2022-msi-amd64-download-tests - - windows-2022-onedir-amd64-download-tests + - pkg-download-tests environment: staging runs-on: - self-hosted @@ -3881,6 +3144,7 @@ jobs: - build-macos-pkgs-src - publish-repositories - upload-release-artifacts + - pkg-download-tests - publish-pypi steps: - name: Get workflow information diff --git a/.github/workflows/templates/test-salt-pkg-repo-downloads.yml.jinja b/.github/workflows/templates/test-salt-pkg-repo-downloads.yml.jinja index bb6da5a4a05..b84ae581e59 100644 --- a/.github/workflows/templates/test-salt-pkg-repo-downloads.yml.jinja +++ b/.github/workflows/templates/test-salt-pkg-repo-downloads.yml.jinja @@ -1,41 +1,10 @@ - <%- set linux_pkg_tests = ( - ("almalinux-8", "Alma Linux 8", "x86_64", "Package"), - ("almalinux-8-arm64", "Alma Linux 8 Arm64", "aarch64", "Package"), - ("almalinux-9", "Alma Linux 9", "x86_64", "Package"), - ("almalinux-9-arm64", "Alma Linux 9 Arm64", "aarch64", "Package"), - ("amazonlinux-2", "Amazon Linux 2", "x86_64", "Package"), - ("amazonlinux-2-arm64", "Amazon Linux 2 Arm64", "aarch64", "Package"), - ("centos-7", "CentOS 7", "x86_64", "Package"), - ("centos-7-arm64", "CentOS 7 Arm64", "aarch64", "Package"), - ("centosstream-8", "CentOS Stream 8", "x86_64", "Package"), - ("centosstream-8-arm64", "CentOS Stream 8 Arm64", "aarch64", "Package"), - ("centosstream-9", "CentOS Stream 9", "x86_64", "Package"), - ("centosstream-9-arm64", "CentOS Stream 9 Arm64", "aarch64", "Package"), - ("debian-10", "Debian 10", "x86_64", "Package"), - ("debian-11", "Debian 11", "x86_64", "Package"), - ("debian-11-arm64", "Debian 11 Arm64", "aarch64", "Package"), - ("fedora-37", "Fedora 37", "x86_64", "Package"), - ("fedora-37-arm64", "Fedora 37 Arm64", "aarch64", "Package"), - ("fedora-38", "Fedora 38", "x86_64", "Package"), - ("fedora-38-arm64", "Fedora 38 Arm64", "aarch64", "Package"), - ("photonos-3", "Photon OS 3", "x86_64", "Package"), - ("photonos-4", "Photon OS 4", "x86_64", "Package"), - ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64", "Package"), - ("ubuntu-20.04", "Ubuntu 20.04", "x86_64", "Package"), - ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64", "Package"), - ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "Package"), - ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "Package"), - ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "Onedir"), - ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "Onedir") - ) %> - - <%- for slug, display_name, arch, pkg_type in linux_pkg_tests %> - <%- set job_name = "{}-{}-download-tests".format(slug.replace(".", ""), pkg_type.lower()) %> + <%- set job_name = "pkg-download-tests" %> <{ job_name }>: <%- do test_repo_needs.append(job_name) %> - name: <{ display_name }> Package Download + <%- do conclusion_needs.append(job_name) %> + name: Package Downloads <%- if gh_environment == "staging" %> if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} <%- else %> @@ -46,98 +15,19 @@ - publish-repositories <%- if gh_environment == "release" %> - download-onedir-artifact - <%- endif %> - uses: ./.github/workflows/test-package-downloads-action-linux.yml - with: - distro-slug: <{ slug }> - nox-session: ci-test-onedir - platform: linux - arch: <{ arch }> - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }> - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: <{ gh_environment }> - nox-version: <{ nox_version }> - python-version: "<{ gh_actions_workflows_python_version }>" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: <{ pkg_type.lower() }> - secrets: inherit - - <%- endfor %> - - - <%- for slug, display_name, arch, pkg_type in ( - ("macos-12", "macOS 12", "x86_64", "Package"), - ("macos-12", "macOS 12", "x86_64", "Onedir"), - ) %> - <%- set job_name = "{}-{}-download-tests".format(slug.replace(".", ""), pkg_type.lower()) %> - - <{ job_name }>: - <%- do test_repo_needs.append(job_name) %> - name: <{ display_name }> Package Download - <%- if gh_environment == "staging" %> - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} <%- else %> - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} + - build-salt-onedir-linux + - build-salt-onedir-macos + - build-salt-onedir-windows <%- endif %> - needs: - - prepare-workflow - - publish-repositories - <%- if gh_environment == "release" %> - - download-onedir-artifact - <%- endif %> - uses: ./.github/workflows/test-package-downloads-action-macos.yml + uses: ./.github/workflows/test-package-downloads-action.yml with: - distro-slug: <{ slug }> nox-session: ci-test-onedir - platform: darwin - arch: <{ arch }> cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }> salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: <{ gh_environment }> - skip-code-coverage: true nox-version: <{ nox_version }> python-version: "<{ gh_actions_workflows_python_version }>" - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - pkg-type: <{ pkg_type.lower() }> - secrets: inherit - <%- endfor %> - - - <%- for slug, display_name, arch in ( - ("windows-2022", "Windows 2022", "amd64"), - ) %> - <%- for pkg_type in ("NSIS", "MSI", "Onedir") %> - <%- set job_name = "{}-{}-{}-download-tests".format(slug.replace(".", ""), pkg_type.lower(), arch.lower()) %> - - <{ job_name }>: - <%- do test_repo_needs.append(job_name) %> - <%- if gh_environment == "staging" %> - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} - <%- else %> - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - <%- endif %> - name: <{ display_name }> Package Download - needs: - - prepare-workflow - - publish-repositories - <%- if gh_environment == "release" %> - - download-onedir-artifact - <%- endif %> - uses: ./.github/workflows/test-package-downloads-action-windows.yml - with: - distro-slug: <{ slug }> - nox-session: ci-test-onedir - platform: windows - arch: <{ arch }> - pkg-type: <{ pkg_type.lower() }> - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }> - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: <{ gh_environment }> skip-code-coverage: true - nox-version: <{ nox_version }> - python-version: "<{ gh_actions_workflows_python_version }>" latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" secrets: inherit - <%- endfor %> - <%- endfor %> diff --git a/.github/workflows/test-package-downloads-action-linux.yml b/.github/workflows/test-package-downloads-action-linux.yml deleted file mode 100644 index f94d094d3b7..00000000000 --- a/.github/workflows/test-package-downloads-action-linux.yml +++ /dev/null @@ -1,338 +0,0 @@ -name: Test Download Packages - -on: - workflow_call: - inputs: - distro-slug: - required: true - type: string - description: The OS slug to run tests against - platform: - required: true - type: string - description: The platform being tested - arch: - required: true - type: string - description: The platform arch being tested - salt-version: - type: string - required: true - description: The Salt version of the packages to install and test - cache-prefix: - required: true - type: string - description: Seed used to invalidate caches - environment: - required: true - type: string - description: The environment to run tests against - latest-release: - required: true - type: string - description: The latest salt release - pkg-type: - required: true - type: string - description: The type of artifact to download - nox-version: - required: true - type: string - description: The nox version to install - python-version: - required: false - type: string - description: The python version to run tests with - default: "3.10" - package-name: - required: false - type: string - description: The onedir package name to use - default: salt - skip-code-coverage: - required: false - type: boolean - description: Skip code coverage - default: false - nox-session: - required: false - type: string - description: The nox session to run - default: ci-test-onedir - -env: - COLUMNS: 190 - AWS_MAX_ATTEMPTS: "10" - AWS_RETRY_MODE: "adaptive" - PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ - PIP_EXTRA_INDEX_URL: https://pypi.org/simple - -jobs: - - test: - name: Test - runs-on: - - self-hosted - - linux - - bastion - environment: ${{ inputs.environment }} - timeout-minutes: 120 # 2 Hours - More than this and something is wrong - strategy: - fail-fast: false - matrix: - arch: - - ${{ inputs.arch }} - pkg-type: - - ${{ inputs.pkg-type }} - - steps: - - - name: "Throttle Builds" - shell: bash - run: | - t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t" - - - name: Checkout Source Code - uses: actions/checkout@v4 - - - name: Download Onedir Tarball as an Artifact - uses: actions/download-artifact@v3 - with: - name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz - path: artifacts/ - - - name: Decompress Onedir Tarball - shell: bash - run: | - python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" - cd artifacts - tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz - - - name: Download cached nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }} - uses: actions/cache@v3 - with: - path: nox.${{ inputs.distro-slug }}.tar.* - key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ - hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') - }} - # If we get a cache miss here it means the dependencies step failed to save the cache - fail-on-cache-miss: true - - - name: Setup Python Tools Scripts - uses: ./.github/actions/setup-python-tools-scripts - - - name: Get Salt Project GitHub Actions Bot Environment - run: | - TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") - SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) - echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" - - - name: Start VM - id: spin-up-vm - run: | - tools --timestamps vm create --environment "${SPB_ENVIRONMENT}" --retries=2 ${{ inputs.distro-slug }} - - - name: List Free Space - run: | - tools --timestamps vm ssh ${{ inputs.distro-slug }} -- df -h || true - - - name: Upload Checkout To VM - run: | - tools --timestamps vm rsync ${{ inputs.distro-slug }} - - - name: Decompress .nox Directory - run: | - tools --timestamps vm decompress-dependencies ${{ inputs.distro-slug }} - - - name: Show System Info & Test Plan - env: - SALT_RELEASE: "${{ inputs.salt-version }}" - SALT_REPO_ARCH: ${{ inputs.arch }} - SALT_REPO_TYPE: ${{ inputs.environment }} - SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} - SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} - SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} - SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} - SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" - LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" - DOWNLOAD_TEST_PACKAGE_TYPE: ${{ inputs.pkg-type }} - run: | - tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ - -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ - -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ - --nox-session=${{ inputs.nox-session }}-pkgs ${{ inputs.distro-slug }} -- download-pkgs - - - name: Run Package Download Tests - env: - SALT_RELEASE: "${{ inputs.salt-version }}" - SALT_REPO_ARCH: ${{ inputs.arch }} - SALT_REPO_TYPE: ${{ inputs.environment }} - SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} - SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} - SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} - SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} - SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" - LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" - DOWNLOAD_TEST_PACKAGE_TYPE: ${{ inputs.pkg-type }} - run: | - tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ - -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ - -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ - --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ inputs.distro-slug }} -- download-pkgs - - - name: Combine Coverage Reports - if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' - run: | - tools --timestamps vm combine-coverage ${{ inputs.distro-slug }} - - - name: Create XML Coverage Reports - if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' - run: | - tools --timestamps vm create-xml-coverage-reports ${{ inputs.distro-slug }} - - - name: Download Test Run Artifacts - id: download-artifacts-from-vm - if: always() && steps.spin-up-vm.outcome == 'success' - run: | - tools --timestamps vm download-artifacts ${{ inputs.distro-slug }} - # Delete the salt onedir, we won't need it anymore and it will prevent - # from it showing in the tree command below - rm -rf artifacts/salt* - tree -a artifacts - - - name: Destroy VM - if: always() - run: | - tools --timestamps vm destroy --no-wait ${{ inputs.distro-slug }} || true - - - name: Fix file ownership - run: | - sudo chown -R "$(id -un)" . - - - name: Install Codecov CLI - if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' - run: | - # We can't yet use tokenless uploads with the codecov CLI - # python3 -m pip install codecov-cli - # - curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import - curl -Os https://uploader.codecov.io/latest/linux/codecov - curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM - curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig - gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM - shasum -a 256 -c codecov.SHA256SUM - chmod +x codecov - - - name: Upload Source Code Coverage To Codecov - if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' - run: | - if [ ! -s artifacts/coverage/salt.xml ]; then - echo "The artifacts/coverage/salt.xml file does not exist" - exit 1 - fi - # We can't yet use tokenless uploads with the codecov CLI - #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/salt.xml \ - # --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ - # --name salt.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - n=0 - until [ "$n" -ge 5 ] - do - if ./codecov --file artifacts/coverage/salt.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags salt,${{ inputs.distro-slug }},pkg \ - --name salt.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then - rc=$? - break - fi - rc=$? - n=$((n+1)) - sleep 15 - done - if [ "$rc" -ne 0 ]; then - echo "Failed to upload codecov stats" - exit 1 - fi - - - name: Upload Tests Code Coverage To Codecov - if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' - run: | - if [ ! -s artifacts/coverage/tests.xml ]; then - echo "The artifacts/coverage/tests.xml file does not exist" - exit 1 - fi - # We can't yet use tokenless uploads with the codecov CLI - #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/tests.xml \ - # --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ - # --name tests.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - n=0 - until [ "$n" -ge 5 ] - do - if ./codecov --file artifacts/coverage/tests.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags tests,${{ inputs.distro-slug }},pkg \ - --name tests.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then - rc=$? - break - fi - rc=$? - n=$((n+1)) - sleep 15 - done - if [ "$rc" -ne 0 ]; then - echo "Failed to upload codecov stats" - exit 1 - fi - - - name: Upload Test Run Artifacts - if: always() && steps.download-artifacts-from-vm.outcome == 'success' - uses: actions/upload-artifact@v3 - with: - name: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.arch }} - path: | - artifacts - !artifacts/salt/* - !artifacts/salt-*.tar.* - - report: - name: Test Pkg Download Reports - runs-on: - - self-hosted - - linux - - x86_64 - environment: ${{ inputs.environment }} - if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped' - needs: - - test - - steps: - - name: Checkout Source Code - uses: actions/checkout@v4 - - - name: Download Test Run Artifacts - id: download-test-run-artifacts - uses: actions/download-artifact@v3 - with: - name: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.arch }} - path: artifacts - - - name: Show Test Run Artifacts - if: always() && steps.download-test-run-artifacts.outcome == 'success' - run: | - tree -a artifacts - - - name: Install Nox - run: | - python3 -m pip install 'nox==${{ inputs.nox-version }}' - - - name: Publish Test Report - uses: mikepenz/action-junit-report@v3 - # always run even if the previous steps fails - if: always() && github.event_name == 'push' && steps.download-test-run-artifacts.outcome == 'success' - with: - check_name: Overall Test Results(${{ inputs.distro-slug }} ${{ inputs.arch }}) - report_paths: 'artifacts/xml-unittests-output/*.xml' - annotate_only: true diff --git a/.github/workflows/test-package-downloads-action-macos.yml b/.github/workflows/test-package-downloads-action-macos.yml deleted file mode 100644 index 632a88a7d29..00000000000 --- a/.github/workflows/test-package-downloads-action-macos.yml +++ /dev/null @@ -1,318 +0,0 @@ -name: Test Download Packages - -on: - workflow_call: - inputs: - distro-slug: - required: true - type: string - description: The OS slug to run tests against - platform: - required: true - type: string - description: The platform being tested - arch: - required: true - type: string - description: The platform arch being tested - salt-version: - type: string - required: true - description: The Salt version of the packages to install and test - cache-prefix: - required: true - type: string - description: Seed used to invalidate caches - environment: - required: true - type: string - description: The environment to run tests against - latest-release: - required: true - type: string - description: The latest salt release - pkg-type: - required: true - type: string - description: The type of artifact to download - nox-version: - required: true - type: string - description: The nox version to install - python-version: - required: false - type: string - description: The python version to run tests with - default: "3.11" - package-name: - required: false - type: string - description: The onedir package name to use - default: salt - skip-code-coverage: - required: false - type: boolean - description: Skip code coverage - default: false - nox-session: - required: false - type: string - description: The nox session to run - default: ci-test-onedir - -env: - COLUMNS: 190 - PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ - PIP_EXTRA_INDEX_URL: https://pypi.org/simple - -jobs: - - test: - name: Test - runs-on: ${{ inputs.distro-slug }} - environment: ${{ inputs.environment }} - timeout-minutes: 120 # 2 Hours - More than this and something is wrong - strategy: - fail-fast: false - matrix: - arch: - - ${{ inputs.arch }} - pkg-type: - - ${{ inputs.pkg-type }} - - steps: - - - name: "Throttle Builds" - shell: bash - run: | - t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" - - - name: Checkout Source Code - uses: actions/checkout@v4 - - - name: Download Onedir Tarball as an Artifact - uses: actions/download-artifact@v3 - with: - name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz - path: artifacts/ - - - name: Install System Dependencies - run: | - brew install tree - - - name: Decompress Onedir Tarball - shell: bash - run: | - python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" - cd artifacts - tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz - - - name: Set up Python ${{ inputs.python-version }} - uses: actions/setup-python@v4 - with: - python-version: "${{ inputs.python-version }}" - update-environment: true - - - name: Install Nox - run: | - python3 -m pip install 'nox==${{ inputs.nox-version }}' - - - name: Download cached nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }} - uses: actions/cache@v3 - with: - path: nox.${{ inputs.distro-slug }}.tar.* - key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ - hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') - }} - # If we get a cache miss here it means the dependencies step failed to save the cache - fail-on-cache-miss: true - - - name: Decompress .nox Directory - run: | - nox --force-color -e decompress-dependencies -- ${{ inputs.distro-slug }} - - - name: Show System Info & Test Plan - env: - SALT_RELEASE: "${{ inputs.salt-version }}" - SKIP_REQUIREMENTS_INSTALL: "1" - PRINT_TEST_SELECTION: "1" - PRINT_TEST_PLAN_ONLY: "1" - PRINT_SYSTEM_INFO: "1" - GITHUB_ACTIONS_PIPELINE: "1" - SKIP_INITIAL_GH_ACTIONS_FAILURES: "1" - SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" - LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" - DOWNLOAD_TEST_PACKAGE_TYPE: ${{ inputs.pkg-type }} - run: | - sudo -E nox --force-color -e ${{ inputs.nox-session }}-pkgs -- download-pkgs - - - name: Run Package Download Tests - env: - SKIP_REQUIREMENTS_INSTALL: "1" - PRINT_TEST_SELECTION: "0" - PRINT_TEST_PLAN_ONLY: "0" - PRINT_SYSTEM_INFO: "0" - RERUN_FAILURES: "1" - GITHUB_ACTIONS_PIPELINE: "1" - SKIP_INITIAL_GH_ACTIONS_FAILURES: "1" - SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" - COVERAGE_CONTEXT: ${{ inputs.distro-slug }} - SALT_RELEASE: "${{ inputs.salt-version }}" - SALT_REPO_ARCH: ${{ inputs.arch }} - LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" - SALT_REPO_TYPE: ${{ inputs.environment }} - SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} - SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} - SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} - SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} - DOWNLOAD_TEST_PACKAGE_TYPE: ${{ inputs.pkg-type }} - run: | - sudo -E nox --force-color -e ${{ inputs.nox-session }}-pkgs -- download-pkgs - - - name: Fix file ownership - run: | - sudo chown -R "$(id -un)" . - - - name: Create XML Coverage Reports - if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' - run: | - nox --force-color -e create-xml-coverage-reports - - - name: Prepare Test Run Artifacts - id: download-artifacts-from-vm - if: always() - run: | - # Delete the salt onedir, we won't need it anymore and it will prevent - # from it showing in the tree command below - rm -rf artifacts/salt* - tree -a artifacts - - - name: Install Codecov CLI - if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' - run: | - # We can't yet use tokenless uploads with the codecov CLI - # python3 -m pip install codecov-cli - # - curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import - curl -Os https://uploader.codecov.io/latest/macos/codecov - curl -Os https://uploader.codecov.io/latest/macos/codecov.SHA256SUM - curl -Os https://uploader.codecov.io/latest/macos/codecov.SHA256SUM.sig - gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM - shasum -a 256 -c codecov.SHA256SUM - chmod +x codecov - - - name: Upload Source Code Coverage To Codecov - if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' - run: | - if [ ! -s artifacts/coverage/salt.xml ]; then - echo "The artifacts/coverage/salt.xml file does not exist" - exit 1 - fi - # We can't yet use tokenless uploads with the codecov CLI - #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/salt.xml \ - # --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ - # --name salt.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - n=0 - until [ "$n" -ge 5 ] - do - if ./codecov --file artifacts/coverage/salt.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags salt,${{ inputs.distro-slug }},pkg \ - --name salt.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then - rc=$? - break - fi - rc=$? - n=$((n+1)) - sleep 15 - done - if [ "$rc" -ne 0 ]; then - echo "Failed to upload codecov stats" - exit 1 - fi - - - name: Upload Tests Code Coverage To Codecov - if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' - run: | - if [ ! -s artifacts/coverage/tests.xml ]; then - echo "The artifacts/coverage/tests.xml file does not exist" - exit 1 - fi - # We can't yet use tokenless uploads with the codecov CLI - #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/tests.xml \ - # --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ - # --name tests.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - n=0 - until [ "$n" -ge 5 ] - do - if ./codecov --file artifacts/coverage/tests.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags tests,${{ inputs.distro-slug }},pkg \ - --name tests.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then - rc=$? - break - fi - rc=$? - n=$((n+1)) - sleep 15 - done - if [ "$rc" -ne 0 ]; then - echo "Failed to upload codecov stats" - exit 1 - fi - - - name: Upload Test Run Artifacts - if: always() - uses: actions/upload-artifact@v3 - with: - name: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.arch }} - path: | - artifacts - !artifacts/salt/* - !artifacts/salt-*.tar.* - - report: - name: Test Pkg Download Reports - runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "x86_64"]') || 'ubuntu-latest' }} - environment: ${{ inputs.environment }} - if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped' - needs: - - test - - steps: - - name: Checkout Source Code - uses: actions/checkout@v4 - - - name: Download Test Run Artifacts - id: download-test-run-artifacts - uses: actions/download-artifact@v3 - with: - name: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.arch }} - path: artifacts - - - name: Show Test Run Artifacts - if: always() && steps.download-test-run-artifacts.outcome == 'success' - run: | - tree -a artifacts - - - name: Set up Python ${{ inputs.python-version }} - uses: actions/setup-python@v4 - with: - python-version: "${{ inputs.python-version }}" - - - name: Install Nox - run: | - python3 -m pip install 'nox==${{ inputs.nox-version }}' - - - name: Publish Test Report - uses: mikepenz/action-junit-report@v3 - # always run even if the previous steps fails - if: always() && github.event_name == 'push' && steps.download-test-run-artifacts.outcome == 'success' - with: - check_name: Overall Test Results(${{ inputs.distro-slug }} ${{ inputs.arch }}) - report_paths: 'artifacts/xml-unittests-output/*.xml' - annotate_only: true diff --git a/.github/workflows/test-package-downloads-action-windows.yml b/.github/workflows/test-package-downloads-action-windows.yml deleted file mode 100644 index beb15893494..00000000000 --- a/.github/workflows/test-package-downloads-action-windows.yml +++ /dev/null @@ -1,343 +0,0 @@ -name: Test Download Packages - -on: - workflow_call: - inputs: - distro-slug: - required: true - type: string - description: The OS slug to run tests against - platform: - required: true - type: string - description: The platform being tested - arch: - required: true - type: string - description: The platform arch being tested - pkg-type: - required: true - type: string - description: The platform arch being tested - salt-version: - type: string - required: true - description: The Salt version of the packages to install and test - cache-prefix: - required: true - type: string - description: Seed used to invalidate caches - environment: - required: true - type: string - description: The environment to run tests against - latest-release: - required: true - type: string - description: The latest salt release - nox-version: - required: true - type: string - description: The nox version to install - python-version: - required: false - type: string - description: The python version to run tests with - default: "3.10" - package-name: - required: false - type: string - description: The onedir package name to use - default: salt - nox-session: - required: false - type: string - description: The nox session to run - default: ci-test-onedir - skip-code-coverage: - required: false - type: boolean - description: Skip code coverage - default: false - skip-junit-reports: - required: false - type: boolean - description: Skip Publishing JUnit Reports - default: false - -env: - COLUMNS: 190 - AWS_MAX_ATTEMPTS: "10" - AWS_RETRY_MODE: "adaptive" - PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ - PIP_EXTRA_INDEX_URL: https://pypi.org/simple - -jobs: - - test: - name: Test - runs-on: - - self-hosted - - linux - - bastion - environment: ${{ inputs.environment }} - timeout-minutes: 120 # 2 Hours - More than this and something is wrong - strategy: - fail-fast: false - matrix: - arch: - - ${{ inputs.arch }} - pkg-type: - - ${{ inputs.pkg-type }} - - steps: - - - name: "Throttle Builds" - shell: bash - run: | - t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" - - - name: Checkout Source Code - uses: actions/checkout@v4 - - - name: Download Onedir Tarball as an Artifact - uses: actions/download-artifact@v3 - with: - name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz - path: artifacts/ - - - name: Decompress Onedir Tarball - shell: bash - run: | - python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" - cd artifacts - tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz - - - name: Download cached nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }} - uses: actions/cache@v3 - with: - path: nox.${{ inputs.distro-slug }}.tar.* - key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ - hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') - }} - # If we get a cache miss here it means the dependencies step failed to save the cache - fail-on-cache-miss: true - - - name: Setup Python Tools Scripts - uses: ./.github/actions/setup-python-tools-scripts - - - name: Get Salt Project GitHub Actions Bot Environment - run: | - TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") - SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) - echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" - - - name: Start VM - id: spin-up-vm - run: | - tools --timestamps vm create --environment "${SPB_ENVIRONMENT}" --retries=2 ${{ inputs.distro-slug }} - - - name: List Free Space - run: | - tools --timestamps vm ssh ${{ inputs.distro-slug }} -- df -h || true - - - name: Upload Checkout To VM - run: | - tools --timestamps vm rsync ${{ inputs.distro-slug }} - - - name: Decompress .nox Directory - run: | - tools --timestamps vm decompress-dependencies ${{ inputs.distro-slug }} - - - name: Show System Info & Test Plan - env: - SALT_RELEASE: "${{ inputs.salt-version }}" - SALT_REPO_ARCH: ${{ inputs.arch }} - LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" - SALT_REPO_TYPE: ${{ inputs.environment }} - SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} - SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} - SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} - SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} - SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" - DOWNLOAD_TEST_PACKAGE_TYPE: ${{ inputs.pkg-type }} - run: | - tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ - -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ - -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ - --nox-session=${{ inputs.nox-session }}-pkgs ${{ inputs.distro-slug }} -- download-pkgs - - - name: Run Package Download Tests - env: - SALT_RELEASE: "${{ inputs.salt-version }}" - SALT_REPO_ARCH: ${{ inputs.arch }} - LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" - SALT_REPO_TYPE: ${{ inputs.environment }} - SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} - SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} - SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} - SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} - SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" - DOWNLOAD_TEST_PACKAGE_TYPE: ${{ inputs.pkg-type }} - run: | - tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ - -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ - -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ - --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ inputs.distro-slug }} -- download-pkgs - - - name: Combine Coverage Reports - if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' - run: | - tools --timestamps vm combine-coverage ${{ inputs.distro-slug }} - - - name: Create XML Coverage Reports - if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' - run: | - tools --timestamps vm create-xml-coverage-reports ${{ inputs.distro-slug }} - - - name: Download Test Run Artifacts - id: download-artifacts-from-vm - if: always() && steps.spin-up-vm.outcome == 'success' - run: | - tools --timestamps vm download-artifacts ${{ inputs.distro-slug }} - # Delete the salt onedir, we won't need it anymore and it will prevent - # from it showing in the tree command below - rm -rf artifacts/salt* - tree -a artifacts - - - name: Destroy VM - if: always() - run: | - tools --timestamps vm destroy --no-wait ${{ inputs.distro-slug }} || true - - - name: Fix file ownership - run: | - sudo chown -R "$(id -un)" . - - - name: Install Codecov CLI - if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' - run: | - # We can't yet use tokenless uploads with the codecov CLI - # python3 -m pip install codecov-cli - # - curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import - curl -Os https://uploader.codecov.io/latest/linux/codecov - curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM - curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig - gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM - shasum -a 256 -c codecov.SHA256SUM - chmod +x codecov - - - name: Upload Source Code Coverage To Codecov - if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' - run: | - if [ ! -s artifacts/coverage/salt.xml ]; then - echo "The artifacts/coverage/salt.xml file does not exist" - exit 1 - fi - # We can't yet use tokenless uploads with the codecov CLI - #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/salt.xml \ - # --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ - # --name salt.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - n=0 - until [ "$n" -ge 5 ] - do - if ./codecov --file artifacts/coverage/salt.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags salt,${{ inputs.distro-slug }},pkg \ - --name salt.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then - rc=$? - break - fi - rc=$? - n=$((n+1)) - sleep 15 - done - if [ "$rc" -ne 0 ]; then - echo "Failed to upload codecov stats" - exit 1 - fi - - - name: Upload Tests Code Coverage To Codecov - if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' - run: | - if [ ! -s artifacts/coverage/tests.xml ]; then - echo "The artifacts/coverage/tests.xml file does not exist" - exit 1 - fi - # We can't yet use tokenless uploads with the codecov CLI - #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/tests.xml \ - # --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ - # --name tests.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - n=0 - until [ "$n" -ge 5 ] - do - if ./codecov --file artifacts/coverage/tests.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags tests,${{ inputs.distro-slug }},pkg \ - --name tests.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then - rc=$? - break - fi - rc=$? - n=$((n+1)) - sleep 15 - done - if [ "$rc" -ne 0 ]; then - echo "Failed to upload codecov stats" - exit 1 - fi - - - name: Upload Test Run Artifacts - if: always() && steps.download-artifacts-from-vm.outcome == 'success' - uses: actions/upload-artifact@v3 - with: - name: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.arch }} - path: | - artifacts - !artifacts/salt/* - !artifacts/salt-*.tar.* - - report: - name: Test Pkg Download Reports - runs-on: - - self-hosted - - linux - - x86_64 - environment: ${{ inputs.environment }} - if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped' - needs: - - test - - steps: - - name: Checkout Source Code - uses: actions/checkout@v4 - - - name: Download Test Run Artifacts - id: download-test-run-artifacts - uses: actions/download-artifact@v3 - with: - name: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ inputs.arch }} - path: artifacts - - - name: Show Test Run Artifacts - if: always() && steps.download-test-run-artifacts.outcome == 'success' - run: | - tree -a artifacts - - - name: Install Nox - run: | - python3 -m pip install 'nox==${{ inputs.nox-version }}' - - - name: Publish Test Report - uses: mikepenz/action-junit-report@v3 - # always run even if the previous steps fails - if: always() && github.event_name == 'push' && steps.download-test-run-artifacts.outcome == 'success' - with: - check_name: Overall Test Results(${{ inputs.distro-slug }} ${{ inputs.arch }} ${{ inputs.pkg-type }} ) - report_paths: 'artifacts/xml-unittests-output/*.xml' - annotate_only: true diff --git a/.github/workflows/test-package-downloads-action.yml b/.github/workflows/test-package-downloads-action.yml new file mode 100644 index 00000000000..32dcd453a57 --- /dev/null +++ b/.github/workflows/test-package-downloads-action.yml @@ -0,0 +1,754 @@ +name: Test Download Packages + +on: + workflow_call: + inputs: + salt-version: + type: string + required: true + description: The Salt version of the packages to install and test + cache-prefix: + required: true + type: string + description: Seed used to invalidate caches + environment: + required: true + type: string + description: The environment to run tests against + latest-release: + required: true + type: string + description: The latest salt release + nox-version: + required: true + type: string + description: The nox version to install + python-version: + required: false + type: string + description: The python version to run tests with + default: "3.10" + package-name: + required: false + type: string + description: The onedir package name to use + default: salt + skip-code-coverage: + required: false + type: boolean + description: Skip code coverage + default: false + nox-session: + required: false + type: string + description: The nox session to run + default: ci-test-onedir + +env: + COLUMNS: 190 + AWS_MAX_ATTEMPTS: "10" + AWS_RETRY_MODE: "adaptive" + PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ + PIP_EXTRA_INDEX_URL: https://pypi.org/simple + +jobs: + + generate-matrix: + name: Test Matrix + runs-on: + - self-hosted + - linux + - x86_64 + outputs: + matrix-include: ${{ steps.generate-matrix.outputs.matrix }} + steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t" + + - name: Checkout Source Code + uses: actions/checkout@v4 + + - name: Setup Python Tools Scripts + uses: ./.github/actions/setup-python-tools-scripts + + - name: Generate Test Matrix + id: generate-matrix + run: | + tools ci pkg-download-matrix + + linux: + name: Linux + runs-on: + - self-hosted + - linux + - bastion + environment: ${{ inputs.environment }} + timeout-minutes: 120 # 2 Hours - More than this and something is wrong + needs: + - generate-matrix + strategy: + fail-fast: false + matrix: + include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include)['linux'] }} + + steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t" + + - name: Checkout Source Code + uses: actions/checkout@v4 + + - name: Download Onedir Tarball as an Artifact + uses: actions/download-artifact@v3 + with: + name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-linux-${{ matrix.arch }}.tar.xz + path: artifacts/ + + - name: Decompress Onedir Tarball + shell: bash + run: | + python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" + cd artifacts + tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-linux-${{ matrix.arch }}.tar.xz + + - name: Download cached nox.${{ matrix.distro-slug }}.tar.* for session ${{ inputs.nox-session }} + uses: actions/cache@v3 + with: + path: nox.${{ matrix.distro-slug }}.tar.* + key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch }}|${{ matrix.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ + hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') + }} + # If we get a cache miss here it means the dependencies step failed to save the cache + fail-on-cache-miss: true + + - name: Setup Python Tools Scripts + uses: ./.github/actions/setup-python-tools-scripts + + - name: Get Salt Project GitHub Actions Bot Environment + run: | + TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") + SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) + echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" + + - name: Start VM + id: spin-up-vm + run: | + tools --timestamps vm create --environment "${SPB_ENVIRONMENT}" --retries=2 ${{ matrix.distro-slug }} + + - name: List Free Space + run: | + tools --timestamps vm ssh ${{ matrix.distro-slug }} -- df -h || true + + - name: Upload Checkout To VM + run: | + tools --timestamps vm rsync ${{ matrix.distro-slug }} + + - name: Decompress .nox Directory + run: | + tools --timestamps vm decompress-dependencies ${{ matrix.distro-slug }} + + - name: Show System Info & Test Plan + env: + SALT_RELEASE: "${{ inputs.salt-version }}" + SALT_REPO_ARCH: ${{ matrix.arch }} + SALT_REPO_TYPE: ${{ inputs.environment }} + SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} + SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} + SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} + SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} + SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" + LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} + run: | + tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ + -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ + --nox-session=${{ inputs.nox-session }}-pkgs ${{ matrix.distro-slug }} -- download-pkgs + + - name: Run Package Download Tests + env: + SALT_RELEASE: "${{ inputs.salt-version }}" + SALT_REPO_ARCH: ${{ matrix.arch }} + SALT_REPO_TYPE: ${{ inputs.environment }} + SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} + SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} + SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} + SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} + SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" + LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} + run: | + tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ + -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ + --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ matrix.distro-slug }} -- download-pkgs + + - name: Combine Coverage Reports + if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' + run: | + tools --timestamps vm combine-coverage ${{ matrix.distro-slug }} + + - name: Download Test Run Artifacts + id: download-artifacts-from-vm + if: always() && steps.spin-up-vm.outcome == 'success' + run: | + tools --timestamps vm download-artifacts ${{ matrix.distro-slug }} + # Delete the salt onedir, we won't need it anymore and it will prevent + # from it showing in the tree command below + rm -rf artifacts/salt* + tree -a artifacts + + - name: Destroy VM + if: always() + run: | + tools --timestamps vm destroy --no-wait ${{ matrix.distro-slug }} || true + + - name: Fix file ownership + run: | + sudo chown -R "$(id -un)" . + + - name: Install Codecov CLI + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + # We can't yet use tokenless uploads with the codecov CLI + # python3 -m pip install codecov-cli + # + curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import + curl -Os https://uploader.codecov.io/latest/linux/codecov + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig + gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM + shasum -a 256 -c codecov.SHA256SUM + chmod +x codecov + + - name: Upload Source Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + if [ ! -s artifacts/coverage/salt.xml ]; then + echo "The artifacts/coverage/salt.xml file does not exist" + exit 1 + fi + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/salt.xml \ + # --flag salt --flag ${{ matrix.distro-slug }} --flag pkg \ + # --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/salt.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags salt,${{ matrix.distro-slug }},pkg \ + --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi + + - name: Upload Tests Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + if [ ! -s artifacts/coverage/tests.xml ]; then + echo "The artifacts/coverage/tests.xml file does not exist" + exit 1 + fi + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/tests.xml \ + # --flag tests --flag ${{ matrix.distro-slug }} --flag pkg \ + # --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/tests.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags tests,${{ matrix.distro-slug }},pkg \ + --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi + + - name: Upload Test Run Artifacts + if: always() && steps.download-artifacts-from-vm.outcome == 'success' + uses: actions/upload-artifact@v3 + with: + name: pkg-testrun-artifacts-${{ matrix.distro-slug }}-${{ matrix.arch }} + path: | + artifacts + !artifacts/salt/* + !artifacts/salt-*.tar.* + + - name: Publish Test Report + uses: mikepenz/action-junit-report@v3 + # always run even if the previous steps fails + if: always() && job.status != 'cancelled' && steps.download-artifacts-from-vm.outcome == 'success' + with: + check_name: Overall Test Results(${{ matrix.distro-slug }} ${{ matrix.arch }}) + report_paths: 'artifacts/xml-unittests-output/*.xml' + annotate_only: true + + + macos: + name: MacOS + runs-on: ${{ matrix.distro-slug }} + environment: ${{ inputs.environment }} + timeout-minutes: 120 # 2 Hours - More than this and something is wrong + needs: + - generate-matrix + strategy: + fail-fast: false + matrix: + include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include)['macos'] }} + + steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" + + - name: Checkout Source Code + uses: actions/checkout@v4 + + - name: Download Onedir Tarball as an Artifact + uses: actions/download-artifact@v3 + with: + name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz + path: artifacts/ + + - name: Install System Dependencies + run: | + brew install tree + + - name: Decompress Onedir Tarball + shell: bash + run: | + python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" + cd artifacts + tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz + + - name: Set up Python ${{ inputs.python-version }} + uses: actions/setup-python@v4 + with: + python-version: "${{ inputs.python-version }}" + update-environment: true + + - name: Install Nox + run: | + python3 -m pip install 'nox==${{ inputs.nox-version }}' + + - name: Download cached nox.${{ matrix.distro-slug }}.tar.* for session ${{ inputs.nox-session }} + uses: actions/cache@v3 + with: + path: nox.${{ matrix.distro-slug }}.tar.* + key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch }}|${{ matrix.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ + hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') + }} + # If we get a cache miss here it means the dependencies step failed to save the cache + fail-on-cache-miss: true + + - name: Decompress .nox Directory + run: | + nox --force-color -e decompress-dependencies -- ${{ matrix.distro-slug }} + + - name: Show System Info & Test Plan + env: + SALT_RELEASE: "${{ inputs.salt-version }}" + SKIP_REQUIREMENTS_INSTALL: "1" + PRINT_TEST_SELECTION: "1" + PRINT_TEST_PLAN_ONLY: "1" + PRINT_SYSTEM_INFO: "1" + GITHUB_ACTIONS_PIPELINE: "1" + SKIP_INITIAL_GH_ACTIONS_FAILURES: "1" + SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" + LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} + run: | + sudo -E nox --force-color -e ${{ inputs.nox-session }}-pkgs -- download-pkgs + + - name: Run Package Download Tests + env: + SKIP_REQUIREMENTS_INSTALL: "1" + PRINT_TEST_SELECTION: "0" + PRINT_TEST_PLAN_ONLY: "0" + PRINT_SYSTEM_INFO: "0" + RERUN_FAILURES: "1" + GITHUB_ACTIONS_PIPELINE: "1" + SKIP_INITIAL_GH_ACTIONS_FAILURES: "1" + SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" + COVERAGE_CONTEXT: ${{ matrix.distro-slug }} + SALT_RELEASE: "${{ inputs.salt-version }}" + SALT_REPO_ARCH: ${{ matrix.arch }} + LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" + SALT_REPO_TYPE: ${{ inputs.environment }} + SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} + SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} + SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} + SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} + run: | + sudo -E nox --force-color -e ${{ inputs.nox-session }}-pkgs -- download-pkgs + + - name: Fix file ownership + run: | + sudo chown -R "$(id -un)" . + + - name: Combine Coverage Reports + if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' + run: | + nox --force-color -e combine-coverage + + - name: Prepare Test Run Artifacts + id: download-artifacts-from-vm + if: always() && job.status != 'cancelled' + run: | + # Delete the salt onedir, we won't need it anymore and it will prevent + # from it showing in the tree command below + rm -rf artifacts/salt* + tree -a artifacts + + - name: Install Codecov CLI + if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' + run: | + # We can't yet use tokenless uploads with the codecov CLI + # python3 -m pip install codecov-cli + # + curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import + curl -Os https://uploader.codecov.io/latest/macos/codecov + curl -Os https://uploader.codecov.io/latest/macos/codecov.SHA256SUM + curl -Os https://uploader.codecov.io/latest/macos/codecov.SHA256SUM.sig + gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM + shasum -a 256 -c codecov.SHA256SUM + chmod +x codecov + + - name: Upload Source Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' + run: | + if [ ! -s artifacts/coverage/salt.xml ]; then + echo "The artifacts/coverage/salt.xml file does not exist" + exit 1 + fi + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/salt.xml \ + # --flag salt --flag ${{ matrix.distro-slug }} --flag pkg \ + # --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/salt.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags salt,${{ matrix.distro-slug }},pkg \ + --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi + + - name: Upload Tests Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' + run: | + if [ ! -s artifacts/coverage/tests.xml ]; then + echo "The artifacts/coverage/tests.xml file does not exist" + exit 1 + fi + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/tests.xml \ + # --flag tests --flag ${{ matrix.distro-slug }} --flag pkg \ + # --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/tests.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags tests,${{ matrix.distro-slug }},pkg \ + --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi + + - name: Upload Test Run Artifacts + if: always() + uses: actions/upload-artifact@v3 + with: + name: pkg-testrun-artifacts-${{ matrix.distro-slug }}-${{ matrix.arch }} + path: | + artifacts + !artifacts/salt/* + !artifacts/salt-*.tar.* + + - name: Publish Test Report + uses: mikepenz/action-junit-report@v3 + # always run even if the previous steps fails + if: always() && job.status != 'cancelled' + with: + check_name: Overall Test Results(${{ matrix.distro-slug }} ${{ matrix.arch }}) + report_paths: 'artifacts/xml-unittests-output/*.xml' + annotate_only: true + + + windows: + name: Windows + runs-on: + - self-hosted + - linux + - bastion + environment: ${{ inputs.environment }} + timeout-minutes: 120 # 2 Hours - More than this and something is wrong + needs: + - generate-matrix + strategy: + fail-fast: false + matrix: + include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include)['windows'] }} + + steps: + - name: Checkout Source Code + uses: actions/checkout@v4 + + - name: Download Onedir Tarball as an Artifact + uses: actions/download-artifact@v3 + with: + name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-windows-${{ matrix.arch }}.tar.xz + path: artifacts/ + + - name: Decompress Onedir Tarball + shell: bash + run: | + python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" + cd artifacts + tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-windows-${{ matrix.arch }}.tar.xz + + - name: Download cached nox.${{ matrix.distro-slug }}.tar.* for session ${{ inputs.nox-session }} + uses: actions/cache@v3 + with: + path: nox.${{ matrix.distro-slug }}.tar.* + key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch }}|${{ matrix.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ + hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') + }} + # If we get a cache miss here it means the dependencies step failed to save the cache + fail-on-cache-miss: true + + - name: Setup Python Tools Scripts + uses: ./.github/actions/setup-python-tools-scripts + + - name: Get Salt Project GitHub Actions Bot Environment + run: | + TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") + SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) + echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" + + - name: Start VM + id: spin-up-vm + run: | + tools --timestamps vm create --environment "${SPB_ENVIRONMENT}" --retries=2 ${{ matrix.distro-slug }} + + - name: List Free Space + run: | + tools --timestamps vm ssh ${{ matrix.distro-slug }} -- df -h || true + + - name: Upload Checkout To VM + run: | + tools --timestamps vm rsync ${{ matrix.distro-slug }} + + - name: Decompress .nox Directory + run: | + tools --timestamps vm decompress-dependencies ${{ matrix.distro-slug }} + + - name: Show System Info & Test Plan + env: + SALT_RELEASE: "${{ inputs.salt-version }}" + SALT_REPO_ARCH: ${{ matrix.arch }} + LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" + SALT_REPO_TYPE: ${{ inputs.environment }} + SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} + SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} + SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} + SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} + SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} + run: | + tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ + -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ + --nox-session=${{ inputs.nox-session }}-pkgs ${{ matrix.distro-slug }} -- download-pkgs + + - name: Run Package Download Tests + env: + SALT_RELEASE: "${{ inputs.salt-version }}" + SALT_REPO_ARCH: ${{ matrix.arch }} + LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" + SALT_REPO_TYPE: ${{ inputs.environment }} + SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} + SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} + SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} + SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} + SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} + run: | + tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ + -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ + --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ matrix.distro-slug }} -- download-pkgs + + - name: Combine Coverage Reports + if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' + run: | + tools --timestamps vm combine-coverage ${{ matrix.distro-slug }} + + - name: Download Test Run Artifacts + id: download-artifacts-from-vm + if: always() && steps.spin-up-vm.outcome == 'success' + run: | + tools --timestamps vm download-artifacts ${{ matrix.distro-slug }} + # Delete the salt onedir, we won't need it anymore and it will prevent + # from it showing in the tree command below + rm -rf artifacts/salt* + tree -a artifacts + + - name: Destroy VM + if: always() + run: | + tools --timestamps vm destroy --no-wait ${{ matrix.distro-slug }} || true + + - name: Fix file ownership + run: | + sudo chown -R "$(id -un)" . + + - name: Install Codecov CLI + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + # We can't yet use tokenless uploads with the codecov CLI + # python3 -m pip install codecov-cli + # + curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import + curl -Os https://uploader.codecov.io/latest/linux/codecov + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig + gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM + shasum -a 256 -c codecov.SHA256SUM + chmod +x codecov + + - name: Upload Source Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + if [ ! -s artifacts/coverage/salt.xml ]; then + echo "The artifacts/coverage/salt.xml file does not exist" + exit 1 + fi + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/salt.xml \ + # --flag salt --flag ${{ matrix.distro-slug }} --flag pkg \ + # --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/salt.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags salt,${{ matrix.distro-slug }},pkg \ + --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi + + - name: Upload Tests Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + if [ ! -s artifacts/coverage/tests.xml ]; then + echo "The artifacts/coverage/tests.xml file does not exist" + exit 1 + fi + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/tests.xml \ + # --flag tests --flag ${{ matrix.distro-slug }} --flag pkg \ + # --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/tests.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags tests,${{ matrix.distro-slug }},pkg \ + --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi + + - name: Upload Test Run Artifacts + if: always() && steps.download-artifacts-from-vm.outcome == 'success' + uses: actions/upload-artifact@v3 + with: + name: pkg-testrun-artifacts-${{ matrix.distro-slug }}-${{ matrix.arch }} + path: | + artifacts + !artifacts/salt/* + !artifacts/salt-*.tar.* + + - name: Publish Test Report + uses: mikepenz/action-junit-report@v3 + # always run even if the previous steps fails + if: always() && job.status != 'cancelled' && steps.download-artifacts-from-vm.outcome == 'success' + with: + check_name: Overall Test Results(${{ matrix.distro-slug }} ${{ matrix.arch }} ${{ matrix.pkg-type }} ) + report_paths: 'artifacts/xml-unittests-output/*.xml' + annotate_only: true diff --git a/tools/ci.py b/tools/ci.py index cc6578be789..5cebdef78b2 100644 --- a/tools/ci.py +++ b/tools/ci.py @@ -777,6 +777,74 @@ def pkg_matrix( ctx.exit(0) +@ci.command( + name="pkg-download-matrix", + arguments={}, +) +def pkg_download_matrix(ctx: Context): + """ + Generate the test matrix. + """ + _platforms = {} + linux_entries = ( + ("almalinux-8", "Alma Linux 8", "x86_64", "package"), + ("almalinux-8-arm64", "Alma Linux 8 Arm64", "aarch64", "package"), + ("almalinux-9", "Alma Linux 9", "x86_64", "package"), + ("almalinux-9-arm64", "Alma Linux 9 Arm64", "aarch64", "package"), + ("amazonlinux-2", "Amazon Linux 2", "x86_64", "package"), + ("amazonlinux-2-arm64", "Amazon Linux 2 Arm64", "aarch64", "package"), + ("centos-7", "CentOS 7", "x86_64", "package"), + ("centos-7-arm64", "CentOS 7 Arm64", "aarch64", "package"), + ("centosstream-8", "CentOS Stream 8", "x86_64", "package"), + ("centosstream-8-arm64", "CentOS Stream 8 Arm64", "aarch64", "package"), + ("centosstream-9", "CentOS Stream 9", "x86_64", "package"), + ("centosstream-9-arm64", "CentOS Stream 9 Arm64", "aarch64", "package"), + ("debian-10", "Debian 10", "x86_64", "package"), + ("debian-11", "Debian 11", "x86_64", "package"), + ("debian-11-arm64", "Debian 11 Arm64", "aarch64", "package"), + ("fedora-37", "Fedora 37", "x86_64", "package"), + ("fedora-37-arm64", "Fedora 37 Arm64", "aarch64", "package"), + ("fedora-38", "Fedora 38", "x86_64", "package"), + ("fedora-38-arm64", "Fedora 38 Arm64", "aarch64", "package"), + ("photonos-3", "Photon OS 3", "x86_64", "package"), + ("photonos-4", "Photon OS 4", "x86_64", "package"), + ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64", "package"), + ("ubuntu-20.04", "Ubuntu 20.04", "x86_64", "package"), + ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64", "package"), + ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "package"), + ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "package"), + ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "onedir"), + ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "onedir"), + ) + macos_entries = ( + ("macos-12", "macOS 12", "x86_64", "Package"), + ("macos-12", "macOS 12", "x86_64", "Onedir"), + ) + windows_entries = (("windows-2022", "Windows 2022", "amd64"),) + _matrix = [] + for distro, display_name, arch, pkg_type in linux_entries: + _matrix.append({"distro-slug": distro, "arch": arch, "pkg_type": pkg_type}) + _platforms["linux"] = _matrix + _matrix = [] + for distro, display_name, arch, pkg_type in macos_entries: + _matrix.append({"distro-slug": distro, "arch": arch, "pkg_type": pkg_type}) + _platforms["macos"] = _matrix + _matrix = [] + for distro, display_name, arch in windows_entries: + for pkg_type in ("nsis", "msi", "onedir"): + _matrix.append({"distro-slug": distro, "arch": arch, "pkg_type": pkg_type}) + _platforms["windows"] = _matrix + + ctx.info("Generated matrix:") + ctx.print(_platforms, soft_wrap=True) + + github_output = os.environ.get("GITHUB_OUTPUT") + if github_output is not None: + with open(github_output, "a", encoding="utf-8") as wfh: + wfh.write(f"matrix={json.dumps(_platforms)}\n") + ctx.exit(0) + + @ci.command( name="get-releases", arguments={ From b4d8898781d57b2dd79d991e21e7464ef4a5a1a5 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 8 Oct 2023 11:42:35 +0100 Subject: [PATCH 124/147] Move the test salt listing to `tools/pre_commit.py` Signed-off-by: Pedro Algarvio --- .../workflows/templates/test-salt.yml.jinja | 29 +++-------------- tools/pre_commit.py | 31 +++++++++++++++++++ 2 files changed, 36 insertions(+), 24 deletions(-) diff --git a/.github/workflows/templates/test-salt.yml.jinja b/.github/workflows/templates/test-salt.yml.jinja index 688d9df5263..91e222aaccc 100644 --- a/.github/workflows/templates/test-salt.yml.jinja +++ b/.github/workflows/templates/test-salt.yml.jinja @@ -1,7 +1,5 @@ - <%- for slug, display_name, arch in (("windows-2016", "Windows 2016", "amd64"), - ("windows-2019", "Windows 2019", "amd64"), - ("windows-2022", "Windows 2022", "amd64")) %> + <%- for slug, display_name, arch in test_salt_listing["windows"] %> <{ slug.replace(".", "") }>: <%- do test_salt_needs.append(slug.replace(".", "")) %> @@ -26,7 +24,8 @@ <%- endfor %> - <%- for slug, display_name, arch in (("macos-12", "macOS 12", "x86_64"),) %> + + <%- for slug, display_name, arch in test_salt_listing["macos"] %> <{ slug.replace(".", "") }>: <%- do test_salt_needs.append(slug.replace(".", "")) %> @@ -51,26 +50,8 @@ <%- endfor %> - <%- for slug, display_name, arch in (("almalinux-8", "Alma Linux 8", "x86_64"), - ("almalinux-9", "Alma Linux 9", "x86_64"), - ("amazonlinux-2", "Amazon Linux 2", "x86_64"), - ("archlinux-lts", "Arch Linux LTS", "x86_64"), - ("centos-7", "CentOS 7", "x86_64"), - ("centosstream-8", "CentOS Stream 8", "x86_64"), - ("centosstream-9", "CentOS Stream 9", "x86_64"), - ("debian-10", "Debian 10", "x86_64"), - ("debian-11", "Debian 11", "x86_64"), - ("debian-11-arm64", "Debian 11 Arm64", "aarch64"), - ("fedora-37", "Fedora 37", "x86_64"), - ("fedora-38", "Fedora 38", "x86_64"), - ("opensuse-15", "Opensuse 15", "x86_64"), - ("photonos-3", "Photon OS 3", "x86_64"), - ("photonos-4", "Photon OS 4", "x86_64"), - ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64"), - ("ubuntu-20.04", "Ubuntu 20.04", "x86_64"), - ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64"), - ("ubuntu-22.04", "Ubuntu 22.04", "x86_64"), - ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64")) %> + + <%- for slug, display_name, arch in test_salt_listing["linux"] %> <{ slug.replace(".", "") }>: <%- do test_salt_needs.append(slug.replace(".", "")) %> diff --git a/tools/pre_commit.py b/tools/pre_commit.py index af054876d80..fc92769e095 100644 --- a/tools/pre_commit.py +++ b/tools/pre_commit.py @@ -81,6 +81,36 @@ def generate_workflows(ctx: Context): }, }, } + test_salt_listing = { + "linux": ( + ("almalinux-8", "Alma Linux 8", "x86_64"), + ("almalinux-9", "Alma Linux 9", "x86_64"), + ("amazonlinux-2", "Amazon Linux 2", "x86_64"), + ("archlinux-lts", "Arch Linux LTS", "x86_64"), + ("centos-7", "CentOS 7", "x86_64"), + ("centosstream-8", "CentOS Stream 8", "x86_64"), + ("centosstream-9", "CentOS Stream 9", "x86_64"), + ("debian-10", "Debian 10", "x86_64"), + ("debian-11", "Debian 11", "x86_64"), + ("debian-11-arm64", "Debian 11 Arm64", "aarch64"), + ("fedora-37", "Fedora 37", "x86_64"), + ("fedora-38", "Fedora 38", "x86_64"), + ("opensuse-15", "Opensuse 15", "x86_64"), + ("photonos-3", "Photon OS 3", "x86_64"), + ("photonos-4", "Photon OS 4", "x86_64"), + ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64"), + ("ubuntu-20.04", "Ubuntu 20.04", "x86_64"), + ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64"), + ("ubuntu-22.04", "Ubuntu 22.04", "x86_64"), + ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64"), + ), + "macos": (("macos-12", "macOS 12", "x86_64"),), + "windows": ( + ("windows-2016", "Windows 2016", "amd64"), + ("windows-2019", "Windows 2019", "amd64"), + ("windows-2022", "Windows 2022", "amd64"), + ), + } env = Environment( block_start_string="<%", block_end_string="%>", @@ -115,6 +145,7 @@ def generate_workflows(ctx: Context): "test_repo_needs": NeedsTracker(), "prepare_workflow_needs": NeedsTracker(), "build_repo_needs": NeedsTracker(), + "test_salt_listing": test_salt_listing, } shared_context_file = ( tools.utils.REPO_ROOT / "cicd" / "shared-gh-workflows-context.yml" From fac23897b383216bb700df33147caae50d7b2227 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 8 Oct 2023 11:54:51 +0100 Subject: [PATCH 125/147] Move the test salt pkg listing to `tools/pre_commit.py` Signed-off-by: Pedro Algarvio --- .../templates/test-salt-pkg.yml.jinja | 43 ++----------------- tools/pre_commit.py | 25 +++++++++++ 2 files changed, 28 insertions(+), 40 deletions(-) diff --git a/.github/workflows/templates/test-salt-pkg.yml.jinja b/.github/workflows/templates/test-salt-pkg.yml.jinja index d078bea80e2..64617d7054d 100644 --- a/.github/workflows/templates/test-salt-pkg.yml.jinja +++ b/.github/workflows/templates/test-salt-pkg.yml.jinja @@ -1,39 +1,4 @@ - <%- set linux_pkg_tests = ( - ("almalinux-8", "Alma Linux 8", "x86_64", "rpm"), - ("almalinux-9", "Alma Linux 9", "x86_64", "rpm"), - ("amazonlinux-2", "Amazon Linux 2", "x86_64", "rpm"), - ("centos-7", "CentOS 7", "x86_64", "rpm"), - ("centosstream-8", "CentOS Stream 8", "x86_64", "rpm"), - ("centosstream-9", "CentOS Stream 9", "x86_64", "rpm"), - ("debian-10", "Debian 10", "x86_64", "deb"), - ("debian-11", "Debian 11", "x86_64", "deb"), - ("debian-11-arm64", "Debian 11 Arm64", "aarch64", "deb"), - ("fedora-37", "Fedora 37", "x86_64", "rpm"), - ("fedora-38", "Fedora 38", "x86_64", "rpm"), - ("ubuntu-20.04", "Ubuntu 20.04", "x86_64", "deb"), - ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64", "deb"), - ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "deb"), - ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "deb") - ) %> - - <%- set linux_pkg_tests = ( - ("amazonlinux-2", "Amazon Linux 2", "x86_64", "rpm"), - ("centos-7", "CentOS 7", "x86_64", "rpm"), - ("centosstream-8", "CentOS Stream 8", "x86_64", "rpm"), - ("centosstream-9", "CentOS Stream 9", "x86_64", "rpm"), - ("debian-10", "Debian 10", "x86_64", "deb"), - ("debian-11", "Debian 11", "x86_64", "deb"), - ("debian-11-arm64", "Debian 11 Arm64", "aarch64", "deb"), - ("photonos-3", "Photon OS 3", "x86_64", "rpm"), - ("photonos-4", "Photon OS 4", "x86_64", "rpm"), - ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64", "rpm"), - ("ubuntu-20.04", "Ubuntu 20.04", "x86_64", "deb"), - ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64", "deb"), - ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "deb"), - ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "deb") - ) %> - - <%- for slug, display_name, arch, pkg_type in linux_pkg_tests %> + <%- for slug, display_name, arch, pkg_type in test_salt_pkg_listing["linux"] %> <%- set job_name = "{}-pkg-tests".format(slug.replace(".", "")) %> <{ job_name }>: @@ -63,7 +28,7 @@ - <%- for slug, display_name, arch in (("macos-12", "macOS 12", "x86_64"),) %> + <%- for slug, display_name, arch in test_salt_pkg_listing["macos"] %> <%- set job_name = "{}-pkg-tests".format(slug.replace(".", "")) %> <{ job_name }>: @@ -92,9 +57,7 @@ <%- endfor %> - <%- for slug, display_name, arch in (("windows-2016", "Windows 2016", "amd64"), - ("windows-2019", "Windows 2019", "amd64"), - ("windows-2022", "Windows 2022", "amd64")) %> + <%- for slug, display_name, arch in test_salt_pkg_listing["windows"] %> <%- for pkg_type in ("NSIS", "MSI") %> <%- set job_name = "{}-{}-pkg-tests".format(slug.replace(".", ""), pkg_type.lower()) %> diff --git a/tools/pre_commit.py b/tools/pre_commit.py index fc92769e095..647a6ed07c1 100644 --- a/tools/pre_commit.py +++ b/tools/pre_commit.py @@ -111,6 +111,30 @@ def generate_workflows(ctx: Context): ("windows-2022", "Windows 2022", "amd64"), ), } + test_salt_pkg_listing = { + "linux": ( + ("amazonlinux-2", "Amazon Linux 2", "x86_64", "rpm"), + ("centos-7", "CentOS 7", "x86_64", "rpm"), + ("centosstream-8", "CentOS Stream 8", "x86_64", "rpm"), + ("centosstream-9", "CentOS Stream 9", "x86_64", "rpm"), + ("debian-10", "Debian 10", "x86_64", "deb"), + ("debian-11", "Debian 11", "x86_64", "deb"), + ("debian-11-arm64", "Debian 11 Arm64", "aarch64", "deb"), + ("photonos-3", "Photon OS 3", "x86_64", "rpm"), + ("photonos-4", "Photon OS 4", "x86_64", "rpm"), + ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64", "rpm"), + ("ubuntu-20.04", "Ubuntu 20.04", "x86_64", "deb"), + ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64", "deb"), + ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "deb"), + ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "deb"), + ), + "macos": (("macos-12", "macOS 12", "x86_64"),), + "windows": ( + ("windows-2016", "Windows 2016", "amd64"), + ("windows-2019", "Windows 2019", "amd64"), + ("windows-2022", "Windows 2022", "amd64"), + ), + } env = Environment( block_start_string="<%", block_end_string="%>", @@ -146,6 +170,7 @@ def generate_workflows(ctx: Context): "prepare_workflow_needs": NeedsTracker(), "build_repo_needs": NeedsTracker(), "test_salt_listing": test_salt_listing, + "test_salt_pkg_listing": test_salt_pkg_listing, } shared_context_file = ( tools.utils.REPO_ROOT / "cicd" / "shared-gh-workflows-context.yml" From 42be5ce98247eb457253ff9dec8b1c25174ee7bd Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 8 Oct 2023 12:04:35 +0100 Subject: [PATCH 126/147] Move the build ci deps listing to `tools/pre_commit.py` Signed-off-by: Pedro Algarvio --- .../templates/build-ci-deps.yml.jinja | 37 +++--------------- tools/pre_commit.py | 39 +++++++++++++++++++ 2 files changed, 44 insertions(+), 32 deletions(-) diff --git a/.github/workflows/templates/build-ci-deps.yml.jinja b/.github/workflows/templates/build-ci-deps.yml.jinja index 7faabaee761..70693eff8b7 100644 --- a/.github/workflows/templates/build-ci-deps.yml.jinja +++ b/.github/workflows/templates/build-ci-deps.yml.jinja @@ -1,7 +1,5 @@ - <%- for slug, display_name, arch in (("windows-2016", "Windows 2016", "amd64"), - ("windows-2019", "Windows 2019", "amd64"), - ("windows-2022", "Windows 2022", "amd64")) %> + <%- for slug, display_name, arch in build_ci_deps_listing["windows"] %> <{ slug.replace(".", "") }>-ci-deps: <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> @@ -23,7 +21,8 @@ <%- endfor %> - <%- for slug, display_name, arch in (("macos-12", "macOS 12", "x86_64"),) %> + + <%- for slug, display_name, arch in build_ci_deps_listing["macos"] %> <{ slug.replace(".", "") }>-ci-deps: <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> @@ -45,34 +44,8 @@ <%- endfor %> - <%- for slug, display_name, arch in (("almalinux-8", "Alma Linux 8", "x86_64"), - ("almalinux-8-arm64", "Alma Linux 8 Arm64", "aarch64"), - ("almalinux-9", "Alma Linux 9", "x86_64"), - ("almalinux-9-arm64", "Alma Linux 9 Arm64", "aarch64"), - ("amazonlinux-2", "Amazon Linux 2", "x86_64"), - ("amazonlinux-2-arm64", "Amazon Linux 2 Arm64", "aarch64"), - ("archlinux-lts", "Arch Linux LTS", "x86_64"), - ("centos-7", "CentOS 7", "x86_64"), - ("centos-7-arm64", "CentOS 7 Arm64", "aarch64"), - ("centosstream-8", "CentOS Stream 8", "x86_64"), - ("centosstream-8-arm64", "CentOS Stream 8 Arm64", "aarch64"), - ("centosstream-9", "CentOS Stream 9", "x86_64"), - ("centosstream-9-arm64", "CentOS Stream 9 Arm64", "aarch64"), - ("debian-10", "Debian 10", "x86_64"), - ("debian-11", "Debian 11", "x86_64"), - ("debian-11-arm64", "Debian 11 Arm64", "aarch64"), - ("fedora-37", "Fedora 37", "x86_64"), - ("fedora-37-arm64", "Fedora 37 Arm64", "aarch64"), - ("fedora-38", "Fedora 38", "x86_64"), - ("fedora-38-arm64", "Fedora 38 Arm64", "aarch64"), - ("opensuse-15", "Opensuse 15", "x86_64"), - ("photonos-3", "Photon OS 3", "x86_64"), - ("photonos-4", "Photon OS 4", "x86_64"), - ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64"), - ("ubuntu-20.04", "Ubuntu 20.04", "x86_64"), - ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64"), - ("ubuntu-22.04", "Ubuntu 22.04", "x86_64"), - ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64")) %> + + <%- for slug, display_name, arch in build_ci_deps_listing["linux"] %> <{ slug.replace(".", "") }>-ci-deps: <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> diff --git a/tools/pre_commit.py b/tools/pre_commit.py index 647a6ed07c1..e4738445606 100644 --- a/tools/pre_commit.py +++ b/tools/pre_commit.py @@ -135,6 +135,44 @@ def generate_workflows(ctx: Context): ("windows-2022", "Windows 2022", "amd64"), ), } + build_ci_deps_listing = { + "linux": ( + ("almalinux-8", "Alma Linux 8", "x86_64"), + ("almalinux-8-arm64", "Alma Linux 8 Arm64", "aarch64"), + ("almalinux-9", "Alma Linux 9", "x86_64"), + ("almalinux-9-arm64", "Alma Linux 9 Arm64", "aarch64"), + ("amazonlinux-2", "Amazon Linux 2", "x86_64"), + ("amazonlinux-2-arm64", "Amazon Linux 2 Arm64", "aarch64"), + ("archlinux-lts", "Arch Linux LTS", "x86_64"), + ("centos-7", "CentOS 7", "x86_64"), + ("centos-7-arm64", "CentOS 7 Arm64", "aarch64"), + ("centosstream-8", "CentOS Stream 8", "x86_64"), + ("centosstream-8-arm64", "CentOS Stream 8 Arm64", "aarch64"), + ("centosstream-9", "CentOS Stream 9", "x86_64"), + ("centosstream-9-arm64", "CentOS Stream 9 Arm64", "aarch64"), + ("debian-10", "Debian 10", "x86_64"), + ("debian-11", "Debian 11", "x86_64"), + ("debian-11-arm64", "Debian 11 Arm64", "aarch64"), + ("fedora-37", "Fedora 37", "x86_64"), + ("fedora-37-arm64", "Fedora 37 Arm64", "aarch64"), + ("fedora-38", "Fedora 38", "x86_64"), + ("fedora-38-arm64", "Fedora 38 Arm64", "aarch64"), + ("opensuse-15", "Opensuse 15", "x86_64"), + ("photonos-3", "Photon OS 3", "x86_64"), + ("photonos-4", "Photon OS 4", "x86_64"), + ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64"), + ("ubuntu-20.04", "Ubuntu 20.04", "x86_64"), + ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64"), + ("ubuntu-22.04", "Ubuntu 22.04", "x86_64"), + ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64"), + ), + "macos": (("macos-12", "macOS 12", "x86_64"),), + "windows": ( + ("windows-2016", "Windows 2016", "amd64"), + ("windows-2019", "Windows 2019", "amd64"), + ("windows-2022", "Windows 2022", "amd64"), + ), + } env = Environment( block_start_string="<%", block_end_string="%>", @@ -171,6 +209,7 @@ def generate_workflows(ctx: Context): "build_repo_needs": NeedsTracker(), "test_salt_listing": test_salt_listing, "test_salt_pkg_listing": test_salt_pkg_listing, + "build_ci_deps_listing": build_ci_deps_listing, } shared_context_file = ( tools.utils.REPO_ROOT / "cicd" / "shared-gh-workflows-context.yml" From 2c6f5d88fda720d18b6de30d78f9f5564556184d Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 9 Oct 2023 14:40:41 +0100 Subject: [PATCH 127/147] Even the release workflow should be working now Signed-off-by: Pedro Algarvio --- .github/workflows/release.yml | 574 +++++++++++++- .github/workflows/staging.yml | 28 + .../templates/build-ci-deps.yml.jinja | 18 + .github/workflows/templates/release.yml.jinja | 4 +- .../test-package-downloads-action.yml.jinja | 737 ++++++++++++++++++ .../test-salt-pkg-repo-downloads.yml.jinja | 3 + .../test-package-downloads-action.yml | 209 ++++- tools/ci.py | 68 -- tools/pre_commit.py | 41 +- 9 files changed, 1572 insertions(+), 110 deletions(-) create mode 100644 .github/workflows/templates/test-package-downloads-action.yml.jinja diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 07785a31e1e..700659a301f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -112,7 +112,7 @@ jobs: - name: Set Cache Seed Output id: set-cache-seed run: | - echo "cache-seed=${{ env.CACHE_SEED }}" >> "$GITHUB_OUTPUT" + tools ci define-cache-seed ${{ env.CACHE_SEED }} download-onedir-artifact: name: Download Staging Onedir Artifact @@ -162,6 +162,518 @@ jobs: retention-days: 7 if-no-files-found: error + windows-2016-ci-deps: + name: Windows 2016 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: windows-2016 + nox-session: ci-test-onedir + platform: windows + arch: amd64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + windows-2019-ci-deps: + name: Windows 2019 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: windows-2019 + nox-session: ci-test-onedir + platform: windows + arch: amd64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + windows-2022-ci-deps: + name: Windows 2022 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: windows-2022 + nox-session: ci-test-onedir + platform: windows + arch: amd64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + macos-12-ci-deps: + name: macOS 12 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action-macos.yml + with: + distro-slug: macos-12 + nox-session: ci-test-onedir + platform: darwin + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + almalinux-8-ci-deps: + name: Alma Linux 8 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: almalinux-8 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + almalinux-8-arm64-ci-deps: + name: Alma Linux 8 Arm64 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: almalinux-8-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + almalinux-9-ci-deps: + name: Alma Linux 9 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: almalinux-9 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + almalinux-9-arm64-ci-deps: + name: Alma Linux 9 Arm64 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: almalinux-9-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + amazonlinux-2-ci-deps: + name: Amazon Linux 2 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: amazonlinux-2 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + amazonlinux-2-arm64-ci-deps: + name: Amazon Linux 2 Arm64 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: amazonlinux-2-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + archlinux-lts-ci-deps: + name: Arch Linux LTS + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: archlinux-lts + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centos-7-ci-deps: + name: CentOS 7 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centos-7 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centos-7-arm64-ci-deps: + name: CentOS 7 Arm64 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centos-7-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centosstream-8-ci-deps: + name: CentOS Stream 8 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centosstream-8 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centosstream-8-arm64-ci-deps: + name: CentOS Stream 8 Arm64 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centosstream-8-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centosstream-9-ci-deps: + name: CentOS Stream 9 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centosstream-9 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + centosstream-9-arm64-ci-deps: + name: CentOS Stream 9 Arm64 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: centosstream-9-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + debian-10-ci-deps: + name: Debian 10 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: debian-10 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + debian-11-ci-deps: + name: Debian 11 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: debian-11 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + debian-11-arm64-ci-deps: + name: Debian 11 Arm64 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: debian-11-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + fedora-37-ci-deps: + name: Fedora 37 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: fedora-37 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + fedora-37-arm64-ci-deps: + name: Fedora 37 Arm64 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: fedora-37-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + fedora-38-ci-deps: + name: Fedora 38 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: fedora-38 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + fedora-38-arm64-ci-deps: + name: Fedora 38 Arm64 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: fedora-38-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + opensuse-15-ci-deps: + name: Opensuse 15 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: opensuse-15 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + photonos-3-ci-deps: + name: Photon OS 3 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: photonos-3 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + photonos-4-ci-deps: + name: Photon OS 4 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: photonos-4 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + photonos-4-arm64-ci-deps: + name: Photon OS 4 Arm64 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: photonos-4-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + ubuntu-2004-ci-deps: + name: Ubuntu 20.04 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: ubuntu-20.04 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + ubuntu-2004-arm64-ci-deps: + name: Ubuntu 20.04 Arm64 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: ubuntu-20.04-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + ubuntu-2204-ci-deps: + name: Ubuntu 22.04 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: ubuntu-22.04 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + ubuntu-2204-arm64-ci-deps: + name: Ubuntu 22.04 Arm64 + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: ubuntu-22.04-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + backup: name: Backup runs-on: @@ -229,6 +741,34 @@ jobs: needs: - prepare-workflow - publish-repositories + - almalinux-8-arm64-ci-deps + - almalinux-8-ci-deps + - almalinux-9-arm64-ci-deps + - almalinux-9-ci-deps + - amazonlinux-2-arm64-ci-deps + - amazonlinux-2-ci-deps + - centos-7-arm64-ci-deps + - centos-7-ci-deps + - centosstream-8-arm64-ci-deps + - centosstream-8-ci-deps + - centosstream-9-arm64-ci-deps + - centosstream-9-ci-deps + - debian-10-ci-deps + - debian-11-arm64-ci-deps + - debian-11-ci-deps + - fedora-37-arm64-ci-deps + - fedora-37-ci-deps + - fedora-38-arm64-ci-deps + - fedora-38-ci-deps + - macos-12-ci-deps + - photonos-3-ci-deps + - photonos-4-arm64-ci-deps + - photonos-4-ci-deps + - ubuntu-2004-arm64-ci-deps + - ubuntu-2004-ci-deps + - ubuntu-2204-arm64-ci-deps + - ubuntu-2204-ci-deps + - windows-2022-ci-deps - download-onedir-artifact uses: ./.github/workflows/test-package-downloads-action.yml with: @@ -416,6 +956,38 @@ jobs: - pkg-download-tests - release - publish-pypi + - windows-2016-ci-deps + - windows-2019-ci-deps + - windows-2022-ci-deps + - macos-12-ci-deps + - almalinux-8-ci-deps + - almalinux-8-arm64-ci-deps + - almalinux-9-ci-deps + - almalinux-9-arm64-ci-deps + - amazonlinux-2-ci-deps + - amazonlinux-2-arm64-ci-deps + - archlinux-lts-ci-deps + - centos-7-ci-deps + - centos-7-arm64-ci-deps + - centosstream-8-ci-deps + - centosstream-8-arm64-ci-deps + - centosstream-9-ci-deps + - centosstream-9-arm64-ci-deps + - debian-10-ci-deps + - debian-11-ci-deps + - debian-11-arm64-ci-deps + - fedora-37-ci-deps + - fedora-37-arm64-ci-deps + - fedora-38-ci-deps + - fedora-38-arm64-ci-deps + - opensuse-15-ci-deps + - photonos-3-ci-deps + - photonos-4-ci-deps + - photonos-4-arm64-ci-deps + - ubuntu-2004-ci-deps + - ubuntu-2004-arm64-ci-deps + - ubuntu-2204-ci-deps + - ubuntu-2204-arm64-ci-deps steps: - name: Get workflow information id: get-workflow-info diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 3c88248c6dc..ac89400d033 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -2974,6 +2974,34 @@ jobs: needs: - prepare-workflow - publish-repositories + - almalinux-8-arm64-ci-deps + - almalinux-8-ci-deps + - almalinux-9-arm64-ci-deps + - almalinux-9-ci-deps + - amazonlinux-2-arm64-ci-deps + - amazonlinux-2-ci-deps + - centos-7-arm64-ci-deps + - centos-7-ci-deps + - centosstream-8-arm64-ci-deps + - centosstream-8-ci-deps + - centosstream-9-arm64-ci-deps + - centosstream-9-ci-deps + - debian-10-ci-deps + - debian-11-arm64-ci-deps + - debian-11-ci-deps + - fedora-37-arm64-ci-deps + - fedora-37-ci-deps + - fedora-38-arm64-ci-deps + - fedora-38-ci-deps + - macos-12-ci-deps + - photonos-3-ci-deps + - photonos-4-arm64-ci-deps + - photonos-4-ci-deps + - ubuntu-2004-arm64-ci-deps + - ubuntu-2004-ci-deps + - ubuntu-2204-arm64-ci-deps + - ubuntu-2204-ci-deps + - windows-2022-ci-deps - build-salt-onedir-linux - build-salt-onedir-macos - build-salt-onedir-windows diff --git a/.github/workflows/templates/build-ci-deps.yml.jinja b/.github/workflows/templates/build-ci-deps.yml.jinja index 70693eff8b7..485637322e9 100644 --- a/.github/workflows/templates/build-ci-deps.yml.jinja +++ b/.github/workflows/templates/build-ci-deps.yml.jinja @@ -4,10 +4,16 @@ <{ slug.replace(".", "") }>-ci-deps: <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> name: <{ display_name }> + <%- if workflow_slug != 'release' %> if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + <%- endif %> needs: - prepare-workflow + <%- if workflow_slug != 'release' %> - build-salt-onedir-windows + <%- else %> + - download-onedir-artifact + <%- endif %> uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: <{ slug }> @@ -27,10 +33,16 @@ <{ slug.replace(".", "") }>-ci-deps: <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> name: <{ display_name }> + <%- if workflow_slug != 'release' %> if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + <%- endif %> needs: - prepare-workflow + <%- if workflow_slug != 'release' %> - build-salt-onedir-macos + <%- else %> + - download-onedir-artifact + <%- endif %> uses: ./.github/workflows/build-deps-ci-action-macos.yml with: distro-slug: <{ slug }> @@ -50,10 +62,16 @@ <{ slug.replace(".", "") }>-ci-deps: <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> name: <{ display_name }> + <%- if workflow_slug != 'release' %> if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + <%- endif %> needs: - prepare-workflow + <%- if workflow_slug != 'release' %> - build-salt-onedir-linux + <%- else %> + - download-onedir-artifact + <%- endif %> uses: ./.github/workflows/build-deps-ci-action.yml with: distro-slug: <{ slug }> diff --git a/.github/workflows/templates/release.yml.jinja b/.github/workflows/templates/release.yml.jinja index 4e109f90463..c79fa26d02f 100644 --- a/.github/workflows/templates/release.yml.jinja +++ b/.github/workflows/templates/release.yml.jinja @@ -140,7 +140,7 @@ permissions: - name: Set Cache Seed Output id: set-cache-seed run: | - echo "cache-seed=${{ env.CACHE_SEED }}" >> "$GITHUB_OUTPUT" + tools ci define-cache-seed ${{ env.CACHE_SEED }} <%- endblock prepare_workflow_job %> <%- endif %> @@ -196,6 +196,8 @@ permissions: retention-days: 7 if-no-files-found: error + <%- include "build-ci-deps.yml.jinja" %> + backup: name: Backup runs-on: diff --git a/.github/workflows/templates/test-package-downloads-action.yml.jinja b/.github/workflows/templates/test-package-downloads-action.yml.jinja new file mode 100644 index 00000000000..ac66c8d8c1f --- /dev/null +++ b/.github/workflows/templates/test-package-downloads-action.yml.jinja @@ -0,0 +1,737 @@ +name: Test Download Packages + +on: + workflow_call: + inputs: + salt-version: + type: string + required: true + description: The Salt version of the packages to install and test + cache-prefix: + required: true + type: string + description: Seed used to invalidate caches + environment: + required: true + type: string + description: The environment to run tests against + latest-release: + required: true + type: string + description: The latest salt release + nox-version: + required: true + type: string + description: The nox version to install + python-version: + required: false + type: string + description: The python version to run tests with + default: "3.10" + package-name: + required: false + type: string + description: The onedir package name to use + default: salt + skip-code-coverage: + required: false + type: boolean + description: Skip code coverage + default: false + nox-session: + required: false + type: string + description: The nox session to run + default: ci-test-onedir + +env: + COLUMNS: 190 + AWS_MAX_ATTEMPTS: "10" + AWS_RETRY_MODE: "adaptive" + PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ + PIP_EXTRA_INDEX_URL: https://pypi.org/simple + +jobs: + + linux: + name: Linux + runs-on: + - self-hosted + - linux + - bastion + environment: ${{ inputs.environment }} + timeout-minutes: 120 # 2 Hours - More than this and something is wrong + strategy: + fail-fast: false + matrix: + include: + <%- for slug, arch, pkg_type in test_salt_pkg_downloads_listing["linux"] %> + - distro-slug: <{ slug }> + arch: <{ arch }> + pkg-type: <{ pkg_type }> + <%- endfor %> + + steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t" + + - name: Checkout Source Code + uses: actions/checkout@v4 + + - name: Download Onedir Tarball as an Artifact + uses: actions/download-artifact@v3 + with: + name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-linux-${{ matrix.arch }}.tar.xz + path: artifacts/ + + - name: Decompress Onedir Tarball + shell: bash + run: | + python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" + cd artifacts + tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-linux-${{ matrix.arch }}.tar.xz + + - name: Download cached nox.${{ matrix.distro-slug }}.tar.* for session ${{ inputs.nox-session }} + uses: actions/cache@v3 + with: + path: nox.${{ matrix.distro-slug }}.tar.* + key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch }}|${{ matrix.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ + hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') + }} + # If we get a cache miss here it means the dependencies step failed to save the cache + fail-on-cache-miss: true + + - name: Setup Python Tools Scripts + uses: ./.github/actions/setup-python-tools-scripts + + - name: Get Salt Project GitHub Actions Bot Environment + run: | + TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") + SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) + echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" + + - name: Start VM + id: spin-up-vm + run: | + tools --timestamps vm create --environment "${SPB_ENVIRONMENT}" --retries=2 ${{ matrix.distro-slug }} + + - name: List Free Space + run: | + tools --timestamps vm ssh ${{ matrix.distro-slug }} -- df -h || true + + - name: Upload Checkout To VM + run: | + tools --timestamps vm rsync ${{ matrix.distro-slug }} + + - name: Decompress .nox Directory + run: | + tools --timestamps vm decompress-dependencies ${{ matrix.distro-slug }} + + - name: Show System Info & Test Plan + env: + SALT_RELEASE: "${{ inputs.salt-version }}" + SALT_REPO_ARCH: ${{ matrix.arch }} + SALT_REPO_TYPE: ${{ inputs.environment }} + SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} + SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} + SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} + SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} + SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" + LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} + run: | + tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ + -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ + --nox-session=${{ inputs.nox-session }}-pkgs ${{ matrix.distro-slug }} -- download-pkgs + + - name: Run Package Download Tests + env: + SALT_RELEASE: "${{ inputs.salt-version }}" + SALT_REPO_ARCH: ${{ matrix.arch }} + SALT_REPO_TYPE: ${{ inputs.environment }} + SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} + SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} + SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} + SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} + SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" + LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} + run: | + tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ + -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ + --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ matrix.distro-slug }} -- download-pkgs + + - name: Combine Coverage Reports + if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' + run: | + tools --timestamps vm combine-coverage ${{ matrix.distro-slug }} + + - name: Download Test Run Artifacts + id: download-artifacts-from-vm + if: always() && steps.spin-up-vm.outcome == 'success' + run: | + tools --timestamps vm download-artifacts ${{ matrix.distro-slug }} + # Delete the salt onedir, we won't need it anymore and it will prevent + # from it showing in the tree command below + rm -rf artifacts/salt* + tree -a artifacts + + - name: Destroy VM + if: always() + run: | + tools --timestamps vm destroy --no-wait ${{ matrix.distro-slug }} || true + + - name: Fix file ownership + run: | + sudo chown -R "$(id -un)" . + + - name: Install Codecov CLI + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + # We can't yet use tokenless uploads with the codecov CLI + # python3 -m pip install codecov-cli + # + curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import + curl -Os https://uploader.codecov.io/latest/linux/codecov + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig + gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM + shasum -a 256 -c codecov.SHA256SUM + chmod +x codecov + + - name: Upload Source Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + if [ ! -s artifacts/coverage/salt.xml ]; then + echo "The artifacts/coverage/salt.xml file does not exist" + exit 1 + fi + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/salt.xml \ + # --flag salt --flag ${{ matrix.distro-slug }} --flag pkg \ + # --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/salt.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags salt,${{ matrix.distro-slug }},pkg \ + --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi + + - name: Upload Tests Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + if [ ! -s artifacts/coverage/tests.xml ]; then + echo "The artifacts/coverage/tests.xml file does not exist" + exit 1 + fi + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/tests.xml \ + # --flag tests --flag ${{ matrix.distro-slug }} --flag pkg \ + # --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/tests.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags tests,${{ matrix.distro-slug }},pkg \ + --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi + + - name: Upload Test Run Artifacts + if: always() && steps.download-artifacts-from-vm.outcome == 'success' + uses: actions/upload-artifact@v3 + with: + name: pkg-testrun-artifacts-${{ matrix.distro-slug }}-${{ matrix.arch }} + path: | + artifacts + !artifacts/salt/* + !artifacts/salt-*.tar.* + + - name: Publish Test Report + uses: mikepenz/action-junit-report@v3 + # always run even if the previous steps fails + if: always() && job.status != 'cancelled' && steps.download-artifacts-from-vm.outcome == 'success' + with: + check_name: Overall Test Results(${{ matrix.distro-slug }} ${{ matrix.arch }}) + report_paths: 'artifacts/xml-unittests-output/*.xml' + annotate_only: true + + + macos: + name: MacOS + runs-on: ${{ matrix.distro-slug }} + environment: ${{ inputs.environment }} + timeout-minutes: 120 # 2 Hours - More than this and something is wrong + strategy: + fail-fast: false + matrix: + include: + <%- for slug, arch, pkg_type in test_salt_pkg_downloads_listing["macos"] %> + - distro-slug: <{ slug }> + arch: <{ arch }> + pkg-type: <{ pkg_type }> + <%- endfor %> + + steps: + + - name: "Throttle Builds" + shell: bash + run: | + t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" + + - name: Checkout Source Code + uses: actions/checkout@v4 + + - name: Download Onedir Tarball as an Artifact + uses: actions/download-artifact@v3 + with: + name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz + path: artifacts/ + + - name: Install System Dependencies + run: | + brew install tree + + - name: Decompress Onedir Tarball + shell: bash + run: | + python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" + cd artifacts + tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz + + - name: Set up Python ${{ inputs.python-version }} + uses: actions/setup-python@v4 + with: + python-version: "${{ inputs.python-version }}" + update-environment: true + + - name: Install Nox + run: | + python3 -m pip install 'nox==${{ inputs.nox-version }}' + + - name: Download cached nox.${{ matrix.distro-slug }}.tar.* for session ${{ inputs.nox-session }} + uses: actions/cache@v3 + with: + path: nox.${{ matrix.distro-slug }}.tar.* + key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch }}|${{ matrix.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ + hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') + }} + # If we get a cache miss here it means the dependencies step failed to save the cache + fail-on-cache-miss: true + + - name: Decompress .nox Directory + run: | + nox --force-color -e decompress-dependencies -- ${{ matrix.distro-slug }} + + - name: Show System Info & Test Plan + env: + SALT_RELEASE: "${{ inputs.salt-version }}" + SKIP_REQUIREMENTS_INSTALL: "1" + PRINT_TEST_SELECTION: "1" + PRINT_TEST_PLAN_ONLY: "1" + PRINT_SYSTEM_INFO: "1" + GITHUB_ACTIONS_PIPELINE: "1" + SKIP_INITIAL_GH_ACTIONS_FAILURES: "1" + SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" + LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} + run: | + sudo -E nox --force-color -e ${{ inputs.nox-session }}-pkgs -- download-pkgs + + - name: Run Package Download Tests + env: + SKIP_REQUIREMENTS_INSTALL: "1" + PRINT_TEST_SELECTION: "0" + PRINT_TEST_PLAN_ONLY: "0" + PRINT_SYSTEM_INFO: "0" + RERUN_FAILURES: "1" + GITHUB_ACTIONS_PIPELINE: "1" + SKIP_INITIAL_GH_ACTIONS_FAILURES: "1" + SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" + COVERAGE_CONTEXT: ${{ matrix.distro-slug }} + SALT_RELEASE: "${{ inputs.salt-version }}" + SALT_REPO_ARCH: ${{ matrix.arch }} + LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" + SALT_REPO_TYPE: ${{ inputs.environment }} + SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} + SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} + SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} + SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} + run: | + sudo -E nox --force-color -e ${{ inputs.nox-session }}-pkgs -- download-pkgs + + - name: Fix file ownership + run: | + sudo chown -R "$(id -un)" . + + - name: Combine Coverage Reports + if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' + run: | + nox --force-color -e combine-coverage + + - name: Prepare Test Run Artifacts + id: download-artifacts-from-vm + if: always() && job.status != 'cancelled' + run: | + # Delete the salt onedir, we won't need it anymore and it will prevent + # from it showing in the tree command below + rm -rf artifacts/salt* + tree -a artifacts + + - name: Install Codecov CLI + if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' + run: | + # We can't yet use tokenless uploads with the codecov CLI + # python3 -m pip install codecov-cli + # + curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import + curl -Os https://uploader.codecov.io/latest/macos/codecov + curl -Os https://uploader.codecov.io/latest/macos/codecov.SHA256SUM + curl -Os https://uploader.codecov.io/latest/macos/codecov.SHA256SUM.sig + gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM + shasum -a 256 -c codecov.SHA256SUM + chmod +x codecov + + - name: Upload Source Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' + run: | + if [ ! -s artifacts/coverage/salt.xml ]; then + echo "The artifacts/coverage/salt.xml file does not exist" + exit 1 + fi + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/salt.xml \ + # --flag salt --flag ${{ matrix.distro-slug }} --flag pkg \ + # --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/salt.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags salt,${{ matrix.distro-slug }},pkg \ + --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi + + - name: Upload Tests Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' + run: | + if [ ! -s artifacts/coverage/tests.xml ]; then + echo "The artifacts/coverage/tests.xml file does not exist" + exit 1 + fi + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/tests.xml \ + # --flag tests --flag ${{ matrix.distro-slug }} --flag pkg \ + # --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/tests.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags tests,${{ matrix.distro-slug }},pkg \ + --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi + + - name: Upload Test Run Artifacts + if: always() + uses: actions/upload-artifact@v3 + with: + name: pkg-testrun-artifacts-${{ matrix.distro-slug }}-${{ matrix.arch }} + path: | + artifacts + !artifacts/salt/* + !artifacts/salt-*.tar.* + + - name: Publish Test Report + uses: mikepenz/action-junit-report@v3 + # always run even if the previous steps fails + if: always() && job.status != 'cancelled' + with: + check_name: Overall Test Results(${{ matrix.distro-slug }} ${{ matrix.arch }}) + report_paths: 'artifacts/xml-unittests-output/*.xml' + annotate_only: true + + + windows: + name: Windows + runs-on: + - self-hosted + - linux + - bastion + environment: ${{ inputs.environment }} + timeout-minutes: 120 # 2 Hours - More than this and something is wrong + strategy: + fail-fast: false + matrix: + include: + <%- for slug, arch, pkg_type in test_salt_pkg_downloads_listing["windows"] %> + - distro-slug: <{ slug }> + arch: <{ arch }> + pkg-type: <{ pkg_type }> + <%- endfor %> + + steps: + - name: Checkout Source Code + uses: actions/checkout@v4 + + - name: Download Onedir Tarball as an Artifact + uses: actions/download-artifact@v3 + with: + name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-windows-${{ matrix.arch }}.tar.xz + path: artifacts/ + + - name: Decompress Onedir Tarball + shell: bash + run: | + python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" + cd artifacts + tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-windows-${{ matrix.arch }}.tar.xz + + - name: Download cached nox.${{ matrix.distro-slug }}.tar.* for session ${{ inputs.nox-session }} + uses: actions/cache@v3 + with: + path: nox.${{ matrix.distro-slug }}.tar.* + key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch }}|${{ matrix.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ + hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') + }} + # If we get a cache miss here it means the dependencies step failed to save the cache + fail-on-cache-miss: true + + - name: Setup Python Tools Scripts + uses: ./.github/actions/setup-python-tools-scripts + + - name: Get Salt Project GitHub Actions Bot Environment + run: | + TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") + SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) + echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" + + - name: Start VM + id: spin-up-vm + run: | + tools --timestamps vm create --environment "${SPB_ENVIRONMENT}" --retries=2 ${{ matrix.distro-slug }} + + - name: List Free Space + run: | + tools --timestamps vm ssh ${{ matrix.distro-slug }} -- df -h || true + + - name: Upload Checkout To VM + run: | + tools --timestamps vm rsync ${{ matrix.distro-slug }} + + - name: Decompress .nox Directory + run: | + tools --timestamps vm decompress-dependencies ${{ matrix.distro-slug }} + + - name: Show System Info & Test Plan + env: + SALT_RELEASE: "${{ inputs.salt-version }}" + SALT_REPO_ARCH: ${{ matrix.arch }} + LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" + SALT_REPO_TYPE: ${{ inputs.environment }} + SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} + SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} + SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} + SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} + SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} + run: | + tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ + -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ + --nox-session=${{ inputs.nox-session }}-pkgs ${{ matrix.distro-slug }} -- download-pkgs + + - name: Run Package Download Tests + env: + SALT_RELEASE: "${{ inputs.salt-version }}" + SALT_REPO_ARCH: ${{ matrix.arch }} + LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" + SALT_REPO_TYPE: ${{ inputs.environment }} + SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} + SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} + SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} + SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} + SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" + DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} + run: | + tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ + -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ + --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ matrix.distro-slug }} -- download-pkgs + + - name: Combine Coverage Reports + if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' + run: | + tools --timestamps vm combine-coverage ${{ matrix.distro-slug }} + + - name: Download Test Run Artifacts + id: download-artifacts-from-vm + if: always() && steps.spin-up-vm.outcome == 'success' + run: | + tools --timestamps vm download-artifacts ${{ matrix.distro-slug }} + # Delete the salt onedir, we won't need it anymore and it will prevent + # from it showing in the tree command below + rm -rf artifacts/salt* + tree -a artifacts + + - name: Destroy VM + if: always() + run: | + tools --timestamps vm destroy --no-wait ${{ matrix.distro-slug }} || true + + - name: Fix file ownership + run: | + sudo chown -R "$(id -un)" . + + - name: Install Codecov CLI + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + # We can't yet use tokenless uploads with the codecov CLI + # python3 -m pip install codecov-cli + # + curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import + curl -Os https://uploader.codecov.io/latest/linux/codecov + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig + gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM + shasum -a 256 -c codecov.SHA256SUM + chmod +x codecov + + - name: Upload Source Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + if [ ! -s artifacts/coverage/salt.xml ]; then + echo "The artifacts/coverage/salt.xml file does not exist" + exit 1 + fi + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/salt.xml \ + # --flag salt --flag ${{ matrix.distro-slug }} --flag pkg \ + # --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/salt.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags salt,${{ matrix.distro-slug }},pkg \ + --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi + + - name: Upload Tests Code Coverage To Codecov + if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' + run: | + if [ ! -s artifacts/coverage/tests.xml ]; then + echo "The artifacts/coverage/tests.xml file does not exist" + exit 1 + fi + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/tests.xml \ + # --flag tests --flag ${{ matrix.distro-slug }} --flag pkg \ + # --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov --file artifacts/coverage/tests.xml \ + --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ + --flags tests,${{ matrix.distro-slug }},pkg \ + --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then + rc=$? + break + fi + rc=$? + n=$((n+1)) + sleep 15 + done + if [ "$rc" -ne 0 ]; then + echo "Failed to upload codecov stats" + exit 1 + fi + + - name: Upload Test Run Artifacts + if: always() && steps.download-artifacts-from-vm.outcome == 'success' + uses: actions/upload-artifact@v3 + with: + name: pkg-testrun-artifacts-${{ matrix.distro-slug }}-${{ matrix.arch }} + path: | + artifacts + !artifacts/salt/* + !artifacts/salt-*.tar.* + + - name: Publish Test Report + uses: mikepenz/action-junit-report@v3 + # always run even if the previous steps fails + if: always() && job.status != 'cancelled' && steps.download-artifacts-from-vm.outcome == 'success' + with: + check_name: Overall Test Results(${{ matrix.distro-slug }} ${{ matrix.arch }} ${{ matrix.pkg-type }} ) + report_paths: 'artifacts/xml-unittests-output/*.xml' + annotate_only: true diff --git a/.github/workflows/templates/test-salt-pkg-repo-downloads.yml.jinja b/.github/workflows/templates/test-salt-pkg-repo-downloads.yml.jinja index b84ae581e59..005c5272ac3 100644 --- a/.github/workflows/templates/test-salt-pkg-repo-downloads.yml.jinja +++ b/.github/workflows/templates/test-salt-pkg-repo-downloads.yml.jinja @@ -13,6 +13,9 @@ needs: - prepare-workflow - publish-repositories + <%- for slug in test_salt_pkg_downloads_needs_slugs %> + - <{ slug }> + <%- endfor %> <%- if gh_environment == "release" %> - download-onedir-artifact <%- else %> diff --git a/.github/workflows/test-package-downloads-action.yml b/.github/workflows/test-package-downloads-action.yml index 32dcd453a57..245ed6f09d0 100644 --- a/.github/workflows/test-package-downloads-action.yml +++ b/.github/workflows/test-package-downloads-action.yml @@ -53,32 +53,6 @@ env: jobs: - generate-matrix: - name: Test Matrix - runs-on: - - self-hosted - - linux - - x86_64 - outputs: - matrix-include: ${{ steps.generate-matrix.outputs.matrix }} - steps: - - - name: "Throttle Builds" - shell: bash - run: | - t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t" - - - name: Checkout Source Code - uses: actions/checkout@v4 - - - name: Setup Python Tools Scripts - uses: ./.github/actions/setup-python-tools-scripts - - - name: Generate Test Matrix - id: generate-matrix - run: | - tools ci pkg-download-matrix - linux: name: Linux runs-on: @@ -87,12 +61,166 @@ jobs: - bastion environment: ${{ inputs.environment }} timeout-minutes: 120 # 2 Hours - More than this and something is wrong - needs: - - generate-matrix strategy: fail-fast: false matrix: - include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include)['linux'] }} + include: + - distro-slug: almalinux-8 + arch: x86_64 + pkg-type: package + - distro-slug: almalinux-8 + arch: x86_64 + pkg-type: onedir + - distro-slug: almalinux-8-arm64 + arch: aarch64 + pkg-type: package + - distro-slug: almalinux-8-arm64 + arch: aarch64 + pkg-type: onedir + - distro-slug: almalinux-9 + arch: x86_64 + pkg-type: package + - distro-slug: almalinux-9 + arch: x86_64 + pkg-type: onedir + - distro-slug: almalinux-9-arm64 + arch: aarch64 + pkg-type: package + - distro-slug: almalinux-9-arm64 + arch: aarch64 + pkg-type: onedir + - distro-slug: amazonlinux-2 + arch: x86_64 + pkg-type: package + - distro-slug: amazonlinux-2 + arch: x86_64 + pkg-type: onedir + - distro-slug: amazonlinux-2-arm64 + arch: aarch64 + pkg-type: package + - distro-slug: amazonlinux-2-arm64 + arch: aarch64 + pkg-type: onedir + - distro-slug: centos-7 + arch: x86_64 + pkg-type: package + - distro-slug: centos-7 + arch: x86_64 + pkg-type: onedir + - distro-slug: centos-7-arm64 + arch: aarch64 + pkg-type: package + - distro-slug: centos-7-arm64 + arch: aarch64 + pkg-type: onedir + - distro-slug: centosstream-8 + arch: x86_64 + pkg-type: package + - distro-slug: centosstream-8 + arch: x86_64 + pkg-type: onedir + - distro-slug: centosstream-8-arm64 + arch: aarch64 + pkg-type: package + - distro-slug: centosstream-8-arm64 + arch: aarch64 + pkg-type: onedir + - distro-slug: centosstream-9 + arch: x86_64 + pkg-type: package + - distro-slug: centosstream-9 + arch: x86_64 + pkg-type: onedir + - distro-slug: centosstream-9-arm64 + arch: aarch64 + pkg-type: package + - distro-slug: centosstream-9-arm64 + arch: aarch64 + pkg-type: onedir + - distro-slug: debian-10 + arch: x86_64 + pkg-type: package + - distro-slug: debian-10 + arch: x86_64 + pkg-type: onedir + - distro-slug: debian-11 + arch: x86_64 + pkg-type: package + - distro-slug: debian-11 + arch: x86_64 + pkg-type: onedir + - distro-slug: debian-11-arm64 + arch: aarch64 + pkg-type: package + - distro-slug: debian-11-arm64 + arch: aarch64 + pkg-type: onedir + - distro-slug: fedora-37 + arch: x86_64 + pkg-type: package + - distro-slug: fedora-37 + arch: x86_64 + pkg-type: onedir + - distro-slug: fedora-37-arm64 + arch: aarch64 + pkg-type: package + - distro-slug: fedora-37-arm64 + arch: aarch64 + pkg-type: onedir + - distro-slug: fedora-38 + arch: x86_64 + pkg-type: package + - distro-slug: fedora-38 + arch: x86_64 + pkg-type: onedir + - distro-slug: fedora-38-arm64 + arch: aarch64 + pkg-type: package + - distro-slug: fedora-38-arm64 + arch: aarch64 + pkg-type: onedir + - distro-slug: photonos-3 + arch: x86_64 + pkg-type: package + - distro-slug: photonos-3 + arch: x86_64 + pkg-type: onedir + - distro-slug: photonos-4 + arch: x86_64 + pkg-type: package + - distro-slug: photonos-4 + arch: x86_64 + pkg-type: onedir + - distro-slug: photonos-4-arm64 + arch: aarch64 + pkg-type: package + - distro-slug: photonos-4-arm64 + arch: aarch64 + pkg-type: onedir + - distro-slug: ubuntu-20.04 + arch: x86_64 + pkg-type: package + - distro-slug: ubuntu-20.04 + arch: x86_64 + pkg-type: onedir + - distro-slug: ubuntu-20.04-arm64 + arch: aarch64 + pkg-type: package + - distro-slug: ubuntu-20.04-arm64 + arch: aarch64 + pkg-type: onedir + - distro-slug: ubuntu-22.04 + arch: x86_64 + pkg-type: package + - distro-slug: ubuntu-22.04 + arch: x86_64 + pkg-type: onedir + - distro-slug: ubuntu-22.04-arm64 + arch: aarch64 + pkg-type: package + - distro-slug: ubuntu-22.04-arm64 + arch: aarch64 + pkg-type: onedir steps: @@ -316,12 +444,16 @@ jobs: runs-on: ${{ matrix.distro-slug }} environment: ${{ inputs.environment }} timeout-minutes: 120 # 2 Hours - More than this and something is wrong - needs: - - generate-matrix strategy: fail-fast: false matrix: - include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include)['macos'] }} + include: + - distro-slug: macos-12 + arch: x86_64 + pkg-type: package + - distro-slug: macos-12 + arch: x86_64 + pkg-type: onedir steps: @@ -536,12 +668,19 @@ jobs: - bastion environment: ${{ inputs.environment }} timeout-minutes: 120 # 2 Hours - More than this and something is wrong - needs: - - generate-matrix strategy: fail-fast: false matrix: - include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include)['windows'] }} + include: + - distro-slug: windows-2022 + arch: amd64 + pkg-type: nsis + - distro-slug: windows-2022 + arch: amd64 + pkg-type: msi + - distro-slug: windows-2022 + arch: amd64 + pkg-type: onedir steps: - name: Checkout Source Code diff --git a/tools/ci.py b/tools/ci.py index 5cebdef78b2..cc6578be789 100644 --- a/tools/ci.py +++ b/tools/ci.py @@ -777,74 +777,6 @@ def pkg_matrix( ctx.exit(0) -@ci.command( - name="pkg-download-matrix", - arguments={}, -) -def pkg_download_matrix(ctx: Context): - """ - Generate the test matrix. - """ - _platforms = {} - linux_entries = ( - ("almalinux-8", "Alma Linux 8", "x86_64", "package"), - ("almalinux-8-arm64", "Alma Linux 8 Arm64", "aarch64", "package"), - ("almalinux-9", "Alma Linux 9", "x86_64", "package"), - ("almalinux-9-arm64", "Alma Linux 9 Arm64", "aarch64", "package"), - ("amazonlinux-2", "Amazon Linux 2", "x86_64", "package"), - ("amazonlinux-2-arm64", "Amazon Linux 2 Arm64", "aarch64", "package"), - ("centos-7", "CentOS 7", "x86_64", "package"), - ("centos-7-arm64", "CentOS 7 Arm64", "aarch64", "package"), - ("centosstream-8", "CentOS Stream 8", "x86_64", "package"), - ("centosstream-8-arm64", "CentOS Stream 8 Arm64", "aarch64", "package"), - ("centosstream-9", "CentOS Stream 9", "x86_64", "package"), - ("centosstream-9-arm64", "CentOS Stream 9 Arm64", "aarch64", "package"), - ("debian-10", "Debian 10", "x86_64", "package"), - ("debian-11", "Debian 11", "x86_64", "package"), - ("debian-11-arm64", "Debian 11 Arm64", "aarch64", "package"), - ("fedora-37", "Fedora 37", "x86_64", "package"), - ("fedora-37-arm64", "Fedora 37 Arm64", "aarch64", "package"), - ("fedora-38", "Fedora 38", "x86_64", "package"), - ("fedora-38-arm64", "Fedora 38 Arm64", "aarch64", "package"), - ("photonos-3", "Photon OS 3", "x86_64", "package"), - ("photonos-4", "Photon OS 4", "x86_64", "package"), - ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64", "package"), - ("ubuntu-20.04", "Ubuntu 20.04", "x86_64", "package"), - ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64", "package"), - ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "package"), - ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "package"), - ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "onedir"), - ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "onedir"), - ) - macos_entries = ( - ("macos-12", "macOS 12", "x86_64", "Package"), - ("macos-12", "macOS 12", "x86_64", "Onedir"), - ) - windows_entries = (("windows-2022", "Windows 2022", "amd64"),) - _matrix = [] - for distro, display_name, arch, pkg_type in linux_entries: - _matrix.append({"distro-slug": distro, "arch": arch, "pkg_type": pkg_type}) - _platforms["linux"] = _matrix - _matrix = [] - for distro, display_name, arch, pkg_type in macos_entries: - _matrix.append({"distro-slug": distro, "arch": arch, "pkg_type": pkg_type}) - _platforms["macos"] = _matrix - _matrix = [] - for distro, display_name, arch in windows_entries: - for pkg_type in ("nsis", "msi", "onedir"): - _matrix.append({"distro-slug": distro, "arch": arch, "pkg_type": pkg_type}) - _platforms["windows"] = _matrix - - ctx.info("Generated matrix:") - ctx.print(_platforms, soft_wrap=True) - - github_output = os.environ.get("GITHUB_OUTPUT") - if github_output is not None: - with open(github_output, "a", encoding="utf-8") as wfh: - wfh.write(f"matrix={json.dumps(_platforms)}\n") - ctx.exit(0) - - @ci.command( name="get-releases", arguments={ diff --git a/tools/pre_commit.py b/tools/pre_commit.py index e4738445606..be773de4217 100644 --- a/tools/pre_commit.py +++ b/tools/pre_commit.py @@ -80,6 +80,9 @@ def generate_workflows(ctx: Context): "test-pkg-downloads": True, }, }, + "Test Package Downloads": { + "template": "test-package-downloads-action.yml", + }, } test_salt_listing = { "linux": ( @@ -136,7 +139,7 @@ def generate_workflows(ctx: Context): ), } build_ci_deps_listing = { - "linux": ( + "linux": [ ("almalinux-8", "Alma Linux 8", "x86_64"), ("almalinux-8-arm64", "Alma Linux 8 Arm64", "aarch64"), ("almalinux-9", "Alma Linux 9", "x86_64"), @@ -165,14 +168,38 @@ def generate_workflows(ctx: Context): ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64"), ("ubuntu-22.04", "Ubuntu 22.04", "x86_64"), ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64"), - ), - "macos": (("macos-12", "macOS 12", "x86_64"),), - "windows": ( + ], + "macos": [ + ("macos-12", "macOS 12", "x86_64"), + ], + "windows": [ ("windows-2016", "Windows 2016", "amd64"), ("windows-2019", "Windows 2019", "amd64"), ("windows-2022", "Windows 2022", "amd64"), - ), + ], } + test_salt_pkg_downloads_listing: dict[str, list[tuple[str, str, str]]] = { + "linux": [], + "macos": [], + "windows": [], + } + for slug, display_name, arch in build_ci_deps_listing["linux"]: + if slug in ("archlinux-lts", "opensuse-15"): + continue + for pkg_type in ("package", "onedir"): + test_salt_pkg_downloads_listing["linux"].append((slug, arch, pkg_type)) + for slug, display_name, arch in build_ci_deps_listing["macos"]: + for pkg_type in ("package", "onedir"): + test_salt_pkg_downloads_listing["macos"].append((slug, arch, pkg_type)) + for slug, display_name, arch in build_ci_deps_listing["windows"][-1:]: + for pkg_type in ("nsis", "msi", "onedir"): + test_salt_pkg_downloads_listing["windows"].append((slug, arch, pkg_type)) + + test_salt_pkg_downloads_needs_slugs = set() + for platform in test_salt_pkg_downloads_listing: + for slug, _, _ in test_salt_pkg_downloads_listing[platform]: + test_salt_pkg_downloads_needs_slugs.add(f"{slug.replace('.', '')}-ci-deps") + env = Environment( block_start_string="<%", block_end_string="%>", @@ -210,6 +237,10 @@ def generate_workflows(ctx: Context): "test_salt_listing": test_salt_listing, "test_salt_pkg_listing": test_salt_pkg_listing, "build_ci_deps_listing": build_ci_deps_listing, + "test_salt_pkg_downloads_listing": test_salt_pkg_downloads_listing, + "test_salt_pkg_downloads_needs_slugs": sorted( + test_salt_pkg_downloads_needs_slugs + ), } shared_context_file = ( tools.utils.REPO_ROOT / "cicd" / "shared-gh-workflows-context.yml" From 5a9703c580a3f8a174e83c696adca8e9b3f03ce1 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 8 Oct 2023 18:27:32 +0100 Subject: [PATCH 128/147] Not that many `onedir` package download tests Signed-off-by: Pedro Algarvio --- .../test-package-downloads-action.yml | 80 +------------------ tools/pre_commit.py | 12 ++- 2 files changed, 12 insertions(+), 80 deletions(-) diff --git a/.github/workflows/test-package-downloads-action.yml b/.github/workflows/test-package-downloads-action.yml index 245ed6f09d0..6e7b04a7f5f 100644 --- a/.github/workflows/test-package-downloads-action.yml +++ b/.github/workflows/test-package-downloads-action.yml @@ -68,156 +68,84 @@ jobs: - distro-slug: almalinux-8 arch: x86_64 pkg-type: package - - distro-slug: almalinux-8 - arch: x86_64 - pkg-type: onedir - distro-slug: almalinux-8-arm64 arch: aarch64 pkg-type: package - - distro-slug: almalinux-8-arm64 - arch: aarch64 - pkg-type: onedir - distro-slug: almalinux-9 arch: x86_64 pkg-type: package - - distro-slug: almalinux-9 - arch: x86_64 - pkg-type: onedir - distro-slug: almalinux-9-arm64 arch: aarch64 pkg-type: package - - distro-slug: almalinux-9-arm64 - arch: aarch64 - pkg-type: onedir - distro-slug: amazonlinux-2 arch: x86_64 pkg-type: package - - distro-slug: amazonlinux-2 - arch: x86_64 - pkg-type: onedir - distro-slug: amazonlinux-2-arm64 arch: aarch64 pkg-type: package - - distro-slug: amazonlinux-2-arm64 - arch: aarch64 - pkg-type: onedir - distro-slug: centos-7 arch: x86_64 pkg-type: package - - distro-slug: centos-7 - arch: x86_64 - pkg-type: onedir - distro-slug: centos-7-arm64 arch: aarch64 pkg-type: package - - distro-slug: centos-7-arm64 - arch: aarch64 - pkg-type: onedir - distro-slug: centosstream-8 arch: x86_64 pkg-type: package - - distro-slug: centosstream-8 - arch: x86_64 - pkg-type: onedir - distro-slug: centosstream-8-arm64 arch: aarch64 pkg-type: package - - distro-slug: centosstream-8-arm64 - arch: aarch64 - pkg-type: onedir - distro-slug: centosstream-9 arch: x86_64 pkg-type: package - - distro-slug: centosstream-9 - arch: x86_64 - pkg-type: onedir - distro-slug: centosstream-9-arm64 arch: aarch64 pkg-type: package - - distro-slug: centosstream-9-arm64 - arch: aarch64 - pkg-type: onedir - distro-slug: debian-10 arch: x86_64 pkg-type: package - - distro-slug: debian-10 - arch: x86_64 - pkg-type: onedir - - distro-slug: debian-11 - arch: x86_64 - pkg-type: package - distro-slug: debian-11 arch: x86_64 - pkg-type: onedir - - distro-slug: debian-11-arm64 - arch: aarch64 pkg-type: package - distro-slug: debian-11-arm64 arch: aarch64 - pkg-type: onedir - - distro-slug: fedora-37 - arch: x86_64 pkg-type: package - distro-slug: fedora-37 arch: x86_64 - pkg-type: onedir - - distro-slug: fedora-37-arm64 - arch: aarch64 pkg-type: package - distro-slug: fedora-37-arm64 arch: aarch64 - pkg-type: onedir - - distro-slug: fedora-38 - arch: x86_64 pkg-type: package - distro-slug: fedora-38 arch: x86_64 - pkg-type: onedir - - distro-slug: fedora-38-arm64 - arch: aarch64 pkg-type: package - distro-slug: fedora-38-arm64 arch: aarch64 - pkg-type: onedir - - distro-slug: photonos-3 - arch: x86_64 pkg-type: package - distro-slug: photonos-3 - arch: x86_64 - pkg-type: onedir - - distro-slug: photonos-4 arch: x86_64 pkg-type: package - distro-slug: photonos-4 arch: x86_64 - pkg-type: onedir - - distro-slug: photonos-4-arm64 - arch: aarch64 pkg-type: package - distro-slug: photonos-4-arm64 arch: aarch64 - pkg-type: onedir - - distro-slug: ubuntu-20.04 - arch: x86_64 pkg-type: package - distro-slug: ubuntu-20.04 arch: x86_64 - pkg-type: onedir - - distro-slug: ubuntu-20.04-arm64 - arch: aarch64 pkg-type: package - distro-slug: ubuntu-20.04-arm64 arch: aarch64 - pkg-type: onedir - - distro-slug: ubuntu-22.04 - arch: x86_64 pkg-type: package - distro-slug: ubuntu-22.04 arch: x86_64 - pkg-type: onedir + pkg-type: package - distro-slug: ubuntu-22.04-arm64 arch: aarch64 pkg-type: package + - distro-slug: ubuntu-22.04 + arch: x86_64 + pkg-type: onedir - distro-slug: ubuntu-22.04-arm64 arch: aarch64 pkg-type: onedir diff --git a/tools/pre_commit.py b/tools/pre_commit.py index be773de4217..1dfbfb70476 100644 --- a/tools/pre_commit.py +++ b/tools/pre_commit.py @@ -186,11 +186,15 @@ def generate_workflows(ctx: Context): for slug, display_name, arch in build_ci_deps_listing["linux"]: if slug in ("archlinux-lts", "opensuse-15"): continue - for pkg_type in ("package", "onedir"): - test_salt_pkg_downloads_listing["linux"].append((slug, arch, pkg_type)) + test_salt_pkg_downloads_listing["linux"].append((slug, arch, "package")) + for slug, display_name, arch in build_ci_deps_listing["linux"][-2:]: + if slug in ("archlinux-lts", "opensuse-15"): + continue + test_salt_pkg_downloads_listing["linux"].append((slug, arch, "onedir")) for slug, display_name, arch in build_ci_deps_listing["macos"]: - for pkg_type in ("package", "onedir"): - test_salt_pkg_downloads_listing["macos"].append((slug, arch, pkg_type)) + test_salt_pkg_downloads_listing["macos"].append((slug, arch, "package")) + for slug, display_name, arch in build_ci_deps_listing["macos"][-1:]: + test_salt_pkg_downloads_listing["macos"].append((slug, arch, "onedir")) for slug, display_name, arch in build_ci_deps_listing["windows"][-1:]: for pkg_type in ("nsis", "msi", "onedir"): test_salt_pkg_downloads_listing["windows"].append((slug, arch, pkg_type)) From 2afb2de14fec7da79f0459012289c96288f321d1 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 8 Oct 2023 18:33:13 +0100 Subject: [PATCH 129/147] Remove unnecessary environment variable passing Signed-off-by: Pedro Algarvio --- .../templates/test-package-downloads-action.yml.jinja | 8 ++++---- .github/workflows/test-package-downloads-action.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/templates/test-package-downloads-action.yml.jinja b/.github/workflows/templates/test-package-downloads-action.yml.jinja index ac66c8d8c1f..6c897f81f87 100644 --- a/.github/workflows/templates/test-package-downloads-action.yml.jinja +++ b/.github/workflows/templates/test-package-downloads-action.yml.jinja @@ -144,7 +144,7 @@ jobs: DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} run: | tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ - -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ --nox-session=${{ inputs.nox-session }}-pkgs ${{ matrix.distro-slug }} -- download-pkgs @@ -162,7 +162,7 @@ jobs: DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} run: | tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ - -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ matrix.distro-slug }} -- download-pkgs @@ -593,7 +593,7 @@ jobs: DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} run: | tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ - -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ --nox-session=${{ inputs.nox-session }}-pkgs ${{ matrix.distro-slug }} -- download-pkgs @@ -611,7 +611,7 @@ jobs: DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} run: | tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ - -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ matrix.distro-slug }} -- download-pkgs diff --git a/.github/workflows/test-package-downloads-action.yml b/.github/workflows/test-package-downloads-action.yml index 6e7b04a7f5f..908e064ae85 100644 --- a/.github/workflows/test-package-downloads-action.yml +++ b/.github/workflows/test-package-downloads-action.yml @@ -223,7 +223,7 @@ jobs: DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} run: | tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ - -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ --nox-session=${{ inputs.nox-session }}-pkgs ${{ matrix.distro-slug }} -- download-pkgs @@ -241,7 +241,7 @@ jobs: DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} run: | tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ - -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ matrix.distro-slug }} -- download-pkgs @@ -677,7 +677,7 @@ jobs: DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} run: | tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \ - -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ --nox-session=${{ inputs.nox-session }}-pkgs ${{ matrix.distro-slug }} -- download-pkgs @@ -695,7 +695,7 @@ jobs: DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} run: | tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ - -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ + -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ matrix.distro-slug }} -- download-pkgs From d068741119594d6df3c627487a3b4a1b870997e0 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 8 Oct 2023 18:38:10 +0100 Subject: [PATCH 130/147] Fix the Onedir Tarball Artifact name Signed-off-by: Pedro Algarvio --- .../templates/test-package-downloads-action.yml.jinja | 4 ++-- .github/workflows/test-package-downloads-action.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/templates/test-package-downloads-action.yml.jinja b/.github/workflows/templates/test-package-downloads-action.yml.jinja index 6c897f81f87..348b0d17227 100644 --- a/.github/workflows/templates/test-package-downloads-action.yml.jinja +++ b/.github/workflows/templates/test-package-downloads-action.yml.jinja @@ -316,7 +316,7 @@ jobs: - name: Download Onedir Tarball as an Artifact uses: actions/download-artifact@v3 with: - name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz + name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-darwin-${{ matrix.arch }}.tar.xz path: artifacts/ - name: Install System Dependencies @@ -328,7 +328,7 @@ jobs: run: | python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" cd artifacts - tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz + tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-darwin-${{ matrix.arch }}.tar.xz - name: Set up Python ${{ inputs.python-version }} uses: actions/setup-python@v4 diff --git a/.github/workflows/test-package-downloads-action.yml b/.github/workflows/test-package-downloads-action.yml index 908e064ae85..5473ebd17ec 100644 --- a/.github/workflows/test-package-downloads-action.yml +++ b/.github/workflows/test-package-downloads-action.yml @@ -396,7 +396,7 @@ jobs: - name: Download Onedir Tarball as an Artifact uses: actions/download-artifact@v3 with: - name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz + name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-darwin-${{ matrix.arch }}.tar.xz path: artifacts/ - name: Install System Dependencies @@ -408,7 +408,7 @@ jobs: run: | python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" cd artifacts - tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz + tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-darwin-${{ matrix.arch }}.tar.xz - name: Set up Python ${{ inputs.python-version }} uses: actions/setup-python@v4 From fdece642536057ce5cc176046652fed4944ed5a8 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 9 Oct 2023 14:41:20 +0100 Subject: [PATCH 131/147] Visual grouping of CI Dependencies install Signed-off-by: Pedro Algarvio --- .../workflows/build-deps-ci-action-macos.yml | 4 +- .github/workflows/build-deps-ci-action.yml | 4 +- .github/workflows/ci.yml | 64 +++++++++---------- .github/workflows/nightly.yml | 64 +++++++++---------- .github/workflows/release.yml | 64 +++++++++---------- .github/workflows/scheduled.yml | 64 +++++++++---------- .github/workflows/staging.yml | 64 +++++++++---------- .../templates/build-ci-deps.yml.jinja | 6 +- 8 files changed, 167 insertions(+), 167 deletions(-) diff --git a/.github/workflows/build-deps-ci-action-macos.yml b/.github/workflows/build-deps-ci-action-macos.yml index ded5ad9c794..350230e9c5c 100644 --- a/.github/workflows/build-deps-ci-action-macos.yml +++ b/.github/workflows/build-deps-ci-action-macos.yml @@ -1,5 +1,5 @@ --- -name: Test Dependencies +name: Install Test Dependencies on: workflow_call: @@ -53,7 +53,7 @@ env: jobs: dependencies: - name: Test Dependencies + name: Install runs-on: ${{ inputs.distro-slug }} timeout-minutes: 90 steps: diff --git a/.github/workflows/build-deps-ci-action.yml b/.github/workflows/build-deps-ci-action.yml index 40c1708c439..4fe391d0384 100644 --- a/.github/workflows/build-deps-ci-action.yml +++ b/.github/workflows/build-deps-ci-action.yml @@ -1,5 +1,5 @@ --- -name: Test Dependencies +name: Install Test Dependencies on: workflow_call: @@ -54,7 +54,7 @@ env: jobs: dependencies: - name: Test Dependencies + name: Install runs-on: - self-hosted - linux diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cabeaf684cb..6a45d047240 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -628,7 +628,7 @@ jobs: source: "src" windows-2016-ci-deps: - name: Windows 2016 + name: Windows 2016 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -645,7 +645,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 windows-2019-ci-deps: - name: Windows 2019 + name: Windows 2019 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -662,7 +662,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 windows-2022-ci-deps: - name: Windows 2022 + name: Windows 2022 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -679,7 +679,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 macos-12-ci-deps: - name: macOS 12 + name: macOS 12 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -696,7 +696,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-8-ci-deps: - name: Alma Linux 8 + name: Alma Linux 8 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -713,7 +713,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-8-arm64-ci-deps: - name: Alma Linux 8 Arm64 + name: Alma Linux 8 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -730,7 +730,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-9-ci-deps: - name: Alma Linux 9 + name: Alma Linux 9 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -747,7 +747,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-9-arm64-ci-deps: - name: Alma Linux 9 Arm64 + name: Alma Linux 9 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -764,7 +764,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-ci-deps: - name: Amazon Linux 2 + name: Amazon Linux 2 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -781,7 +781,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-arm64-ci-deps: - name: Amazon Linux 2 Arm64 + name: Amazon Linux 2 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -798,7 +798,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 archlinux-lts-ci-deps: - name: Arch Linux LTS + name: Arch Linux LTS Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -815,7 +815,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centos-7-ci-deps: - name: CentOS 7 + name: CentOS 7 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -832,7 +832,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centos-7-arm64-ci-deps: - name: CentOS 7 Arm64 + name: CentOS 7 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -849,7 +849,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-8-ci-deps: - name: CentOS Stream 8 + name: CentOS Stream 8 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -866,7 +866,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-8-arm64-ci-deps: - name: CentOS Stream 8 Arm64 + name: CentOS Stream 8 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -883,7 +883,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-9-ci-deps: - name: CentOS Stream 9 + name: CentOS Stream 9 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -900,7 +900,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-9-arm64-ci-deps: - name: CentOS Stream 9 Arm64 + name: CentOS Stream 9 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -917,7 +917,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-10-ci-deps: - name: Debian 10 + name: Debian 10 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -934,7 +934,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-11-ci-deps: - name: Debian 11 + name: Debian 11 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -951,7 +951,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-11-arm64-ci-deps: - name: Debian 11 Arm64 + name: Debian 11 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -968,7 +968,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-37-ci-deps: - name: Fedora 37 + name: Fedora 37 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -985,7 +985,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-37-arm64-ci-deps: - name: Fedora 37 Arm64 + name: Fedora 37 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1002,7 +1002,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-38-ci-deps: - name: Fedora 38 + name: Fedora 38 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1019,7 +1019,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-38-arm64-ci-deps: - name: Fedora 38 Arm64 + name: Fedora 38 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1036,7 +1036,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 opensuse-15-ci-deps: - name: Opensuse 15 + name: Opensuse 15 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1053,7 +1053,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-3-ci-deps: - name: Photon OS 3 + name: Photon OS 3 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1070,7 +1070,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-4-ci-deps: - name: Photon OS 4 + name: Photon OS 4 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1087,7 +1087,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-4-arm64-ci-deps: - name: Photon OS 4 Arm64 + name: Photon OS 4 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1104,7 +1104,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2004-ci-deps: - name: Ubuntu 20.04 + name: Ubuntu 20.04 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1121,7 +1121,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2004-arm64-ci-deps: - name: Ubuntu 20.04 Arm64 + name: Ubuntu 20.04 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1138,7 +1138,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2204-ci-deps: - name: Ubuntu 22.04 + name: Ubuntu 22.04 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1155,7 +1155,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2204-arm64-ci-deps: - name: Ubuntu 22.04 Arm64 + name: Ubuntu 22.04 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 6f570114738..0a83fb7dec4 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -689,7 +689,7 @@ jobs: secrets: inherit windows-2016-ci-deps: - name: Windows 2016 + name: Windows 2016 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -706,7 +706,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 windows-2019-ci-deps: - name: Windows 2019 + name: Windows 2019 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -723,7 +723,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 windows-2022-ci-deps: - name: Windows 2022 + name: Windows 2022 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -740,7 +740,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 macos-12-ci-deps: - name: macOS 12 + name: macOS 12 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -757,7 +757,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-8-ci-deps: - name: Alma Linux 8 + name: Alma Linux 8 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -774,7 +774,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-8-arm64-ci-deps: - name: Alma Linux 8 Arm64 + name: Alma Linux 8 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -791,7 +791,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-9-ci-deps: - name: Alma Linux 9 + name: Alma Linux 9 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -808,7 +808,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-9-arm64-ci-deps: - name: Alma Linux 9 Arm64 + name: Alma Linux 9 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -825,7 +825,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-ci-deps: - name: Amazon Linux 2 + name: Amazon Linux 2 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -842,7 +842,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-arm64-ci-deps: - name: Amazon Linux 2 Arm64 + name: Amazon Linux 2 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -859,7 +859,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 archlinux-lts-ci-deps: - name: Arch Linux LTS + name: Arch Linux LTS Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -876,7 +876,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centos-7-ci-deps: - name: CentOS 7 + name: CentOS 7 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -893,7 +893,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centos-7-arm64-ci-deps: - name: CentOS 7 Arm64 + name: CentOS 7 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -910,7 +910,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-8-ci-deps: - name: CentOS Stream 8 + name: CentOS Stream 8 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -927,7 +927,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-8-arm64-ci-deps: - name: CentOS Stream 8 Arm64 + name: CentOS Stream 8 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -944,7 +944,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-9-ci-deps: - name: CentOS Stream 9 + name: CentOS Stream 9 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -961,7 +961,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-9-arm64-ci-deps: - name: CentOS Stream 9 Arm64 + name: CentOS Stream 9 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -978,7 +978,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-10-ci-deps: - name: Debian 10 + name: Debian 10 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -995,7 +995,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-11-ci-deps: - name: Debian 11 + name: Debian 11 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1012,7 +1012,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-11-arm64-ci-deps: - name: Debian 11 Arm64 + name: Debian 11 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1029,7 +1029,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-37-ci-deps: - name: Fedora 37 + name: Fedora 37 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1046,7 +1046,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-37-arm64-ci-deps: - name: Fedora 37 Arm64 + name: Fedora 37 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1063,7 +1063,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-38-ci-deps: - name: Fedora 38 + name: Fedora 38 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1080,7 +1080,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-38-arm64-ci-deps: - name: Fedora 38 Arm64 + name: Fedora 38 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1097,7 +1097,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 opensuse-15-ci-deps: - name: Opensuse 15 + name: Opensuse 15 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1114,7 +1114,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-3-ci-deps: - name: Photon OS 3 + name: Photon OS 3 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1131,7 +1131,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-4-ci-deps: - name: Photon OS 4 + name: Photon OS 4 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1148,7 +1148,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-4-arm64-ci-deps: - name: Photon OS 4 Arm64 + name: Photon OS 4 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1165,7 +1165,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2004-ci-deps: - name: Ubuntu 20.04 + name: Ubuntu 20.04 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1182,7 +1182,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2004-arm64-ci-deps: - name: Ubuntu 20.04 Arm64 + name: Ubuntu 20.04 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1199,7 +1199,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2204-ci-deps: - name: Ubuntu 22.04 + name: Ubuntu 22.04 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1216,7 +1216,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2204-arm64-ci-deps: - name: Ubuntu 22.04 Arm64 + name: Ubuntu 22.04 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 700659a301f..7a0b40d8e4b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -163,7 +163,7 @@ jobs: if-no-files-found: error windows-2016-ci-deps: - name: Windows 2016 + name: Windows 2016 Deps needs: - prepare-workflow - download-onedir-artifact @@ -179,7 +179,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 windows-2019-ci-deps: - name: Windows 2019 + name: Windows 2019 Deps needs: - prepare-workflow - download-onedir-artifact @@ -195,7 +195,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 windows-2022-ci-deps: - name: Windows 2022 + name: Windows 2022 Deps needs: - prepare-workflow - download-onedir-artifact @@ -211,7 +211,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 macos-12-ci-deps: - name: macOS 12 + name: macOS 12 Deps needs: - prepare-workflow - download-onedir-artifact @@ -227,7 +227,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-8-ci-deps: - name: Alma Linux 8 + name: Alma Linux 8 Deps needs: - prepare-workflow - download-onedir-artifact @@ -243,7 +243,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-8-arm64-ci-deps: - name: Alma Linux 8 Arm64 + name: Alma Linux 8 Arm64 Deps needs: - prepare-workflow - download-onedir-artifact @@ -259,7 +259,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-9-ci-deps: - name: Alma Linux 9 + name: Alma Linux 9 Deps needs: - prepare-workflow - download-onedir-artifact @@ -275,7 +275,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-9-arm64-ci-deps: - name: Alma Linux 9 Arm64 + name: Alma Linux 9 Arm64 Deps needs: - prepare-workflow - download-onedir-artifact @@ -291,7 +291,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-ci-deps: - name: Amazon Linux 2 + name: Amazon Linux 2 Deps needs: - prepare-workflow - download-onedir-artifact @@ -307,7 +307,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-arm64-ci-deps: - name: Amazon Linux 2 Arm64 + name: Amazon Linux 2 Arm64 Deps needs: - prepare-workflow - download-onedir-artifact @@ -323,7 +323,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 archlinux-lts-ci-deps: - name: Arch Linux LTS + name: Arch Linux LTS Deps needs: - prepare-workflow - download-onedir-artifact @@ -339,7 +339,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centos-7-ci-deps: - name: CentOS 7 + name: CentOS 7 Deps needs: - prepare-workflow - download-onedir-artifact @@ -355,7 +355,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centos-7-arm64-ci-deps: - name: CentOS 7 Arm64 + name: CentOS 7 Arm64 Deps needs: - prepare-workflow - download-onedir-artifact @@ -371,7 +371,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-8-ci-deps: - name: CentOS Stream 8 + name: CentOS Stream 8 Deps needs: - prepare-workflow - download-onedir-artifact @@ -387,7 +387,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-8-arm64-ci-deps: - name: CentOS Stream 8 Arm64 + name: CentOS Stream 8 Arm64 Deps needs: - prepare-workflow - download-onedir-artifact @@ -403,7 +403,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-9-ci-deps: - name: CentOS Stream 9 + name: CentOS Stream 9 Deps needs: - prepare-workflow - download-onedir-artifact @@ -419,7 +419,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-9-arm64-ci-deps: - name: CentOS Stream 9 Arm64 + name: CentOS Stream 9 Arm64 Deps needs: - prepare-workflow - download-onedir-artifact @@ -435,7 +435,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-10-ci-deps: - name: Debian 10 + name: Debian 10 Deps needs: - prepare-workflow - download-onedir-artifact @@ -451,7 +451,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-11-ci-deps: - name: Debian 11 + name: Debian 11 Deps needs: - prepare-workflow - download-onedir-artifact @@ -467,7 +467,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-11-arm64-ci-deps: - name: Debian 11 Arm64 + name: Debian 11 Arm64 Deps needs: - prepare-workflow - download-onedir-artifact @@ -483,7 +483,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-37-ci-deps: - name: Fedora 37 + name: Fedora 37 Deps needs: - prepare-workflow - download-onedir-artifact @@ -499,7 +499,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-37-arm64-ci-deps: - name: Fedora 37 Arm64 + name: Fedora 37 Arm64 Deps needs: - prepare-workflow - download-onedir-artifact @@ -515,7 +515,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-38-ci-deps: - name: Fedora 38 + name: Fedora 38 Deps needs: - prepare-workflow - download-onedir-artifact @@ -531,7 +531,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-38-arm64-ci-deps: - name: Fedora 38 Arm64 + name: Fedora 38 Arm64 Deps needs: - prepare-workflow - download-onedir-artifact @@ -547,7 +547,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 opensuse-15-ci-deps: - name: Opensuse 15 + name: Opensuse 15 Deps needs: - prepare-workflow - download-onedir-artifact @@ -563,7 +563,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-3-ci-deps: - name: Photon OS 3 + name: Photon OS 3 Deps needs: - prepare-workflow - download-onedir-artifact @@ -579,7 +579,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-4-ci-deps: - name: Photon OS 4 + name: Photon OS 4 Deps needs: - prepare-workflow - download-onedir-artifact @@ -595,7 +595,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-4-arm64-ci-deps: - name: Photon OS 4 Arm64 + name: Photon OS 4 Arm64 Deps needs: - prepare-workflow - download-onedir-artifact @@ -611,7 +611,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2004-ci-deps: - name: Ubuntu 20.04 + name: Ubuntu 20.04 Deps needs: - prepare-workflow - download-onedir-artifact @@ -627,7 +627,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2004-arm64-ci-deps: - name: Ubuntu 20.04 Arm64 + name: Ubuntu 20.04 Arm64 Deps needs: - prepare-workflow - download-onedir-artifact @@ -643,7 +643,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2204-ci-deps: - name: Ubuntu 22.04 + name: Ubuntu 22.04 Deps needs: - prepare-workflow - download-onedir-artifact @@ -659,7 +659,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2204-arm64-ci-deps: - name: Ubuntu 22.04 Arm64 + name: Ubuntu 22.04 Arm64 Deps needs: - prepare-workflow - download-onedir-artifact diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index f0adb6704ba..4aa3a61665f 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -662,7 +662,7 @@ jobs: source: "src" windows-2016-ci-deps: - name: Windows 2016 + name: Windows 2016 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -679,7 +679,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 windows-2019-ci-deps: - name: Windows 2019 + name: Windows 2019 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -696,7 +696,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 windows-2022-ci-deps: - name: Windows 2022 + name: Windows 2022 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -713,7 +713,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 macos-12-ci-deps: - name: macOS 12 + name: macOS 12 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -730,7 +730,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-8-ci-deps: - name: Alma Linux 8 + name: Alma Linux 8 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -747,7 +747,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-8-arm64-ci-deps: - name: Alma Linux 8 Arm64 + name: Alma Linux 8 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -764,7 +764,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-9-ci-deps: - name: Alma Linux 9 + name: Alma Linux 9 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -781,7 +781,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-9-arm64-ci-deps: - name: Alma Linux 9 Arm64 + name: Alma Linux 9 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -798,7 +798,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-ci-deps: - name: Amazon Linux 2 + name: Amazon Linux 2 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -815,7 +815,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-arm64-ci-deps: - name: Amazon Linux 2 Arm64 + name: Amazon Linux 2 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -832,7 +832,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 archlinux-lts-ci-deps: - name: Arch Linux LTS + name: Arch Linux LTS Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -849,7 +849,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centos-7-ci-deps: - name: CentOS 7 + name: CentOS 7 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -866,7 +866,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centos-7-arm64-ci-deps: - name: CentOS 7 Arm64 + name: CentOS 7 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -883,7 +883,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-8-ci-deps: - name: CentOS Stream 8 + name: CentOS Stream 8 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -900,7 +900,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-8-arm64-ci-deps: - name: CentOS Stream 8 Arm64 + name: CentOS Stream 8 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -917,7 +917,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-9-ci-deps: - name: CentOS Stream 9 + name: CentOS Stream 9 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -934,7 +934,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-9-arm64-ci-deps: - name: CentOS Stream 9 Arm64 + name: CentOS Stream 9 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -951,7 +951,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-10-ci-deps: - name: Debian 10 + name: Debian 10 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -968,7 +968,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-11-ci-deps: - name: Debian 11 + name: Debian 11 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -985,7 +985,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-11-arm64-ci-deps: - name: Debian 11 Arm64 + name: Debian 11 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1002,7 +1002,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-37-ci-deps: - name: Fedora 37 + name: Fedora 37 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1019,7 +1019,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-37-arm64-ci-deps: - name: Fedora 37 Arm64 + name: Fedora 37 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1036,7 +1036,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-38-ci-deps: - name: Fedora 38 + name: Fedora 38 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1053,7 +1053,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-38-arm64-ci-deps: - name: Fedora 38 Arm64 + name: Fedora 38 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1070,7 +1070,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 opensuse-15-ci-deps: - name: Opensuse 15 + name: Opensuse 15 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1087,7 +1087,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-3-ci-deps: - name: Photon OS 3 + name: Photon OS 3 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1104,7 +1104,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-4-ci-deps: - name: Photon OS 4 + name: Photon OS 4 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1121,7 +1121,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-4-arm64-ci-deps: - name: Photon OS 4 Arm64 + name: Photon OS 4 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1138,7 +1138,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2004-ci-deps: - name: Ubuntu 20.04 + name: Ubuntu 20.04 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1155,7 +1155,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2004-arm64-ci-deps: - name: Ubuntu 20.04 Arm64 + name: Ubuntu 20.04 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1172,7 +1172,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2204-ci-deps: - name: Ubuntu 22.04 + name: Ubuntu 22.04 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1189,7 +1189,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2204-arm64-ci-deps: - name: Ubuntu 22.04 Arm64 + name: Ubuntu 22.04 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index ac89400d033..4a319ff5e95 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -684,7 +684,7 @@ jobs: secrets: inherit windows-2016-ci-deps: - name: Windows 2016 + name: Windows 2016 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -701,7 +701,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 windows-2019-ci-deps: - name: Windows 2019 + name: Windows 2019 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -718,7 +718,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 windows-2022-ci-deps: - name: Windows 2022 + name: Windows 2022 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -735,7 +735,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 macos-12-ci-deps: - name: macOS 12 + name: macOS 12 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -752,7 +752,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-8-ci-deps: - name: Alma Linux 8 + name: Alma Linux 8 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -769,7 +769,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-8-arm64-ci-deps: - name: Alma Linux 8 Arm64 + name: Alma Linux 8 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -786,7 +786,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-9-ci-deps: - name: Alma Linux 9 + name: Alma Linux 9 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -803,7 +803,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 almalinux-9-arm64-ci-deps: - name: Alma Linux 9 Arm64 + name: Alma Linux 9 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -820,7 +820,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-ci-deps: - name: Amazon Linux 2 + name: Amazon Linux 2 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -837,7 +837,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-arm64-ci-deps: - name: Amazon Linux 2 Arm64 + name: Amazon Linux 2 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -854,7 +854,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 archlinux-lts-ci-deps: - name: Arch Linux LTS + name: Arch Linux LTS Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -871,7 +871,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centos-7-ci-deps: - name: CentOS 7 + name: CentOS 7 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -888,7 +888,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centos-7-arm64-ci-deps: - name: CentOS 7 Arm64 + name: CentOS 7 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -905,7 +905,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-8-ci-deps: - name: CentOS Stream 8 + name: CentOS Stream 8 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -922,7 +922,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-8-arm64-ci-deps: - name: CentOS Stream 8 Arm64 + name: CentOS Stream 8 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -939,7 +939,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-9-ci-deps: - name: CentOS Stream 9 + name: CentOS Stream 9 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -956,7 +956,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 centosstream-9-arm64-ci-deps: - name: CentOS Stream 9 Arm64 + name: CentOS Stream 9 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -973,7 +973,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-10-ci-deps: - name: Debian 10 + name: Debian 10 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -990,7 +990,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-11-ci-deps: - name: Debian 11 + name: Debian 11 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1007,7 +1007,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 debian-11-arm64-ci-deps: - name: Debian 11 Arm64 + name: Debian 11 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1024,7 +1024,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-37-ci-deps: - name: Fedora 37 + name: Fedora 37 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1041,7 +1041,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-37-arm64-ci-deps: - name: Fedora 37 Arm64 + name: Fedora 37 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1058,7 +1058,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-38-ci-deps: - name: Fedora 38 + name: Fedora 38 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1075,7 +1075,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 fedora-38-arm64-ci-deps: - name: Fedora 38 Arm64 + name: Fedora 38 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1092,7 +1092,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 opensuse-15-ci-deps: - name: Opensuse 15 + name: Opensuse 15 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1109,7 +1109,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-3-ci-deps: - name: Photon OS 3 + name: Photon OS 3 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1126,7 +1126,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-4-ci-deps: - name: Photon OS 4 + name: Photon OS 4 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1143,7 +1143,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 photonos-4-arm64-ci-deps: - name: Photon OS 4 Arm64 + name: Photon OS 4 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1160,7 +1160,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2004-ci-deps: - name: Ubuntu 20.04 + name: Ubuntu 20.04 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1177,7 +1177,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2004-arm64-ci-deps: - name: Ubuntu 20.04 Arm64 + name: Ubuntu 20.04 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1194,7 +1194,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2204-ci-deps: - name: Ubuntu 22.04 + name: Ubuntu 22.04 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1211,7 +1211,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 ubuntu-2204-arm64-ci-deps: - name: Ubuntu 22.04 Arm64 + name: Ubuntu 22.04 Arm64 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/templates/build-ci-deps.yml.jinja b/.github/workflows/templates/build-ci-deps.yml.jinja index 485637322e9..d7215a8c4f7 100644 --- a/.github/workflows/templates/build-ci-deps.yml.jinja +++ b/.github/workflows/templates/build-ci-deps.yml.jinja @@ -3,7 +3,7 @@ <{ slug.replace(".", "") }>-ci-deps: <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> - name: <{ display_name }> + name: <{ display_name }> Deps <%- if workflow_slug != 'release' %> if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} <%- endif %> @@ -32,7 +32,7 @@ <{ slug.replace(".", "") }>-ci-deps: <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> - name: <{ display_name }> + name: <{ display_name }> Deps <%- if workflow_slug != 'release' %> if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} <%- endif %> @@ -61,7 +61,7 @@ <{ slug.replace(".", "") }>-ci-deps: <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> - name: <{ display_name }> + name: <{ display_name }> Deps <%- if workflow_slug != 'release' %> if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} <%- endif %> From 6bcf8f7267d997363277777c7f5547cf6511248c Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 8 Oct 2023 18:45:08 +0100 Subject: [PATCH 132/147] A more explicit test group Signed-off-by: Pedro Algarvio --- .github/workflows/ci.yml | 48 +++++++++---------- .github/workflows/nightly.yml | 48 +++++++++---------- .github/workflows/scheduled.yml | 48 +++++++++---------- .github/workflows/staging.yml | 48 +++++++++---------- .../workflows/templates/test-salt.yml.jinja | 6 +-- 5 files changed, 99 insertions(+), 99 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6a45d047240..33bcb457c0a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1634,7 +1634,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016: - name: Windows 2016 + name: Windows 2016 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1654,7 +1654,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} windows-2019: - name: Windows 2019 + name: Windows 2019 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1674,7 +1674,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} windows-2022: - name: Windows 2022 + name: Windows 2022 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1694,7 +1694,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} macos-12: - name: macOS 12 + name: macOS 12 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -1714,7 +1714,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} almalinux-8: - name: Alma Linux 8 + name: Alma Linux 8 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1734,7 +1734,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} almalinux-9: - name: Alma Linux 9 + name: Alma Linux 9 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1754,7 +1754,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} amazonlinux-2: - name: Amazon Linux 2 + name: Amazon Linux 2 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1774,7 +1774,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} archlinux-lts: - name: Arch Linux LTS + name: Arch Linux LTS Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1794,7 +1794,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} centos-7: - name: CentOS 7 + name: CentOS 7 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1814,7 +1814,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} centosstream-8: - name: CentOS Stream 8 + name: CentOS Stream 8 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1834,7 +1834,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} centosstream-9: - name: CentOS Stream 9 + name: CentOS Stream 9 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1854,7 +1854,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} debian-10: - name: Debian 10 + name: Debian 10 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1874,7 +1874,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} debian-11: - name: Debian 11 + name: Debian 11 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1894,7 +1894,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} debian-11-arm64: - name: Debian 11 Arm64 + name: Debian 11 Arm64 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1914,7 +1914,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} fedora-37: - name: Fedora 37 + name: Fedora 37 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1934,7 +1934,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} fedora-38: - name: Fedora 38 + name: Fedora 38 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1954,7 +1954,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} opensuse-15: - name: Opensuse 15 + name: Opensuse 15 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1974,7 +1974,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} photonos-3: - name: Photon OS 3 + name: Photon OS 3 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1994,7 +1994,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} photonos-4: - name: Photon OS 4 + name: Photon OS 4 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2014,7 +2014,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} photonos-4-arm64: - name: Photon OS 4 Arm64 + name: Photon OS 4 Arm64 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2034,7 +2034,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} ubuntu-2004: - name: Ubuntu 20.04 + name: Ubuntu 20.04 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2054,7 +2054,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} ubuntu-2004-arm64: - name: Ubuntu 20.04 Arm64 + name: Ubuntu 20.04 Arm64 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2074,7 +2074,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} ubuntu-2204: - name: Ubuntu 22.04 + name: Ubuntu 22.04 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2094,7 +2094,7 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} ubuntu-2204-arm64: - name: Ubuntu 22.04 Arm64 + name: Ubuntu 22.04 Arm64 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 0a83fb7dec4..415dbbbc04d 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -1695,7 +1695,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016: - name: Windows 2016 + name: Windows 2016 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1715,7 +1715,7 @@ jobs: skip-junit-reports: false windows-2019: - name: Windows 2019 + name: Windows 2019 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1735,7 +1735,7 @@ jobs: skip-junit-reports: false windows-2022: - name: Windows 2022 + name: Windows 2022 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1755,7 +1755,7 @@ jobs: skip-junit-reports: false macos-12: - name: macOS 12 + name: macOS 12 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -1775,7 +1775,7 @@ jobs: skip-junit-reports: false almalinux-8: - name: Alma Linux 8 + name: Alma Linux 8 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1795,7 +1795,7 @@ jobs: skip-junit-reports: false almalinux-9: - name: Alma Linux 9 + name: Alma Linux 9 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1815,7 +1815,7 @@ jobs: skip-junit-reports: false amazonlinux-2: - name: Amazon Linux 2 + name: Amazon Linux 2 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1835,7 +1835,7 @@ jobs: skip-junit-reports: false archlinux-lts: - name: Arch Linux LTS + name: Arch Linux LTS Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1855,7 +1855,7 @@ jobs: skip-junit-reports: false centos-7: - name: CentOS 7 + name: CentOS 7 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1875,7 +1875,7 @@ jobs: skip-junit-reports: false centosstream-8: - name: CentOS Stream 8 + name: CentOS Stream 8 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1895,7 +1895,7 @@ jobs: skip-junit-reports: false centosstream-9: - name: CentOS Stream 9 + name: CentOS Stream 9 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1915,7 +1915,7 @@ jobs: skip-junit-reports: false debian-10: - name: Debian 10 + name: Debian 10 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1935,7 +1935,7 @@ jobs: skip-junit-reports: false debian-11: - name: Debian 11 + name: Debian 11 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1955,7 +1955,7 @@ jobs: skip-junit-reports: false debian-11-arm64: - name: Debian 11 Arm64 + name: Debian 11 Arm64 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1975,7 +1975,7 @@ jobs: skip-junit-reports: false fedora-37: - name: Fedora 37 + name: Fedora 37 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1995,7 +1995,7 @@ jobs: skip-junit-reports: false fedora-38: - name: Fedora 38 + name: Fedora 38 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2015,7 +2015,7 @@ jobs: skip-junit-reports: false opensuse-15: - name: Opensuse 15 + name: Opensuse 15 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2035,7 +2035,7 @@ jobs: skip-junit-reports: false photonos-3: - name: Photon OS 3 + name: Photon OS 3 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2055,7 +2055,7 @@ jobs: skip-junit-reports: false photonos-4: - name: Photon OS 4 + name: Photon OS 4 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2075,7 +2075,7 @@ jobs: skip-junit-reports: false photonos-4-arm64: - name: Photon OS 4 Arm64 + name: Photon OS 4 Arm64 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2095,7 +2095,7 @@ jobs: skip-junit-reports: false ubuntu-2004: - name: Ubuntu 20.04 + name: Ubuntu 20.04 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2115,7 +2115,7 @@ jobs: skip-junit-reports: false ubuntu-2004-arm64: - name: Ubuntu 20.04 Arm64 + name: Ubuntu 20.04 Arm64 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2135,7 +2135,7 @@ jobs: skip-junit-reports: false ubuntu-2204: - name: Ubuntu 22.04 + name: Ubuntu 22.04 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2155,7 +2155,7 @@ jobs: skip-junit-reports: false ubuntu-2204-arm64: - name: Ubuntu 22.04 Arm64 + name: Ubuntu 22.04 Arm64 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 4aa3a61665f..7f6bfb1d2c7 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -1668,7 +1668,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016: - name: Windows 2016 + name: Windows 2016 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1688,7 +1688,7 @@ jobs: skip-junit-reports: false windows-2019: - name: Windows 2019 + name: Windows 2019 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1708,7 +1708,7 @@ jobs: skip-junit-reports: false windows-2022: - name: Windows 2022 + name: Windows 2022 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1728,7 +1728,7 @@ jobs: skip-junit-reports: false macos-12: - name: macOS 12 + name: macOS 12 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -1748,7 +1748,7 @@ jobs: skip-junit-reports: false almalinux-8: - name: Alma Linux 8 + name: Alma Linux 8 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1768,7 +1768,7 @@ jobs: skip-junit-reports: false almalinux-9: - name: Alma Linux 9 + name: Alma Linux 9 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1788,7 +1788,7 @@ jobs: skip-junit-reports: false amazonlinux-2: - name: Amazon Linux 2 + name: Amazon Linux 2 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1808,7 +1808,7 @@ jobs: skip-junit-reports: false archlinux-lts: - name: Arch Linux LTS + name: Arch Linux LTS Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1828,7 +1828,7 @@ jobs: skip-junit-reports: false centos-7: - name: CentOS 7 + name: CentOS 7 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1848,7 +1848,7 @@ jobs: skip-junit-reports: false centosstream-8: - name: CentOS Stream 8 + name: CentOS Stream 8 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1868,7 +1868,7 @@ jobs: skip-junit-reports: false centosstream-9: - name: CentOS Stream 9 + name: CentOS Stream 9 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1888,7 +1888,7 @@ jobs: skip-junit-reports: false debian-10: - name: Debian 10 + name: Debian 10 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1908,7 +1908,7 @@ jobs: skip-junit-reports: false debian-11: - name: Debian 11 + name: Debian 11 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1928,7 +1928,7 @@ jobs: skip-junit-reports: false debian-11-arm64: - name: Debian 11 Arm64 + name: Debian 11 Arm64 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1948,7 +1948,7 @@ jobs: skip-junit-reports: false fedora-37: - name: Fedora 37 + name: Fedora 37 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1968,7 +1968,7 @@ jobs: skip-junit-reports: false fedora-38: - name: Fedora 38 + name: Fedora 38 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1988,7 +1988,7 @@ jobs: skip-junit-reports: false opensuse-15: - name: Opensuse 15 + name: Opensuse 15 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2008,7 +2008,7 @@ jobs: skip-junit-reports: false photonos-3: - name: Photon OS 3 + name: Photon OS 3 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2028,7 +2028,7 @@ jobs: skip-junit-reports: false photonos-4: - name: Photon OS 4 + name: Photon OS 4 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2048,7 +2048,7 @@ jobs: skip-junit-reports: false photonos-4-arm64: - name: Photon OS 4 Arm64 + name: Photon OS 4 Arm64 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2068,7 +2068,7 @@ jobs: skip-junit-reports: false ubuntu-2004: - name: Ubuntu 20.04 + name: Ubuntu 20.04 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2088,7 +2088,7 @@ jobs: skip-junit-reports: false ubuntu-2004-arm64: - name: Ubuntu 20.04 Arm64 + name: Ubuntu 20.04 Arm64 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2108,7 +2108,7 @@ jobs: skip-junit-reports: false ubuntu-2204: - name: Ubuntu 22.04 + name: Ubuntu 22.04 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2128,7 +2128,7 @@ jobs: skip-junit-reports: false ubuntu-2204-arm64: - name: Ubuntu 22.04 Arm64 + name: Ubuntu 22.04 Arm64 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 4a319ff5e95..b3a9149a428 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -1690,7 +1690,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016: - name: Windows 2016 + name: Windows 2016 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1710,7 +1710,7 @@ jobs: skip-junit-reports: true windows-2019: - name: Windows 2019 + name: Windows 2019 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1730,7 +1730,7 @@ jobs: skip-junit-reports: true windows-2022: - name: Windows 2022 + name: Windows 2022 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1750,7 +1750,7 @@ jobs: skip-junit-reports: true macos-12: - name: macOS 12 + name: macOS 12 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -1770,7 +1770,7 @@ jobs: skip-junit-reports: true almalinux-8: - name: Alma Linux 8 + name: Alma Linux 8 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1790,7 +1790,7 @@ jobs: skip-junit-reports: true almalinux-9: - name: Alma Linux 9 + name: Alma Linux 9 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1810,7 +1810,7 @@ jobs: skip-junit-reports: true amazonlinux-2: - name: Amazon Linux 2 + name: Amazon Linux 2 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1830,7 +1830,7 @@ jobs: skip-junit-reports: true archlinux-lts: - name: Arch Linux LTS + name: Arch Linux LTS Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1850,7 +1850,7 @@ jobs: skip-junit-reports: true centos-7: - name: CentOS 7 + name: CentOS 7 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1870,7 +1870,7 @@ jobs: skip-junit-reports: true centosstream-8: - name: CentOS Stream 8 + name: CentOS Stream 8 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1890,7 +1890,7 @@ jobs: skip-junit-reports: true centosstream-9: - name: CentOS Stream 9 + name: CentOS Stream 9 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1910,7 +1910,7 @@ jobs: skip-junit-reports: true debian-10: - name: Debian 10 + name: Debian 10 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1930,7 +1930,7 @@ jobs: skip-junit-reports: true debian-11: - name: Debian 11 + name: Debian 11 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1950,7 +1950,7 @@ jobs: skip-junit-reports: true debian-11-arm64: - name: Debian 11 Arm64 + name: Debian 11 Arm64 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1970,7 +1970,7 @@ jobs: skip-junit-reports: true fedora-37: - name: Fedora 37 + name: Fedora 37 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1990,7 +1990,7 @@ jobs: skip-junit-reports: true fedora-38: - name: Fedora 38 + name: Fedora 38 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2010,7 +2010,7 @@ jobs: skip-junit-reports: true opensuse-15: - name: Opensuse 15 + name: Opensuse 15 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2030,7 +2030,7 @@ jobs: skip-junit-reports: true photonos-3: - name: Photon OS 3 + name: Photon OS 3 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2050,7 +2050,7 @@ jobs: skip-junit-reports: true photonos-4: - name: Photon OS 4 + name: Photon OS 4 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2070,7 +2070,7 @@ jobs: skip-junit-reports: true photonos-4-arm64: - name: Photon OS 4 Arm64 + name: Photon OS 4 Arm64 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2090,7 +2090,7 @@ jobs: skip-junit-reports: true ubuntu-2004: - name: Ubuntu 20.04 + name: Ubuntu 20.04 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2110,7 +2110,7 @@ jobs: skip-junit-reports: true ubuntu-2004-arm64: - name: Ubuntu 20.04 Arm64 + name: Ubuntu 20.04 Arm64 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2130,7 +2130,7 @@ jobs: skip-junit-reports: true ubuntu-2204: - name: Ubuntu 22.04 + name: Ubuntu 22.04 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -2150,7 +2150,7 @@ jobs: skip-junit-reports: true ubuntu-2204-arm64: - name: Ubuntu 22.04 Arm64 + name: Ubuntu 22.04 Arm64 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/templates/test-salt.yml.jinja b/.github/workflows/templates/test-salt.yml.jinja index 91e222aaccc..63834ee10dc 100644 --- a/.github/workflows/templates/test-salt.yml.jinja +++ b/.github/workflows/templates/test-salt.yml.jinja @@ -3,7 +3,7 @@ <{ slug.replace(".", "") }>: <%- do test_salt_needs.append(slug.replace(".", "")) %> - name: <{ display_name }> + name: <{ display_name }> Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -29,7 +29,7 @@ <{ slug.replace(".", "") }>: <%- do test_salt_needs.append(slug.replace(".", "")) %> - name: <{ display_name }> + name: <{ display_name }> Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -55,7 +55,7 @@ <{ slug.replace(".", "") }>: <%- do test_salt_needs.append(slug.replace(".", "")) %> - name: <{ display_name }> + name: <{ display_name }> Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow From eb118957fbf52f98cfa0344bfdb430457cfaed71 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 9 Oct 2023 09:56:16 +0100 Subject: [PATCH 133/147] Exclude the nightly builds from the backup/restore process Signed-off-by: Pedro Algarvio --- tools/pkg/repo/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/pkg/repo/__init__.py b/tools/pkg/repo/__init__.py index d965fcfd923..5599bfd5722 100644 --- a/tools/pkg/repo/__init__.py +++ b/tools/pkg/repo/__init__.py @@ -91,6 +91,7 @@ def _rclone(ctx: Context, src: str, dst: str): "--transfers=50", "--fast-list", "--verbose", + "--exclude=salt-dev/*", ] if src == tools.utils.RELEASE_BUCKET_NAME: cmdline.append("--s3-storage-class=INTELLIGENT_TIERING") From 6007633da60974634d8a0e5b0da532146301a2de Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 9 Oct 2023 10:00:24 +0100 Subject: [PATCH 134/147] Minor display name changes Signed-off-by: Pedro Algarvio --- .github/workflows/ci.yml | 42 +++++++++---------- .github/workflows/nightly.yml | 42 +++++++++---------- .github/workflows/scheduled.yml | 42 +++++++++---------- .github/workflows/staging.yml | 42 +++++++++---------- .../templates/test-salt-pkg.yml.jinja | 6 +-- 5 files changed, 87 insertions(+), 87 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 33bcb457c0a..793de1052d5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1172,7 +1172,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-pkg-tests: - name: Amazon Linux 2 Package + name: Amazon Linux 2 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1194,7 +1194,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centos-7-pkg-tests: - name: CentOS 7 Package + name: CentOS 7 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1216,7 +1216,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-8-pkg-tests: - name: CentOS Stream 8 Package + name: CentOS Stream 8 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1238,7 +1238,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-9-pkg-tests: - name: CentOS Stream 9 Package + name: CentOS Stream 9 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1260,7 +1260,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-10-pkg-tests: - name: Debian 10 Package + name: Debian 10 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1282,7 +1282,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-pkg-tests: - name: Debian 11 Package + name: Debian 11 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1304,7 +1304,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-arm64-pkg-tests: - name: Debian 11 Arm64 Package + name: Debian 11 Arm64 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1326,7 +1326,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-3-pkg-tests: - name: Photon OS 3 Package + name: Photon OS 3 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1348,7 +1348,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-pkg-tests: - name: Photon OS 4 Package + name: Photon OS 4 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1370,7 +1370,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-arm64-pkg-tests: - name: Photon OS 4 Arm64 Package + name: Photon OS 4 Arm64 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1392,7 +1392,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-pkg-tests: - name: Ubuntu 20.04 Package + name: Ubuntu 20.04 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1414,7 +1414,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-arm64-pkg-tests: - name: Ubuntu 20.04 Arm64 Package + name: Ubuntu 20.04 Arm64 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1436,7 +1436,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-pkg-tests: - name: Ubuntu 22.04 Package + name: Ubuntu 22.04 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1458,7 +1458,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-arm64-pkg-tests: - name: Ubuntu 22.04 Arm64 Package + name: Ubuntu 22.04 Arm64 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1480,7 +1480,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} macos-12-pkg-tests: - name: macOS 12 Package + name: macOS 12 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -1502,7 +1502,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-nsis-pkg-tests: - name: Windows 2016 NSIS Package + name: Windows 2016 NSIS Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1524,7 +1524,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-msi-pkg-tests: - name: Windows 2016 MSI Package + name: Windows 2016 MSI Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1546,7 +1546,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-nsis-pkg-tests: - name: Windows 2019 NSIS Package + name: Windows 2019 NSIS Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1568,7 +1568,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-msi-pkg-tests: - name: Windows 2019 MSI Package + name: Windows 2019 MSI Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1590,7 +1590,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-nsis-pkg-tests: - name: Windows 2022 NSIS Package + name: Windows 2022 NSIS Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1612,7 +1612,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-msi-pkg-tests: - name: Windows 2022 MSI Package + name: Windows 2022 MSI Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 415dbbbc04d..7ca61814767 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -1233,7 +1233,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-pkg-tests: - name: Amazon Linux 2 Package + name: Amazon Linux 2 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1255,7 +1255,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centos-7-pkg-tests: - name: CentOS 7 Package + name: CentOS 7 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1277,7 +1277,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-8-pkg-tests: - name: CentOS Stream 8 Package + name: CentOS Stream 8 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1299,7 +1299,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-9-pkg-tests: - name: CentOS Stream 9 Package + name: CentOS Stream 9 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1321,7 +1321,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-10-pkg-tests: - name: Debian 10 Package + name: Debian 10 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1343,7 +1343,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-pkg-tests: - name: Debian 11 Package + name: Debian 11 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1365,7 +1365,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-arm64-pkg-tests: - name: Debian 11 Arm64 Package + name: Debian 11 Arm64 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1387,7 +1387,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-3-pkg-tests: - name: Photon OS 3 Package + name: Photon OS 3 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1409,7 +1409,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-pkg-tests: - name: Photon OS 4 Package + name: Photon OS 4 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1431,7 +1431,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-arm64-pkg-tests: - name: Photon OS 4 Arm64 Package + name: Photon OS 4 Arm64 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1453,7 +1453,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-pkg-tests: - name: Ubuntu 20.04 Package + name: Ubuntu 20.04 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1475,7 +1475,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-arm64-pkg-tests: - name: Ubuntu 20.04 Arm64 Package + name: Ubuntu 20.04 Arm64 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1497,7 +1497,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-pkg-tests: - name: Ubuntu 22.04 Package + name: Ubuntu 22.04 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1519,7 +1519,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-arm64-pkg-tests: - name: Ubuntu 22.04 Arm64 Package + name: Ubuntu 22.04 Arm64 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1541,7 +1541,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} macos-12-pkg-tests: - name: macOS 12 Package + name: macOS 12 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -1563,7 +1563,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-nsis-pkg-tests: - name: Windows 2016 NSIS Package + name: Windows 2016 NSIS Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1585,7 +1585,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-msi-pkg-tests: - name: Windows 2016 MSI Package + name: Windows 2016 MSI Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1607,7 +1607,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-nsis-pkg-tests: - name: Windows 2019 NSIS Package + name: Windows 2019 NSIS Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1629,7 +1629,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-msi-pkg-tests: - name: Windows 2019 MSI Package + name: Windows 2019 MSI Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1651,7 +1651,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-nsis-pkg-tests: - name: Windows 2022 NSIS Package + name: Windows 2022 NSIS Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1673,7 +1673,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-msi-pkg-tests: - name: Windows 2022 MSI Package + name: Windows 2022 MSI Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 7f6bfb1d2c7..a0ebe954be8 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -1206,7 +1206,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-pkg-tests: - name: Amazon Linux 2 Package + name: Amazon Linux 2 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1228,7 +1228,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centos-7-pkg-tests: - name: CentOS 7 Package + name: CentOS 7 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1250,7 +1250,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-8-pkg-tests: - name: CentOS Stream 8 Package + name: CentOS Stream 8 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1272,7 +1272,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-9-pkg-tests: - name: CentOS Stream 9 Package + name: CentOS Stream 9 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1294,7 +1294,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-10-pkg-tests: - name: Debian 10 Package + name: Debian 10 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1316,7 +1316,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-pkg-tests: - name: Debian 11 Package + name: Debian 11 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1338,7 +1338,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-arm64-pkg-tests: - name: Debian 11 Arm64 Package + name: Debian 11 Arm64 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1360,7 +1360,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-3-pkg-tests: - name: Photon OS 3 Package + name: Photon OS 3 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1382,7 +1382,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-pkg-tests: - name: Photon OS 4 Package + name: Photon OS 4 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1404,7 +1404,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-arm64-pkg-tests: - name: Photon OS 4 Arm64 Package + name: Photon OS 4 Arm64 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1426,7 +1426,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-pkg-tests: - name: Ubuntu 20.04 Package + name: Ubuntu 20.04 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1448,7 +1448,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-arm64-pkg-tests: - name: Ubuntu 20.04 Arm64 Package + name: Ubuntu 20.04 Arm64 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1470,7 +1470,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-pkg-tests: - name: Ubuntu 22.04 Package + name: Ubuntu 22.04 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1492,7 +1492,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-arm64-pkg-tests: - name: Ubuntu 22.04 Arm64 Package + name: Ubuntu 22.04 Arm64 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1514,7 +1514,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} macos-12-pkg-tests: - name: macOS 12 Package + name: macOS 12 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -1536,7 +1536,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-nsis-pkg-tests: - name: Windows 2016 NSIS Package + name: Windows 2016 NSIS Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1558,7 +1558,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-msi-pkg-tests: - name: Windows 2016 MSI Package + name: Windows 2016 MSI Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1580,7 +1580,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-nsis-pkg-tests: - name: Windows 2019 NSIS Package + name: Windows 2019 NSIS Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1602,7 +1602,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-msi-pkg-tests: - name: Windows 2019 MSI Package + name: Windows 2019 MSI Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1624,7 +1624,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-nsis-pkg-tests: - name: Windows 2022 NSIS Package + name: Windows 2022 NSIS Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1646,7 +1646,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-msi-pkg-tests: - name: Windows 2022 MSI Package + name: Windows 2022 MSI Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index b3a9149a428..2b9a3b44ab7 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -1228,7 +1228,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 amazonlinux-2-pkg-tests: - name: Amazon Linux 2 Package + name: Amazon Linux 2 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1250,7 +1250,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centos-7-pkg-tests: - name: CentOS 7 Package + name: CentOS 7 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1272,7 +1272,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-8-pkg-tests: - name: CentOS Stream 8 Package + name: CentOS Stream 8 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1294,7 +1294,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} centosstream-9-pkg-tests: - name: CentOS Stream 9 Package + name: CentOS Stream 9 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1316,7 +1316,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-10-pkg-tests: - name: Debian 10 Package + name: Debian 10 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1338,7 +1338,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-pkg-tests: - name: Debian 11 Package + name: Debian 11 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1360,7 +1360,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} debian-11-arm64-pkg-tests: - name: Debian 11 Arm64 Package + name: Debian 11 Arm64 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1382,7 +1382,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-3-pkg-tests: - name: Photon OS 3 Package + name: Photon OS 3 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1404,7 +1404,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-pkg-tests: - name: Photon OS 4 Package + name: Photon OS 4 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1426,7 +1426,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} photonos-4-arm64-pkg-tests: - name: Photon OS 4 Arm64 Package + name: Photon OS 4 Arm64 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1448,7 +1448,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-pkg-tests: - name: Ubuntu 20.04 Package + name: Ubuntu 20.04 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1470,7 +1470,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2004-arm64-pkg-tests: - name: Ubuntu 20.04 Arm64 Package + name: Ubuntu 20.04 Arm64 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1492,7 +1492,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-pkg-tests: - name: Ubuntu 22.04 Package + name: Ubuntu 22.04 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1514,7 +1514,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} ubuntu-2204-arm64-pkg-tests: - name: Ubuntu 22.04 Arm64 Package + name: Ubuntu 22.04 Arm64 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1536,7 +1536,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} macos-12-pkg-tests: - name: macOS 12 Package + name: macOS 12 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -1558,7 +1558,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-nsis-pkg-tests: - name: Windows 2016 NSIS Package + name: Windows 2016 NSIS Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1580,7 +1580,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2016-msi-pkg-tests: - name: Windows 2016 MSI Package + name: Windows 2016 MSI Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1602,7 +1602,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-nsis-pkg-tests: - name: Windows 2019 NSIS Package + name: Windows 2019 NSIS Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1624,7 +1624,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2019-msi-pkg-tests: - name: Windows 2019 MSI Package + name: Windows 2019 MSI Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1646,7 +1646,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-nsis-pkg-tests: - name: Windows 2022 NSIS Package + name: Windows 2022 NSIS Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -1668,7 +1668,7 @@ jobs: testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} windows-2022-msi-pkg-tests: - name: Windows 2022 MSI Package + name: Windows 2022 MSI Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow diff --git a/.github/workflows/templates/test-salt-pkg.yml.jinja b/.github/workflows/templates/test-salt-pkg.yml.jinja index 64617d7054d..5a674683485 100644 --- a/.github/workflows/templates/test-salt-pkg.yml.jinja +++ b/.github/workflows/templates/test-salt-pkg.yml.jinja @@ -3,7 +3,7 @@ <{ job_name }>: <%- do test_salt_pkg_needs.append(job_name) %> - name: <{ display_name }> Package + name: <{ display_name }> Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow @@ -33,7 +33,7 @@ <{ job_name }>: <%- do test_salt_pkg_needs.append(job_name) %> - name: <{ display_name }> Package + name: <{ display_name }> Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow @@ -63,7 +63,7 @@ <{ job_name }>: <%- do test_salt_pkg_needs.append(job_name) %> - name: <{ display_name }> <{ pkg_type }> Package + name: <{ display_name }> <{ pkg_type }> Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow From 21770b86a739de563151c4d3d10e9fc9fda04507 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 9 Oct 2023 14:45:50 +0100 Subject: [PATCH 135/147] The build CI deps jobs are now behind the `build-deps-ci` flag Signed-off-by: Pedro Algarvio --- .github/workflows/ci.yml | 64 +++++++++---------- .github/workflows/nightly.yml | 64 +++++++++---------- .github/workflows/scheduled.yml | 64 +++++++++---------- .github/workflows/staging.yml | 64 +++++++++---------- .../templates/build-ci-deps.yml.jinja | 6 +- tools/ci.py | 2 + 6 files changed, 133 insertions(+), 131 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 793de1052d5..64c9f92d9a9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -629,7 +629,7 @@ jobs: windows-2016-ci-deps: name: Windows 2016 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -646,7 +646,7 @@ jobs: windows-2019-ci-deps: name: Windows 2019 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -663,7 +663,7 @@ jobs: windows-2022-ci-deps: name: Windows 2022 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -680,7 +680,7 @@ jobs: macos-12-ci-deps: name: macOS 12 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - build-salt-onedir-macos @@ -697,7 +697,7 @@ jobs: almalinux-8-ci-deps: name: Alma Linux 8 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -714,7 +714,7 @@ jobs: almalinux-8-arm64-ci-deps: name: Alma Linux 8 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -731,7 +731,7 @@ jobs: almalinux-9-ci-deps: name: Alma Linux 9 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -748,7 +748,7 @@ jobs: almalinux-9-arm64-ci-deps: name: Alma Linux 9 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -765,7 +765,7 @@ jobs: amazonlinux-2-ci-deps: name: Amazon Linux 2 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -782,7 +782,7 @@ jobs: amazonlinux-2-arm64-ci-deps: name: Amazon Linux 2 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -799,7 +799,7 @@ jobs: archlinux-lts-ci-deps: name: Arch Linux LTS Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -816,7 +816,7 @@ jobs: centos-7-ci-deps: name: CentOS 7 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -833,7 +833,7 @@ jobs: centos-7-arm64-ci-deps: name: CentOS 7 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -850,7 +850,7 @@ jobs: centosstream-8-ci-deps: name: CentOS Stream 8 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -867,7 +867,7 @@ jobs: centosstream-8-arm64-ci-deps: name: CentOS Stream 8 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -884,7 +884,7 @@ jobs: centosstream-9-ci-deps: name: CentOS Stream 9 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -901,7 +901,7 @@ jobs: centosstream-9-arm64-ci-deps: name: CentOS Stream 9 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -918,7 +918,7 @@ jobs: debian-10-ci-deps: name: Debian 10 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -935,7 +935,7 @@ jobs: debian-11-ci-deps: name: Debian 11 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -952,7 +952,7 @@ jobs: debian-11-arm64-ci-deps: name: Debian 11 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -969,7 +969,7 @@ jobs: fedora-37-ci-deps: name: Fedora 37 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -986,7 +986,7 @@ jobs: fedora-37-arm64-ci-deps: name: Fedora 37 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1003,7 +1003,7 @@ jobs: fedora-38-ci-deps: name: Fedora 38 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1020,7 +1020,7 @@ jobs: fedora-38-arm64-ci-deps: name: Fedora 38 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1037,7 +1037,7 @@ jobs: opensuse-15-ci-deps: name: Opensuse 15 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1054,7 +1054,7 @@ jobs: photonos-3-ci-deps: name: Photon OS 3 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1071,7 +1071,7 @@ jobs: photonos-4-ci-deps: name: Photon OS 4 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1088,7 +1088,7 @@ jobs: photonos-4-arm64-ci-deps: name: Photon OS 4 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1105,7 +1105,7 @@ jobs: ubuntu-2004-ci-deps: name: Ubuntu 20.04 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1122,7 +1122,7 @@ jobs: ubuntu-2004-arm64-ci-deps: name: Ubuntu 20.04 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1139,7 +1139,7 @@ jobs: ubuntu-2204-ci-deps: name: Ubuntu 22.04 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1156,7 +1156,7 @@ jobs: ubuntu-2204-arm64-ci-deps: name: Ubuntu 22.04 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 7ca61814767..3a66c846bd4 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -690,7 +690,7 @@ jobs: windows-2016-ci-deps: name: Windows 2016 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -707,7 +707,7 @@ jobs: windows-2019-ci-deps: name: Windows 2019 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -724,7 +724,7 @@ jobs: windows-2022-ci-deps: name: Windows 2022 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -741,7 +741,7 @@ jobs: macos-12-ci-deps: name: macOS 12 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - build-salt-onedir-macos @@ -758,7 +758,7 @@ jobs: almalinux-8-ci-deps: name: Alma Linux 8 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -775,7 +775,7 @@ jobs: almalinux-8-arm64-ci-deps: name: Alma Linux 8 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -792,7 +792,7 @@ jobs: almalinux-9-ci-deps: name: Alma Linux 9 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -809,7 +809,7 @@ jobs: almalinux-9-arm64-ci-deps: name: Alma Linux 9 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -826,7 +826,7 @@ jobs: amazonlinux-2-ci-deps: name: Amazon Linux 2 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -843,7 +843,7 @@ jobs: amazonlinux-2-arm64-ci-deps: name: Amazon Linux 2 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -860,7 +860,7 @@ jobs: archlinux-lts-ci-deps: name: Arch Linux LTS Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -877,7 +877,7 @@ jobs: centos-7-ci-deps: name: CentOS 7 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -894,7 +894,7 @@ jobs: centos-7-arm64-ci-deps: name: CentOS 7 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -911,7 +911,7 @@ jobs: centosstream-8-ci-deps: name: CentOS Stream 8 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -928,7 +928,7 @@ jobs: centosstream-8-arm64-ci-deps: name: CentOS Stream 8 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -945,7 +945,7 @@ jobs: centosstream-9-ci-deps: name: CentOS Stream 9 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -962,7 +962,7 @@ jobs: centosstream-9-arm64-ci-deps: name: CentOS Stream 9 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -979,7 +979,7 @@ jobs: debian-10-ci-deps: name: Debian 10 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -996,7 +996,7 @@ jobs: debian-11-ci-deps: name: Debian 11 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1013,7 +1013,7 @@ jobs: debian-11-arm64-ci-deps: name: Debian 11 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1030,7 +1030,7 @@ jobs: fedora-37-ci-deps: name: Fedora 37 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1047,7 +1047,7 @@ jobs: fedora-37-arm64-ci-deps: name: Fedora 37 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1064,7 +1064,7 @@ jobs: fedora-38-ci-deps: name: Fedora 38 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1081,7 +1081,7 @@ jobs: fedora-38-arm64-ci-deps: name: Fedora 38 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1098,7 +1098,7 @@ jobs: opensuse-15-ci-deps: name: Opensuse 15 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1115,7 +1115,7 @@ jobs: photonos-3-ci-deps: name: Photon OS 3 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1132,7 +1132,7 @@ jobs: photonos-4-ci-deps: name: Photon OS 4 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1149,7 +1149,7 @@ jobs: photonos-4-arm64-ci-deps: name: Photon OS 4 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1166,7 +1166,7 @@ jobs: ubuntu-2004-ci-deps: name: Ubuntu 20.04 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1183,7 +1183,7 @@ jobs: ubuntu-2004-arm64-ci-deps: name: Ubuntu 20.04 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1200,7 +1200,7 @@ jobs: ubuntu-2204-ci-deps: name: Ubuntu 22.04 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1217,7 +1217,7 @@ jobs: ubuntu-2204-arm64-ci-deps: name: Ubuntu 22.04 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index a0ebe954be8..2cd24d6ee33 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -663,7 +663,7 @@ jobs: windows-2016-ci-deps: name: Windows 2016 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -680,7 +680,7 @@ jobs: windows-2019-ci-deps: name: Windows 2019 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -697,7 +697,7 @@ jobs: windows-2022-ci-deps: name: Windows 2022 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -714,7 +714,7 @@ jobs: macos-12-ci-deps: name: macOS 12 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - build-salt-onedir-macos @@ -731,7 +731,7 @@ jobs: almalinux-8-ci-deps: name: Alma Linux 8 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -748,7 +748,7 @@ jobs: almalinux-8-arm64-ci-deps: name: Alma Linux 8 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -765,7 +765,7 @@ jobs: almalinux-9-ci-deps: name: Alma Linux 9 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -782,7 +782,7 @@ jobs: almalinux-9-arm64-ci-deps: name: Alma Linux 9 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -799,7 +799,7 @@ jobs: amazonlinux-2-ci-deps: name: Amazon Linux 2 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -816,7 +816,7 @@ jobs: amazonlinux-2-arm64-ci-deps: name: Amazon Linux 2 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -833,7 +833,7 @@ jobs: archlinux-lts-ci-deps: name: Arch Linux LTS Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -850,7 +850,7 @@ jobs: centos-7-ci-deps: name: CentOS 7 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -867,7 +867,7 @@ jobs: centos-7-arm64-ci-deps: name: CentOS 7 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -884,7 +884,7 @@ jobs: centosstream-8-ci-deps: name: CentOS Stream 8 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -901,7 +901,7 @@ jobs: centosstream-8-arm64-ci-deps: name: CentOS Stream 8 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -918,7 +918,7 @@ jobs: centosstream-9-ci-deps: name: CentOS Stream 9 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -935,7 +935,7 @@ jobs: centosstream-9-arm64-ci-deps: name: CentOS Stream 9 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -952,7 +952,7 @@ jobs: debian-10-ci-deps: name: Debian 10 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -969,7 +969,7 @@ jobs: debian-11-ci-deps: name: Debian 11 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -986,7 +986,7 @@ jobs: debian-11-arm64-ci-deps: name: Debian 11 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1003,7 +1003,7 @@ jobs: fedora-37-ci-deps: name: Fedora 37 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1020,7 +1020,7 @@ jobs: fedora-37-arm64-ci-deps: name: Fedora 37 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1037,7 +1037,7 @@ jobs: fedora-38-ci-deps: name: Fedora 38 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1054,7 +1054,7 @@ jobs: fedora-38-arm64-ci-deps: name: Fedora 38 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1071,7 +1071,7 @@ jobs: opensuse-15-ci-deps: name: Opensuse 15 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1088,7 +1088,7 @@ jobs: photonos-3-ci-deps: name: Photon OS 3 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1105,7 +1105,7 @@ jobs: photonos-4-ci-deps: name: Photon OS 4 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1122,7 +1122,7 @@ jobs: photonos-4-arm64-ci-deps: name: Photon OS 4 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1139,7 +1139,7 @@ jobs: ubuntu-2004-ci-deps: name: Ubuntu 20.04 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1156,7 +1156,7 @@ jobs: ubuntu-2004-arm64-ci-deps: name: Ubuntu 20.04 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1173,7 +1173,7 @@ jobs: ubuntu-2204-ci-deps: name: Ubuntu 22.04 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1190,7 +1190,7 @@ jobs: ubuntu-2204-arm64-ci-deps: name: Ubuntu 22.04 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 2b9a3b44ab7..0da203729de 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -685,7 +685,7 @@ jobs: windows-2016-ci-deps: name: Windows 2016 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -702,7 +702,7 @@ jobs: windows-2019-ci-deps: name: Windows 2019 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -719,7 +719,7 @@ jobs: windows-2022-ci-deps: name: Windows 2022 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-windows @@ -736,7 +736,7 @@ jobs: macos-12-ci-deps: name: macOS 12 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} needs: - prepare-workflow - build-salt-onedir-macos @@ -753,7 +753,7 @@ jobs: almalinux-8-ci-deps: name: Alma Linux 8 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -770,7 +770,7 @@ jobs: almalinux-8-arm64-ci-deps: name: Alma Linux 8 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -787,7 +787,7 @@ jobs: almalinux-9-ci-deps: name: Alma Linux 9 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -804,7 +804,7 @@ jobs: almalinux-9-arm64-ci-deps: name: Alma Linux 9 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -821,7 +821,7 @@ jobs: amazonlinux-2-ci-deps: name: Amazon Linux 2 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -838,7 +838,7 @@ jobs: amazonlinux-2-arm64-ci-deps: name: Amazon Linux 2 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -855,7 +855,7 @@ jobs: archlinux-lts-ci-deps: name: Arch Linux LTS Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -872,7 +872,7 @@ jobs: centos-7-ci-deps: name: CentOS 7 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -889,7 +889,7 @@ jobs: centos-7-arm64-ci-deps: name: CentOS 7 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -906,7 +906,7 @@ jobs: centosstream-8-ci-deps: name: CentOS Stream 8 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -923,7 +923,7 @@ jobs: centosstream-8-arm64-ci-deps: name: CentOS Stream 8 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -940,7 +940,7 @@ jobs: centosstream-9-ci-deps: name: CentOS Stream 9 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -957,7 +957,7 @@ jobs: centosstream-9-arm64-ci-deps: name: CentOS Stream 9 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -974,7 +974,7 @@ jobs: debian-10-ci-deps: name: Debian 10 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -991,7 +991,7 @@ jobs: debian-11-ci-deps: name: Debian 11 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1008,7 +1008,7 @@ jobs: debian-11-arm64-ci-deps: name: Debian 11 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1025,7 +1025,7 @@ jobs: fedora-37-ci-deps: name: Fedora 37 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1042,7 +1042,7 @@ jobs: fedora-37-arm64-ci-deps: name: Fedora 37 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1059,7 +1059,7 @@ jobs: fedora-38-ci-deps: name: Fedora 38 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1076,7 +1076,7 @@ jobs: fedora-38-arm64-ci-deps: name: Fedora 38 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1093,7 +1093,7 @@ jobs: opensuse-15-ci-deps: name: Opensuse 15 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1110,7 +1110,7 @@ jobs: photonos-3-ci-deps: name: Photon OS 3 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1127,7 +1127,7 @@ jobs: photonos-4-ci-deps: name: Photon OS 4 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1144,7 +1144,7 @@ jobs: photonos-4-arm64-ci-deps: name: Photon OS 4 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1161,7 +1161,7 @@ jobs: ubuntu-2004-ci-deps: name: Ubuntu 20.04 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1178,7 +1178,7 @@ jobs: ubuntu-2004-arm64-ci-deps: name: Ubuntu 20.04 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1195,7 +1195,7 @@ jobs: ubuntu-2204-ci-deps: name: Ubuntu 22.04 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux @@ -1212,7 +1212,7 @@ jobs: ubuntu-2204-arm64-ci-deps: name: Ubuntu 22.04 Arm64 Deps - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} needs: - prepare-workflow - build-salt-onedir-linux diff --git a/.github/workflows/templates/build-ci-deps.yml.jinja b/.github/workflows/templates/build-ci-deps.yml.jinja index d7215a8c4f7..5d31da8b363 100644 --- a/.github/workflows/templates/build-ci-deps.yml.jinja +++ b/.github/workflows/templates/build-ci-deps.yml.jinja @@ -5,7 +5,7 @@ <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> name: <{ display_name }> Deps <%- if workflow_slug != 'release' %> - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} <%- endif %> needs: - prepare-workflow @@ -34,7 +34,7 @@ <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> name: <{ display_name }> Deps <%- if workflow_slug != 'release' %> - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} <%- endif %> needs: - prepare-workflow @@ -63,7 +63,7 @@ <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %> name: <{ display_name }> Deps <%- if workflow_slug != 'release' %> - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} <%- endif %> needs: - prepare-workflow diff --git a/tools/ci.py b/tools/ci.py index cc6578be789..6127db6777f 100644 --- a/tools/ci.py +++ b/tools/ci.py @@ -285,6 +285,7 @@ def define_jobs( "build-deps-onedir": True, "build-salt-onedir": True, "build-pkgs": True, + "build-deps-ci": True, } if skip_tests: @@ -392,6 +393,7 @@ def define_jobs( if not jobs["test"] and not jobs["test-pkg"] and not jobs["test-pkg-download"]: with open(github_step_summary, "a", encoding="utf-8") as wfh: for job in ( + "build-deps-ci", "build-deps-onedir", "build-salt-onedir", "build-pkgs", From 31146eae69a054b5b4dbf3a91d7f8fdda0419042 Mon Sep 17 00:00:00 2001 From: Alexander Graul Date: Tue, 19 Sep 2023 16:35:31 +0200 Subject: [PATCH 136/147] Allow all primitive grain types for autosign_grains --- changelog/61416.fixed.md | 1 + changelog/63708.fixed.md | 1 + salt/daemons/masterapi.py | 2 +- tests/pytests/unit/daemons/masterapi/test_auto_key.py | 7 ++++--- 4 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 changelog/61416.fixed.md create mode 100644 changelog/63708.fixed.md diff --git a/changelog/61416.fixed.md b/changelog/61416.fixed.md new file mode 100644 index 00000000000..3203a0a1c6a --- /dev/null +++ b/changelog/61416.fixed.md @@ -0,0 +1 @@ +Allow all primitive grain types for autosign_grains diff --git a/changelog/63708.fixed.md b/changelog/63708.fixed.md new file mode 100644 index 00000000000..3203a0a1c6a --- /dev/null +++ b/changelog/63708.fixed.md @@ -0,0 +1 @@ +Allow all primitive grain types for autosign_grains diff --git a/salt/daemons/masterapi.py b/salt/daemons/masterapi.py index 485f39ee9fb..07ce6122ba4 100644 --- a/salt/daemons/masterapi.py +++ b/salt/daemons/masterapi.py @@ -380,7 +380,7 @@ class AutoKey: line = salt.utils.stringutils.to_unicode(line).strip() if line.startswith("#"): continue - if autosign_grains[grain] == line: + if str(autosign_grains[grain]) == line: return True return False diff --git a/tests/pytests/unit/daemons/masterapi/test_auto_key.py b/tests/pytests/unit/daemons/masterapi/test_auto_key.py index b3657b7f1bc..ddcfc17e4a7 100644 --- a/tests/pytests/unit/daemons/masterapi/test_auto_key.py +++ b/tests/pytests/unit/daemons/masterapi/test_auto_key.py @@ -256,16 +256,17 @@ def test_check_autosign_grains_no_autosign_grains_dir(auto_key): _test_check_autosign_grains(test_func, auto_key, autosign_grains_dir=None) -def test_check_autosign_grains_accept(auto_key): +@pytest.mark.parametrize("grain_value", ["test_value", 123, True]) +def test_check_autosign_grains_accept(grain_value, auto_key): """ Asserts that autosigning from grains passes when a matching grain value is in an autosign_grain file. """ def test_func(*args): - assert auto_key.check_autosign_grains({"test_grain": "test_value"}) is True + assert auto_key.check_autosign_grains({"test_grain": grain_value}) is True - file_content = "#test_ignore\ntest_value" + file_content = f"#test_ignore\n{grain_value}" _test_check_autosign_grains(test_func, auto_key, file_content=file_content) From 74f02e8a68ee47f48327d8ebd5de82695369303f Mon Sep 17 00:00:00 2001 From: Alexander Graul Date: Wed, 27 Sep 2023 16:22:53 +0200 Subject: [PATCH 137/147] blacken daemons/masterapi.py and its test_auto_key --- tests/pytests/unit/daemons/masterapi/test_auto_key.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/pytests/unit/daemons/masterapi/test_auto_key.py b/tests/pytests/unit/daemons/masterapi/test_auto_key.py index ddcfc17e4a7..54c3f22d2a9 100644 --- a/tests/pytests/unit/daemons/masterapi/test_auto_key.py +++ b/tests/pytests/unit/daemons/masterapi/test_auto_key.py @@ -17,11 +17,11 @@ def gen_permissions(owner="", group="", others=""): """ ret = 0 for c in owner: - ret |= getattr(stat, "S_I{}USR".format(c.upper()), 0) + ret |= getattr(stat, f"S_I{c.upper()}USR", 0) for c in group: - ret |= getattr(stat, "S_I{}GRP".format(c.upper()), 0) + ret |= getattr(stat, f"S_I{c.upper()}GRP", 0) for c in others: - ret |= getattr(stat, "S_I{}OTH".format(c.upper()), 0) + ret |= getattr(stat, f"S_I{c.upper()}OTH", 0) return ret From f7e290deff0280e808399c6f8b6c1ac4e9805511 Mon Sep 17 00:00:00 2001 From: ScriptAutomate Date: Tue, 5 Sep 2023 16:46:07 -0500 Subject: [PATCH 138/147] Add support for Debian 12 --- .github/workflows/ci.yml | 128 +++++++++++++++++ .github/workflows/nightly.yml | 136 ++++++++++++++++++ .github/workflows/release.yml | 36 +++++ .github/workflows/scheduled.yml | 128 +++++++++++++++++ .github/workflows/staging.yml | 134 +++++++++++++++++ .../templates/build-deb-repo.yml.jinja | 2 + .../test-package-downloads-action.yml | 6 + changelog/64223.added.md | 1 + cicd/golden-images.json | 20 +++ tests/pytests/unit/grains/test_core.py | 30 ++++ tools/pkg/repo/create.py | 7 +- tools/pre_commit.py | 6 + 12 files changed, 633 insertions(+), 1 deletion(-) create mode 100644 changelog/64223.added.md diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 64c9f92d9a9..c43fb31f71c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -967,6 +967,40 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + debian-12-ci-deps: + name: Debian 12 Deps + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir-linux + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: debian-12 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + debian-12-arm64-ci-deps: + name: Debian 12 Arm64 Deps + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir-linux + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: debian-12-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + fedora-37-ci-deps: name: Fedora 37 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -1325,6 +1359,50 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + debian-12-pkg-tests: + name: Debian 12 Package Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-deb-pkgs-onedir + - debian-12-ci-deps + uses: ./.github/workflows/test-packages-action.yml + with: + distro-slug: debian-12 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + pkg-type: deb + nox-version: 2022.8.7 + python-version: "3.10" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} + skip-junit-reports: ${{ github.event_name == 'pull_request' }} + testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + + debian-12-arm64-pkg-tests: + name: Debian 12 Arm64 Package Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-deb-pkgs-onedir + - debian-12-arm64-ci-deps + uses: ./.github/workflows/test-packages-action.yml + with: + distro-slug: debian-12-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + pkg-type: deb + nox-version: 2022.8.7 + python-version: "3.10" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} + skip-junit-reports: ${{ github.event_name == 'pull_request' }} + testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + photonos-3-pkg-tests: name: Photon OS 3 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -1913,6 +1991,46 @@ jobs: skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} + debian-12: + name: Debian 12 Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - debian-12-ci-deps + uses: ./.github/workflows/test-action.yml + with: + distro-slug: debian-12 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + testrun: ${{ needs.prepare-workflow.outputs.testrun }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} + skip-junit-reports: ${{ github.event_name == 'pull_request' }} + + debian-12-arm64: + name: Debian 12 Arm64 Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - debian-12-arm64-ci-deps + uses: ./.github/workflows/test-action.yml + with: + distro-slug: debian-12-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + testrun: ${{ needs.prepare-workflow.outputs.testrun }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} + skip-junit-reports: ${{ github.event_name == 'pull_request' }} + fedora-37: name: Fedora 37 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -2139,6 +2257,8 @@ jobs: - debian-10-ci-deps - debian-11-ci-deps - debian-11-arm64-ci-deps + - debian-12-ci-deps + - debian-12-arm64-ci-deps - fedora-37-ci-deps - fedora-37-arm64-ci-deps - fedora-38-ci-deps @@ -2165,6 +2285,8 @@ jobs: - debian-10 - debian-11 - debian-11-arm64 + - debian-12 + - debian-12-arm64 - fedora-37 - fedora-38 - opensuse-15 @@ -2294,6 +2416,8 @@ jobs: - debian-10-ci-deps - debian-11-ci-deps - debian-11-arm64-ci-deps + - debian-12-ci-deps + - debian-12-arm64-ci-deps - fedora-37-ci-deps - fedora-37-arm64-ci-deps - fedora-38-ci-deps @@ -2320,6 +2444,8 @@ jobs: - debian-10 - debian-11 - debian-11-arm64 + - debian-12 + - debian-12-arm64 - fedora-37 - fedora-38 - opensuse-15 @@ -2337,6 +2463,8 @@ jobs: - debian-10-pkg-tests - debian-11-pkg-tests - debian-11-arm64-pkg-tests + - debian-12-pkg-tests + - debian-12-arm64-pkg-tests - photonos-3-pkg-tests - photonos-4-pkg-tests - photonos-4-arm64-pkg-tests diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 3a66c846bd4..1fb508551ca 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -1028,6 +1028,40 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + debian-12-ci-deps: + name: Debian 12 Deps + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir-linux + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: debian-12 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + debian-12-arm64-ci-deps: + name: Debian 12 Arm64 Deps + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir-linux + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: debian-12-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + fedora-37-ci-deps: name: Fedora 37 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -1386,6 +1420,50 @@ jobs: skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + debian-12-pkg-tests: + name: Debian 12 Package Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-deb-pkgs-onedir + - debian-12-ci-deps + uses: ./.github/workflows/test-packages-action.yml + with: + distro-slug: debian-12 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + pkg-type: deb + nox-version: 2022.8.7 + python-version: "3.10" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: false + skip-junit-reports: false + testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + + debian-12-arm64-pkg-tests: + name: Debian 12 Arm64 Package Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-deb-pkgs-onedir + - debian-12-arm64-ci-deps + uses: ./.github/workflows/test-packages-action.yml + with: + distro-slug: debian-12-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + pkg-type: deb + nox-version: 2022.8.7 + python-version: "3.10" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: false + skip-junit-reports: false + testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + photonos-3-pkg-tests: name: Photon OS 3 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -1974,6 +2052,46 @@ jobs: skip-code-coverage: false skip-junit-reports: false + debian-12: + name: Debian 12 Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - debian-12-ci-deps + uses: ./.github/workflows/test-action.yml + with: + distro-slug: debian-12 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + testrun: ${{ needs.prepare-workflow.outputs.testrun }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: false + skip-junit-reports: false + + debian-12-arm64: + name: Debian 12 Arm64 Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - debian-12-arm64-ci-deps + uses: ./.github/workflows/test-action.yml + with: + distro-slug: debian-12-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + testrun: ${{ needs.prepare-workflow.outputs.testrun }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: false + skip-junit-reports: false + fedora-37: name: Fedora 37 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -2200,6 +2318,8 @@ jobs: - debian-10-ci-deps - debian-11-ci-deps - debian-11-arm64-ci-deps + - debian-12-ci-deps + - debian-12-arm64-ci-deps - fedora-37-ci-deps - fedora-37-arm64-ci-deps - fedora-38-ci-deps @@ -2226,6 +2346,8 @@ jobs: - debian-10 - debian-11 - debian-11-arm64 + - debian-12 + - debian-12-arm64 - fedora-37 - fedora-38 - opensuse-15 @@ -2441,6 +2563,14 @@ jobs: distro: debian version: "11" arch: aarch64 + - pkg-type: deb + distro: debian + version: "12" + arch: x86_64 + - pkg-type: deb + distro: debian + version: "12" + arch: aarch64 - pkg-type: deb distro: ubuntu version: "20.04" @@ -3030,6 +3160,8 @@ jobs: - debian-10-ci-deps - debian-11-ci-deps - debian-11-arm64-ci-deps + - debian-12-ci-deps + - debian-12-arm64-ci-deps - fedora-37-ci-deps - fedora-37-arm64-ci-deps - fedora-38-ci-deps @@ -3056,6 +3188,8 @@ jobs: - debian-10 - debian-11 - debian-11-arm64 + - debian-12 + - debian-12-arm64 - fedora-37 - fedora-38 - opensuse-15 @@ -3134,6 +3268,8 @@ jobs: - debian-10-pkg-tests - debian-11-pkg-tests - debian-11-arm64-pkg-tests + - debian-12-pkg-tests + - debian-12-arm64-pkg-tests - photonos-3-pkg-tests - photonos-4-pkg-tests - photonos-4-arm64-pkg-tests diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7a0b40d8e4b..6810dc17199 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -482,6 +482,38 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + debian-12-ci-deps: + name: Debian 12 Deps + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: debian-12 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + debian-12-arm64-ci-deps: + name: Debian 12 Arm64 Deps + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: debian-12-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + fedora-37-ci-deps: name: Fedora 37 Deps needs: @@ -756,6 +788,8 @@ jobs: - debian-10-ci-deps - debian-11-arm64-ci-deps - debian-11-ci-deps + - debian-12-arm64-ci-deps + - debian-12-ci-deps - fedora-37-arm64-ci-deps - fedora-37-ci-deps - fedora-38-arm64-ci-deps @@ -976,6 +1010,8 @@ jobs: - debian-10-ci-deps - debian-11-ci-deps - debian-11-arm64-ci-deps + - debian-12-ci-deps + - debian-12-arm64-ci-deps - fedora-37-ci-deps - fedora-37-arm64-ci-deps - fedora-38-ci-deps diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 2cd24d6ee33..756a07df6ad 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -1001,6 +1001,40 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + debian-12-ci-deps: + name: Debian 12 Deps + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir-linux + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: debian-12 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + debian-12-arm64-ci-deps: + name: Debian 12 Arm64 Deps + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir-linux + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: debian-12-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + fedora-37-ci-deps: name: Fedora 37 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -1359,6 +1393,50 @@ jobs: skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + debian-12-pkg-tests: + name: Debian 12 Package Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-deb-pkgs-onedir + - debian-12-ci-deps + uses: ./.github/workflows/test-packages-action.yml + with: + distro-slug: debian-12 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + pkg-type: deb + nox-version: 2022.8.7 + python-version: "3.10" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: false + skip-junit-reports: false + testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + + debian-12-arm64-pkg-tests: + name: Debian 12 Arm64 Package Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-deb-pkgs-onedir + - debian-12-arm64-ci-deps + uses: ./.github/workflows/test-packages-action.yml + with: + distro-slug: debian-12-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + pkg-type: deb + nox-version: 2022.8.7 + python-version: "3.10" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: false + skip-junit-reports: false + testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + photonos-3-pkg-tests: name: Photon OS 3 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -1947,6 +2025,46 @@ jobs: skip-code-coverage: false skip-junit-reports: false + debian-12: + name: Debian 12 Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - debian-12-ci-deps + uses: ./.github/workflows/test-action.yml + with: + distro-slug: debian-12 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + testrun: ${{ needs.prepare-workflow.outputs.testrun }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: false + skip-junit-reports: false + + debian-12-arm64: + name: Debian 12 Arm64 Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - debian-12-arm64-ci-deps + uses: ./.github/workflows/test-action.yml + with: + distro-slug: debian-12-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + testrun: ${{ needs.prepare-workflow.outputs.testrun }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: false + skip-junit-reports: false + fedora-37: name: Fedora 37 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -2173,6 +2291,8 @@ jobs: - debian-10-ci-deps - debian-11-ci-deps - debian-11-arm64-ci-deps + - debian-12-ci-deps + - debian-12-arm64-ci-deps - fedora-37-ci-deps - fedora-37-arm64-ci-deps - fedora-38-ci-deps @@ -2199,6 +2319,8 @@ jobs: - debian-10 - debian-11 - debian-11-arm64 + - debian-12 + - debian-12-arm64 - fedora-37 - fedora-38 - opensuse-15 @@ -2330,6 +2452,8 @@ jobs: - debian-10-ci-deps - debian-11-ci-deps - debian-11-arm64-ci-deps + - debian-12-ci-deps + - debian-12-arm64-ci-deps - fedora-37-ci-deps - fedora-37-arm64-ci-deps - fedora-38-ci-deps @@ -2356,6 +2480,8 @@ jobs: - debian-10 - debian-11 - debian-11-arm64 + - debian-12 + - debian-12-arm64 - fedora-37 - fedora-38 - opensuse-15 @@ -2373,6 +2499,8 @@ jobs: - debian-10-pkg-tests - debian-11-pkg-tests - debian-11-arm64-pkg-tests + - debian-12-pkg-tests + - debian-12-arm64-pkg-tests - photonos-3-pkg-tests - photonos-4-pkg-tests - photonos-4-arm64-pkg-tests diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 0da203729de..378aad8bd21 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -1023,6 +1023,40 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + debian-12-ci-deps: + name: Debian 12 Deps + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir-linux + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: debian-12 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + debian-12-arm64-ci-deps: + name: Debian 12 Arm64 Deps + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir-linux + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: debian-12-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + fedora-37-ci-deps: name: Fedora 37 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -1381,6 +1415,50 @@ jobs: skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + debian-12-pkg-tests: + name: Debian 12 Package Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-deb-pkgs-onedir + - debian-12-ci-deps + uses: ./.github/workflows/test-packages-action.yml + with: + distro-slug: debian-12 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + pkg-type: deb + nox-version: 2022.8.7 + python-version: "3.10" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: true + skip-junit-reports: true + testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + + debian-12-arm64-pkg-tests: + name: Debian 12 Arm64 Package Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-deb-pkgs-onedir + - debian-12-arm64-ci-deps + uses: ./.github/workflows/test-packages-action.yml + with: + distro-slug: debian-12-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + pkg-type: deb + nox-version: 2022.8.7 + python-version: "3.10" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: true + skip-junit-reports: true + testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + photonos-3-pkg-tests: name: Photon OS 3 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -1969,6 +2047,46 @@ jobs: skip-code-coverage: true skip-junit-reports: true + debian-12: + name: Debian 12 Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - debian-12-ci-deps + uses: ./.github/workflows/test-action.yml + with: + distro-slug: debian-12 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + testrun: ${{ needs.prepare-workflow.outputs.testrun }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: true + skip-junit-reports: true + + debian-12-arm64: + name: Debian 12 Arm64 Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - debian-12-arm64-ci-deps + uses: ./.github/workflows/test-action.yml + with: + distro-slug: debian-12-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + testrun: ${{ needs.prepare-workflow.outputs.testrun }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: true + skip-junit-reports: true + fedora-37: name: Fedora 37 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -2297,6 +2415,14 @@ jobs: distro: debian version: "11" arch: aarch64 + - pkg-type: deb + distro: debian + version: "12" + arch: x86_64 + - pkg-type: deb + distro: debian + version: "12" + arch: aarch64 - pkg-type: deb distro: ubuntu version: "20.04" @@ -2989,6 +3115,8 @@ jobs: - debian-10-ci-deps - debian-11-arm64-ci-deps - debian-11-ci-deps + - debian-12-arm64-ci-deps + - debian-12-ci-deps - fedora-37-arm64-ci-deps - fedora-37-ci-deps - fedora-38-arm64-ci-deps @@ -3043,6 +3171,8 @@ jobs: - debian-10-ci-deps - debian-11-ci-deps - debian-11-arm64-ci-deps + - debian-12-ci-deps + - debian-12-arm64-ci-deps - fedora-37-ci-deps - fedora-37-arm64-ci-deps - fedora-38-ci-deps @@ -3069,6 +3199,8 @@ jobs: - debian-10 - debian-11 - debian-11-arm64 + - debian-12 + - debian-12-arm64 - fedora-37 - fedora-38 - opensuse-15 @@ -3086,6 +3218,8 @@ jobs: - debian-10-pkg-tests - debian-11-pkg-tests - debian-11-arm64-pkg-tests + - debian-12-pkg-tests + - debian-12-arm64-pkg-tests - photonos-3-pkg-tests - photonos-4-pkg-tests - photonos-4-arm64-pkg-tests diff --git a/.github/workflows/templates/build-deb-repo.yml.jinja b/.github/workflows/templates/build-deb-repo.yml.jinja index c2f0c09d0f2..165c60c02e9 100644 --- a/.github/workflows/templates/build-deb-repo.yml.jinja +++ b/.github/workflows/templates/build-deb-repo.yml.jinja @@ -8,6 +8,8 @@ ("debian", "10", "aarch64"), ("debian", "11", "x86_64"), ("debian", "11", "aarch64"), + ("debian", "12", "x86_64"), + ("debian", "12", "aarch64"), ("ubuntu", "20.04", "x86_64"), ("ubuntu", "20.04", "aarch64"), ("ubuntu", "22.04", "x86_64"), diff --git a/.github/workflows/test-package-downloads-action.yml b/.github/workflows/test-package-downloads-action.yml index 5473ebd17ec..9ab635d6855 100644 --- a/.github/workflows/test-package-downloads-action.yml +++ b/.github/workflows/test-package-downloads-action.yml @@ -110,6 +110,12 @@ jobs: - distro-slug: debian-11-arm64 arch: aarch64 pkg-type: package + - distro-slug: debian-12 + arch: x86_64 + pkg-type: package + - distro-slug: debian-12-arm64 + arch: aarch64 + pkg-type: package - distro-slug: fedora-37 arch: x86_64 pkg-type: package diff --git a/changelog/64223.added.md b/changelog/64223.added.md new file mode 100644 index 00000000000..a68be1cfe15 --- /dev/null +++ b/changelog/64223.added.md @@ -0,0 +1 @@ +Added Salt support for Debian 12 diff --git a/cicd/golden-images.json b/cicd/golden-images.json index 962af9809e6..864296199e9 100644 --- a/cicd/golden-images.json +++ b/cicd/golden-images.json @@ -209,6 +209,26 @@ "is_windows": "false", "ssh_username": "admin" }, + "debian-12-arm64": { + "ami": "ami-055b0a6d5bb3e9ecd", + "ami_description": "CI Image of Debian 12 arm64", + "ami_name": "salt-project/ci/debian/12/arm64/20230912.1550", + "arch": "arm64", + "cloudwatch-agent-available": "false", + "instance_type": "m6g.large", + "is_windows": "false", + "ssh_username": "admin" + }, + "debian-12": { + "ami": "ami-0eada119571a913fd", + "ami_description": "CI Image of Debian 12 x86_64", + "ami_name": "salt-project/ci/debian/12/x86_64/20230912.1550", + "arch": "x86_64", + "cloudwatch-agent-available": "true", + "instance_type": "t3a.large", + "is_windows": "false", + "ssh_username": "admin" + }, "fedora-37-arm64": { "ami": "ami-0201f64fda9f1ca6d", "ami_description": "CI Image of Fedora 37 arm64", diff --git a/tests/pytests/unit/grains/test_core.py b/tests/pytests/unit/grains/test_core.py index 993c7239508..796da9658d2 100644 --- a/tests/pytests/unit/grains/test_core.py +++ b/tests/pytests/unit/grains/test_core.py @@ -890,6 +890,36 @@ def test_debian_11_os_grains(): _run_os_grains_tests(_os_release_data, {}, expectation) +@pytest.mark.skip_unless_on_linux +def test_debian_12_os_grains(): + """ + Test if OS grains are parsed correctly in Debian 12 "bookworm" + """ + # /etc/os-release data taken from base-files 12.4 + _os_release_data = { + "PRETTY_NAME": "Debian GNU/Linux 12 (bookworm)", + "NAME": "Debian GNU/Linux", + "VERSION_ID": "12", + "VERSION": "12 (bookworm)", + "VERSION_CODENAME": "bookworm", + "ID": "debian", + "HOME_URL": "https://www.debian.org/", + "SUPPORT_URL": "https://www.debian.org/support", + "BUG_REPORT_URL": "https://bugs.debian.org/", + } + expectation = { + "os": "Debian", + "os_family": "Debian", + "oscodename": "bookworm", + "osfullname": "Debian GNU/Linux", + "osrelease": "12", + "osrelease_info": (12,), + "osmajorrelease": 12, + "osfinger": "Debian-12", + } + _run_os_grains_tests(_os_release_data, {}, expectation) + + @pytest.mark.skip_unless_on_linux def test_centos_8_os_grains(): """ diff --git a/tools/pkg/repo/create.py b/tools/pkg/repo/create.py index f8ca561295c..fb4c72db6aa 100644 --- a/tools/pkg/repo/create.py +++ b/tools/pkg/repo/create.py @@ -51,11 +51,16 @@ _deb_distro_info = { "10": { "label": "deb10ary", "codename": "buster", - "suitename": "oldstable", + "suitename": "oldoldstable", }, "11": { "label": "deb11ary", "codename": "bullseye", + "suitename": "oldstable", + }, + "12": { + "label": "deb12ary", + "codename": "bookworm", "suitename": "stable", }, }, diff --git a/tools/pre_commit.py b/tools/pre_commit.py index 1dfbfb70476..9598f06aedc 100644 --- a/tools/pre_commit.py +++ b/tools/pre_commit.py @@ -96,6 +96,8 @@ def generate_workflows(ctx: Context): ("debian-10", "Debian 10", "x86_64"), ("debian-11", "Debian 11", "x86_64"), ("debian-11-arm64", "Debian 11 Arm64", "aarch64"), + ("debian-12", "Debian 12", "x86_64"), + ("debian-12-arm64", "Debian 12 Arm64", "aarch64"), ("fedora-37", "Fedora 37", "x86_64"), ("fedora-38", "Fedora 38", "x86_64"), ("opensuse-15", "Opensuse 15", "x86_64"), @@ -123,6 +125,8 @@ def generate_workflows(ctx: Context): ("debian-10", "Debian 10", "x86_64", "deb"), ("debian-11", "Debian 11", "x86_64", "deb"), ("debian-11-arm64", "Debian 11 Arm64", "aarch64", "deb"), + ("debian-12", "Debian 12", "x86_64", "deb"), + ("debian-12-arm64", "Debian 12 Arm64", "aarch64", "deb"), ("photonos-3", "Photon OS 3", "x86_64", "rpm"), ("photonos-4", "Photon OS 4", "x86_64", "rpm"), ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64", "rpm"), @@ -156,6 +160,8 @@ def generate_workflows(ctx: Context): ("debian-10", "Debian 10", "x86_64"), ("debian-11", "Debian 11", "x86_64"), ("debian-11-arm64", "Debian 11 Arm64", "aarch64"), + ("debian-12", "Debian 12", "x86_64"), + ("debian-12-arm64", "Debian 12 Arm64", "aarch64"), ("fedora-37", "Fedora 37", "x86_64"), ("fedora-37-arm64", "Fedora 37 Arm64", "aarch64"), ("fedora-38", "Fedora 38", "x86_64"), From efbc3ea42aed837bd4753d7e1fad2a31344d688c Mon Sep 17 00:00:00 2001 From: Megan Wilhite Date: Fri, 29 Sep 2023 14:34:56 -0600 Subject: [PATCH 139/147] Fix debian 12 package tests --- tests/pytests/functional/modules/test_pkg.py | 4 ++++ tests/pytests/functional/states/pkgrepo/test_debian.py | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/tests/pytests/functional/modules/test_pkg.py b/tests/pytests/functional/modules/test_pkg.py index 72a5fd3b157..44769d84c97 100644 --- a/tests/pytests/functional/modules/test_pkg.py +++ b/tests/pytests/functional/modules/test_pkg.py @@ -551,6 +551,10 @@ def test_pkg_install_port(grains, modules): if grains["os_family"] == "Debian": url = modules.cmd.run("apt download --print-uris nano").split()[-4] + if url.startswith("'mirror+file"): + url = "http://ftp.debian.org/debian/pool/" + url.split("pool")[1].rstrip( + "'" + ) try: ret = modules.pkg.install(sources=f'[{{"nano":{url}}}]') version = re.compile(r"\d\.\d") diff --git a/tests/pytests/functional/states/pkgrepo/test_debian.py b/tests/pytests/functional/states/pkgrepo/test_debian.py index 389bf918c08..b8c8344c095 100644 --- a/tests/pytests/functional/states/pkgrepo/test_debian.py +++ b/tests/pytests/functional/states/pkgrepo/test_debian.py @@ -673,6 +673,10 @@ class Repo: if ( self.grains["osfullname"] == "Ubuntu" and self.grains["osrelease"] == "22.04" + or "Debian" in self.grains["osfullname"] + and self.grains["osrelease"] == "12" + # only need to use alt repo until + # we release Debian 12 salt packages ): return True return False From 2a4bb2698d17f9ca95fe1cd58af9d9584755b6b1 Mon Sep 17 00:00:00 2001 From: ScriptAutomate Date: Fri, 29 Sep 2023 15:37:48 -0500 Subject: [PATCH 140/147] Remove Debian 12 dupes in golden-images --- cicd/golden-images.json | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/cicd/golden-images.json b/cicd/golden-images.json index 864296199e9..962af9809e6 100644 --- a/cicd/golden-images.json +++ b/cicd/golden-images.json @@ -209,26 +209,6 @@ "is_windows": "false", "ssh_username": "admin" }, - "debian-12-arm64": { - "ami": "ami-055b0a6d5bb3e9ecd", - "ami_description": "CI Image of Debian 12 arm64", - "ami_name": "salt-project/ci/debian/12/arm64/20230912.1550", - "arch": "arm64", - "cloudwatch-agent-available": "false", - "instance_type": "m6g.large", - "is_windows": "false", - "ssh_username": "admin" - }, - "debian-12": { - "ami": "ami-0eada119571a913fd", - "ami_description": "CI Image of Debian 12 x86_64", - "ami_name": "salt-project/ci/debian/12/x86_64/20230912.1550", - "arch": "x86_64", - "cloudwatch-agent-available": "true", - "instance_type": "t3a.large", - "is_windows": "false", - "ssh_username": "admin" - }, "fedora-37-arm64": { "ami": "ami-0201f64fda9f1ca6d", "ami_description": "CI Image of Fedora 37 arm64", From cdd940a9aaaf59fc68fd82bc827b905be795518f Mon Sep 17 00:00:00 2001 From: Megan Wilhite Date: Thu, 5 Oct 2023 08:16:54 -0600 Subject: [PATCH 141/147] Debian 12: Do not run upgrade/downgrade tests until we release packages --- tools/ci.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/ci.py b/tools/ci.py index 6127db6777f..20d78575965 100644 --- a/tools/ci.py +++ b/tools/ci.py @@ -706,6 +706,9 @@ def pkg_matrix( distro_slug not in [ "debian-11-arm64", + # TODO: remove debian 12 once debian 12 pkgs are released + "debian-12-arm64", + "debian-12", "ubuntu-20.04-arm64", "ubuntu-22.04-arm64", "photonos-3", @@ -741,6 +744,9 @@ def pkg_matrix( distro_slug not in [ "centosstream-9", + "debian-11-arm64", + "debian-12-arm64", + "debian-12", "ubuntu-22.04", "ubuntu-22.04-arm64", "photonos-3", From 34cc82e53864e6d8b0737b49e6dca181bd7bf74d Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 10 Oct 2023 19:19:10 +0100 Subject: [PATCH 142/147] If `test:coverage` label is set, run the full test suite. Signed-off-by: Pedro Algarvio --- tools/ci.py | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/tools/ci.py b/tools/ci.py index 20d78575965..1c319ad069a 100644 --- a/tools/ci.py +++ b/tools/ci.py @@ -471,16 +471,20 @@ def define_testrun(ctx: Context, event_name: str, changed_files: pathlib.Path): label[0] for label in _get_pr_test_labels_from_event_payload(gh_event) ) - skip_code_coverage = True if "test:coverage" in labels: - skip_code_coverage = False + ctx.info("Writing 'testrun' to the github outputs file") + testrun = TestRun(type="full", skip_code_coverage=False) + with open(github_output, "a", encoding="utf-8") as wfh: + wfh.write(f"testrun={json.dumps(testrun)}\n") + with open(github_step_summary, "a", encoding="utf-8") as wfh: + wfh.write( + "Full test run chosen because the label `test:coverage` is set.\n" + ) + return elif event_name != "pull_request": - skip_code_coverage = False - - if event_name != "pull_request": # In this case, a full test run is in order ctx.info("Writing 'testrun' to the github outputs file") - testrun = TestRun(type="full", skip_code_coverage=skip_code_coverage) + testrun = TestRun(type="full", skip_code_coverage=False) with open(github_output, "a", encoding="utf-8") as wfh: wfh.write(f"testrun={json.dumps(testrun)}\n") @@ -488,6 +492,8 @@ def define_testrun(ctx: Context, event_name: str, changed_files: pathlib.Path): wfh.write(f"Full test run chosen due to event type of `{event_name}`.\n") return + # So, it's a pull request... + if not changed_files.exists(): ctx.error(f"The '{changed_files}' file does not exist.") ctx.error( @@ -501,7 +507,6 @@ def define_testrun(ctx: Context, event_name: str, changed_files: pathlib.Path): ctx.error(f"Could not load the changed files from '{changed_files}': {exc}") ctx.exit(1) - # So, it's a pull request... # Based on which files changed, or other things like PR labels we can # decide what to run, or even if the full test run should be running on the # pull request, etc... @@ -517,7 +522,7 @@ def define_testrun(ctx: Context, event_name: str, changed_files: pathlib.Path): "Full test run chosen because there was a change made " "to `cicd/golden-images.json`.\n" ) - testrun = TestRun(type="full", skip_code_coverage=skip_code_coverage) + testrun = TestRun(type="full", skip_code_coverage=True) elif changed_pkg_requirements_files or changed_test_requirements_files: with open(github_step_summary, "a", encoding="utf-8") as wfh: wfh.write( @@ -532,16 +537,16 @@ def define_testrun(ctx: Context, event_name: str, changed_files: pathlib.Path): ): wfh.write(f"{path}\n") wfh.write("\n\n") - testrun = TestRun(type="full", skip_code_coverage=skip_code_coverage) + testrun = TestRun(type="full", skip_code_coverage=True) elif "test:full" in labels: with open(github_step_summary, "a", encoding="utf-8") as wfh: wfh.write("Full test run chosen because the label `test:full` is set.\n") - testrun = TestRun(type="full", skip_code_coverage=skip_code_coverage) + testrun = TestRun(type="full", skip_code_coverage=True) else: testrun_changed_files_path = tools.utils.REPO_ROOT / "testrun-changed-files.txt" testrun = TestRun( type="changed", - skip_code_coverage=skip_code_coverage, + skip_code_coverage=True, from_filenames=str( testrun_changed_files_path.relative_to(tools.utils.REPO_ROOT) ), From cb44e8887b09de7a449cd091f0e0f389f86ec18b Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 11 Oct 2023 08:05:00 +0100 Subject: [PATCH 143/147] Run `pygupgrade` against changed files from merge-forward Signed-off-by: Pedro Algarvio --- tests/pytests/unit/grains/test_core.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/tests/pytests/unit/grains/test_core.py b/tests/pytests/unit/grains/test_core.py index 796da9658d2..c75794e5418 100644 --- a/tests/pytests/unit/grains/test_core.py +++ b/tests/pytests/unit/grains/test_core.py @@ -450,7 +450,7 @@ def test_gnu_slash_linux_in_os_name(): ), patch.object( os.path, "exists", path_exists_mock ), patch( - "{}.__import__".format(built_in), side_effect=_import_mock + f"{built_in}.__import__", side_effect=_import_mock ), patch.object( os.path, "isfile", path_isfile_mock ), patch.object( @@ -528,7 +528,7 @@ def test_suse_os_from_cpe_data(): ), patch.object( os.path, "exists", path_exists_mock ), patch( - "{}.__import__".format(built_in), side_effect=_import_mock + f"{built_in}.__import__", side_effect=_import_mock ), patch.object( os.path, "isfile", MagicMock(return_value=False) ), patch.object( @@ -603,7 +603,7 @@ def _run_os_grains_tests(os_release_data, os_release_map, expectation): ), patch.object( os.path, "exists", path_isfile_mock ), patch( - "{}.__import__".format(built_in), side_effect=_import_mock + f"{built_in}.__import__", side_effect=_import_mock ), patch.object( os.path, "isfile", path_isfile_mock ), patch.object( @@ -1709,7 +1709,7 @@ def test_docker_virtual(cgroup_substr): """ Test if virtual grains are parsed correctly in Docker. """ - cgroup_data = "10:memory{}a_long_sha256sum".format(cgroup_substr) + cgroup_data = f"10:memory{cgroup_substr}a_long_sha256sum" log.debug("Testing Docker cgroup substring '%s'", cgroup_substr) with patch.object(os.path, "isdir", MagicMock(return_value=False)), patch.object( os.path, @@ -1844,7 +1844,7 @@ def test_illumos_virtual(): if cmd == "/usr/bin/zonename": # NOTE: we return the name of the zone return "myzone" - mylogdebug = "cmd.run_all: '{}'".format(cmd) + mylogdebug = f"cmd.run_all: '{cmd}'" log.debug(mylogdebug) def _cmd_all_side_effect(cmd): @@ -1948,7 +1948,7 @@ def _check_ipaddress(value, ip_v): """ for val in value: assert isinstance(val, str) - ip_method = "is_ipv{}".format(ip_v) + ip_method = f"is_ipv{ip_v}" assert getattr(salt.utils.network, ip_method)(val) @@ -1958,11 +1958,9 @@ def _check_empty(key, value, empty): if empty is True and value exists assert error """ if not empty and not value: - raise Exception("{} is empty, expecting a value".format(key)) + raise Exception(f"{key} is empty, expecting a value") elif empty and value: - raise Exception( - "{} is suppose to be empty. value: {} exists".format(key, value) - ) + raise Exception(f"{key} is suppose to be empty. value: {value} exists") def _check_ip_fqdn_set(value, empty, _set=None): @@ -2335,7 +2333,7 @@ def test_core_virtual(): "pid": 78, "retcode": 0, "stderr": "", - "stdout": "\n\n{}".format(virt), + "stdout": f"\n\n{virt}", } ) }, From 0445f9ea3938237323b498e4b86ede6936533140 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 10 Oct 2023 20:51:30 +0100 Subject: [PATCH 144/147] Improve error message Signed-off-by: Pedro Algarvio --- salt/transport/tcp.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/salt/transport/tcp.py b/salt/transport/tcp.py index 3cf464b222c..2efc1a502a3 100644 --- a/salt/transport/tcp.py +++ b/salt/transport/tcp.py @@ -308,12 +308,14 @@ class TCPPubClient(salt.transport.base.PublishClient): self.unpacker = salt.utils.msgpack.Unpacker() log.debug("PubClient conencted to %r %r", self, self.path) except Exception as exc: # pylint: disable=broad-except + if self.path: + _connect_to = self.path + else: + _connect_to = f"{self.host}:{self.port}" log.warning( "TCP Publish Client encountered an exception while connecting to" - " %s:%s %s: %r, will reconnect in %d seconds", - self.host, - self.port, - self.path, + " %s: %r, will reconnect in %d seconds", + _connect_to, exc, self.backoff, ) From 0971af933119a04e285ded086c52ea281f2f6071 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 10 Oct 2023 20:45:56 +0100 Subject: [PATCH 145/147] Some tests require `TCPPubClient` to be mocked. This prevents the tests from hanging on Windows, and slowing down on Linux. Signed-off-by: Pedro Algarvio --- tests/pytests/unit/conftest.py | 15 +++++++++++++++ tests/pytests/unit/modules/state/test_state.py | 1 + tests/pytests/unit/modules/test_beacons.py | 8 ++++++-- tests/pytests/unit/modules/test_schedule.py | 4 ++++ tests/pytests/unit/runners/test_reactor.py | 4 ++++ tests/pytests/unit/states/file/test_mod_beacon.py | 4 ++++ tests/pytests/unit/states/test_pkg.py | 1 + tests/pytests/unit/states/test_service.py | 9 +++++---- 8 files changed, 40 insertions(+), 6 deletions(-) diff --git a/tests/pytests/unit/conftest.py b/tests/pytests/unit/conftest.py index cf839ba798b..5283510994f 100644 --- a/tests/pytests/unit/conftest.py +++ b/tests/pytests/unit/conftest.py @@ -1,6 +1,10 @@ +import asyncio + import pytest import salt.config +import salt.transport.tcp +from tests.support.mock import MagicMock, patch @pytest.fixture @@ -53,3 +57,14 @@ def syndic_opts(tmp_path): opts[name] = str(dirpath) opts["log_file"] = "logs/syndic.log" return opts + + +@pytest.fixture +def mocked_tcp_pub_client(): + transport = MagicMock(spec=salt.transport.tcp.TCPPubClient) + transport.connect = MagicMock() + future = asyncio.Future() + transport.connect.return_value = future + future.set_result(True) + with patch("salt.transport.tcp.TCPPubClient", transport): + yield diff --git a/tests/pytests/unit/modules/state/test_state.py b/tests/pytests/unit/modules/state/test_state.py index cec4720265c..b5031964aaa 100644 --- a/tests/pytests/unit/modules/state/test_state.py +++ b/tests/pytests/unit/modules/state/test_state.py @@ -1212,6 +1212,7 @@ def test_get_pillar_errors(pillar: PillarPair, expected_errors): ) +@pytest.mark.usefixtures("mocked_tcp_pub_client") def test_event(): """ test state.event runner diff --git a/tests/pytests/unit/modules/test_beacons.py b/tests/pytests/unit/modules/test_beacons.py index 150133f41cd..52fc23a0634 100644 --- a/tests/pytests/unit/modules/test_beacons.py +++ b/tests/pytests/unit/modules/test_beacons.py @@ -13,6 +13,10 @@ from tests.support.mock import MagicMock, call, mock_open, patch log = logging.getLogger(__name__) +pytestmark = [ + pytest.mark.usefixtures("mocked_tcp_pub_client"), +] + @pytest.fixture def configure_loader_modules(minion_opts): @@ -111,7 +115,7 @@ def test_save(): # Test that beacons contents are written to config file. _expected = { - "comment": "Beacons saved to {}.".format(_beacon_conf_file), + "comment": f"Beacons saved to {_beacon_conf_file}.", "result": True, } with patch("salt.utils.files.fopen", mock_open(read_data="")) as fopen_mock: @@ -131,7 +135,7 @@ def test_save(): # Test that when beacons is empty then an empty config file is written. _expected = { - "comment": "Beacons saved to {}.".format(_beacon_conf_file), + "comment": f"Beacons saved to {_beacon_conf_file}.", "result": True, } with patch("salt.utils.files.fopen", mock_open(read_data="")) as fopen_mock: diff --git a/tests/pytests/unit/modules/test_schedule.py b/tests/pytests/unit/modules/test_schedule.py index d39ae30e5c2..cd4a6d5925f 100644 --- a/tests/pytests/unit/modules/test_schedule.py +++ b/tests/pytests/unit/modules/test_schedule.py @@ -15,6 +15,10 @@ from tests.support.mock import MagicMock, call, mock_open, patch log = logging.getLogger(__name__) +pytestmark = [ + pytest.mark.usefixtures("mocked_tcp_pub_client"), +] + @pytest.fixture def job1(): diff --git a/tests/pytests/unit/runners/test_reactor.py b/tests/pytests/unit/runners/test_reactor.py index 359db8ebbcc..10edc5de289 100644 --- a/tests/pytests/unit/runners/test_reactor.py +++ b/tests/pytests/unit/runners/test_reactor.py @@ -14,6 +14,10 @@ from tests.support.mock import MagicMock, patch log = logging.getLogger(__name__) +pytestmark = [ + pytest.mark.usefixtures("mocked_tcp_pub_client"), +] + class MockEvent: """ diff --git a/tests/pytests/unit/states/file/test_mod_beacon.py b/tests/pytests/unit/states/file/test_mod_beacon.py index 512e55094b5..d201b7971f8 100644 --- a/tests/pytests/unit/states/file/test_mod_beacon.py +++ b/tests/pytests/unit/states/file/test_mod_beacon.py @@ -10,6 +10,10 @@ import salt.states.file as filestate from salt.utils.event import SaltEvent from tests.support.mock import MagicMock, patch +pytestmark = [ + pytest.mark.usefixtures("mocked_tcp_pub_client"), +] + @pytest.fixture def configure_loader_modules(): diff --git a/tests/pytests/unit/states/test_pkg.py b/tests/pytests/unit/states/test_pkg.py index 30e4e6cfb6c..a7b6b048f88 100644 --- a/tests/pytests/unit/states/test_pkg.py +++ b/tests/pytests/unit/states/test_pkg.py @@ -328,6 +328,7 @@ def test_fulfills_version_spec(installed_versions, operator, version, expected_r ) +@pytest.mark.usefixtures("mocked_tcp_pub_client") def test_mod_beacon(tmp_path): """ Test to create a beacon based on a pkg diff --git a/tests/pytests/unit/states/test_service.py b/tests/pytests/unit/states/test_service.py index e36d498087d..6be5afdc8ae 100644 --- a/tests/pytests/unit/states/test_service.py +++ b/tests/pytests/unit/states/test_service.py @@ -478,7 +478,7 @@ def test_dead_with_missing_service(): ret = service.dead(name=name) assert ret == { "changes": {}, - "comment": "The named service {} is not available".format(name), + "comment": f"The named service {name} is not available", "result": True, "name": name, } @@ -587,6 +587,7 @@ def test_mod_watch(): assert service.mod_watch("salt", "stack") == ret[1] +@pytest.mark.usefixtures("mocked_tcp_pub_client") def test_mod_beacon(tmp_path): """ Test to create a beacon based on a service @@ -708,7 +709,7 @@ def test_running_with_reload(minion_opts): service_name = "Spooler" if os_family != "Windows" and salt.utils.path.which(cmd_name) is None: - pytest.skip("{} is not installed".format(cmd_name)) + pytest.skip(f"{cmd_name} is not installed") pre_srv_enabled = ( True if service_name in modules["service.get_enabled"]() else False @@ -732,9 +733,9 @@ def test_running_with_reload(minion_opts): result = service.running(name=service_name, enable=True, reload=False) if salt.utils.platform.is_windows(): - comment = "Started service {}".format(service_name) + comment = f"Started service {service_name}" else: - comment = "Service {} has been enabled, and is running".format(service_name) + comment = f"Service {service_name} has been enabled, and is running" expected = { "changes": {service_name: True}, "comment": comment, From e0bc1bd255b8745f1f31e78bba74edc66152a655 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 11 Oct 2023 17:12:25 +0100 Subject: [PATCH 146/147] Upgrade to `tornado>=6.3.3` due to https://github.com/advisories/GHSA-qppv-j76h-2rpx Signed-off-by: Pedro Algarvio --- changelog/64989.security.md | 1 + requirements/base.txt | 3 ++- requirements/static/ci/py3.10/darwin.txt | 2 +- requirements/static/ci/py3.10/freebsd.txt | 2 +- requirements/static/ci/py3.10/linux.txt | 2 +- requirements/static/ci/py3.10/windows.txt | 2 +- requirements/static/ci/py3.11/darwin.txt | 2 +- requirements/static/ci/py3.11/freebsd.txt | 2 +- requirements/static/ci/py3.11/linux.txt | 2 +- requirements/static/ci/py3.11/windows.txt | 2 +- requirements/static/ci/py3.8/freebsd.txt | 2 +- requirements/static/ci/py3.8/linux.txt | 2 +- requirements/static/ci/py3.8/windows.txt | 2 +- requirements/static/ci/py3.9/darwin.txt | 2 +- requirements/static/ci/py3.9/freebsd.txt | 2 +- requirements/static/ci/py3.9/linux.txt | 2 +- requirements/static/ci/py3.9/windows.txt | 2 +- requirements/static/pkg/py3.10/darwin.txt | 2 +- requirements/static/pkg/py3.10/freebsd.txt | 2 +- requirements/static/pkg/py3.10/linux.txt | 2 +- requirements/static/pkg/py3.10/windows.txt | 2 +- requirements/static/pkg/py3.11/darwin.txt | 2 +- requirements/static/pkg/py3.11/freebsd.txt | 2 +- requirements/static/pkg/py3.11/linux.txt | 2 +- requirements/static/pkg/py3.11/windows.txt | 2 +- requirements/static/pkg/py3.8/freebsd.txt | 2 +- requirements/static/pkg/py3.8/linux.txt | 2 +- requirements/static/pkg/py3.8/windows.txt | 2 +- requirements/static/pkg/py3.9/darwin.txt | 2 +- requirements/static/pkg/py3.9/freebsd.txt | 2 +- requirements/static/pkg/py3.9/linux.txt | 2 +- requirements/static/pkg/py3.9/windows.txt | 2 +- 32 files changed, 33 insertions(+), 31 deletions(-) create mode 100644 changelog/64989.security.md diff --git a/changelog/64989.security.md b/changelog/64989.security.md new file mode 100644 index 00000000000..65ec0821e67 --- /dev/null +++ b/changelog/64989.security.md @@ -0,0 +1 @@ +Upgrade to `tornado>=6.3.3` due to https://github.com/advisories/GHSA-qppv-j76h-2rpx diff --git a/requirements/base.txt b/requirements/base.txt index d681ad0a5dd..55574c2725b 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,6 +8,7 @@ distro>=1.0.1 psutil>=5.0.0 packaging>=21.3 looseversion +tornado>=6.3.3 + # We need contextvars for salt-ssh contextvars -tornado>=6.3.2 diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index 13bde8d4701..2c009ac2623 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -505,7 +505,7 @@ toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest -tornado==6.3.2 +tornado==6.3.3 # via # -c requirements/static/ci/../pkg/py3.10/darwin.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index 0498cbc5ae9..8679b634449 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -495,7 +495,7 @@ toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest -tornado==6.3.2 +tornado==6.3.3 # via # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index 2fbe7f4f304..d4947890ae6 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -557,7 +557,7 @@ toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest -tornado==6.3.2 +tornado==6.3.3 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index bbabb0f82c8..16e3aa1cbf4 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -454,7 +454,7 @@ toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest -tornado==6.3.2 +tornado==6.3.3 # via # -c requirements/static/ci/../pkg/py3.10/windows.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.11/darwin.txt b/requirements/static/ci/py3.11/darwin.txt index 1d3aa656f03..4a596e9d465 100644 --- a/requirements/static/ci/py3.11/darwin.txt +++ b/requirements/static/ci/py3.11/darwin.txt @@ -499,7 +499,7 @@ timelib==0.3.0 # -r requirements/darwin.txt toml==0.10.2 # via -r requirements/static/ci/common.in -tornado==6.3.2 +tornado==6.3.3 # via # -c requirements/static/ci/../pkg/py3.11/darwin.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.11/freebsd.txt b/requirements/static/ci/py3.11/freebsd.txt index 12cea146fe8..9e0748b02d6 100644 --- a/requirements/static/ci/py3.11/freebsd.txt +++ b/requirements/static/ci/py3.11/freebsd.txt @@ -491,7 +491,7 @@ timelib==0.3.0 # -r requirements/static/pkg/freebsd.in toml==0.10.2 # via -r requirements/static/ci/common.in -tornado==6.3.2 +tornado==6.3.3 # via # -c requirements/static/ci/../pkg/py3.11/freebsd.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.11/linux.txt b/requirements/static/ci/py3.11/linux.txt index 74609480c7c..ea1d14dcb36 100644 --- a/requirements/static/ci/py3.11/linux.txt +++ b/requirements/static/ci/py3.11/linux.txt @@ -551,7 +551,7 @@ timelib==0.3.0 # -r requirements/static/pkg/linux.in toml==0.10.2 # via -r requirements/static/ci/common.in -tornado==6.3.2 +tornado==6.3.3 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.11/windows.txt b/requirements/static/ci/py3.11/windows.txt index 5589143a203..b87b69665f6 100644 --- a/requirements/static/ci/py3.11/windows.txt +++ b/requirements/static/ci/py3.11/windows.txt @@ -450,7 +450,7 @@ timelib==0.3.0 # -r requirements/windows.txt toml==0.10.2 # via -r requirements/static/ci/common.in -tornado==6.3.2 +tornado==6.3.3 # via # -c requirements/static/ci/../pkg/py3.11/windows.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.8/freebsd.txt b/requirements/static/ci/py3.8/freebsd.txt index 1ec1f371827..7e3ed54ec5d 100644 --- a/requirements/static/ci/py3.8/freebsd.txt +++ b/requirements/static/ci/py3.8/freebsd.txt @@ -499,7 +499,7 @@ toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest -tornado==6.3.2 +tornado==6.3.3 # via # -c requirements/static/ci/../pkg/py3.8/freebsd.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.8/linux.txt b/requirements/static/ci/py3.8/linux.txt index 7537115e408..cf85eddf786 100644 --- a/requirements/static/ci/py3.8/linux.txt +++ b/requirements/static/ci/py3.8/linux.txt @@ -561,7 +561,7 @@ toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest -tornado==6.3.2 +tornado==6.3.3 # via # -c requirements/static/ci/../pkg/py3.8/linux.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.8/windows.txt b/requirements/static/ci/py3.8/windows.txt index e10eec77acd..61692dc740c 100644 --- a/requirements/static/ci/py3.8/windows.txt +++ b/requirements/static/ci/py3.8/windows.txt @@ -459,7 +459,7 @@ toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest -tornado==6.3.2 +tornado==6.3.3 # via # -c requirements/static/ci/../pkg/py3.8/windows.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index 9fd32dd3f96..81bf5659f3d 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -505,7 +505,7 @@ toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest -tornado==6.3.2 +tornado==6.3.3 # via # -c requirements/static/ci/../pkg/py3.9/darwin.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index aeb57d8bd32..2fef8a45713 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -495,7 +495,7 @@ toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest -tornado==6.3.2 +tornado==6.3.3 # via # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index bd78fe9359f..20e1779d670 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -559,7 +559,7 @@ toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest -tornado==6.3.2 +tornado==6.3.3 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index be0122f5378..db9f51e024f 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -455,7 +455,7 @@ toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 # via pytest -tornado==6.3.2 +tornado==6.3.3 # via # -c requirements/static/ci/../pkg/py3.9/windows.txt # -r requirements/base.txt diff --git a/requirements/static/pkg/py3.10/darwin.txt b/requirements/static/pkg/py3.10/darwin.txt index fa6ffefb74d..0346f0cee58 100644 --- a/requirements/static/pkg/py3.10/darwin.txt +++ b/requirements/static/pkg/py3.10/darwin.txt @@ -111,7 +111,7 @@ tempora==5.3.0 # via portend timelib==0.3.0 # via -r requirements/darwin.txt -tornado==6.3.2 +tornado==6.3.3 # via -r requirements/base.txt typing-extensions==4.6.3 # via pydantic diff --git a/requirements/static/pkg/py3.10/freebsd.txt b/requirements/static/pkg/py3.10/freebsd.txt index 8d8fe488e26..bbebd9e46af 100644 --- a/requirements/static/pkg/py3.10/freebsd.txt +++ b/requirements/static/pkg/py3.10/freebsd.txt @@ -98,7 +98,7 @@ tempora==5.3.0 # via portend timelib==0.3.0 # via -r requirements/static/pkg/freebsd.in -tornado==6.3.2 +tornado==6.3.3 # via -r requirements/base.txt typing-extensions==4.6.3 # via pydantic diff --git a/requirements/static/pkg/py3.10/linux.txt b/requirements/static/pkg/py3.10/linux.txt index 3884a1e478c..0b460b9c226 100644 --- a/requirements/static/pkg/py3.10/linux.txt +++ b/requirements/static/pkg/py3.10/linux.txt @@ -98,7 +98,7 @@ tempora==5.3.0 # via portend timelib==0.3.0 # via -r requirements/static/pkg/linux.in -tornado==6.3.2 +tornado==6.3.3 # via -r requirements/base.txt typing-extensions==4.6.3 # via pydantic diff --git a/requirements/static/pkg/py3.10/windows.txt b/requirements/static/pkg/py3.10/windows.txt index 686b16489ad..33aebdf33df 100644 --- a/requirements/static/pkg/py3.10/windows.txt +++ b/requirements/static/pkg/py3.10/windows.txt @@ -125,7 +125,7 @@ tempora==5.3.0 # via portend timelib==0.3.0 # via -r requirements/windows.txt -tornado==6.3.2 +tornado==6.3.3 # via -r requirements/base.txt typing-extensions==4.6.3 # via pydantic diff --git a/requirements/static/pkg/py3.11/darwin.txt b/requirements/static/pkg/py3.11/darwin.txt index cacfc9d9ca1..c8a9a99f9a8 100644 --- a/requirements/static/pkg/py3.11/darwin.txt +++ b/requirements/static/pkg/py3.11/darwin.txt @@ -111,7 +111,7 @@ tempora==5.3.0 # via portend timelib==0.3.0 # via -r requirements/darwin.txt -tornado==6.3.2 +tornado==6.3.3 # via -r requirements/base.txt typing-extensions==4.6.3 # via pydantic diff --git a/requirements/static/pkg/py3.11/freebsd.txt b/requirements/static/pkg/py3.11/freebsd.txt index 3f6f7516a0b..8bf7177e2d1 100644 --- a/requirements/static/pkg/py3.11/freebsd.txt +++ b/requirements/static/pkg/py3.11/freebsd.txt @@ -98,7 +98,7 @@ tempora==5.3.0 # via portend timelib==0.3.0 # via -r requirements/static/pkg/freebsd.in -tornado==6.3.2 +tornado==6.3.3 # via -r requirements/base.txt typing-extensions==4.6.3 # via pydantic diff --git a/requirements/static/pkg/py3.11/linux.txt b/requirements/static/pkg/py3.11/linux.txt index cce7e2c0464..28d32ae04f6 100644 --- a/requirements/static/pkg/py3.11/linux.txt +++ b/requirements/static/pkg/py3.11/linux.txt @@ -98,7 +98,7 @@ tempora==5.3.0 # via portend timelib==0.3.0 # via -r requirements/static/pkg/linux.in -tornado==6.3.2 +tornado==6.3.3 # via -r requirements/base.txt typing-extensions==4.6.3 # via pydantic diff --git a/requirements/static/pkg/py3.11/windows.txt b/requirements/static/pkg/py3.11/windows.txt index b653520a284..894eeb2fb6f 100644 --- a/requirements/static/pkg/py3.11/windows.txt +++ b/requirements/static/pkg/py3.11/windows.txt @@ -125,7 +125,7 @@ tempora==5.3.0 # via portend timelib==0.3.0 # via -r requirements/windows.txt -tornado==6.3.2 +tornado==6.3.3 # via -r requirements/base.txt typing-extensions==4.6.3 # via pydantic diff --git a/requirements/static/pkg/py3.8/freebsd.txt b/requirements/static/pkg/py3.8/freebsd.txt index b71c112aeb3..9a4d6c9515f 100644 --- a/requirements/static/pkg/py3.8/freebsd.txt +++ b/requirements/static/pkg/py3.8/freebsd.txt @@ -100,7 +100,7 @@ tempora==5.3.0 # via portend timelib==0.3.0 # via -r requirements/static/pkg/freebsd.in -tornado==6.3.2 +tornado==6.3.3 # via -r requirements/base.txt typing-extensions==4.6.3 # via pydantic diff --git a/requirements/static/pkg/py3.8/linux.txt b/requirements/static/pkg/py3.8/linux.txt index c20268ddb2c..80726f0fb68 100644 --- a/requirements/static/pkg/py3.8/linux.txt +++ b/requirements/static/pkg/py3.8/linux.txt @@ -100,7 +100,7 @@ tempora==5.3.0 # via portend timelib==0.3.0 # via -r requirements/static/pkg/linux.in -tornado==6.3.2 +tornado==6.3.3 # via -r requirements/base.txt typing-extensions==4.6.3 # via pydantic diff --git a/requirements/static/pkg/py3.8/windows.txt b/requirements/static/pkg/py3.8/windows.txt index 6b759a1b8d4..9e3384790e9 100644 --- a/requirements/static/pkg/py3.8/windows.txt +++ b/requirements/static/pkg/py3.8/windows.txt @@ -128,7 +128,7 @@ tempora==5.3.0 # via portend timelib==0.3.0 # via -r requirements/windows.txt -tornado==6.3.2 +tornado==6.3.3 # via -r requirements/base.txt typing-extensions==4.6.3 # via pydantic diff --git a/requirements/static/pkg/py3.9/darwin.txt b/requirements/static/pkg/py3.9/darwin.txt index d62383b3fe0..da1faf9abc6 100644 --- a/requirements/static/pkg/py3.9/darwin.txt +++ b/requirements/static/pkg/py3.9/darwin.txt @@ -111,7 +111,7 @@ tempora==5.3.0 # via portend timelib==0.3.0 # via -r requirements/darwin.txt -tornado==6.3.2 +tornado==6.3.3 # via -r requirements/base.txt typing-extensions==4.6.3 # via pydantic diff --git a/requirements/static/pkg/py3.9/freebsd.txt b/requirements/static/pkg/py3.9/freebsd.txt index e798b6c8090..4d59e1c3ad4 100644 --- a/requirements/static/pkg/py3.9/freebsd.txt +++ b/requirements/static/pkg/py3.9/freebsd.txt @@ -98,7 +98,7 @@ tempora==5.3.0 # via portend timelib==0.3.0 # via -r requirements/static/pkg/freebsd.in -tornado==6.3.2 +tornado==6.3.3 # via -r requirements/base.txt typing-extensions==4.6.3 # via pydantic diff --git a/requirements/static/pkg/py3.9/linux.txt b/requirements/static/pkg/py3.9/linux.txt index 340665099c5..61267c4640f 100644 --- a/requirements/static/pkg/py3.9/linux.txt +++ b/requirements/static/pkg/py3.9/linux.txt @@ -98,7 +98,7 @@ tempora==5.3.0 # via portend timelib==0.3.0 # via -r requirements/static/pkg/linux.in -tornado==6.3.2 +tornado==6.3.3 # via -r requirements/base.txt typing-extensions==4.6.3 # via pydantic diff --git a/requirements/static/pkg/py3.9/windows.txt b/requirements/static/pkg/py3.9/windows.txt index 24e82858748..be2a05a34e7 100644 --- a/requirements/static/pkg/py3.9/windows.txt +++ b/requirements/static/pkg/py3.9/windows.txt @@ -126,7 +126,7 @@ tempora==5.3.0 # via portend timelib==0.3.0 # via -r requirements/windows.txt -tornado==6.3.2 +tornado==6.3.3 # via -r requirements/base.txt typing-extensions==4.6.3 # via pydantic From b213670518b94a4d41714c1185424638d363414d Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 11 Oct 2023 17:20:31 +0100 Subject: [PATCH 147/147] Install Salt in the container before starting any of Salt's daemons Signed-off-by: Pedro Algarvio --- tests/pytests/integration/modules/test_virt.py | 16 ---------------- tests/support/virt.py | 9 +++++++++ 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/tests/pytests/integration/modules/test_virt.py b/tests/pytests/integration/modules/test_virt.py index c39851305bc..2fd47767158 100644 --- a/tests/pytests/integration/modules/test_virt.py +++ b/tests/pytests/integration/modules/test_virt.py @@ -7,7 +7,6 @@ from xml.etree import ElementTree import pytest -import salt.version from tests.support.virt import SaltVirtMinionContainerFactory docker = pytest.importorskip("docker") @@ -20,19 +19,6 @@ pytestmark = [ ] -def _install_salt_dependencies(container): - dependencies = [] - for package, version in salt.version.dependency_information(): - if package.lower() not in ("tornado", "packaging", "looseversion"): - # These are newer base dependencies which the container might not - # yet have - continue - dependencies.append(f"{package.lower()}=={version}") - if dependencies: - ret = container.run("python3", "-m", "pip", "install", *dependencies) - log.debug("Install missing dependecies ret: %s", ret) - - @pytest.fixture(scope="module") def virt_minion_0_id(): return "virt-minion-0" @@ -73,7 +59,6 @@ def virt_minion_0( skip_on_pull_failure=True, skip_if_docker_client_not_connectable=True, ) - factory.before_start(_install_salt_dependencies, factory) factory.after_terminate( pytest.helpers.remove_stale_minion_key, salt_master, factory.id ) @@ -111,7 +96,6 @@ def virt_minion_1( skip_on_pull_failure=True, skip_if_docker_client_not_connectable=True, ) - factory.before_start(_install_salt_dependencies, factory) factory.after_terminate( pytest.helpers.remove_stale_minion_key, salt_master, factory.id ) diff --git a/tests/support/virt.py b/tests/support/virt.py index 0f2b946ace4..13498a9f630 100644 --- a/tests/support/virt.py +++ b/tests/support/virt.py @@ -1,3 +1,4 @@ +import logging import time import uuid @@ -7,6 +8,13 @@ from saltfactories.daemons.container import SaltMinion from tests.conftest import CODE_DIR +log = logging.getLogger(__name__) + + +def _install_salt_in_container(container): + ret = container.run("python3", "-m", "pip", "install", "/salt") + log.debug("Install Salt in the container: %s", ret) + @attr.s(kw_only=True, slots=True) class SaltVirtMinionContainerFactory(SaltMinion): @@ -64,6 +72,7 @@ class SaltVirtMinionContainerFactory(SaltMinion): self.container_start_check(self._check_script_path_exists) for port in (self.sshd_port, self.libvirt_tcp_port, self.libvirt_tls_port): self.check_ports[port] = port + self.before_start(_install_salt_in_container, self, on_container=False) def _check_script_path_exists(self, timeout_at): while time.time() <= timeout_at: