mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Merge 3006.x into master
This commit is contained in:
Pedro Algarvio
commit
8e07f20ef0
55 changed files with 1446 additions and 850 deletions
|
|
@ -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
|
||||
|
|
|
|||
16
.github/actions/build-onedir-deps/action.yml
vendored
16
.github/actions/build-onedir-deps/action.yml
vendored
|
|
@ -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
|
||||
|
|
|
|||
16
.github/actions/build-onedir-salt/action.yml
vendored
16
.github/actions/build-onedir-salt/action.yml
vendored
|
|
@ -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
|
||||
|
|
|
|||
81
.github/workflows/build-deps-onedir-linux.yml
vendored
Normal file
81
.github/workflows/build-deps-onedir-linux.yml
vendored
Normal file
|
|
@ -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 }}
|
||||
83
.github/workflows/build-deps-onedir-macos.yml
vendored
Normal file
83
.github/workflows/build-deps-onedir-macos.yml
vendored
Normal file
|
|
@ -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 }}
|
||||
84
.github/workflows/build-deps-onedir-windows.yml
vendored
Normal file
84
.github/workflows/build-deps-onedir-windows.yml
vendored
Normal file
|
|
@ -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 }}
|
||||
174
.github/workflows/build-deps-onedir.yml
vendored
174
.github/workflows/build-deps-onedir.yml
vendored
|
|
@ -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 }}
|
||||
88
.github/workflows/build-salt-onedir-linux.yml
vendored
Normal file
88
.github/workflows/build-salt-onedir-linux.yml
vendored
Normal file
|
|
@ -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 }}
|
||||
89
.github/workflows/build-salt-onedir-macos.yml
vendored
Normal file
89
.github/workflows/build-salt-onedir-macos.yml
vendored
Normal file
|
|
@ -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 }}
|
||||
91
.github/workflows/build-salt-onedir-windows.yml
vendored
Normal file
91
.github/workflows/build-salt-onedir-windows.yml
vendored
Normal file
|
|
@ -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 }}
|
||||
194
.github/workflows/build-salt-onedir.yml
vendored
194
.github/workflows/build-salt-onedir.yml
vendored
|
|
@ -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 }}
|
||||
178
.github/workflows/ci.yml
vendored
178
.github/workflows/ci.yml
vendored
|
|
@ -452,12 +452,12 @@ 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 }}"
|
||||
|
|
@ -466,14 +466,74 @@ jobs:
|
|||
relenv-version: "0.13.11"
|
||||
python-version: "3.10.13"
|
||||
|
||||
build-salt-onedir:
|
||||
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 }}"
|
||||
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-linux:
|
||||
name: Build Salt Onedir
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-salt-onedir'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-deps-onedir
|
||||
- build-deps-onedir-linux
|
||||
- build-source-tarball
|
||||
uses: ./.github/workflows/build-salt-onedir.yml
|
||||
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-macos.yml
|
||||
with:
|
||||
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
|
|
@ -487,7 +547,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 }}"
|
||||
|
|
@ -500,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 }}"
|
||||
|
|
@ -513,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-deb-packages.yml
|
||||
with:
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
|
|
@ -526,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 }}"
|
||||
|
|
@ -539,7 +599,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 }}"
|
||||
|
|
@ -552,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 }}"
|
||||
|
|
@ -565,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-macos
|
||||
uses: ./.github/workflows/build-macos-packages.yml
|
||||
with:
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
|
|
@ -578,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 }}"
|
||||
|
|
@ -591,7 +651,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
|
||||
|
|
@ -608,7 +668,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
|
||||
|
|
@ -625,7 +685,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
|
||||
|
|
@ -642,7 +702,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
|
||||
|
|
@ -659,7 +719,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
|
||||
|
|
@ -676,7 +736,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
|
||||
|
|
@ -693,7 +753,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
|
||||
|
|
@ -710,7 +770,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
|
||||
|
|
@ -727,7 +787,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
|
||||
|
|
@ -744,7 +804,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
|
||||
|
|
@ -761,7 +821,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
|
||||
|
|
@ -778,7 +838,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
|
||||
|
|
@ -795,7 +855,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
|
||||
|
|
@ -812,7 +872,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
|
||||
|
|
@ -829,7 +889,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
|
||||
|
|
@ -846,7 +906,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
|
||||
|
|
@ -863,7 +923,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
|
||||
|
|
@ -880,7 +940,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
|
||||
|
|
@ -897,7 +957,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
|
||||
|
|
@ -914,7 +974,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
|
||||
|
|
@ -931,7 +991,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
|
||||
|
|
@ -948,7 +1008,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
|
||||
|
|
@ -965,7 +1025,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
|
||||
|
|
@ -982,7 +1042,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
|
||||
|
|
@ -999,7 +1059,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
|
||||
|
|
@ -1016,7 +1076,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
|
||||
|
|
@ -1033,7 +1093,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
|
||||
|
|
@ -1050,7 +1110,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
|
||||
|
|
@ -1067,7 +1127,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
|
||||
|
|
@ -1084,7 +1144,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
|
||||
|
|
@ -1101,7 +1161,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
|
||||
|
|
@ -1118,7 +1178,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
|
||||
|
|
@ -2161,15 +2221,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
|
||||
|
||||
|
|
@ -2184,8 +2256,12 @@ jobs:
|
|||
- pre-commit
|
||||
- lint
|
||||
- build-docs
|
||||
- build-deps-onedir
|
||||
- build-salt-onedir
|
||||
- build-deps-onedir-linux
|
||||
- build-deps-onedir-windows
|
||||
- build-deps-onedir-macos
|
||||
- build-salt-onedir-linux
|
||||
- build-salt-onedir-windows
|
||||
- build-salt-onedir-macos
|
||||
- build-rpm-pkgs-src
|
||||
- build-deb-pkgs-src
|
||||
- build-windows-pkgs-src
|
||||
|
|
|
|||
180
.github/workflows/nightly.yml
vendored
180
.github/workflows/nightly.yml
vendored
|
|
@ -496,12 +496,12 @@ 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 }}"
|
||||
|
|
@ -510,14 +510,74 @@ jobs:
|
|||
relenv-version: "0.13.11"
|
||||
python-version: "3.10.13"
|
||||
|
||||
build-salt-onedir:
|
||||
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 }}"
|
||||
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-linux:
|
||||
name: Build Salt Onedir
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-salt-onedir'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-deps-onedir
|
||||
- build-deps-onedir-linux
|
||||
- build-source-tarball
|
||||
uses: ./.github/workflows/build-salt-onedir.yml
|
||||
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-macos.yml
|
||||
with:
|
||||
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
|
|
@ -531,7 +591,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 }}"
|
||||
|
|
@ -544,7 +604,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 }}"
|
||||
|
|
@ -557,7 +617,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 }}"
|
||||
|
|
@ -570,7 +630,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 }}"
|
||||
|
|
@ -583,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 }}"
|
||||
|
|
@ -599,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-windows
|
||||
uses: ./.github/workflows/build-windows-packages.yml
|
||||
with:
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
|
|
@ -615,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 }}"
|
||||
|
|
@ -631,7 +691,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 }}"
|
||||
|
|
@ -647,7 +707,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
|
||||
|
|
@ -664,7 +724,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
|
||||
|
|
@ -681,7 +741,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
|
||||
|
|
@ -698,7 +758,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
|
||||
|
|
@ -715,7 +775,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
|
||||
|
|
@ -732,7 +792,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
|
||||
|
|
@ -749,7 +809,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
|
||||
|
|
@ -766,7 +826,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
|
||||
|
|
@ -783,7 +843,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
|
||||
|
|
@ -800,7 +860,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
|
||||
|
|
@ -817,7 +877,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
|
||||
|
|
@ -834,7 +894,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
|
||||
|
|
@ -851,7 +911,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
|
||||
|
|
@ -868,7 +928,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
|
||||
|
|
@ -885,7 +945,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
|
||||
|
|
@ -902,7 +962,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
|
||||
|
|
@ -919,7 +979,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
|
||||
|
|
@ -936,7 +996,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
|
||||
|
|
@ -953,7 +1013,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
|
||||
|
|
@ -970,7 +1030,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
|
||||
|
|
@ -987,7 +1047,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
|
||||
|
|
@ -1004,7 +1064,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
|
||||
|
|
@ -1021,7 +1081,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
|
||||
|
|
@ -1038,7 +1098,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
|
||||
|
|
@ -1055,7 +1115,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
|
||||
|
|
@ -1072,7 +1132,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
|
||||
|
|
@ -1089,7 +1149,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
|
||||
|
|
@ -1106,7 +1166,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
|
||||
|
|
@ -1123,7 +1183,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
|
||||
|
|
@ -1140,7 +1200,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
|
||||
|
|
@ -1157,7 +1217,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
|
||||
|
|
@ -1174,7 +1234,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
|
||||
|
|
@ -2217,15 +2277,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
|
||||
|
||||
|
|
@ -2238,7 +2310,6 @@ jobs:
|
|||
- repo-nightly
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-salt-onedir
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
|
|
@ -2755,7 +2826,6 @@ jobs:
|
|||
- repo-nightly
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-salt-onedir
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
|
|
@ -2979,8 +3049,12 @@ jobs:
|
|||
- pre-commit
|
||||
- lint
|
||||
- build-docs
|
||||
- build-deps-onedir
|
||||
- build-salt-onedir
|
||||
- build-deps-onedir-linux
|
||||
- build-deps-onedir-windows
|
||||
- build-deps-onedir-macos
|
||||
- build-salt-onedir-linux
|
||||
- build-salt-onedir-windows
|
||||
- build-salt-onedir-macos
|
||||
- build-rpm-pkgs-src
|
||||
- build-deb-pkgs-src
|
||||
- build-windows-pkgs-src
|
||||
|
|
|
|||
178
.github/workflows/scheduled.yml
vendored
178
.github/workflows/scheduled.yml
vendored
|
|
@ -486,12 +486,12 @@ 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 }}"
|
||||
|
|
@ -500,14 +500,74 @@ jobs:
|
|||
relenv-version: "0.13.11"
|
||||
python-version: "3.10.13"
|
||||
|
||||
build-salt-onedir:
|
||||
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 }}"
|
||||
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-linux:
|
||||
name: Build Salt Onedir
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-salt-onedir'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-deps-onedir
|
||||
- build-deps-onedir-linux
|
||||
- build-source-tarball
|
||||
uses: ./.github/workflows/build-salt-onedir.yml
|
||||
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-macos.yml
|
||||
with:
|
||||
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
|
|
@ -521,7 +581,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 }}"
|
||||
|
|
@ -534,7 +594,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 }}"
|
||||
|
|
@ -547,7 +607,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 }}"
|
||||
|
|
@ -560,7 +620,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 }}"
|
||||
|
|
@ -573,7 +633,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 }}"
|
||||
|
|
@ -586,7 +646,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 }}"
|
||||
|
|
@ -599,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 }}"
|
||||
|
|
@ -612,7 +672,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 }}"
|
||||
|
|
@ -625,7 +685,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
|
||||
|
|
@ -642,7 +702,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
|
||||
|
|
@ -659,7 +719,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
|
||||
|
|
@ -676,7 +736,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
|
||||
|
|
@ -693,7 +753,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
|
||||
|
|
@ -710,7 +770,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
|
||||
|
|
@ -727,7 +787,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
|
||||
|
|
@ -744,7 +804,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
|
||||
|
|
@ -761,7 +821,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
|
||||
|
|
@ -778,7 +838,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
|
||||
|
|
@ -795,7 +855,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
|
||||
|
|
@ -812,7 +872,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
|
||||
|
|
@ -829,7 +889,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
|
||||
|
|
@ -846,7 +906,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
|
||||
|
|
@ -863,7 +923,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
|
||||
|
|
@ -880,7 +940,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
|
||||
|
|
@ -897,7 +957,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
|
||||
|
|
@ -914,7 +974,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
|
||||
|
|
@ -931,7 +991,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
|
||||
|
|
@ -948,7 +1008,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
|
||||
|
|
@ -965,7 +1025,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
|
||||
|
|
@ -982,7 +1042,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
|
||||
|
|
@ -999,7 +1059,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
|
||||
|
|
@ -1016,7 +1076,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
|
||||
|
|
@ -1033,7 +1093,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
|
||||
|
|
@ -1050,7 +1110,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
|
||||
|
|
@ -1067,7 +1127,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
|
||||
|
|
@ -1084,7 +1144,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
|
||||
|
|
@ -1101,7 +1161,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
|
||||
|
|
@ -1118,7 +1178,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
|
||||
|
|
@ -1135,7 +1195,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
|
||||
|
|
@ -1152,7 +1212,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
|
||||
|
|
@ -2195,15 +2255,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
|
||||
|
||||
|
|
@ -2220,8 +2292,12 @@ jobs:
|
|||
- pre-commit
|
||||
- lint
|
||||
- build-docs
|
||||
- build-deps-onedir
|
||||
- build-salt-onedir
|
||||
- build-deps-onedir-linux
|
||||
- build-deps-onedir-windows
|
||||
- build-deps-onedir-macos
|
||||
- build-salt-onedir-linux
|
||||
- build-salt-onedir-windows
|
||||
- build-salt-onedir-macos
|
||||
- build-rpm-pkgs-src
|
||||
- build-deb-pkgs-src
|
||||
- build-windows-pkgs-src
|
||||
|
|
|
|||
160
.github/workflows/staging.yml
vendored
160
.github/workflows/staging.yml
vendored
|
|
@ -496,12 +496,12 @@ 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 }}"
|
||||
|
|
@ -510,14 +510,74 @@ jobs:
|
|||
relenv-version: "0.13.11"
|
||||
python-version: "3.10.13"
|
||||
|
||||
build-salt-onedir:
|
||||
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 }}"
|
||||
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-linux:
|
||||
name: Build Salt Onedir
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-salt-onedir'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-deps-onedir
|
||||
- build-deps-onedir-linux
|
||||
- build-source-tarball
|
||||
uses: ./.github/workflows/build-salt-onedir.yml
|
||||
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-macos.yml
|
||||
with:
|
||||
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
|
|
@ -531,7 +591,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 }}"
|
||||
|
|
@ -544,7 +604,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 }}"
|
||||
|
|
@ -557,7 +617,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 }}"
|
||||
|
|
@ -570,7 +630,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 }}"
|
||||
|
|
@ -583,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 }}"
|
||||
|
|
@ -599,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-windows
|
||||
uses: ./.github/workflows/build-windows-packages.yml
|
||||
with:
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
|
|
@ -615,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 }}"
|
||||
|
|
@ -631,7 +691,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 }}"
|
||||
|
|
@ -647,7 +707,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
|
||||
|
|
@ -664,7 +724,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
|
||||
|
|
@ -681,7 +741,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
|
||||
|
|
@ -698,7 +758,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
|
||||
|
|
@ -715,7 +775,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
|
||||
|
|
@ -732,7 +792,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
|
||||
|
|
@ -749,7 +809,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
|
||||
|
|
@ -766,7 +826,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
|
||||
|
|
@ -783,7 +843,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
|
||||
|
|
@ -800,7 +860,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
|
||||
|
|
@ -817,7 +877,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
|
||||
|
|
@ -834,7 +894,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
|
||||
|
|
@ -851,7 +911,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
|
||||
|
|
@ -868,7 +928,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
|
||||
|
|
@ -885,7 +945,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
|
||||
|
|
@ -902,7 +962,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
|
||||
|
|
@ -919,7 +979,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
|
||||
|
|
@ -936,7 +996,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
|
||||
|
|
@ -953,7 +1013,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
|
||||
|
|
@ -970,7 +1030,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
|
||||
|
|
@ -987,7 +1047,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
|
||||
|
|
@ -1004,7 +1064,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
|
||||
|
|
@ -1021,7 +1081,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
|
||||
|
|
@ -1038,7 +1098,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
|
||||
|
|
@ -1055,7 +1115,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
|
||||
|
|
@ -1072,7 +1132,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
|
||||
|
|
@ -1089,7 +1149,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
|
||||
|
|
@ -1106,7 +1166,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
|
||||
|
|
@ -1123,7 +1183,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
|
||||
|
|
@ -1140,7 +1200,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
|
||||
|
|
@ -1157,7 +1217,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
|
||||
|
|
@ -1174,7 +1234,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
|
||||
|
|
@ -2137,7 +2197,6 @@ jobs:
|
|||
- repo-staging
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-salt-onedir
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
|
|
@ -2656,7 +2715,6 @@ jobs:
|
|||
- repo-staging
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-salt-onedir
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
|
|
@ -3776,8 +3834,12 @@ jobs:
|
|||
- pre-commit
|
||||
- lint
|
||||
- build-docs
|
||||
- build-deps-onedir
|
||||
- build-salt-onedir
|
||||
- build-deps-onedir-linux
|
||||
- build-deps-onedir-windows
|
||||
- build-deps-onedir-macos
|
||||
- build-salt-onedir-linux
|
||||
- build-salt-onedir-windows
|
||||
- build-salt-onedir-macos
|
||||
- build-rpm-pkgs-src
|
||||
- build-deb-pkgs-src
|
||||
- build-windows-pkgs-src
|
||||
|
|
|
|||
|
|
@ -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 }>
|
||||
|
|
|
|||
|
|
@ -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 }}"
|
||||
|
|
|
|||
|
|
@ -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) %>
|
||||
|
||||
|
|
|
|||
40
.github/workflows/templates/ci.yml.jinja
vendored
40
.github/workflows/templates/ci.yml.jinja
vendored
|
|
@ -259,14 +259,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 }}"
|
||||
|
|
@ -275,21 +277,24 @@
|
|||
relenv-version: "<{ relenv_version }>"
|
||||
python-version: "<{ python_version }>"
|
||||
|
||||
<%- endfor %>
|
||||
<%- endif %>
|
||||
|
||||
|
||||
<%- 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
|
||||
- build-deps-onedir
|
||||
- build-deps-onedir-<{ platform }>
|
||||
- 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 +303,7 @@
|
|||
relenv-version: "<{ relenv_version }>"
|
||||
python-version: "<{ python_version }>"
|
||||
|
||||
<%- endfor %>
|
||||
<%- endif %>
|
||||
|
||||
|
||||
|
|
@ -360,15 +366,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 %>
|
||||
|
|
|
|||
10
.github/workflows/test-action-macos.yml
vendored
10
.github/workflows/test-action-macos.yml
vendored
|
|
@ -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
|
||||
|
|
@ -316,11 +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: Prepare Test Run Artifacts
|
||||
id: download-artifacts-from-vm
|
||||
if: always() && job.status != 'cancelled'
|
||||
|
|
@ -331,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
|
||||
|
|
|
|||
18
.github/workflows/test-action.yml
vendored
18
.github/workflows/test-action.yml
vendored
|
|
@ -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 ${{ fromJSON(inputs.testrun)['type'] == 'full' && '--full ' || '' }}${{ inputs.distro-slug }}
|
||||
|
||||
test:
|
||||
name: Test
|
||||
|
|
@ -109,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
|
||||
|
|
@ -250,18 +249,14 @@ 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
|
||||
-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'
|
||||
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'
|
||||
|
|
@ -272,8 +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 }}
|
||||
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 }}.grp${{ matrix.test-group || '1' }}
|
||||
fi
|
||||
|
||||
- name: Destroy VM
|
||||
|
|
@ -318,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
|
||||
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
|
|
|
|||
1
changelog/65302.fixed.md
Normal file
1
changelog/65302.fixed.md
Normal file
|
|
@ -0,0 +1 @@
|
|||
Ensure that the correct value of jid_inclue is passed if the argument is included in the passed keyword arguments.
|
||||
|
|
@ -1 +1 @@
|
|||
centosstream-9-x86_64: ami-091986d83f4c0bdd7
|
||||
centosstream-9-x86_64: ami-09b72b340acb62c73
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"almalinux-8-arm64": {
|
||||
"ami": "ami-09017a2c26bb6cf37",
|
||||
"ami": "ami-0f08fc00f1689a8ec",
|
||||
"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.2057",
|
||||
"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-08f648e0e6fa619c2",
|
||||
"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.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-0b45894ce343176b0",
|
||||
"ami": "ami-0394b210e1e09b962",
|
||||
"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.2058",
|
||||
"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-0a909a150cfebea5b",
|
||||
"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.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-0aac44852e96fb156",
|
||||
"ami": "ami-038eac6a08feecdb2",
|
||||
"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.2104",
|
||||
"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-09682e96e7785642d",
|
||||
"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.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-0430562e1dc073734",
|
||||
"ami": "ami-0e46c84fb43817334",
|
||||
"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.2103",
|
||||
"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-0ac591368ec230345",
|
||||
"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.2103",
|
||||
"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-017de6f1e636021a0",
|
||||
"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.2108",
|
||||
"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-088cb5f3066efa748",
|
||||
"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.2108",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "m6g.large",
|
||||
|
|
@ -100,9 +100,9 @@
|
|||
"ssh_username": "centos"
|
||||
},
|
||||
"centos-7": {
|
||||
"ami": "ami-04e695ebbac38868e",
|
||||
"ami": "ami-05c4056c36cecc136",
|
||||
"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.2107",
|
||||
"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-0e2a761782490f7c2",
|
||||
"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.2109",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "m6g.large",
|
||||
|
|
@ -120,9 +120,9 @@
|
|||
"ssh_username": "centos"
|
||||
},
|
||||
"centosstream-8": {
|
||||
"ami": "ami-0706ab643607236c0",
|
||||
"ami": "ami-06178cd094ea71c34",
|
||||
"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.2108",
|
||||
"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-0ea1025028e6fe700",
|
||||
"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.2109",
|
||||
"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-0f474b360fca72512",
|
||||
"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.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-08b7b9fb74d7c58f2",
|
||||
"ami": "ami-0b9cbee875ae2e145",
|
||||
"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.2114",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "false",
|
||||
"instance_type": "m6g.large",
|
||||
|
|
@ -160,9 +160,9 @@
|
|||
"ssh_username": "admin"
|
||||
},
|
||||
"debian-10": {
|
||||
"ami": "ami-0002ea04be195948e",
|
||||
"ami": "ami-03b713e88ac915c18",
|
||||
"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.2112",
|
||||
"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-0e48f24d9def8d84c",
|
||||
"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.2114",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "false",
|
||||
"instance_type": "m6g.large",
|
||||
|
|
@ -180,9 +180,9 @@
|
|||
"ssh_username": "admin"
|
||||
},
|
||||
"debian-11": {
|
||||
"ami": "ami-06c5ea0d19a5773d7",
|
||||
"ami": "ami-07a2fb75d29d0d6f7",
|
||||
"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.2116",
|
||||
"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-027199ded9ce9f659",
|
||||
"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.2117",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "false",
|
||||
"instance_type": "m6g.large",
|
||||
|
|
@ -200,9 +200,9 @@
|
|||
"ssh_username": "admin"
|
||||
},
|
||||
"debian-12": {
|
||||
"ami": "ami-0eada119571a913fd",
|
||||
"ami": "ami-02156ad853a403599",
|
||||
"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.2119",
|
||||
"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-0dfb1b2e3b6cd8847",
|
||||
"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.2119",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "m6g.large",
|
||||
|
|
@ -220,9 +220,9 @@
|
|||
"ssh_username": "fedora"
|
||||
},
|
||||
"fedora-37": {
|
||||
"ami": "ami-01e0becc3552ad2f6",
|
||||
"ami": "ami-0d27e014bf07af18b",
|
||||
"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.2120",
|
||||
"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-04f5a34bae3040974",
|
||||
"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.2120",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "m6g.large",
|
||||
|
|
@ -240,9 +240,9 @@
|
|||
"ssh_username": "fedora"
|
||||
},
|
||||
"fedora-38": {
|
||||
"ami": "ami-0c38a1907f5b55077",
|
||||
"ami": "ami-0e69802061ed79891",
|
||||
"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.2123",
|
||||
"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-0ebb684e16914ad0a",
|
||||
"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.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-0383031c08217b13e",
|
||||
"ami": "ami-054765b3beb6dd97c",
|
||||
"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.2129",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "m6g.large",
|
||||
|
|
@ -270,9 +270,9 @@
|
|||
"ssh_username": "root"
|
||||
},
|
||||
"photonos-3": {
|
||||
"ami": "ami-06004a7d856e94355",
|
||||
"ami": "ami-0224e8a4471113ebb",
|
||||
"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.2128",
|
||||
"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-091f6d77aa3921394",
|
||||
"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.2124",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "m6g.large",
|
||||
|
|
@ -290,9 +290,9 @@
|
|||
"ssh_username": "root"
|
||||
},
|
||||
"photonos-4": {
|
||||
"ami": "ami-0fd7a6ed4c61ee312",
|
||||
"ami": "ami-0714704e9471a8e0c",
|
||||
"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.2130",
|
||||
"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-05ebc5bddb487c20b",
|
||||
"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.2130",
|
||||
"arch": "arm64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "m6g.large",
|
||||
|
|
@ -310,9 +310,9 @@
|
|||
"ssh_username": "root"
|
||||
},
|
||||
"photonos-5": {
|
||||
"ami": "ami-0732ce03b2ab6fad2",
|
||||
"ami": "ami-0b7e17bc1990da3af",
|
||||
"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.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-05aeb3d5bf0a16369",
|
||||
"ami": "ami-09210544c9163df86",
|
||||
"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.2110",
|
||||
"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-05894335447f4c052",
|
||||
"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.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-0f7dc3333620d58fd",
|
||||
"ami": "ami-090423dbe605f6d3e",
|
||||
"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.2111",
|
||||
"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-0a465357b34ea7fdc",
|
||||
"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.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-0e8818777218efeeb",
|
||||
"ami": "ami-0ed81524d646f95ee",
|
||||
"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.2111",
|
||||
"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-02c7edd6357be51b6",
|
||||
"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.2112",
|
||||
"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-04f113ff291a8953f",
|
||||
"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.2104",
|
||||
"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-06475f495e0151fc9",
|
||||
"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.2106",
|
||||
"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-0558da89560480f32",
|
||||
"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.2106",
|
||||
"arch": "x86_64",
|
||||
"cloudwatch-agent-available": "true",
|
||||
"instance_type": "t3a.xlarge",
|
||||
|
|
|
|||
137
noxfile.py
137
noxfile.py
|
|
@ -335,7 +335,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==5.5"
|
||||
session.install(
|
||||
"--progress-bar=off", coverage_requirement, silent=PIP_INSTALL_SILENT
|
||||
)
|
||||
|
|
@ -403,7 +403,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
|
||||
|
|
@ -415,7 +417,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,
|
||||
)
|
||||
|
|
@ -426,7 +428,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
|
||||
|
|
@ -435,7 +437,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,
|
||||
)
|
||||
|
|
@ -446,7 +448,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,
|
||||
)
|
||||
|
||||
|
|
@ -497,7 +499,7 @@ def _report_coverage(session):
|
|||
)
|
||||
cmd_args = [
|
||||
"--omit=tests/*,pkg/tests/*",
|
||||
"--include=salt/*,artifacts/salt/*",
|
||||
"--include=salt/*",
|
||||
]
|
||||
|
||||
elif report_section == "tests":
|
||||
|
|
@ -505,7 +507,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:
|
||||
|
|
@ -513,9 +515,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",
|
||||
|
|
@ -524,12 +533,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")
|
||||
|
|
@ -1072,6 +1075,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"
|
||||
|
|
@ -1088,20 +1093,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"
|
||||
|
|
@ -1181,6 +1186,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)
|
||||
|
||||
|
||||
|
|
@ -1376,20 +1389,76 @@ 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,
|
||||
)
|
||||
|
||||
|
||||
@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
|
||||
|
|
@ -1404,7 +1473,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,
|
||||
)
|
||||
|
|
@ -1419,13 +1488,27 @@ 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:
|
||||
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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -9,3 +9,4 @@ pytest-timeout
|
|||
pytest-httpserver
|
||||
pytest-custom-exit-code >= 0.3
|
||||
flaky
|
||||
more-itertools
|
||||
|
|
|
|||
|
|
@ -239,11 +239,12 @@ markupsafe==2.1.2
|
|||
# werkzeug
|
||||
mercurial==6.4.4
|
||||
# via -r requirements/static/ci/darwin.in
|
||||
mock==5.0.2
|
||||
mock==5.1.0
|
||||
# via -r requirements/pytest.txt
|
||||
more-itertools==9.1.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
|
||||
# -r requirements/pytest.txt
|
||||
# cheroot
|
||||
# cherrypy
|
||||
# jaraco.functools
|
||||
|
|
|
|||
|
|
@ -234,11 +234,12 @@ markupsafe==2.1.2
|
|||
# werkzeug
|
||||
mercurial==6.4.4
|
||||
# via -r requirements/static/ci/freebsd.in
|
||||
mock==5.0.2
|
||||
mock==5.1.0
|
||||
# via -r requirements/pytest.txt
|
||||
more-itertools==9.1.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
|
||||
# -r requirements/pytest.txt
|
||||
# cheroot
|
||||
# cherrypy
|
||||
# jaraco.functools
|
||||
|
|
|
|||
|
|
@ -259,11 +259,12 @@ markupsafe==2.1.2
|
|||
# werkzeug
|
||||
mercurial==6.4.4
|
||||
# via -r requirements/static/ci/linux.in
|
||||
mock==5.0.2
|
||||
mock==5.1.0
|
||||
# via -r requirements/pytest.txt
|
||||
more-itertools==9.1.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/linux.txt
|
||||
# -r requirements/pytest.txt
|
||||
# cheroot
|
||||
# cherrypy
|
||||
# jaraco.functools
|
||||
|
|
|
|||
|
|
@ -218,11 +218,12 @@ markupsafe==2.1.2
|
|||
# jinja2
|
||||
# mako
|
||||
# werkzeug
|
||||
mock==5.0.2
|
||||
mock==5.1.0
|
||||
# via -r requirements/pytest.txt
|
||||
more-itertools==9.1.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/windows.txt
|
||||
# -r requirements/pytest.txt
|
||||
# cheroot
|
||||
# cherrypy
|
||||
# jaraco.functools
|
||||
|
|
|
|||
|
|
@ -237,11 +237,12 @@ markupsafe==2.1.2
|
|||
# werkzeug
|
||||
mercurial==6.4.4
|
||||
# via -r requirements/static/ci/darwin.in
|
||||
mock==5.0.2
|
||||
mock==5.1.0
|
||||
# via -r requirements/pytest.txt
|
||||
more-itertools==9.1.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
|
||||
# -r requirements/pytest.txt
|
||||
# cheroot
|
||||
# cherrypy
|
||||
# jaraco.functools
|
||||
|
|
|
|||
|
|
@ -232,11 +232,12 @@ markupsafe==2.1.2
|
|||
# werkzeug
|
||||
mercurial==6.4.4
|
||||
# via -r requirements/static/ci/freebsd.in
|
||||
mock==5.0.2
|
||||
mock==5.1.0
|
||||
# via -r requirements/pytest.txt
|
||||
more-itertools==9.1.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
|
||||
# -r requirements/pytest.txt
|
||||
# cheroot
|
||||
# cherrypy
|
||||
# jaraco.functools
|
||||
|
|
|
|||
|
|
@ -255,11 +255,12 @@ markupsafe==2.1.2
|
|||
# werkzeug
|
||||
mercurial==6.4.4
|
||||
# via -r requirements/static/ci/linux.in
|
||||
mock==5.0.2
|
||||
mock==5.1.0
|
||||
# via -r requirements/pytest.txt
|
||||
more-itertools==9.1.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/linux.txt
|
||||
# -r requirements/pytest.txt
|
||||
# cheroot
|
||||
# cherrypy
|
||||
# jaraco.functools
|
||||
|
|
|
|||
|
|
@ -216,11 +216,12 @@ markupsafe==2.1.2
|
|||
# jinja2
|
||||
# mako
|
||||
# werkzeug
|
||||
mock==5.0.2
|
||||
mock==5.1.0
|
||||
# via -r requirements/pytest.txt
|
||||
more-itertools==9.1.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/windows.txt
|
||||
# -r requirements/pytest.txt
|
||||
# cheroot
|
||||
# cherrypy
|
||||
# jaraco.functools
|
||||
|
|
|
|||
|
|
@ -238,11 +238,12 @@ markupsafe==2.1.2
|
|||
# werkzeug
|
||||
mercurial==6.4.4
|
||||
# via -r requirements/static/ci/freebsd.in
|
||||
mock==5.0.2
|
||||
mock==5.1.0
|
||||
# via -r requirements/pytest.txt
|
||||
more-itertools==9.1.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
|
||||
# -r requirements/pytest.txt
|
||||
# cheroot
|
||||
# cherrypy
|
||||
# jaraco.functools
|
||||
|
|
|
|||
|
|
@ -263,11 +263,12 @@ markupsafe==2.1.2
|
|||
# werkzeug
|
||||
mercurial==6.4.4
|
||||
# via -r requirements/static/ci/linux.in
|
||||
mock==5.0.2
|
||||
mock==5.1.0
|
||||
# via -r requirements/pytest.txt
|
||||
more-itertools==9.1.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/linux.txt
|
||||
# -r requirements/pytest.txt
|
||||
# cheroot
|
||||
# cherrypy
|
||||
# jaraco.functools
|
||||
|
|
|
|||
|
|
@ -222,11 +222,12 @@ markupsafe==2.1.2
|
|||
# jinja2
|
||||
# mako
|
||||
# werkzeug
|
||||
mock==5.0.2
|
||||
mock==5.1.0
|
||||
# via -r requirements/pytest.txt
|
||||
more-itertools==9.1.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/windows.txt
|
||||
# -r requirements/pytest.txt
|
||||
# cheroot
|
||||
# cherrypy
|
||||
# jaraco.functools
|
||||
|
|
|
|||
|
|
@ -239,11 +239,12 @@ markupsafe==2.1.2
|
|||
# werkzeug
|
||||
mercurial==6.4.4
|
||||
# via -r requirements/static/ci/darwin.in
|
||||
mock==5.0.2
|
||||
mock==5.1.0
|
||||
# via -r requirements/pytest.txt
|
||||
more-itertools==9.1.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
|
||||
# -r requirements/pytest.txt
|
||||
# cheroot
|
||||
# cherrypy
|
||||
# jaraco.functools
|
||||
|
|
|
|||
|
|
@ -234,11 +234,12 @@ markupsafe==2.1.2
|
|||
# werkzeug
|
||||
mercurial==6.4.4
|
||||
# via -r requirements/static/ci/freebsd.in
|
||||
mock==5.0.2
|
||||
mock==5.1.0
|
||||
# via -r requirements/pytest.txt
|
||||
more-itertools==9.1.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
|
||||
# -r requirements/pytest.txt
|
||||
# cheroot
|
||||
# cherrypy
|
||||
# jaraco.functools
|
||||
|
|
|
|||
|
|
@ -261,11 +261,12 @@ markupsafe==2.1.2
|
|||
# werkzeug
|
||||
mercurial==6.4.4
|
||||
# via -r requirements/static/ci/linux.in
|
||||
mock==5.0.2
|
||||
mock==5.1.0
|
||||
# via -r requirements/pytest.txt
|
||||
more-itertools==9.1.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/linux.txt
|
||||
# -r requirements/pytest.txt
|
||||
# cheroot
|
||||
# cherrypy
|
||||
# jaraco.functools
|
||||
|
|
|
|||
|
|
@ -218,11 +218,12 @@ markupsafe==2.1.2
|
|||
# jinja2
|
||||
# mako
|
||||
# werkzeug
|
||||
mock==5.0.2
|
||||
mock==5.1.0
|
||||
# via -r requirements/pytest.txt
|
||||
more-itertools==9.1.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/windows.txt
|
||||
# -r requirements/pytest.txt
|
||||
# cheroot
|
||||
# cherrypy
|
||||
# jaraco.functools
|
||||
|
|
|
|||
|
|
@ -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):
|
||||
|
|
|
|||
|
|
@ -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")
|
||||
|
|
@ -835,9 +809,20 @@ 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)
|
||||
# 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:
|
||||
|
|
@ -845,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} ({len(items)} tests)\n",
|
||||
f"Running test group #{group_id}(out of #{group_count}) ({len(items)} out of {total_items} tests)\n",
|
||||
yellow=True,
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -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):
|
||||
"""
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -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__)
|
||||
|
||||
|
|
@ -81,14 +79,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,29 +111,23 @@ 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
|
||||
|
||||
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):
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -143,10 +143,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()
|
||||
|
|
|
|||
45
tools/ci.py
45
tools/ci.py
|
|
@ -371,6 +371,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:
|
||||
|
|
@ -610,13 +611,22 @@ 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.
|
||||
"""
|
||||
_matrix = []
|
||||
_splits = {
|
||||
"functional": 4,
|
||||
"integration": 6,
|
||||
"scenarios": 2,
|
||||
"unit": 3,
|
||||
}
|
||||
for transport in ("zeromq", "tcp"):
|
||||
if transport == "tcp":
|
||||
if distro_slug not in (
|
||||
|
|
@ -633,8 +643,27 @@ def matrix(ctx: Context, distro_slug: str):
|
|||
continue
|
||||
if "macos" in distro_slug and chunk == "scenarios":
|
||||
continue
|
||||
_matrix.append({"transport": transport, "tests-chunk": chunk})
|
||||
print(json.dumps(_matrix))
|
||||
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-group": split,
|
||||
"test-group-count": splits,
|
||||
}
|
||||
)
|
||||
else:
|
||||
_matrix.append({"transport": transport, "tests-chunk": chunk})
|
||||
|
||||
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)
|
||||
|
||||
|
||||
|
|
@ -668,7 +697,7 @@ def pkg_matrix(
|
|||
ctx.warn("The 'GITHUB_OUTPUT' variable is not set.")
|
||||
if TYPE_CHECKING:
|
||||
assert testing_releases
|
||||
matrix = []
|
||||
_matrix = []
|
||||
sessions = [
|
||||
"install",
|
||||
]
|
||||
|
|
@ -734,20 +763,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)
|
||||
|
||||
|
||||
|
|
|
|||
31
tools/vm.py
31
tools/vm.py
|
|
@ -983,8 +983,7 @@ class VM:
|
|||
log.info("Starting CI configured VM")
|
||||
else:
|
||||
# This is a developer running
|
||||
log.info("Starting Developer configured VM")
|
||||
# Get the develpers security group
|
||||
log.info(f"Starting Developer configured VM In Environment '{environment}'")
|
||||
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(
|
||||
|
|
@ -1439,7 +1454,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):
|
||||
"""
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue