diff options
| author | John McCrae <john.mccrae@progress.com> | 2023-01-09 17:05:44 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-09 17:05:44 -0800 |
| commit | 8a551f368aa62918ac33d8f1416ab2ee8fd8d84c (patch) | |
| tree | b4b0561db7fe2c8e0ac2d22b156935cc26179410 | |
| parent | d7400f32969aa6aaf09877c226e705de58d0aa0d (diff) | |
| parent | 4d31e4100a24754495dff84d86ddf7c33b7778fc (diff) | |
| download | chef-8a551f368aa62918ac33d8f1416ab2ee8fd8d84c.tar.gz | |
Merge pull request #13486 from chef/jfm/chef16_zypper3
Rewriting the zypper code to run only on openSUSE 15
| -rwxr-xr-x | .expeditor/scripts/zypper_prep.sh | 11 | ||||
| -rw-r--r-- | .expeditor/verify.pipeline.yml | 6 |
2 files changed, 14 insertions, 3 deletions
diff --git a/.expeditor/scripts/zypper_prep.sh b/.expeditor/scripts/zypper_prep.sh new file mode 100755 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 a297acc873..007dfd9725 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -131,7 +131,7 @@ steps: - label: "Integration openSUSE 15 :ruby: 2.7" commands: - /workdir/.expeditor/scripts/bk_container_prep.sh - - zypper addrepo --check --priority 50 --refresh --name "Chefzypper-repo" "https://mirror.fcix.net/opensuse/distribution/leap/15.3/repo/oss/" "chefzypper" + - /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 @@ -145,7 +145,7 @@ steps: - label: "Functional openSUSE 15 :ruby: 2.7" commands: - /workdir/.expeditor/scripts/bk_container_prep.sh - - zypper addrepo --check --priority 50 --refresh --name "Chefzypper-repo" "https://mirror.fcix.net/opensuse/distribution/leap/15.3/repo/oss/" "chefzypper" + - /workdir/.expeditor/scripts/zypper_prep.sh - zypper install -y cronie insserv-compat - cd /workdir; bundle config set --local without omnibus_package ruby_prof - cd /workdir; bundle install --jobs=3 --retry=3 --path=vendor/bundle @@ -159,7 +159,7 @@ steps: - label: "Unit openSUSE 15 :ruby: 2.7" commands: - /workdir/.expeditor/scripts/bk_container_prep.sh - - zypper addrepo --check --priority 50 --refresh --name "Chefzypper-repo" "https://mirror.fcix.net/opensuse/distribution/leap/15.3/repo/oss/" "chefzypper" + - /workdir/.expeditor/scripts/zypper_prep.sh - zypper install -y cron insserv-compat - bundle config set --local without omnibus_package ruby_prof - bundle install --jobs=3 --retry=3 --path=vendor/bundle |