saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Less macos

Browse source
This commit is contained in:
Daniel A. Wozniak 2024-11-01 21:50:34 -07:00 • committed by Daniel Wozniak
parent aaeebbd0a1
commit 43b75c6cae
11 changed files with 45 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/actions/cached-virtualenv/action.yml vendored
View file

@ -51,7 +51,6 @@ runs:
- name: Cache VirtualEnv
id: cache-virtualenv
if: false # Disable cache since aws is going away.
uses: ./.github/actions/cache
with:
key: ${{ steps.setup-cache-key.outputs.cache-key }}

4
.github/workflows/ci.yml vendored
View file

@ -796,7 +796,7 @@ jobs:
windows-2016:
name: Windows 2016 Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'windows-2016') }}
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
needs:
- prepare-workflow
- build-ci-deps-windows
@ -817,7 +817,7 @@ jobs:
windows-2019:
name: Windows 2019 Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'windows-2019') }}
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
needs:
- prepare-workflow
- build-ci-deps-windows

8
.github/workflows/nightly.yml vendored
View file

@ -1054,7 +1054,9 @@ jobs:
needs:
- prepare-workflow
- build-source-tarball
- build-pkgs-src
- build-pkgs-src-linux
- build-pkgs-src-macos
- build-pkgs-src-windows
strategy:
fail-fast: false
matrix:
@ -1652,7 +1654,9 @@ jobs:
USE_S3_CACHE: 'false'
needs:
- prepare-workflow
- build-salt-onedir
- build-salt-onedir-linux
- build-salt-onedir-macos
- build-salt-onedir-windows
strategy:
fail-fast: false
matrix:

4
.github/workflows/release.yml vendored
View file

@ -284,7 +284,9 @@ jobs:
needs:
- prepare-workflow
- publish-repositories
- build-ci-deps
- build-ci-deps-linux
- build-ci-deps-macos
- build-ci-deps-windows
- download-onedir-artifact
uses: ./.github/workflows/test-package-downloads-action.yml
with:

16
.github/workflows/staging.yml vendored
View file

@ -1036,7 +1036,9 @@ jobs:
needs:
- prepare-workflow
- build-source-tarball
- build-pkgs-src
- build-pkgs-src-linux
- build-pkgs-src-macos
- build-pkgs-src-windows
strategy:
fail-fast: false
matrix:
@ -1636,7 +1638,9 @@ jobs:
USE_S3_CACHE: 'false'
needs:
- prepare-workflow
- build-salt-onedir
- build-salt-onedir-linux
- build-salt-onedir-macos
- build-salt-onedir-windows
strategy:
fail-fast: false
matrix:
@ -1873,8 +1877,12 @@ jobs:
needs:
- prepare-workflow
- publish-repositories
- build-ci-deps
- build-salt-onedir
- build-ci-deps-linux
- build-ci-deps-macos
- build-ci-deps-windows
- build-salt-onedir-linux
- build-salt-onedir-macos
- build-salt-onedir-windows
uses: ./.github/workflows/test-package-downloads-action.yml
with:
nox-session: ci-test-onedir

8
.github/workflows/templates/build-repos.yml.jinja vendored
View file

@ -26,10 +26,14 @@
- build-pkgs-onedir-<{ type }>
<%- endif %>
<%- elif type == 'onedir' %>
- build-salt-onedir
- build-salt-onedir-linux
- build-salt-onedir-macos
- build-salt-onedir-windows
<%- elif type == 'src' %>
- build-source-tarball
- build-pkgs-src
- build-pkgs-src-linux
- build-pkgs-src-macos
- build-pkgs-src-windows
<%- endif %>
<%- include "build-{}-repo.yml.jinja".format(type) %>

8
.github/workflows/templates/test-salt-pkg-repo-downloads.yml.jinja vendored
View file

@ -13,11 +13,15 @@
needs:
- prepare-workflow
- publish-repositories
- build-ci-deps
- build-ci-deps-linux
- build-ci-deps-macos
- build-ci-deps-windows
<%- if gh_environment == "release" %>
- download-onedir-artifact
<%- else %>
- build-salt-onedir
- build-salt-onedir-linux
- build-salt-onedir-macos
- build-salt-onedir-windows
<%- endif %>
uses: ./.github/workflows/test-package-downloads-action.yml
with:

2
.github/workflows/templates/test-salt.yml.jinja vendored
View file

@ -12,7 +12,7 @@
<%- if workflow_slug != "ci" or os.slug in mandatory_os_slugs %>
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
<%- else %>
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), '<{ os.slug }>') }}
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
<%- endif %>
needs:
- prepare-workflow

6
.github/workflows/test-packages-action-linux.yml vendored
View file

@ -70,7 +70,7 @@ env:
PIP_EXTRA_INDEX_URL: ${{ vars.PIP_EXTRA_INDEX_URL }}
PIP_DISABLE_PIP_VERSION_CHECK: "1"
RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1"
USE_S3_CACHE: 'true'
USE_S3_CACHE: 'false'
jobs:
@ -208,7 +208,7 @@ jobs:
${{ matrix.version && format('--prev-version={0}', matrix.version) || ''}}
- name: Upload Test Run Artifacts
if: always() && steps.download-artifacts-from-vm.outcome == 'success'
if: always()
uses: actions/upload-artifact@v4
with:
name: pkg-testrun-artifacts-${{ inputs.distro-slug }}${{ inputs.fips && '-fips' || '' }}-${{ inputs.pkg-type }}-${{ inputs.arch }}-${{ matrix.tests-chunk }}-${{ matrix.version || 'no-version'}}-${{ env.TIMESTAMP }}
@ -263,6 +263,6 @@ jobs:
- name: Show Test Run Artifacts
if: always() && steps.download-test-run-artifacts.outcome == 'success'
if: always()
run: |
tree -a artifacts

30
.github/workflows/test-packages-action-windows.yml vendored
View file

@ -78,9 +78,7 @@ jobs:
runs-on:
# We need to run on our self-hosted runners because we need proper credentials
# for boto3 to scan through our repositories.
- self-hosted
- linux
- x86_64
- ubuntu-latest
outputs:
pkg-matrix-include: ${{ steps.generate-pkg-matrix.outputs.matrix }}
build-reports: ${{ steps.generate-pkg-matrix.outputs.build-reports }}
@ -108,10 +106,7 @@ jobs:
test:
name: Test
runs-on:
- self-hosted
- linux
- bastion
runs-on: windows-latest
timeout-minutes: 120 # 2 Hours - More than this and something is wrong
needs:
- generate-matrix
@ -168,28 +163,9 @@ jobs:
with:
cache-prefix: ${{ inputs.cache-prefix }}
- 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 }}
nox --force-color -e decompress-dependencies -- windows ${{ inputs.arch }}
- name: Show System Info
run: |

3
tools/ci.py
View file

@ -399,6 +399,9 @@ def define_jobs(
changed_files_contents["workflows"],
changed_files_contents["golden_images"],
}
if any([_.startswith("test:os:macos") for _ in labels]):
jobs["build-deps-onedir-macos"] = True
jobs["build-salt-onedir-macos"] = True
if jobs["test-pkg"] and required_pkg_test_changes == {"false"}:
if "test:pkg" in labels:
with open(github_step_summary, "a", encoding="utf-8") as wfh: