Merge branch '3006.x' into fix_65288

saltstack · Sep 25, 2023 · 492dcbb · 492dcbb
2 parents 15327dc + da7d79a
commit 492dcbb
Show file tree

Hide file tree

Showing 37 changed files with 542 additions and 117 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -680,6 +680,25 @@ jobs:
       skip-junit-reports: ${{ github.event_name == 'pull_request' }}
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
+  photonos-4-arm64-pkg-tests:
+    name: Photon OS 4 Arm64 Package Tests
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
+    needs:
+      - prepare-workflow
+      - build-rpm-pkgs
+    uses: ./.github/workflows/test-packages-action.yml
+    with:
+      distro-slug: photonos-4-arm64
+      platform: linux
+      arch: aarch64
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      pkg-type: rpm
+      nox-version: 2022.8.7
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
+      skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
+      skip-junit-reports: ${{ github.event_name == 'pull_request' }}
+      testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
+
   ubuntu-2004-pkg-tests:
     name: Ubuntu 20.04 Package Tests
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@@ -1250,6 +1269,25 @@ jobs:
       skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
       skip-junit-reports: ${{ github.event_name == 'pull_request' }}
 
+  photonos-4-arm64:
+    name: Photon OS 4 Arm64
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
+    needs:
+      - prepare-workflow
+      - build-salt-onedir
+    uses: ./.github/workflows/test-action.yml
+    with:
+      distro-slug: photonos-4-arm64
+      nox-session: ci-test-onedir
+      platform: linux
+      arch: aarch64
+      nox-version: 2022.8.7
+      testrun: ${{ needs.prepare-workflow.outputs.testrun }}
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
+      skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
+      skip-junit-reports: ${{ github.event_name == 'pull_request' }}
+
   ubuntu-2004:
     name: Ubuntu 20.04
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@@ -1351,6 +1389,7 @@ jobs:
       - opensuse-15
       - photonos-3
       - photonos-4
+      - photonos-4-arm64
       - ubuntu-2004
       - ubuntu-2004-arm64
       - ubuntu-2204
@@ -1427,6 +1466,7 @@ jobs:
       - opensuse-15
       - photonos-3
       - photonos-4
+      - photonos-4-arm64
       - ubuntu-2004
       - ubuntu-2004-arm64
       - ubuntu-2204
@@ -1440,6 +1480,7 @@ jobs:
       - debian-11-arm64-pkg-tests
       - photonos-3-pkg-tests
       - photonos-4-pkg-tests
+      - photonos-4-arm64-pkg-tests
       - ubuntu-2004-pkg-tests
       - ubuntu-2004-arm64-pkg-tests
       - ubuntu-2204-pkg-tests

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -735,6 +735,25 @@ jobs:
       skip-junit-reports: false
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
+  photonos-4-arm64-pkg-tests:
+    name: Photon OS 4 Arm64 Package Tests
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
+    needs:
+      - prepare-workflow
+      - build-rpm-pkgs
+    uses: ./.github/workflows/test-packages-action.yml
+    with:
+      distro-slug: photonos-4-arm64
+      platform: linux
+      arch: aarch64
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      pkg-type: rpm
+      nox-version: 2022.8.7
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
+      skip-code-coverage: false
+      skip-junit-reports: false
+      testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
+
   ubuntu-2004-pkg-tests:
     name: Ubuntu 20.04 Package Tests
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@@ -1305,6 +1324,25 @@ jobs:
       skip-code-coverage: false
       skip-junit-reports: false
 
+  photonos-4-arm64:
+    name: Photon OS 4 Arm64
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
+    needs:
+      - prepare-workflow
+      - build-salt-onedir
+    uses: ./.github/workflows/test-action.yml
+    with:
+      distro-slug: photonos-4-arm64
+      nox-session: ci-test-onedir
+      platform: linux
+      arch: aarch64
+      nox-version: 2022.8.7
+      testrun: ${{ needs.prepare-workflow.outputs.testrun }}
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
+      skip-code-coverage: false
+      skip-junit-reports: false
+
   ubuntu-2004:
     name: Ubuntu 20.04
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@@ -1406,6 +1444,7 @@ jobs:
       - opensuse-15
       - photonos-3
       - photonos-4
+      - photonos-4-arm64
       - ubuntu-2004
       - ubuntu-2004-arm64
       - ubuntu-2204
@@ -2113,6 +2152,7 @@ jobs:
       - opensuse-15
       - photonos-3
       - photonos-4
+      - photonos-4-arm64
       - ubuntu-2004
       - ubuntu-2004-arm64
       - ubuntu-2204
@@ -2179,6 +2219,7 @@ jobs:
       - debian-11-arm64-pkg-tests
       - photonos-3-pkg-tests
       - photonos-4-pkg-tests
+      - photonos-4-arm64-pkg-tests
       - ubuntu-2004-pkg-tests
       - ubuntu-2004-arm64-pkg-tests
       - ubuntu-2204-pkg-tests

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -664,6 +664,27 @@ jobs:
       pkg-type: package
     secrets: inherit
 
+  photonos-4-arm64-package-download-tests:
+    name: Test Photon OS 4 Arm64 package Downloads
+    if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
+    needs:
+      - prepare-workflow
+      - publish-repositories
+      - download-onedir-artifact
+    uses: ./.github/workflows/test-package-downloads-action-linux.yml
+    with:
+      distro-slug: photonos-4-arm64
+      platform: linux
+      arch: aarch64
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      environment: release
+      nox-version: 2022.8.7
+      skip-code-coverage: true
+      latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      pkg-type: package
+    secrets: inherit
+
   ubuntu-2004-package-download-tests:
     name: Test Ubuntu 20.04 package Downloads
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
@@ -927,6 +948,7 @@ jobs:
       - fedora-38-arm64-package-download-tests
       - photonos-3-package-download-tests
       - photonos-4-package-download-tests
+      - photonos-4-arm64-package-download-tests
       - ubuntu-2004-package-download-tests
       - ubuntu-2004-arm64-package-download-tests
       - ubuntu-2204-package-download-tests

diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml
@@ -714,6 +714,25 @@ jobs:
       skip-junit-reports: false
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
+  photonos-4-arm64-pkg-tests:
+    name: Photon OS 4 Arm64 Package Tests
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
+    needs:
+      - prepare-workflow
+      - build-rpm-pkgs
+    uses: ./.github/workflows/test-packages-action.yml
+    with:
+      distro-slug: photonos-4-arm64
+      platform: linux
+      arch: aarch64
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      pkg-type: rpm
+      nox-version: 2022.8.7
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
+      skip-code-coverage: false
+      skip-junit-reports: false
+      testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
+
   ubuntu-2004-pkg-tests:
     name: Ubuntu 20.04 Package Tests
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@@ -1284,6 +1303,25 @@ jobs:
       skip-code-coverage: false
       skip-junit-reports: false
 
+  photonos-4-arm64:
+    name: Photon OS 4 Arm64
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
+    needs:
+      - prepare-workflow
+      - build-salt-onedir
+    uses: ./.github/workflows/test-action.yml
+    with:
+      distro-slug: photonos-4-arm64
+      nox-session: ci-test-onedir
+      platform: linux
+      arch: aarch64
+      nox-version: 2022.8.7
+      testrun: ${{ needs.prepare-workflow.outputs.testrun }}
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
+      skip-code-coverage: false
+      skip-junit-reports: false
+
   ubuntu-2004:
     name: Ubuntu 20.04
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@@ -1385,6 +1423,7 @@ jobs:
       - opensuse-15
       - photonos-3
       - photonos-4
+      - photonos-4-arm64
       - ubuntu-2004
       - ubuntu-2004-arm64
       - ubuntu-2204
@@ -1463,6 +1502,7 @@ jobs:
       - opensuse-15
       - photonos-3
       - photonos-4
+      - photonos-4-arm64
       - ubuntu-2004
       - ubuntu-2004-arm64
       - ubuntu-2204
@@ -1476,6 +1516,7 @@ jobs:
       - debian-11-arm64-pkg-tests
       - photonos-3-pkg-tests
       - photonos-4-pkg-tests
+      - photonos-4-arm64-pkg-tests
       - ubuntu-2004-pkg-tests
       - ubuntu-2004-arm64-pkg-tests
       - ubuntu-2204-pkg-tests

diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
@@ -730,6 +730,25 @@ jobs:
       skip-junit-reports: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
+  photonos-4-arm64-pkg-tests:
+    name: Photon OS 4 Arm64 Package Tests
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
+    needs:
+      - prepare-workflow
+      - build-rpm-pkgs
+    uses: ./.github/workflows/test-packages-action.yml
+    with:
+      distro-slug: photonos-4-arm64
+      platform: linux
+      arch: aarch64
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      pkg-type: rpm
+      nox-version: 2022.8.7
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
+      skip-code-coverage: true
+      skip-junit-reports: true
+      testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
+
   ubuntu-2004-pkg-tests:
     name: Ubuntu 20.04 Package Tests
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@@ -1300,6 +1319,25 @@ jobs:
       skip-code-coverage: true
       skip-junit-reports: true
 
+  photonos-4-arm64:
+    name: Photon OS 4 Arm64
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
+    needs:
+      - prepare-workflow
+      - build-salt-onedir
+    uses: ./.github/workflows/test-action.yml
+    with:
+      distro-slug: photonos-4-arm64
+      nox-session: ci-test-onedir
+      platform: linux
+      arch: aarch64
+      nox-version: 2022.8.7
+      testrun: ${{ needs.prepare-workflow.outputs.testrun }}
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
+      skip-code-coverage: true
+      skip-junit-reports: true
+
   ubuntu-2004:
     name: Ubuntu 20.04
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@@ -2543,6 +2581,26 @@ jobs:
       pkg-type: package
     secrets: inherit
 
+  photonos-4-arm64-package-download-tests:
+    name: Test Photon OS 4 Arm64 package Downloads
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
+    needs:
+      - prepare-workflow
+      - publish-repositories
+    uses: ./.github/workflows/test-package-downloads-action-linux.yml
+    with:
+      distro-slug: photonos-4-arm64
+      platform: linux
+      arch: aarch64
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      environment: staging
+      nox-version: 2022.8.7
+      skip-code-coverage: true
+      latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
+      pkg-type: package
+    secrets: inherit
+
   ubuntu-2004-package-download-tests:
     name: Test Ubuntu 20.04 package Downloads
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@@ -2788,6 +2846,7 @@ jobs:
       - opensuse-15
       - photonos-3
       - photonos-4
+      - photonos-4-arm64
       - ubuntu-2004
       - ubuntu-2004-arm64
       - ubuntu-2204
@@ -2801,6 +2860,7 @@ jobs:
       - debian-11-arm64-pkg-tests
       - photonos-3-pkg-tests
       - photonos-4-pkg-tests
+      - photonos-4-arm64-pkg-tests
       - ubuntu-2004-pkg-tests
       - ubuntu-2004-arm64-pkg-tests
       - ubuntu-2204-pkg-tests
@@ -2833,6 +2893,7 @@ jobs:
       - fedora-38-arm64-package-download-tests
       - photonos-3-package-download-tests
       - photonos-4-package-download-tests
+      - photonos-4-arm64-package-download-tests
       - ubuntu-2004-package-download-tests
       - ubuntu-2004-arm64-package-download-tests
       - ubuntu-2204-package-download-tests

diff --git a/.github/workflows/templates/test-pkg-repo-downloads.yml.jinja b/.github/workflows/templates/test-pkg-repo-downloads.yml.jinja
@@ -21,6 +21,7 @@
                                ("fedora-38-arm64", "Fedora 38 Arm64", "aarch64", "package"),
                                ("photonos-3", "Photon OS 3", "x86_64", "package"),
                                ("photonos-4", "Photon OS 4", "x86_64", "package"),
+                               ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64", "package"),
                                ("ubuntu-20.04", "Ubuntu 20.04", "x86_64", "package"),
                                ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64", "package"),
                                ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "package"),

diff --git a/.github/workflows/templates/test-salt-pkg.yml.jinja b/.github/workflows/templates/test-salt-pkg.yml.jinja
@@ -27,6 +27,7 @@
                                ("debian-11-arm64", "Debian 11 Arm64", "aarch64", "deb"),
                                ("photonos-3", "Photon OS 3", "x86_64", "rpm"),
                                ("photonos-4", "Photon OS 4", "x86_64", "rpm"),
+                               ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64", "rpm"),
                                ("ubuntu-20.04", "Ubuntu 20.04", "x86_64", "deb"),
                                ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64", "deb"),
                                ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "deb"),

diff --git a/.github/workflows/templates/test-salt.yml.jinja b/.github/workflows/templates/test-salt.yml.jinja
@@ -64,6 +64,7 @@
                                        ("opensuse-15", "Opensuse 15", "x86_64"),
                                        ("photonos-3", "Photon OS 3", "x86_64"),
                                        ("photonos-4", "Photon OS 4", "x86_64"),
+                                       ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64"),
                                        ("ubuntu-20.04", "Ubuntu 20.04", "x86_64"),
                                        ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64"),
                                        ("ubuntu-22.04", "Ubuntu 22.04", "x86_64"),

diff --git a/cicd/amis.yml b/cicd/amis.yml
@@ -1 +1 @@
-centosstream-9-x86_64: ami-0bd92f4dca5d74017
+centosstream-9-x86_64: ami-0dfa940714a95b497
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		centosstream-9-x86_64: ami-0bd92f4dca5d74017
		centosstream-9-x86_64: ami-0dfa940714a95b497