diff options
| author | John <john.mccrae@progress.com> | 2023-01-09 10:57:10 -0800 |
|---|---|---|
| committer | John <john.mccrae@progress.com> | 2023-01-09 10:57:10 -0800 |
| commit | c5d678a2bd47a592b521eabafb318c06199a7bd0 (patch) | |
| tree | bc68dcca1c3d883ff4857843fd3225edee755610 | |
| parent | d7400f32969aa6aaf09877c226e705de58d0aa0d (diff) | |
| download | chef-c5d678a2bd47a592b521eabafb318c06199a7bd0.tar.gz | |
Rewriting the zypper code to run only on openSUSE 15
Signed-off-by: John <john.mccrae@progress.com>
| -rw-r--r-- | .expeditor/verify.pipeline.yml | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index a297acc873..572cd78cc7 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -129,13 +129,17 @@ steps: image: rubydistros/centos-7:2.7 - 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" - - 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 - - bundle exec rake spec:integration + 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 + 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 + bundle exec rake spec:integration expeditor: executor: docker: |