diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-09 21:22:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-09 21:22:17 -0400 |
| commit | 9967f28339dc43c97966bc07345af53a374faf67 (patch) | |
| tree | c137de11b94adfdeefe16688321328f9494cb4cb /contrib/cirrus/packer/fedora_setup.sh | |
| parent | 2fa7f03a358c2be4521030f24086e12fb990746a (diff) | |
| parent | 455a94d1f932cd32dc07d9bf62131423610f8e2b (diff) | |
| download | podman-9967f28339dc43c97966bc07345af53a374faf67.tar.gz podman-9967f28339dc43c97966bc07345af53a374faf67.tar.bz2 podman-9967f28339dc43c97966bc07345af53a374faf67.zip | |
Merge pull request #6193 from cevich/conmon_ci_packages
Cirrus: Include packages for containers/conmon CI
Diffstat (limited to 'contrib/cirrus/packer/fedora_setup.sh')
| -rw-r--r-- | contrib/cirrus/packer/fedora_setup.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/cirrus/packer/fedora_setup.sh b/contrib/cirrus/packer/fedora_setup.sh index 3830b3bc4..25b568e8a 100644 --- a/contrib/cirrus/packer/fedora_setup.sh +++ b/contrib/cirrus/packer/fedora_setup.sh @@ -12,11 +12,11 @@ req_env_var SCRIPT_BASE PACKER_BASE INSTALL_AUTOMATION_VERSION PACKER_BUILDER_NA workaround_bfq_bug -# Do not enable update-stesting on the previous Fedora release -if [[ "$FEDORA_BASE_IMAGE" =~ "${OS_RELEASE_ID}-cloud-base-${OS_RELEASE_VER}" ]]; then - DISABLE_UPDATES_TESTING=0 -else +# Do not enable updates-testing on the previous Fedora release +if [[ "$PRIOR_FEDORA_BASE_IMAGE" =~ "${OS_RELEASE_ID}-cloud-base-${OS_RELEASE_VER}" ]]; then DISABLE_UPDATES_TESTING=1 +else + DISABLE_UPDATES_TESTING=0 fi bash $PACKER_BASE/fedora_packaging.sh |