From b903662ad044ece9201a5bbd8efca84ca0aeb106 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Fri, 17 Jun 2022 13:17:21 +0100
Subject: [PATCH 1/3] feat(bootstrap-salt): handle openSUSE downstream repo
 change for `15.4`

The difference between `15.3` and `15.4` can be seen here:

* https://download.opensuse.org/repositories/systemsmanagement:/saltstack/
  - `openSUSE_Leap_15.3`
  - `15.4` (i.e. not `openSUSE_Leap_15.4`)
---
 bootstrap-salt.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index b0d6d686a..e2a9b6c21 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -6463,6 +6463,8 @@ __set_suse_pkg_repo() {
     # Set distro repo variable
     if [ "${DISTRO_MAJOR_VERSION}" -gt 2015 ]; then
         DISTRO_REPO="openSUSE_Tumbleweed"
+    elif [ "${DISTRO_MAJOR_VERSION}" -eq 15 ] && [ "${DISTRO_MINOR_VERSION}" -ge 4 ]; then
+        DISTRO_REPO="${DISTRO_MAJOR_VERSION}.${DISTRO_MINOR_VERSION}"
     elif [ "${DISTRO_MAJOR_VERSION}" -ge 42 ] || [ "${DISTRO_MAJOR_VERSION}" -eq 15 ]; then
         DISTRO_REPO="openSUSE_Leap_${DISTRO_MAJOR_VERSION}.${DISTRO_MINOR_VERSION}"
     else

From 0a9badd439aee0b5ca32171a847a1a2a7691fcaa Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Fri, 17 Jun 2022 13:19:51 +0100
Subject: [PATCH 2/3] ci(kitchen): update to openSUSE Leap 15.4

---
 kitchen.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kitchen.yml b/kitchen.yml
index 743cafb60..1a94327d3 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -81,7 +81,7 @@ platforms:
         - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
   - name: opensuse-15
     driver:
-      image: opensuse/leap:15.3
+      image: opensuse/leap:15.4
       provision_command:
         - &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

From 8b33e968e1b9135e1b145138b4a23e7c80133b85 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Fri, 17 Jun 2022 13:59:11 +0100
Subject: [PATCH 3/3] fix(bootstrap-salt): add `pyzmq` build deps for
 Tumbleweed `git` builds

---
 bootstrap-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index e2a9b6c21..4c11c5d19 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -6614,7 +6614,7 @@ install_opensuse_git_deps() {
         fi
     # Check for Tumbleweed
     elif [ "${DISTRO_MAJOR_VERSION}" -ge 20210101 ]; then
-        __PACKAGES="python3-pip"
+        __PACKAGES="python3-pip gcc-c++ python310-pyzmq-devel"
     else
         __PACKAGES="python-pip python-setuptools gcc"
     fi