From 8855eaa5d3324862b73bf8ff7d263f2da3aa674c Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Tue, 5 Nov 2024 19:44:46 -0700 Subject: [PATCH] Use rocky linux 8 too --- .github/workflows/ci.yml | 48 +++++++++++++++++++++++++++++++++ .github/workflows/nightly.yml | 46 +++++++++++++++++++++++++++++++ .github/workflows/scheduled.yml | 46 +++++++++++++++++++++++++++++++ .github/workflows/staging.yml | 46 +++++++++++++++++++++++++++++++ tools/precommit/workflows.py | 18 ++++++++----- 5 files changed, 198 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 64e610de01c..14e1cc078f3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -862,6 +862,50 @@ jobs: workflow-slug: ci default-timeout: 180 + rockylinux-8: + name: Rocky Linux 8 Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'rockylinux-8') }} + needs: + - prepare-workflow + - build-ci-deps-linux + uses: ./.github/workflows/test-action-linux.yml + with: + distro-slug: rockylinux-8 + nox-session: ci-test-onedir + platform: linux + container: ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-8 + arch: x86_64 + nox-version: 2022.8.7 + gh-actions-python-version: "3.10" + testrun: ${{ needs.prepare-workflow.outputs.testrun }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.15 + skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} + workflow-slug: ci + default-timeout: 180 + + rockylinux-8-arm64: + name: Rocky Linux 8 Arm64 Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'rockylinux-8-arm64') }} + needs: + - prepare-workflow + - build-ci-deps-linux + uses: ./.github/workflows/test-action-linux.yml + with: + distro-slug: rockylinux-8-arm64 + nox-session: ci-test-onedir + platform: linux + container: ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-8 + arch: arm64 + nox-version: 2022.8.7 + gh-actions-python-version: "3.10" + testrun: ${{ needs.prepare-workflow.outputs.testrun }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.15 + skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} + workflow-slug: ci + default-timeout: 180 + rockylinux-9: name: Rocky Linux 9 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -964,6 +1008,8 @@ jobs: - windows-2019 - windows-2022 - macos-12 + - rockylinux-8 + - rockylinux-8-arm64 - rockylinux-9 - rockylinux-9-arm64 - ubuntu-2204 @@ -1113,6 +1159,8 @@ jobs: - windows-2019 - windows-2022 - macos-12 + - rockylinux-8 + - rockylinux-8-arm64 - rockylinux-9 - rockylinux-9-arm64 - ubuntu-2204 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index dcbeda32744..df24d4a10fc 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -985,6 +985,50 @@ jobs: workflow-slug: nightly default-timeout: 360 + rockylinux-8: + name: Rocky Linux 8 Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-ci-deps-linux + uses: ./.github/workflows/test-action-linux.yml + with: + distro-slug: rockylinux-8 + nox-session: ci-test-onedir + platform: linux + container: ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-8 + arch: x86_64 + nox-version: 2022.8.7 + gh-actions-python-version: "3.10" + testrun: ${{ needs.prepare-workflow.outputs.testrun }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.15 + skip-code-coverage: true + workflow-slug: nightly + default-timeout: 360 + + rockylinux-8-arm64: + name: Rocky Linux 8 Arm64 Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-ci-deps-linux + uses: ./.github/workflows/test-action-linux.yml + with: + distro-slug: rockylinux-8-arm64 + nox-session: ci-test-onedir + platform: linux + container: ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-8 + arch: arm64 + nox-version: 2022.8.7 + gh-actions-python-version: "3.10" + testrun: ${{ needs.prepare-workflow.outputs.testrun }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.15 + skip-code-coverage: true + workflow-slug: nightly + default-timeout: 360 + rockylinux-9: name: Rocky Linux 9 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -1824,6 +1868,8 @@ jobs: - windows-2019 - windows-2022 - macos-12 + - rockylinux-8 + - rockylinux-8-arm64 - rockylinux-9 - rockylinux-9-arm64 - ubuntu-2204 diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 43ececd64b7..90a5e39d441 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -901,6 +901,50 @@ jobs: workflow-slug: scheduled default-timeout: 360 + rockylinux-8: + name: Rocky Linux 8 Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-ci-deps-linux + uses: ./.github/workflows/test-action-linux.yml + with: + distro-slug: rockylinux-8 + nox-session: ci-test-onedir + platform: linux + container: ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-8 + arch: x86_64 + nox-version: 2022.8.7 + gh-actions-python-version: "3.10" + testrun: ${{ needs.prepare-workflow.outputs.testrun }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.15 + skip-code-coverage: true + workflow-slug: scheduled + default-timeout: 360 + + rockylinux-8-arm64: + name: Rocky Linux 8 Arm64 Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-ci-deps-linux + uses: ./.github/workflows/test-action-linux.yml + with: + distro-slug: rockylinux-8-arm64 + nox-session: ci-test-onedir + platform: linux + container: ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-8 + arch: arm64 + nox-version: 2022.8.7 + gh-actions-python-version: "3.10" + testrun: ${{ needs.prepare-workflow.outputs.testrun }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.15 + skip-code-coverage: true + workflow-slug: scheduled + default-timeout: 360 + rockylinux-9: name: Rocky Linux 9 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -1015,6 +1059,8 @@ jobs: - windows-2019 - windows-2022 - macos-12 + - rockylinux-8 + - rockylinux-8-arm64 - rockylinux-9 - rockylinux-9-arm64 - ubuntu-2204 diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index c9768a908ae..2869f6cf856 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -967,6 +967,50 @@ jobs: workflow-slug: staging default-timeout: 180 + rockylinux-8: + name: Rocky Linux 8 Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-ci-deps-linux + uses: ./.github/workflows/test-action-linux.yml + with: + distro-slug: rockylinux-8 + nox-session: ci-test-onedir + platform: linux + container: ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-8 + arch: x86_64 + nox-version: 2022.8.7 + gh-actions-python-version: "3.10" + testrun: ${{ needs.prepare-workflow.outputs.testrun }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.15 + skip-code-coverage: true + workflow-slug: staging + default-timeout: 180 + + rockylinux-8-arm64: + name: Rocky Linux 8 Arm64 Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-ci-deps-linux + uses: ./.github/workflows/test-action-linux.yml + with: + distro-slug: rockylinux-8-arm64 + nox-session: ci-test-onedir + platform: linux + container: ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-8 + arch: arm64 + nox-version: 2022.8.7 + gh-actions-python-version: "3.10" + testrun: ${{ needs.prepare-workflow.outputs.testrun }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.15 + skip-code-coverage: true + workflow-slug: staging + default-timeout: 180 + rockylinux-9: name: Rocky Linux 9 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -1936,6 +1980,8 @@ jobs: - windows-2019 - windows-2022 - macos-12 + - rockylinux-8 + - rockylinux-8-arm64 - rockylinux-9 - rockylinux-9-arm64 - ubuntu-2204 diff --git a/tools/precommit/workflows.py b/tools/precommit/workflows.py index cacfb2f89a6..5d4554017af 100644 --- a/tools/precommit/workflows.py +++ b/tools/precommit/workflows.py @@ -23,12 +23,18 @@ TEMPLATES = WORKFLOWS / "templates" TEST_SALT_LISTING = PlatformDefinitions( { "linux": [ - # Linux(slug="rockylinux-8", display_name="Rocky Linux 8", arch="x86_64"), - # Linux( - # slug="rockylinux-8-arm64", - # display_name="Rocky Linux 8 Arm64", - # arch="arm64", - # ), + Linux( + slug="rockylinux-8", + display_name="Rocky Linux 8", + arch="x86_64", + container="ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-8", + ), + Linux( + slug="rockylinux-8-arm64", + display_name="Rocky Linux 8 Arm64", + arch="arm64", + container="ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-8", + ), Linux( slug="rockylinux-9", display_name="Rocky Linux 9",