prepare-ci is called prepare-workflow now

This commit is contained in:
MKLeb 2023-01-27 16:10:55 -05:00 committed by Pedro Algarvio
parent e30a876589
commit 935e64c3fb
3 changed files with 40 additions and 41 deletions

View file

@ -27,7 +27,7 @@ jobs:
- aarch64
container:
image: ghcr.io/saltstack/salt-ci-containers/packaging:centosstream-9
image: ghcr.io/saltstack/salt-ci-containers/packaging:centos-7
steps:
- uses: actions/checkout@v3

View file

@ -424,186 +424,186 @@ jobs:
amazonlinux-2-pkg-tests:
name: Amazon Linux 2 Package Tests
if: ${{ fromJSON(needs.prepare-ci.outputs.jobs)['self-hosted-runners'] }}
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['self-hosted-runners'] }}
needs:
- prepare-ci
- prepare-workflow
- build-pkgs
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: amazonlinux-2
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-ci.outputs.salt-version }}"
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
centos-7-pkg-tests:
name: CentOS 7 Package Tests
if: ${{ fromJSON(needs.prepare-ci.outputs.jobs)['self-hosted-runners'] }}
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['self-hosted-runners'] }}
needs:
- prepare-ci
- prepare-workflow
- build-pkgs
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: centos-7
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-ci.outputs.salt-version }}"
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
centosstream-8-pkg-tests:
name: CentOS 8 Stream Package Tests
if: ${{ fromJSON(needs.prepare-ci.outputs.jobs)['self-hosted-runners'] }}
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['self-hosted-runners'] }}
needs:
- prepare-ci
- prepare-workflow
- build-pkgs
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: centosstream-8
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-ci.outputs.salt-version }}"
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
centosstream-9-pkg-tests:
name: CentOS 9 Stream Package Tests
if: ${{ fromJSON(needs.prepare-ci.outputs.jobs)['self-hosted-runners'] }}
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['self-hosted-runners'] }}
needs:
- prepare-ci
- prepare-workflow
- build-pkgs
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: centosstream-9
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-ci.outputs.salt-version }}"
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
debian-10-pkg-tests:
name: Debian 10 Package Tests
if: ${{ fromJSON(needs.prepare-ci.outputs.jobs)['self-hosted-runners'] }}
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['self-hosted-runners'] }}
needs:
- prepare-ci
- prepare-workflow
- build-pkgs
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: debian-10
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-ci.outputs.salt-version }}"
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: deb
debian-11-pkg-tests:
name: Debian 11 Package Tests
if: ${{ fromJSON(needs.prepare-ci.outputs.jobs)['self-hosted-runners'] }}
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['self-hosted-runners'] }}
needs:
- prepare-ci
- prepare-workflow
- build-pkgs
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: debian-11
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-ci.outputs.salt-version }}"
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: deb
debian-11-arm64-pkg-tests:
name: Debian 11 Arm64 Package Tests
if: ${{ fromJSON(needs.prepare-ci.outputs.jobs)['self-hosted-runners'] }}
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['self-hosted-runners'] }}
needs:
- prepare-ci
- prepare-workflow
- build-pkgs
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: debian-11-arm64
platform: linux
arch: aarch64
salt-version: "${{ needs.prepare-ci.outputs.salt-version }}"
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: deb
ubuntu-1804-pkg-tests:
name: Ubuntu 18.04 Package Tests
if: ${{ fromJSON(needs.prepare-ci.outputs.jobs)['self-hosted-runners'] }}
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['self-hosted-runners'] }}
needs:
- prepare-ci
- prepare-workflow
- build-pkgs
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: ubuntu-18.04
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-ci.outputs.salt-version }}"
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: deb
ubuntu-2004-pkg-tests:
name: Ubuntu 20.04 Package Tests
if: ${{ fromJSON(needs.prepare-ci.outputs.jobs)['self-hosted-runners'] }}
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['self-hosted-runners'] }}
needs:
- prepare-ci
- prepare-workflow
- build-pkgs
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: ubuntu-20.04
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-ci.outputs.salt-version }}"
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: deb
ubuntu-2004-arm64-pkg-tests:
name: Ubuntu 20.04 Arm64 Package Tests
if: ${{ fromJSON(needs.prepare-ci.outputs.jobs)['self-hosted-runners'] }}
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['self-hosted-runners'] }}
needs:
- prepare-ci
- prepare-workflow
- build-pkgs
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: ubuntu-20.04-arm64
platform: linux
arch: aarch64
salt-version: "${{ needs.prepare-ci.outputs.salt-version }}"
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: deb
ubuntu-2204-pkg-tests:
name: Ubuntu 22.04 Package Tests
if: ${{ fromJSON(needs.prepare-ci.outputs.jobs)['self-hosted-runners'] }}
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['self-hosted-runners'] }}
needs:
- prepare-ci
- prepare-workflow
- build-pkgs
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: ubuntu-22.04
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-ci.outputs.salt-version }}"
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: deb
ubuntu-2204-arm64-pkg-tests:
name: Ubuntu 22.04 Arm64 Package Tests
if: ${{ fromJSON(needs.prepare-ci.outputs.jobs)['self-hosted-runners'] }}
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['self-hosted-runners'] }}
needs:
- prepare-ci
- prepare-workflow
- build-pkgs
uses: ./.github/workflows/test-packages-action.yml
with:
distro-slug: ubuntu-22.04-arm64
platform: linux
arch: aarch64
salt-version: "${{ needs.prepare-ci.outputs.salt-version }}"
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: deb
macos-12-pkg-tests:
name: macOS 12 Package Tests
if: ${{ fromJSON(needs.prepare-ci.outputs.jobs)['github-hosted-runners'] }}
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['github-hosted-runners'] }}
needs:
- prepare-ci
- prepare-workflow
- build-pkgs
uses: ./.github/workflows/test-packages-action-macos.yml
with:
distro-slug: macos-12
platform: darwin
arch: x86_64
salt-version: "${{ needs.prepare-ci.outputs.salt-version }}"
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: macos
# <-------------------------------- PACKAGE TESTS -------------------------------->

View file

@ -219,7 +219,6 @@ jobs:
- name: Run Package Tests
env:
SKIP_REQUIREMENTS_INSTALL: "1"
PRINT_TEST_SELECTION: "0"
PRINT_TEST_PLAN_ONLY: "0"
PRINT_SYSTEM_INFO: "0"