summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2019-02-22 14:27:43 -0500
committerGitHub <noreply@github.com>2019-02-22 14:27:43 -0500
commit8039ccf4d560acbc308066cf8996bc4e6167a4a9 (patch)
tree01e2e4c937a51c2eaf62bc712d358c3925df3876
parent1788addd047310ee8b8c7a62d8949953b93cfca7 (diff)
parent69c91e044a41455b9d089767f4094c8f992faa7e (diff)
downloadpodman-8039ccf4d560acbc308066cf8996bc4e6167a4a9.tar.gz
podman-8039ccf4d560acbc308066cf8996bc4e6167a4a9.tar.bz2
podman-8039ccf4d560acbc308066cf8996bc4e6167a4a9.zip
Merge pull request #2411 from cevich/ubuntu_go111
Cirrus: Install Go 1.11 on Ubuntu VMs
-rw-r--r--.cirrus.yml2
-rwxr-xr-xcontrib/cirrus/integration_test.sh2
-rw-r--r--contrib/cirrus/lib.sh2
-rw-r--r--contrib/cirrus/packer/ubuntu_setup.sh8
-rwxr-xr-xcontrib/cirrus/setup_environment.sh5
5 files changed, 13 insertions, 6 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index cb1279331..ad9edd404 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -29,7 +29,7 @@ env:
###
FEDORA_CACHE_IMAGE_NAME: "fedora-29-libpod-7f4cd1f7"
PRIOR_FEDORA_CACHE_IMAGE_NAME: "fedora-28-libpod-7f4cd1f7"
- UBUNTU_CACHE_IMAGE_NAME: "ubuntu-18-libpod-7f4cd1f7"
+ UBUNTU_CACHE_IMAGE_NAME: "ubuntu-18-libpod-84514d8b"
# RHEL_CACHE_IMAGE_NAME: "rhel-8-notready"
PRIOR_RHEL_CACHE_IMAGE_NAME: "rhel-7-libpod-7f4cd1f7"
# CENTOS_CACHE_IMAGE_NAME: "centos-7-notready"
diff --git a/contrib/cirrus/integration_test.sh b/contrib/cirrus/integration_test.sh
index 58c8af289..0fd86dfdc 100755
--- a/contrib/cirrus/integration_test.sh
+++ b/contrib/cirrus/integration_test.sh
@@ -19,7 +19,7 @@ case "${OS_RELEASE_ID}-${OS_RELEASE_VER}" in
ubuntu-18)
make install PREFIX=/usr ETCDIR=/etc
make test-binaries
- SKIP_USERNS=1 make localintegration
+ SKIP_USERNS=1 make localintegration GINKGOTIMEOUT=90m
;;
fedora-29) ;& # Continue to the next item
fedora-28) ;&
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh
index 39e6c7699..8be696933 100644
--- a/contrib/cirrus/lib.sh
+++ b/contrib/cirrus/lib.sh
@@ -325,7 +325,7 @@ install_packer_copied_files(){
/etc/containers/registries.d/registry.access.redhat.com.yaml
}
-install_varlink(){
+install_varlink() {
echo "Installing varlink from the cheese-factory"
ooe.sh sudo -H pip3 install varlink
}
diff --git a/contrib/cirrus/packer/ubuntu_setup.sh b/contrib/cirrus/packer/ubuntu_setup.sh
index af5671c90..7d49c5dc7 100644
--- a/contrib/cirrus/packer/ubuntu_setup.sh
+++ b/contrib/cirrus/packer/ubuntu_setup.sh
@@ -28,7 +28,13 @@ export DEBIAN_FRONTEND=noninteractive
echo "Updating system and installing package dependencies"
ooe.sh sudo -E apt-get -qq update || sudo -E apt-get -qq update
ooe.sh sudo -E apt-get -qq upgrade || sudo -E apt-get -qq upgrade
-ooe.sh sudo -E apt-get -qq install --no-install-recommends \
+ooe.sh sudo -E apt-get -qq install software-properties-common
+
+# Required to have Go 1.11 on Ubuntu 18.0.4
+ooe.sh sudo -E add-apt-repository --yes ppa:longsleep/golang-backports
+ooe.sh sudo -E apt-get -qq update || sudo -E apt-get -qq update
+
+ooe.sh sudo -E apt-get -qq install \
apparmor \
autoconf \
automake \
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index 838f3c3f3..77c20d9bd 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -79,8 +79,9 @@ then
cd "${GOSRC}/"
source "$SCRIPT_BASE/lib.sh"
- # Only testing-VMs need deps installed
- [[ -n "$PACKER_BUILDS" ]] || install_testing_dependencies # must exist in $GOPATH
+ # Only testing-VMs need deps installed, not image-builder VM
+ echo "$CIRRUS_TASK_NAME" | grep -q 'image' || \
+ install_testing_dependencies # must exist in $GOPATH
fi
record_timestamp "env. setup end"