mirror of
https://github.com/containers/podman.git
synced 2025-06-20 09:03:43 +08:00
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>
This commit is contained in:
@ -300,21 +300,6 @@ EOF
|
|||||||
fi
|
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_packer_copied_files(){
|
||||||
# Install cni config, policy and registry config
|
# Install cni config, policy and registry config
|
||||||
sudo install -D -m 755 /tmp/libpod/cni/87-podman-bridge.conflist \
|
sudo install -D -m 755 /tmp/libpod/cni/87-podman-bridge.conflist \
|
||||||
|
@ -78,10 +78,6 @@ then
|
|||||||
|
|
||||||
cd "${GOSRC}/"
|
cd "${GOSRC}/"
|
||||||
source "$SCRIPT_BASE/lib.sh"
|
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
|
fi
|
||||||
|
|
||||||
record_timestamp "env. setup end"
|
record_timestamp "env. setup end"
|
||||||
|
Reference in New Issue
Block a user