summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2019-03-04 10:55:48 -0500
committerChris Evich <cevich@redhat.com>2019-03-04 17:08:21 -0500
commita888e0fad2d50b8e4dd051136e1c36d6294fb0fc (patch)
treea2efe6fa7f08975ecece389221f8f8308a758a6f
parenta810d96b6c71ee01b5812c69b98d5620427ad043 (diff)
downloadpodman-a888e0fad2d50b8e4dd051136e1c36d6294fb0fc.tar.gz
podman-a888e0fad2d50b8e4dd051136e1c36d6294fb0fc.tar.bz2
podman-a888e0fad2d50b8e4dd051136e1c36d6294fb0fc.zip
cirrus: Drop ginkgo, gomega, easyjson install
Signed-off-by: Chris Evich <cevich@redhat.com>
-rw-r--r--contrib/cirrus/lib.sh15
-rwxr-xr-xcontrib/cirrus/setup_environment.sh4
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"