diff options
| author | John McCrae <john.mccrae@progress.com> | 2023-01-04 11:28:39 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-04 11:28:39 -0800 |
| commit | 1b57ce8becda03c132b2911e68380313085465f5 (patch) | |
| tree | 7be5d9d026552c4302f2370fb7d87bc96cfbd850 | |
| parent | d9a57c494af4d65e85e1a86d68a2e63b7b2f38f8 (diff) | |
| parent | bed8f6d551368d93b396da55df44f0eeb7166a40 (diff) | |
| download | chef-1b57ce8becda03c132b2911e68380313085465f5.tar.gz | |
Merge pull request #13470 from chef/jfm/chef18_yum_cache_updated
Updating Zypper to overcome repository errors. No relevant failures in verify since we're only touching zypper.
| -rw-r--r-- | .expeditor/adhoc-canary.omnibus.yml | 6 | ||||
| -rw-r--r-- | .expeditor/verify.pipeline.yml | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/.expeditor/adhoc-canary.omnibus.yml b/.expeditor/adhoc-canary.omnibus.yml index 731a7fecdf..a19e39058e 100644 --- a/.expeditor/adhoc-canary.omnibus.yml +++ b/.expeditor/adhoc-canary.omnibus.yml @@ -59,9 +59,9 @@ builder-to-testers-map: mac_os_x-11-arm64: - mac_os_x-11-arm64 # - mac_os_x-12-arm64 canary org doesn't yet have a macos 12 arm64 omnibus worker - # sles-12-s390x: - # - sles-12-s390x - # - sles-15-s390x + sles-12-s390x: + - sles-12-s390x + - sles-15-s390x sles-12-x86_64: - sles-12-x86_64 - sles-15-x86_64 diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 7ab1ea33cd..5e7467a828 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -146,7 +146,9 @@ 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 - zypper install -y cron insserv-compat - cd /workdir; bundle config set --local without omnibus_package - bundle config set --local path 'vendor/bundle' @@ -161,7 +163,9 @@ 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 - zypper install -y cronie insserv-compat - zypper install -y libarchive-devel - cd /workdir; bundle config set --local without omnibus_package @@ -177,7 +181,9 @@ 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 - zypper install -y cron insserv-compat libarchive-devel - bundle config set --local without omnibus_package - bundle config set --local path 'vendor/bundle' |