diff options
| author | Chris Evich <cevich@redhat.com> | 2020-05-12 12:23:35 -0400 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2020-06-09 14:47:23 -0400 |
| commit | 455a94d1f932cd32dc07d9bf62131423610f8e2b (patch) | |
| tree | 0387e09597aa4354cda3d2390fad254313112e1e /contrib/cirrus/packer/fedora_setup.sh | |
| parent | 2869cce1d53aedfe2500f3d921fb901dd5994690 (diff) | |
| download | podman-455a94d1f932cd32dc07d9bf62131423610f8e2b.tar.gz podman-455a94d1f932cd32dc07d9bf62131423610f8e2b.tar.bz2 podman-455a94d1f932cd32dc07d9bf62131423610f8e2b.zip | |
Cirrus: Include packages for containers/conmon CI
This allows the containers/conmon repository to share the same VM
images produced by containers/libpod. Included are several packages
which are downloaded only since they might otherwise interfere with
testing for some repos. This allows stable versions to be at the ready
at testing runtime, avoiding any version updates surprising developers.
Also, re-enable running the VM-image check test which was not working
due to a logic problem in Cirrus-CI configuration. Update the neglected
tests so that they pass on all distros.
Signed-off-by: Chris Evich <cevich@redhat.com>
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 |