diff options
| author | John <john.mccrae@progress.com> | 2023-01-09 11:53:43 -0800 |
|---|---|---|
| committer | John <john.mccrae@progress.com> | 2023-01-09 11:53:43 -0800 |
| commit | 01d3e4d8fa875cb51c65c2e700082aa71c9aebdd (patch) | |
| tree | 471bd5e6805275b028c83107489b7c814e4304c4 | |
| parent | c5d678a2bd47a592b521eabafb318c06199a7bd0 (diff) | |
| download | chef-01d3e4d8fa875cb51c65c2e700082aa71c9aebdd.tar.gz | |
Rewriting the zypper code to run only on openSUSE 15
Signed-off-by: John <john.mccrae@progress.com>
| -rw-r--r-- | .expeditor/scripts/zypper_prep.sh | 11 | ||||
| -rw-r--r-- | .expeditor/verify.pipeline.yml | 6 |
2 files changed, 12 insertions, 5 deletions
diff --git a/.expeditor/scripts/zypper_prep.sh b/.expeditor/scripts/zypper_prep.sh new file mode 100644 index 0000000000..e93c10bf36 --- /dev/null +++ b/.expeditor/scripts/zypper_prep.sh @@ -0,0 +1,11 @@ +#!/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" + 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 572cd78cc7..dd21f83049 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -131,11 +131,7 @@ steps: - label: "Integration openSUSE 15 :ruby: 2.7" run: | /workdir/.expeditor/scripts/bk_container_prep.sh - VERSION_STRING=$(cat /etc/os-release | grep '^VERSION=' | sed 's/VERSION=\"\([0-9]\+\).*/\1/') - if [[ $VERSION_STRING == "15" ]]; - 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 - fi + /workdir/.expeditor/scripts/zypper_prep.sh zypper install -y cron insserv-compat cd /workdir; bundle config set --local without omnibus_package cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle |