diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2019-02-22 14:27:43 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-22 14:27:43 -0500 |
| commit | 8039ccf4d560acbc308066cf8996bc4e6167a4a9 (patch) | |
| tree | 01e2e4c937a51c2eaf62bc712d358c3925df3876 /contrib/cirrus/setup_environment.sh | |
| parent | 1788addd047310ee8b8c7a62d8949953b93cfca7 (diff) | |
| parent | 69c91e044a41455b9d089767f4094c8f992faa7e (diff) | |
| download | podman-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
Diffstat (limited to 'contrib/cirrus/setup_environment.sh')
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 5 |
1 files changed, 3 insertions, 2 deletions
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" |