summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2019-02-01 10:26:43 -0500
committerChris Evich <cevich@redhat.com>2019-05-21 08:44:01 -0400
commit84c6f7c55da4a1f4d6968c5f8bd8a8553ab5d55e (patch)
treea75a1452e97c5718da19a4a86e2e9ee7d648199e
parent773b9ac9d059a66280ac50163a17bc705bde0a60 (diff)
downloadpodman-84c6f7c55da4a1f4d6968c5f8bd8a8553ab5d55e.tar.gz
podman-84c6f7c55da4a1f4d6968c5f8bd8a8553ab5d55e.tar.bz2
podman-84c6f7c55da4a1f4d6968c5f8bd8a8553ab5d55e.zip
Cirrus: Remove "too new" runc hack
Hack was to workaround not having fix for: https://bodhi.fedoraproject.org/updates/FEDORA-2019-b4356521ba Update `RUNC_COMMIT` value to match commit id to working package. Signed-off-by: Chris Evich <cevich@redhat.com>
-rw-r--r--.cirrus.yml11
-rw-r--r--contrib/cirrus/packer/fedora_setup.sh3
-rwxr-xr-xcontrib/cirrus/setup_environment.sh29
3 files changed, 13 insertions, 30 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index fe09ea988..fccecee7b 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -289,11 +289,6 @@ testing_task:
image_name: "${PRIOR_FEDORA_CACHE_IMAGE_NAME}"
image_name: "${UBUNTU_CACHE_IMAGE_NAME}"
- # TODO: Make these work (also optional_testing_task below)
- # image_name: "${PRIOR_RHEL_CACHE_IMAGE_NAME}"
- # image_name: "${RHEL_CACHE_IMAGE_NAME}"
- # image_name: "${CENTOS_CACHE_IMAGE_NAME}"
-
timeout_in: 120m
# Every *_script runs in sequence, for each task. The name prefix is for
@@ -367,10 +362,8 @@ optional_testing_task:
image_name: "${FEDORA_CACHE_IMAGE_NAME}"
image_name: "${PRIOR_FEDORA_CACHE_IMAGE_NAME}"
image_name: "${UBUNTU_CACHE_IMAGE_NAME}"
- # TODO: Make these work (also testing_task above)
- # image_name: "${RHEL_CACHE_IMAGE_NAME}"
- # image_name: "${PRIOR_RHEL_CACHE_IMAGE_NAME}"
- # image_name: "${CENTOS_CACHE_IMAGE_NAME}"
+ image_name: "${PRIOR_RHEL_CACHE_IMAGE_NAME}"
+ image_name: "${CENTOS_CACHE_IMAGE_NAME}"
timeout_in: 60m
diff --git a/contrib/cirrus/packer/fedora_setup.sh b/contrib/cirrus/packer/fedora_setup.sh
index 36a65eb71..18490fdac 100644
--- a/contrib/cirrus/packer/fedora_setup.sh
+++ b/contrib/cirrus/packer/fedora_setup.sh
@@ -22,6 +22,7 @@ ooe.sh sudo dnf install -y \
bats \
btrfs-progs-devel \
bzip2 \
+ criu \
device-mapper-devel \
emacs-nox \
findutils \
@@ -75,8 +76,6 @@ install_buildah
install_conmon
-install_criu
-
install_packer_copied_files
rh_finalize # N/B: Halts system!
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index 4dbd56ed9..1a89a5b71 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -46,26 +46,17 @@ then
X=$(echo "$envstr" | tee -a "$HOME/$ENVLIB") && eval "$X" && echo "$X"
done
- # Some setup needs to vary between distros
+ # Some environment setup needs to vary between distros
+ # Note: This should only be used for environment variables, and minor details.
+ # Anything that could vary from one run to the next, should go into
+ # contrib/cirrus/packer/*_setup.sh and be incorporated into VM cache-images
+ # (see docs)
case "${OS_RELEASE_ID}-${OS_RELEASE_VER}" in
- ubuntu-18)
- # Always install runc on Ubuntu
- install_runc_from_git
- ;;
- fedora-29)
- CON_SEL="https://kojipkgs.fedoraproject.org/packages/container-selinux/2.100/1.git3b78187.fc29/noarch/container-selinux-2.100-1.git3b78187.fc29.noarch.rpm"
- echo ">>>>> OVERRIDING container-selinux WITH $CON_SEL <<<<<"
- dnf -y install $CON_SEL
- echo ">>>>> OVERRIDING criu and selinux-policy with latest package <<<<<"
- dnf -y upgrade criu selinux-policy
- ;& # Continue to the next item
- fedora-28)
- echo ">>>>> OVERRIDING source-built runc with latest package <<<<<"
- dnf update -y runc
- ;& # Continue to the next item
- centos-7) ;&
- rhel-7)
- ;;
+ ubuntu-18) ;;
+ fedora-29) ;;
+ fedora-28) ;;
+ centos-7) ;;
+ rhel-7) ;;
*) bad_os_id_ver ;;
esac