opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 03:19:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cirrus: Install Go 1.11 on Ubuntu VMs

Browse Source 
There is no native package for this, so the packaged version must also
be installed, otherwise all the support/dependencies would be removed
also (like go-md2man).  Fix this by installing from the google released
tarball, into /usr/local/go and set $GOROOT to point there.

Also, include a small fix for hack/get_ci_vm.sh not installing
testing dependencies because of an old assumption.

***CIRRUS: REBUILD IMAGES***

Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
Chris Evich
2019-02-22 09:33:41 -05:00
parent 7184efe939
commit 69c91e044a
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.cirrus.yml
View File

@ -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"

2
contrib/cirrus/lib.sh
View File

@ -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
}

8
contrib/cirrus/packer/ubuntu_setup.sh
View File

@ -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 \

5
contrib/cirrus/setup_environment.sh
View File

@ -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"