diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-12-22 02:59:10 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-22 02:59:10 -0800 |
| commit | 7122b49464519252a4f91ce1df337150ca24be42 (patch) | |
| tree | 3f6de5ad1df62449b1a511f14697a61f7ef4a182 | |
| parent | fe186c6ebba95db89463f38c6aa0f0dcc104a249 (diff) | |
| parent | 727f8faff61d658e3d74009b2c5a022270d53ce9 (diff) | |
| download | podman-7122b49464519252a4f91ce1df337150ca24be42.tar.gz podman-7122b49464519252a4f91ce1df337150ca24be42.tar.bz2 podman-7122b49464519252a4f91ce1df337150ca24be42.zip | |
Merge pull request #2042 from cevich/new_criu_images
Use new VM images with updated CRIU
| -rw-r--r-- | .cirrus.yml | 14 | ||||
| -rw-r--r-- | contrib/cirrus/lib.sh | 19 |
2 files changed, 16 insertions, 17 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 7afd8f0b3..d1029d554 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -113,7 +113,7 @@ build_each_commit_task: memory: "4Gb" disk: 40 matrix: - image_name: "fedora-29-libpod-0c954a67" + image_name: "fedora-29-libpod-9afa57a9" timeout_in: 20m @@ -139,9 +139,9 @@ testing_task: # 'matrix' combinations. matrix: # Images are generated separately, from build_images_task (below) - image_name: "ubuntu-18-libpod-86d821ea" - image_name: "fedora-28-libpod-86d821ea" - image_name: "fedora-29-libpod-86d821ea" + image_name: fedora-29-libpod-9afa57a9 + image_name: fedora-28-libpod-9afa57a9 + image_name: ubuntu-18-libpod-9afa57a9 # TODO: tests fail # image_name: "rhel-7-something-something" @@ -176,9 +176,9 @@ optional_testing_task: gce_instance: image_project: "libpod-218412" matrix: - image_name: "ubuntu-18-libpod-86d821ea" - image_name: "fedora-28-libpod-86d821ea" - image_name: "fedora-29-libpod-86d821ea" + image_name: fedora-29-libpod-9afa57a9 + image_name: fedora-28-libpod-9afa57a9 + image_name: ubuntu-18-libpod-9afa57a9 # TODO: Make these work (also build_images_task below) #image_name: "rhel-server-ec2-7-5-165-1-libpod-fce09afe" #image_name: "centos-7-v20180911-libpod-fce09afe" diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index 12941a917..9e9639223 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -7,17 +7,16 @@ export USER="$(whoami)" export HOME="$(getent passwd $USER | cut -d : -f 6)" -# These are normally set by cirrus, if not use some reasonable defaults +# These are normally set by cirrus, but can't be for VMs setup by hack/get_ci_vm.sh +# Pick some reasonable defaults ENVLIB=${ENVLIB:-.bash_profile} -CIRRUS_WORKING_DIR=${CIRRUS_WORKING_DIR:-/var/tmp/go/src/github.com/containers/libpod} +CIRRUS_WORKING_DIR="${CIRRUS_WORKING_DIR:-/var/tmp/go/src/github.com/containers/libpod}" +GOSRC="${GOSRC:-$CIRRUS_WORKING_DIR}" SCRIPT_BASE=${SCRIPT_BASE:-./contrib/cirrus} PACKER_BASE=${PACKER_BASE:-./contrib/cirrus/packer} CIRRUS_BUILD_ID=${CIRRUS_BUILD_ID:-DEADBEEF} # a human -cd "$CIRRUS_WORKING_DIR" -CIRRUS_BASE_SHA=${CIRRUS_BASE_SHA:-$(git rev-parse upstream/master || git rev-parse origin/master)} -CIRRUS_CHANGE_IN_REPO=${CIRRUS_CHANGE_IN_REPO:-$(git rev-parse HEAD)} -CIRRUS_REPO_NAME=${CIRRUS_REPO_NAME:-libpod} -cd - +CIRRUS_BASE_SHA=${CIRRUS_BASE_SHA:-HEAD} +CIRRUS_CHANGE_IN_REPO=${CIRRUS_CHANGE_IN_REPO:-FETCH_HEAD} if ! [[ "$PATH" =~ "/usr/local/bin" ]] then @@ -258,9 +257,9 @@ install_criu(){ " if [[ "$OS_RELEASE_ID" =~ "ubuntu" ]]; then - ooe.sh sudo add-apt-repository ppa:criu/ppa - ooe.sh sudo apt-get update - ooe.sh sudo apt-get -y install criu + ooe.sh sudo -E add-apt-repository -y ppa:criu/ppa + ooe.sh sudo -E apt-get -qq -y update + ooe.sh sudo -E apt-get -qq -y install criu elif [[ ( "$OS_RELEASE_ID" =~ "centos" || "$OS_RELEASE_ID" =~ "rhel" ) && "$OS_RELEASE_VER" =~ "7"* ]]; then echo "Configuring Repositories for latest CRIU" ooe.sh sudo tee /etc/yum.repos.d/adrian-criu-el7.repo <<EOF |