Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix eliminate shellcheck failures in /hack/e2e-internal/... #74230

Merged
merged 1 commit into from
Feb 20, 2019
Merged

fix eliminate shellcheck failures in /hack/e2e-internal/... #74230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 0 additions & 7 deletions hack/.shellcheck_failures
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,6 @@
./hack/build-cross.sh
./hack/build-go.sh
./hack/cherry_pick_pull.sh
./hack/e2e-internal/e2e-cluster-size.sh
./hack/e2e-internal/e2e-down.sh
./hack/e2e-internal/e2e-grow-cluster.sh
./hack/e2e-internal/e2e-shrink-cluster.sh
./hack/e2e-internal/e2e-status.sh
./hack/e2e-internal/e2e-up.sh
./hack/e2e-node-test.sh
./hack/generate-bindata.sh
./hack/generate-docs.sh
./hack/get-build.sh
Expand Down
6 changes: 3 additions & 3 deletions hack/e2e-internal/e2e-cluster-size.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ set -o errexit
set -o nounset
set -o pipefail

KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..

: ${KUBECTL:=${KUBE_ROOT}/cluster/kubectl.sh}
: ${KUBE_CONFIG_FILE:="config-test.sh"}
: "${KUBECTL:=${KUBE_ROOT}/cluster/kubectl.sh}"
: "${KUBE_CONFIG_FILE:="config-test.sh"}"

export KUBECTL KUBE_CONFIG_FILE

Expand Down
6 changes: 3 additions & 3 deletions hack/e2e-internal/e2e-down.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ set -o errexit
set -o nounset
set -o pipefail

KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..

: ${KUBECTL:=${KUBE_ROOT}/cluster/kubectl.sh}
: ${KUBE_CONFIG_FILE:="config-test.sh"}
: "${KUBECTL:=${KUBE_ROOT}/cluster/kubectl.sh}"
: "${KUBE_CONFIG_FILE:="config-test.sh"}"

export KUBECTL KUBE_CONFIG_FILE

Expand Down
10 changes: 5 additions & 5 deletions hack/e2e-internal/e2e-grow-cluster.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.

KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..

if [[ ! -z "${1:-}" ]]; then
if [[ -n "${1:-}" ]]; then
export KUBE_GCE_ZONE="${1}"
fi
if [[ ! -z "${2:-}" ]]; then
if [[ -n "${2:-}" ]]; then
export MULTIZONE="${2}"
fi
if [[ ! -z "${3:-}" ]]; then
if [[ -n "${3:-}" ]]; then
export KUBE_REPLICATE_EXISTING_MASTER="${3}"
fi
if [[ ! -z "${4:-}" ]]; then
if [[ -n "${4:-}" ]]; then
export KUBE_USE_EXISTING_MASTER="${4}"
fi
if [[ -z "${NUM_NODES:-}" ]]; then
Expand Down
10 changes: 5 additions & 5 deletions hack/e2e-internal/e2e-shrink-cluster.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.

KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..

if [[ ! -z "${1:-}" ]]; then
if [[ -n "${1:-}" ]]; then
export KUBE_GCE_ZONE="${1}"
fi
if [[ ! -z "${2:-}" ]]; then
if [[ -n "${2:-}" ]]; then
export MULTIZONE="${2}"
fi
if [[ ! -z "${3:-}" ]]; then
if [[ -n "${3:-}" ]]; then
export KUBE_DELETE_NODES="${3}"
fi
if [[ ! -z "${4:-}" ]]; then
if [[ -n "${4:-}" ]]; then
export KUBE_USE_EXISTING_MASTER="${4}"
fi

Expand Down
6 changes: 3 additions & 3 deletions hack/e2e-internal/e2e-status.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ set -o errexit
set -o nounset
set -o pipefail

KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..

: ${KUBECTL:=${KUBE_ROOT}/cluster/kubectl.sh}
: ${KUBE_CONFIG_FILE:="config-test.sh"}
: "${KUBECTL:=${KUBE_ROOT}/cluster/kubectl.sh}"
: "${KUBE_CONFIG_FILE:="config-test.sh"}"

export KUBECTL KUBE_CONFIG_FILE

Expand Down
6 changes: 3 additions & 3 deletions hack/e2e-internal/e2e-up.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ set -o errexit
set -o nounset
set -o pipefail

KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..

: ${KUBECTL:=${KUBE_ROOT}/cluster/kubectl.sh}
: ${KUBE_CONFIG_FILE:="config-test.sh"}
: "${KUBECTL:=${KUBE_ROOT}/cluster/kubectl.sh}"
: "${KUBE_CONFIG_FILE:="config-test.sh"}"

export KUBECTL KUBE_CONFIG_FILE

Expand Down
4 changes: 2 additions & 2 deletions hack/e2e-node-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ set -o errexit
set -o nounset
set -o pipefail

KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..

# For help output
ARGHELP=""
Expand All @@ -40,4 +40,4 @@ echo "The equivalent of this invocation is: "
echo " make test-e2e-node ${ARGHELP}"
echo
echo
make --no-print-directory -C "${KUBE_ROOT}" test-e2e-node FOCUS=${FOCUS:-} SKIP=${SKIP:-}
make --no-print-directory -C "${KUBE_ROOT}" test-e2e-node FOCUS="${FOCUS:-}" SKIP="${SKIP:-}"