Merge pull request #13512 from chef/jfm/chef17_zypper3

The failures above have nothing to do with the code changes here. The new changes are working. Merging

3 files changed, 17 insertions, 5 deletions

diff --git a/.expeditor/scripts/zypper_prep.sh b/.expeditor/scripts/zypper_prep.sh
new file mode 100755
index 0000000000..5e87ff0265
--- /dev/null
+++ b/.expeditor/scripts/zypper_prep.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+VERSION_STRING=$(cat /etc/os-release | grep '^VERSION=' | sed 's/VERSION=\"\([0-9]\+\).*/\1/')
+if [[ $VERSION_STRING == "15" ]]
+then
+  echo "--- :hammer_and_wrench: Updating Zypper Repos on openSUSE 15"
+  find /etc/zypp/repos.d -name "SMT-*" -execdir rm -f -- '{}' \;
+  zypper addrepo --check --priority 50 --refresh --name "Chefzypper-repo" "https://mirror.fcix.net/opensuse/distribution/leap/15.3/repo/oss/" "chefzypper"
+  zypper --gpg-auto-import-keys ref
+else
+  echo "--- :hammer_and_wrench: Not Running on openSUSE 15, nothing to do"
+fi
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 0f1c66abbe..4e9abe2b59 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -175,8 +175,8 @@ steps:
 
 - label: "Integration openSUSE 15 :ruby: 3.0"
   commands:
-    - zypper addrepo --check --priority 50 --refresh --name "Chefzypper-repo" "https://mirror.fcix.net/opensuse/distribution/leap/15.3/repo/oss/" "chefzypper"
     - /workdir/.expeditor/scripts/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/zypper_prep.sh
     - zypper install -y cron insserv-compat
     - cd /workdir; bundle config set --local without omnibus_package
     - bundle config set --local path 'vendor/bundle'
@@ -190,8 +190,8 @@ steps:
 
 - label: "Functional openSUSE 15 :ruby: 3.0"
   commands:
-    - zypper addrepo --check --priority 50 --refresh --name "Chefzypper-repo" "https://mirror.fcix.net/opensuse/distribution/leap/15.3/repo/oss/" "chefzypper"
     - /workdir/.expeditor/scripts/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/zypper_prep.sh
     - zypper install -y cronie insserv-compat
     - zypper install -y libarchive-devel
     - cd /workdir; bundle config set --local without omnibus_package
@@ -206,8 +206,8 @@ steps:
 
 - label: "Unit openSUSE 15 :ruby: 3.0"
   commands:
-    - zypper addrepo --check --priority 50 --refresh --name "Chefzypper-repo" "https://mirror.fcix.net/opensuse/distribution/leap/15.3/repo/oss/" "chefzypper"
     - /workdir/.expeditor/scripts/bk_container_prep.sh
+    - /workdir/.expeditor/scripts/zypper_prep.sh
     - zypper install -y cron insserv-compat libarchive-devel
     - bundle config set --local without omnibus_package
     - bundle config set --local path 'vendor/bundle'
diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml
index 3b7f6fd9b6..52f3b2187f 100644
--- a/.github/workflows/kitchen.yml
+++ b/.github/workflows/kitchen.yml
@@ -19,7 +19,7 @@ jobs:
     - name: 'Install Chef/Ohai from Omnitruck'
       id: install_chef
       run: |
-        . { Invoke-WebRequest -useb https://omnitruck.chef.io/install.ps1 } | Invoke-Expression; Install-Project -project chef -channel current -v 17
+        . { Invoke-WebRequest -useb https://omnitruck.chef.io/install.ps1 } | Invoke-Expression; Install-Project -project chef -channel stable -v 17
         $env:PATH = "C:\opscode\chef\bin;C:\opscode\chef\embedded\bin;" + $env:PATH
         chef-client -v
         ohai -v
@@ -86,7 +86,7 @@ jobs:
       id: install_chef
       run: |
         brew install coreutils
-        curl -L https://omnitruck.chef.io/install.sh | sudo bash -s -- -c current -v 17
+        curl -L https://omnitruck.chef.io/install.sh | sudo bash -s -- -c stable -v 17
         /opt/chef/bin/chef-client -v
         /opt/chef/bin/ohai -v
         /opt/chef/embedded/bin/rake --version