diff options
author | John McCrae <john.mccrae@progress.com> | 2023-01-18 12:15:03 +0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-18 12:15:03 +0600 |
commit | 52b84e9e9e0a9cc46ecfa58cfbbf158c20b72313 (patch) | |
tree | 4267b59cf4d26710f77f051b41bb20e77e9cf074 | |
parent | 1d411337b0524027f807cb7058dccf4bfc527979 (diff) | |
parent | 1383a3841f07b75aba8da6c299ee674bfd195111 (diff) | |
download | chef-52b84e9e9e0a9cc46ecfa58cfbbf158c20b72313.tar.gz |
Merge pull request #13490 from chef/jfm/chef18_zypper3
The 2 linux failures are known issues unrelated to the code here.
-rwxr-xr-x | .expeditor/scripts/zypper_prep.sh | 12 | ||||
-rw-r--r-- | .expeditor/verify.pipeline.yml | 12 |
2 files changed, 15 insertions, 9 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 5e7467a828..ed321683e8 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -146,9 +146,7 @@ steps: - label: "Integration openSUSE 15 :ruby: 3.1" commands: - /workdir/.expeditor/scripts/bk_container_prep.sh - - 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 + - /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' @@ -163,9 +161,7 @@ steps: - label: "Functional openSUSE 15 :ruby: 3.1" commands: - /workdir/.expeditor/scripts/bk_container_prep.sh - - 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 + - /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 @@ -181,9 +177,7 @@ steps: - label: "Unit openSUSE 15 :ruby: 3.1" commands: - /workdir/.expeditor/scripts/bk_container_prep.sh - - 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 + - /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' |