Merge develop into stable for v2023.04.26 release

saltstack · Apr 26, 2023 · 535bf70 · 535bf70
2 parents de22841 + 9cd4780
commit 535bf70
Show file tree

Hide file tree

Showing 8 changed files with 587 additions and 72 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -249,7 +249,7 @@ jobs:
       distro-slug: almalinux-8
       display-name: AlmaLinux 8
       timeout: 20
-      instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest"]'
+      instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest", "default"]'
 
 
   almalinux-9:
@@ -263,7 +263,7 @@ jobs:
       distro-slug: almalinux-9
       display-name: AlmaLinux 9
       timeout: 20
-      instances: '["git-3005", "onedir-3005", "onedir-3006", "git-master"]'
+      instances: '["git-3005", "stable-3006", "onedir-3006", "git-master", "latest", "default"]'
 
 
   amazon-2:
@@ -277,7 +277,7 @@ jobs:
       distro-slug: amazon-2
       display-name: Amazon 2
       timeout: 20
-      instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "git-master", "latest"]'
+      instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "git-master", "latest", "default"]'
 
 
   arch:
@@ -291,7 +291,7 @@ jobs:
       distro-slug: arch
       display-name: Arch
       timeout: 20
-      instances: '["git-master", "latest"]'
+      instances: '["git-master", "latest", "default"]'
 
 
   centos-7:
@@ -305,7 +305,7 @@ jobs:
       distro-slug: centos-7
       display-name: CentOS 7
       timeout: 20
-      instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest"]'
+      instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest", "default"]'
 
 
   centos-stream8:
@@ -319,7 +319,7 @@ jobs:
       distro-slug: centos-stream8
       display-name: CentOS Stream 8
       timeout: 20
-      instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest"]'
+      instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest", "default"]'
 
 
   centos-stream9:
@@ -333,7 +333,7 @@ jobs:
       distro-slug: centos-stream9
       display-name: CentOS Stream 9
       timeout: 20
-      instances: '["git-3005", "onedir-3005", "onedir-3006", "git-master"]'
+      instances: '["git-3005", "stable-3006", "onedir-3006", "git-master", "latest", "default"]'
 
 
   debian-10:
@@ -347,7 +347,7 @@ jobs:
       distro-slug: debian-10
       display-name: Debian 10
       timeout: 20
-      instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "git-master", "latest"]'
+      instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "git-master", "latest", "default"]'
 
 
   debian-11:
@@ -361,21 +361,7 @@ jobs:
       distro-slug: debian-11
       display-name: Debian 11
       timeout: 20
-      instances: '["stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "git-master", "latest"]'
-
-
-  fedora-35:
-    name: Fedora 35
-    if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
-    uses: ./.github/workflows/test-linux.yml
-    needs:
-      - lint
-      - generate-actions-workflow
-    with:
-      distro-slug: fedora-35
-      display-name: Fedora 35
-      timeout: 20
-      instances: '["git-master", "latest"]'
+      instances: '["stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "git-master", "latest", "default"]'
 
 
   fedora-36:
@@ -389,7 +375,7 @@ jobs:
       distro-slug: fedora-36
       display-name: Fedora 36
       timeout: 20
-      instances: '["git-master", "latest"]'
+      instances: '["stable-3006", "onedir-3006", "git-master", "latest", "default"]'
 
 
   fedora-37:
@@ -403,7 +389,7 @@ jobs:
       distro-slug: fedora-37
       display-name: Fedora 37
       timeout: 20
-      instances: '["latest"]'
+      instances: '["stable-3006", "onedir-3006", "latest", "default"]'
 
 
   fedora-38:
@@ -417,7 +403,7 @@ jobs:
       distro-slug: fedora-38
       display-name: Fedora 38
       timeout: 20
-      instances: '["latest"]'
+      instances: '["stable-3006", "onedir-3006", "latest", "default"]'
 
 
   gentoo:
@@ -431,7 +417,7 @@ jobs:
       distro-slug: gentoo
       display-name: Gentoo
       timeout: 90
-      instances: '["git-master", "latest"]'
+      instances: '["git-master", "latest", "default"]'
 
 
   gentoo-systemd:
@@ -445,7 +431,7 @@ jobs:
       distro-slug: gentoo-systemd
       display-name: Gentoo (systemd)
       timeout: 90
-      instances: '["git-master", "latest"]'
+      instances: '["git-master", "latest", "default"]'
 
 
   opensuse-15:
@@ -459,7 +445,7 @@ jobs:
       distro-slug: opensuse-15
       display-name: Opensuse 15
       timeout: 20
-      instances: '["latest"]'
+      instances: '["latest", "default"]'
 
 
   opensuse-tumbleweed:
@@ -473,7 +459,7 @@ jobs:
       distro-slug: opensuse-tumbleweed
       display-name: Opensuse Tumbleweed
       timeout: 20
-      instances: '["git-master", "latest"]'
+      instances: '["git-master", "latest", "default"]'
 
 
   oraclelinux-7:
@@ -487,7 +473,7 @@ jobs:
       distro-slug: oraclelinux-7
       display-name: Oracle Linux 7
       timeout: 20
-      instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest"]'
+      instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest", "default"]'
 
 
   oraclelinux-8:
@@ -501,7 +487,35 @@ jobs:
       distro-slug: oraclelinux-8
       display-name: Oracle Linux 8
       timeout: 20
-      instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest"]'
+      instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest", "default"]'
+
+
+  photon-3:
+    name: Photon OS 3
+    if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
+    uses: ./.github/workflows/test-linux.yml
+    needs:
+      - lint
+      - generate-actions-workflow
+    with:
+      distro-slug: photon-3
+      display-name: Photon OS 3
+      timeout: 20
+      instances: '["stable-3006", "onedir-3006", "git-master", "latest", "default"]'
+
+
+  photon-4:
+    name: Photon OS 4
+    if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
+    uses: ./.github/workflows/test-linux.yml
+    needs:
+      - lint
+      - generate-actions-workflow
+    with:
+      distro-slug: photon-4
+      display-name: Photon OS 4
+      timeout: 20
+      instances: '["stable-3006", "onedir-3006", "git-master", "latest", "default"]'
 
 
   rockylinux-8:
@@ -515,7 +529,7 @@ jobs:
       distro-slug: rockylinux-8
       display-name: Rocky Linux 8
       timeout: 20
-      instances: '["stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest"]'
+      instances: '["stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "latest", "default"]'
 
 
   rockylinux-9:
@@ -529,7 +543,7 @@ jobs:
       distro-slug: rockylinux-9
       display-name: Rocky Linux 9
       timeout: 20
-      instances: '["git-3005", "onedir-3005", "onedir-3006", "git-master"]'
+      instances: '["git-3005", "stable-3006", "onedir-3006", "git-master", "latest", "default"]'
 
 
   ubuntu-2004:
@@ -543,7 +557,7 @@ jobs:
       distro-slug: ubuntu-2004
       display-name: Ubuntu 20.04
       timeout: 20
-      instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "git-master", "latest"]'
+      instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "git-master", "latest", "default"]'
 
 
   ubuntu-2204:
@@ -557,7 +571,7 @@ jobs:
       distro-slug: ubuntu-2204
       display-name: Ubuntu 22.04
       timeout: 20
-      instances: '["stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "git-master", "latest"]'
+      instances: '["stable-3004", "stable-3005", "onedir-3005", "stable-3006", "onedir-3006", "git-master", "latest", "default"]'
 
 
   set-pipeline-exit-status:
@@ -585,7 +599,6 @@ jobs:
       - centos-stream9
       - debian-10
       - debian-11
-      - fedora-35
       - fedora-36
       - fedora-37
       - fedora-38
@@ -595,6 +608,8 @@ jobs:
       - opensuse-tumbleweed
       - oraclelinux-7
       - oraclelinux-8
+      - photon-3
+      - photon-4
       - rockylinux-8
       - rockylinux-9
       - ubuntu-2004