Merge pull request #1840 from myii/ci/add-fedora-37

ci: add `fedora-37` & `fedora-38`

.github/workflows/ci.yml

@@ -364,6 +364,34 @@ jobs:
       instances: '["git-master", "latest"]'
 
 
+  fedora-37:
+    name: Fedora 37
+    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-37
+      display-name: Fedora 37
+      timeout: 20
+      instances: '["latest"]'
+
+
+  fedora-38:
+    name: Fedora 38
+    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-38
+      display-name: Fedora 38
+      timeout: 20
+      instances: '["latest"]'
+
+
   gentoo:
     name: Gentoo
     if: github.event_name == 'push'
@@ -529,6 +557,8 @@ jobs:
       - debian-11
       - fedora-35
       - fedora-36
+      - fedora-37
+      - fedora-38
       - gentoo
       - gentoo-systemd
       - opensuse-15

.github/workflows/templates/generate.py

@@ -17,6 +17,8 @@ LINUX_DISTROS = [
     "debian-11",
     "fedora-35",
     "fedora-36",
+    "fedora-37",
+    "fedora-38",
     "gentoo",
     "gentoo-systemd",
     "opensuse-15",
@@ -54,6 +56,8 @@ STABLE_DISTROS = [
     "debian-11",
     "fedora-35",
     "fedora-36",
+    "fedora-37",
+    "fedora-38",
     "gentoo",
     "gentoo-systemd",
     "opensuse-15",
@@ -86,6 +90,8 @@ BLACKLIST_3003 = [
     "debian-11",
     "fedora-35",
     "fedora-36",
+    "fedora-37",
+    "fedora-38",
     "gentoo",
     "gentoo-systemd",
     "opensuse-15",
@@ -101,6 +107,8 @@ BLACKLIST_GIT_3003 = [
     "debian-11",
     "fedora-35",
     "fedora-36",
+    "fedora-37",
+    "fedora-38",
     "gentoo",
     "gentoo-systemd",
     "opensuse-15",
@@ -115,6 +123,8 @@ BLACKLIST_3004 = [
     "arch",
     "fedora-35",
     "fedora-36",
+    "fedora-37",
+    "fedora-38",
     "gentoo",
     "gentoo-systemd",
     "opensuse-15",
@@ -125,6 +135,8 @@ BLACKLIST_3005 = [
     "arch",
     "fedora-35",
     "fedora-36",
+    "fedora-37",
+    "fedora-38",
     "gentoo",
     "gentoo-systemd",
     "opensuse-15",
@@ -138,6 +150,8 @@ BLACKLIST_GIT_3004 = [
     "debian-11",
     "fedora-35",
     "fedora-36",
+    "fedora-37",
+    "fedora-38",
     "gentoo",
     "gentoo-systemd",
     "opensuse-15",
@@ -154,6 +168,8 @@ BLACKLIST_GIT_3005 = [
     "debian-11",
     "fedora-35",
     "fedora-36",
+    "fedora-37",
+    "fedora-38",
     "gentoo",
     "gentoo-systemd",
     "opensuse-15",
@@ -196,6 +212,19 @@ GIT_VERSION_BLACKLIST = [
     "nightly",
 ]
 
+# TODO: Revert the commit relating to this section, once the Git-based builds
+#       have been fixed for the distros listed below
+#
+#       Apparent failure is:
+#
+#           /usr/lib/python3.11/site-packages/setuptools/command/install.py:34:
+#           SetuptoolsDeprecationWarning: setup.py install is deprecated.
+#           Use build and pip and other standards-based tools.
+GIT_DISTRO_BLACKLIST = [
+    "fedora-37",
+    "fedora-38",
+]
+
 LATEST_PKG_BLACKLIST = []
 
 DISTRO_DISPLAY_NAMES = {
@@ -208,6 +237,8 @@ DISTRO_DISPLAY_NAMES = {
     "debian-11": "Debian 11",
     "fedora-35": "Fedora 35",
     "fedora-36": "Fedora 36",
+    "fedora-37": "Fedora 37",
+    "fedora-38": "Fedora 38",
     "gentoo": "Gentoo",
     "gentoo-systemd": "Gentoo (systemd)",
     "opensuse-15": "Opensuse 15",
@@ -454,6 +485,8 @@ def generate_test_jobs():
                 if bootstrap_type == "git":
                     if salt_version in GIT_VERSION_BLACKLIST:
                         continue
+                    if distro in GIT_DISTRO_BLACKLIST:
+                        continue
 
                 BLACKLIST = {
                     "3003": BLACKLIST_3003,

bootstrap-salt.sh

@@ -649,7 +649,7 @@ elif [ "$ITYPE" = "onedir" ]; then
             ONEDIR_REV="minor/$1"
             shift
         else
-            echo "Unknown stable version: $1 (valid: 3005, latest, nightly.)"
+            echo "Unknown onedir version: $1 (valid: 3005, latest, nightly.)"
             exit 1
         fi
     fi
@@ -673,7 +673,7 @@ elif [ "$ITYPE" = "onedir_rc" ]; then
             ONEDIR_REV="minor/$1"
             shift
         else
-            echo "Unknown stable version: $1 (valid: 3005-1, latest.)"
+            echo "Unknown onedir_rc version: $1 (valid: 3005-1, latest.)"
             exit 1
         fi
     fi
@@ -7242,7 +7242,7 @@ install_opensuse_git_deps() {
         fi
     # Check for Tumbleweed
     elif [ "${DISTRO_MAJOR_VERSION}" -ge 20210101 ]; then
-        __PACKAGES="python3-pip gcc-c++ python310-pyzmq-devel"
+        __PACKAGES="python3-pip gcc-c++ python3-pyzmq-devel"
     else
         __PACKAGES="python-pip python-setuptools gcc"
     fi

kitchen.yml

@@ -65,6 +65,12 @@ platforms:
   - name: fedora-36
     driver:
       provision_command: *fedora_provision_command
+  - name: fedora-37
+    driver:
+      provision_command: *fedora_provision_command
+  - name: fedora-38
+    driver:
+      provision_command: *fedora_provision_command
   - name: gentoo
     driver:
       image: gentoo/stage3:latest