github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #211 from lavalamp/test_fix

Browse Source 
Fix jq detection (tested, works)
This commit is contained in:
brendandburns 2014-06-23 19:43:51 -07:00
commit 91c8828cd7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hack/e2e-test.sh
View File

@ -22,9 +22,6 @@
ALREADY_UP=${1:-0} ALREADY_UP=${1:-0}
LEAVE_UP=${2:-0} LEAVE_UP=${2:-0}
# Exit on error
set -e
HAVE_JQ=$(which jq) HAVE_JQ=$(which jq)
if [[ -z ${HAVE_JQ} ]]; then if [[ -z ${HAVE_JQ} ]]; then
echo "Please install jq, e.g.: 'sudo apt-get install jq' or, " echo "Please install jq, e.g.: 'sudo apt-get install jq' or, "
@ -32,6 +29,9 @@ if [[ -z ${HAVE_JQ} ]]; then
exit 1 exit 1
fi fi
# Exit on error
set -e
# Use testing config # Use testing config
export KUBE_CONFIG_FILE="config-test.sh" export KUBE_CONFIG_FILE="config-test.sh"
export KUBE_REPO_ROOT="$(dirname $0)/.." export KUBE_REPO_ROOT="$(dirname $0)/.."