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 shellcheck failures on ginkgo-e2e.sh #76937

Merged
merged 1 commit into from
Apr 24, 2019
Merged

Fix shellcheck failures on ginkgo-e2e.sh #76937

merged 1 commit into from
Apr 24, 2019

Conversation

xichengliudui
Copy link
Contributor

/kind cleanup
/priority backlog
/kind cleanup
/sig testing

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Which issue(s) this PR fixes:

Ref #72956

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

NONE

@xichengliudui
Fix shellcheck failures on
2fb859d 
update pull request

update pull request
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. priority/backlog Higher priority than priority/awaiting-more-evidence. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. sig/testing Categorizes an issue or PR as relevant to SIG Testing. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Apr 23, 2019
@xichengliudui
Copy link
Contributor Author

/assign @fejta

xichengliudui
xichengliudui commented Apr 23, 2019
View reviewed changes
hack/ginkgo-e2e.sh
@@ -48,11 +48,13 @@ source "${KUBE_ROOT}/cluster/kube-util.sh"
function detect-master-from-kubeconfig() {
export KUBECONFIG=${KUBECONFIG:-$DEFAULT_KUBECONFIG}

local cc=$("${KUBE_ROOT}/cluster/kubectl.sh" config view -o jsonpath="{.current-context}")
if [[ ! -z "${KUBE_CONTEXT:-}" ]]; then
local cc
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ref: https://github.com/koalaman/shellcheck/wiki/SC2155 [1]

hack/ginkgo-e2e.sh
cc="${KUBE_CONTEXT}"
fi
local cluster=$("${KUBE_ROOT}/cluster/kubectl.sh" config view -o jsonpath="{.contexts[?(@.name == \"${cc}\")].context.cluster}")
local cluster
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[1]

hack/ginkgo-e2e.sh
export PATH=$(dirname "${e2e_test}"):"${PATH}"
# Add path for things like running kubectl binary.
PATH=$(dirname "${e2e_test}"):"${PATH}"
export PATH
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[1]

hack/ginkgo-e2e.sh
@@ -86,8 +88,8 @@ fi
if [[ "${KUBERNETES_PROVIDER}" == "gce" ]]; then
set_num_migs
NODE_INSTANCE_GROUP=""
for ((i=1; i<=${NUM_MIGS}; i++)); do
if [[ ${i} == ${NUM_MIGS} ]]; then
for ((i=1; i<=NUM_MIGS; i++)); do
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ref: https://github.com/koalaman/shellcheck/wiki/SC2004

hack/ginkgo-e2e.sh
for ((i=1; i<=${NUM_MIGS}; i++)); do
if [[ ${i} == ${NUM_MIGS} ]]; then
for ((i=1; i<=NUM_MIGS; i++)); do
if [[ ${i} == "${NUM_MIGS}" ]]; then
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ref: https://github.com/koalaman/shellcheck/wiki/SC2053

fejta
fejta reviewed Apr 23, 2019
View reviewed changes
Copy link
Contributor

@fejta fejta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove the shellcheck exception if you're going to update this file

kubernetes/hack/.shellcheck_failures

Line 24 in 36ccff1

./hack/ginkgo-e2e.sh

@xichengliudui
Copy link
Contributor Author

@fejta Thank you. I forgot to delete it

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 24, 2019
fejta
fejta reviewed Apr 24, 2019
View reviewed changes
Copy link
Contributor

@fejta fejta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/approve
/retest

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fejta, xichengliudui

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 24, 2019
@xichengliudui
Copy link
Contributor Author

/test pull-kubernetes-e2e-gce-100-performance

@fejta
Copy link
Contributor

fejta commented Apr 24, 2019

/test pull-kubernetes-e2e-gce-100-performance

A /retest command is an easier way to accomplish the same thing

@xichengliudui
Copy link
Contributor Author

Thanks for the warning.

@xichengliudui
Copy link
Contributor Author

/retest

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 24, 2019
@xichengliudui
Copy link
Contributor Author

Resolved file conflicts.

fejta
fejta reviewed Apr 24, 2019
View reviewed changes
Copy link
Contributor

@fejta fejta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 24, 2019
@k8s-ci-robot k8s-ci-robot merged commit e8f28b5 into kubernetes:master Apr 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fejta fejta fejta left review comments

@lavalamp lavalamp Awaiting requested review from lavalamp

@zmerlynn zmerlynn Awaiting requested review from zmerlynn

Assignees

@fejta fejta

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/backlog Higher priority than priority/awaiting-more-evidence. release-note-none Denotes a PR that doesn't merit a release note. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@xichengliudui @k8s-ci-robot @fejta