Removed testing for OpenSUSE Tumbleweed and install contextvars for F…

…edora git
saltstack · Sep 18, 2024 · 8c9e662 · 8c9e662
1 parent 9848c33
commit 8c9e662
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 30 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -346,20 +346,6 @@ jobs:
       instances: '["latest", "default"]'
 
 
-  opensuse-tumbleweed:
-    name: Opensuse Tumbleweed
-    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: opensuse-tumbleweed
-      display-name: Opensuse Tumbleweed
-      timeout: 20
-      instances: '["git-master", "latest", "default"]'
-
-
   oraclelinux-8:
     name: Oracle Linux 8
     if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
@@ -510,7 +496,6 @@ jobs:
       - gentoo
       - gentoo-systemd
       - opensuse-15
-      - opensuse-tumbleweed
       - oraclelinux-8
       - oraclelinux-9
       - photon-4

diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
@@ -7,6 +7,7 @@
 os.chdir(os.path.abspath(os.path.dirname(__file__)))
 
 ##    "amazon-2023",
+##    "opensuse-tumbleweed",
 LINUX_DISTROS = [
     "almalinux-8",
     "almalinux-9",
@@ -20,7 +21,6 @@
     "gentoo",
     "gentoo-systemd",
     "opensuse-15",
-    "opensuse-tumbleweed",
     "oraclelinux-8",
     "oraclelinux-9",
     "photon-4",
@@ -43,6 +43,7 @@
 
 
 ##    "amazon-2023",
+##    "opensuse-tumbleweed",
 STABLE_DISTROS = [
     "almalinux-8",
     "almalinux-9",
@@ -54,7 +55,6 @@
     "fedora-39",
     "fedora-40",
     "opensuse-15",
-    "opensuse-tumbleweed",
     "oraclelinux-8",
     "oraclelinux-9",
     "photon-4",
@@ -99,29 +99,30 @@
     "ubuntu-2404",
 ]
 
+##    "opensuse-tumbleweed",
 BLACKLIST_3006 = [
     "arch",
     "debian-12",
     "fedora-40",
     "gentoo",
     "gentoo-systemd",
     "opensuse-15",
-    "opensuse-tumbleweed",
     "ubuntu-2404",
 ]
 
+##    "opensuse-tumbleweed",
 BLACKLIST_3007 = [
     "arch",
     "fedora-39",
     "gentoo",
     "gentoo-systemd",
     "opensuse-15",
-    "opensuse-tumbleweed",
     "photon-4",
     "photon-5",
 ]
 
 ##    "amazon-2023",
+##    "opensuse-tumbleweed",
 BLACKLIST_GIT_3006 = [
     "almalinux-9",
     "amazon-2",
@@ -133,7 +134,6 @@
     "gentoo",
     "gentoo-systemd",
     "opensuse-15",
-    "opensuse-tumbleweed",
     "oraclelinux-9",
     "photon-4",
     "photon-5",
@@ -144,6 +144,7 @@
 ]
 
 ##    "amazon-2023",
+##    "opensuse-tumbleweed",
 BLACKLIST_GIT_3007 = [
     "almalinux-9",
     "amazon-2",
@@ -156,7 +157,6 @@
     "gentoo",
     "gentoo-systemd",
     "opensuse-15",
-    "opensuse-tumbleweed",
     "oraclelinux-9",
     "photon-4",
     "photon-5",
@@ -240,6 +240,7 @@
 ]
 
 ##    "amazon-2023": "Amazon 2023",
+##    "opensuse-tumbleweed": "Opensuse Tumbleweed",
 DISTRO_DISPLAY_NAMES = {
     "almalinux-8": "AlmaLinux 8",
     "almalinux-9": "AlmaLinux 9",
@@ -253,7 +254,6 @@
     "gentoo": "Gentoo",
     "gentoo-systemd": "Gentoo (systemd)",
     "opensuse-15": "Opensuse 15",
-    "opensuse-tumbleweed": "Opensuse Tumbleweed",
     "oraclelinux-8": "Oracle Linux 8",
     "oraclelinux-9": "Oracle Linux 9",
     "photon-4": "Photon OS 4",

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
@@ -3843,6 +3843,10 @@ install_fedora_git_deps() {
         CONFIG_SALT_FUNC="config_salt"
     fi
 
+    _fedora_dep="contextvars"
+    echodebug "Running '${_PY_EXE} -m pip install --upgrade ${_fedora_dep}'"
+    ${_PY_EXE} -m pip install --upgrade "${_fedora_dep}"
+
     return 0
 }
 

diff --git a/kitchen.yml b/kitchen.yml
@@ -36,6 +36,15 @@ provisioner:
 ##        - yum -y install --allowerasing procps-ng curl
 ##        - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
 
+##  - name: opensuse-tumbleweed
+##    driver:
+##      image: opensuse/tumbleweed:latest
+##      provision_command:
+##        - *opensuse_provision_command_01
+##        - *opensuse_provision_command_02
+##        - *opensuse_provision_command_03
+##        - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
+
 platforms:
   - name: almalinux-9
     driver:
@@ -104,14 +113,6 @@ platforms:
         - &opensuse_provision_command_01 zypper --non-interactive install --auto-agree-with-licenses dbus-1
         - &opensuse_provision_command_02 zypper --non-interactive install --auto-agree-with-licenses sudo openssh which curl systemd
         - &opensuse_provision_command_03 systemctl enable sshd.service
-  - name: opensuse-tumbleweed
-    driver:
-      image: opensuse/tumbleweed:latest
-      provision_command:
-        - *opensuse_provision_command_01
-        - *opensuse_provision_command_02
-        - *opensuse_provision_command_03
-        - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
   - name: rockylinux-9
     driver:
       platform: centosstream