Merge pull request #1902 from saltstack/add_3006_0_rc2

Adding 3006.0rc2 to bootstrap tests.
saltstack · Mar 19, 2023 · b9988d1 · b9988d1
2 parents ec4df56 + c009da6
commit b9988d1
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 14 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", "latest", "onedir-nightly", "onedir-rc-3006-0rc1"]'
+      instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
 
 
   almalinux-9:
@@ -263,7 +263,7 @@ jobs:
       distro-slug: almalinux-9
       display-name: AlmaLinux 9
       timeout: 20
-      instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir-rc-3006-0rc1"]'
+      instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
 
 
   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", "git-master", "latest", "onedir-nightly", "onedir-rc-3006-0rc1"]'
+      instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
 
 
   arch:
@@ -305,7 +305,7 @@ jobs:
       distro-slug: centos-7
       display-name: CentOS 7
       timeout: 20
-      instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1"]'
+      instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
 
 
   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", "latest", "onedir-nightly", "onedir-rc-3006-0rc1"]'
+      instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
 
 
   centos-stream9:
@@ -333,7 +333,7 @@ jobs:
       distro-slug: centos-stream9
       display-name: CentOS Stream 9
       timeout: 20
-      instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir-rc-3006-0rc1"]'
+      instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
 
 
   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", "git-master", "latest", "onedir-nightly", "onedir-rc-3006-0rc1"]'
+      instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
 
 
   debian-11:
@@ -361,7 +361,7 @@ jobs:
       distro-slug: debian-11
       display-name: Debian 11
       timeout: 20
-      instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir-rc-3006-0rc1"]'
+      instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
 
 
   fedora-35:
@@ -487,7 +487,7 @@ jobs:
       distro-slug: oraclelinux-7
       display-name: Oracle Linux 7
       timeout: 20
-      instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1"]'
+      instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
 
 
   oraclelinux-8:
@@ -501,7 +501,7 @@ jobs:
       distro-slug: oraclelinux-8
       display-name: Oracle Linux 8
       timeout: 20
-      instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1"]'
+      instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
 
 
   rockylinux-8:
@@ -515,7 +515,7 @@ jobs:
       distro-slug: rockylinux-8
       display-name: Rocky Linux 8
       timeout: 20
-      instances: '["stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1"]'
+      instances: '["stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
 
 
   rockylinux-9:
@@ -529,7 +529,7 @@ jobs:
       distro-slug: rockylinux-9
       display-name: Rocky Linux 9
       timeout: 20
-      instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir-rc-3006-0rc1"]'
+      instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
 
 
   ubuntu-2004:
@@ -543,7 +543,7 @@ jobs:
       distro-slug: ubuntu-2004
       display-name: Ubuntu 20.04
       timeout: 20
-      instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir-rc-3006-0rc1"]'
+      instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
 
 
   ubuntu-2204:
@@ -557,7 +557,7 @@ jobs:
       distro-slug: ubuntu-2204
       display-name: Ubuntu 22.04
       timeout: 20
-      instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir-rc-3006-0rc1"]'
+      instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
 
 
   set-pipeline-exit-status:

diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
@@ -219,6 +219,7 @@
     "latest",
     "nightly",
     "3006-0rc1",
+    "3006-0rc2",
 ]
 
 ONEDIR_SALT_VERSIONS = [
@@ -229,6 +230,7 @@
 
 ONEDIR_RC_SALT_VERSIONS = [
     "3006-0rc1",
+    "3006-0rc2",
 ]
 
 VERSION_DISPLAY_NAMES = {
@@ -244,11 +246,13 @@
     "master",
     "nightly",
     "3006-0rc1",
+    "3006-0rc2",
 ]
 
 GIT_VERSION_BLACKLIST = [
     "nightly",
     "3006-0rc1",
+    "3006-0rc2",
 ]
 
 # TODO: Revert the commit relating to this section, once the Git-based builds

diff --git a/kitchen.yml b/kitchen.yml
@@ -42,6 +42,12 @@ platforms:
       platform: rhel
       provision_command:
         - yum -y install procps-ng
+  - name: amazon-2023
+    driver:
+      image: amazonlinux:2023
+      platform: fedora
+      provision_command:
+        - yum -y install procps-ng
   - name: arch
     driver:
       image: archlinux/archlinux
@@ -265,6 +271,20 @@ suites:
       salt_version: 3005
       salt_bootstrap_options: -MP onedir %s
 
+  - name: onedir-rc-3006-0rc2
+    provisioner:
+      salt_version: 3006.0rc2
+      salt_bootstrap_options: -R staging.repo.saltproject.io -MP onedir_rc %s
+    excludes:
+      - arch
+      - freebsd-131
+      - freebsd-123
+      - gentoo
+      - openbsd-6
+      - opensuse-15
+      - opensuse-tumbleweed
+      - ubuntu-1804
+
   - name: onedir-rc-3006-0rc1
     provisioner:
       salt_version: 3006.0rc1