diff options
| author | Chris Evich <cevich@redhat.com> | 2019-03-04 10:55:48 -0500 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2019-03-04 17:13:10 -0500 |
| commit | 0a81bcd35f382170413cb94352c80a181d1d8d3e (patch) | |
| tree | 97a22bfc6a4ee2cec8579982358fbabc9ada1bc8 | |
| parent | 6d2f0cbac724b9f6d6b689c845c6f7bea19d1bc5 (diff) | |
| download | podman-0a81bcd35f382170413cb94352c80a181d1d8d3e.tar.gz podman-0a81bcd35f382170413cb94352c80a181d1d8d3e.tar.bz2 podman-0a81bcd35f382170413cb94352c80a181d1d8d3e.zip | |
cirrus: Drop ginkgo, gomega, easyjson install
This is potentially harmful, since ginkgo and it's dependencies are now
vendored and installed by `make .install.ginkgo`, and may not agree with
installed 'go get' code under `$GOPATH`. Prune this (and easyjson
install) from automation scripts.
Signed-off-by: Chris Evich <cevich@redhat.com>
| -rw-r--r-- | contrib/cirrus/lib.sh | 15 | ||||
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 4 |
2 files changed, 0 insertions, 19 deletions
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index 8be696933..acd2447c0 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -300,21 +300,6 @@ EOF fi } -# Runs in testing VM, not image building -install_testing_dependencies() { - echo "Installing ginkgo, gomega, and easyjson into \$GOPATH=$GOPATH" - req_env_var " - GOPATH $GOPATH - GOSRC $GOSRC - " - cd "$GOSRC" - ooe.sh go get -u github.com/onsi/ginkgo/ginkgo - ooe.sh install -D -m 755 "$GOPATH"/bin/ginkgo /usr/bin/ - ooe.sh go get github.com/onsi/gomega/... - ooe.sh go get -u github.com/mailru/easyjson/... - sudo install -D -m 755 "$GOPATH"/bin/easyjson /usr/bin/ -} - install_packer_copied_files(){ # Install cni config, policy and registry config sudo install -D -m 755 /tmp/libpod/cni/87-podman-bridge.conflist \ diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 77c20d9bd..c3276bb6f 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -78,10 +78,6 @@ then cd "${GOSRC}/" source "$SCRIPT_BASE/lib.sh" - - # 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" |