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

Don't delete namespace after kubemark tests, as cluster will be torn … #16520

Merged
merged 1 commit into from
Nov 2, 2015
Merged

Don't delete namespace after kubemark tests, as cluster will be torn … #16520

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
2 changes: 1 addition & 1 deletion hack/jenkins/e2e.sh
View file
Open in desktop
Expand Up @@ -1436,7 +1436,7 @@ if [[ "${USE_KUBEMARK:-}" == "true" ]]; then
NUM_MINIONS=${KUBEMARK_NUM_MINIONS:-$NUM_MINIONS}
MASTER_SIZE=${KUBEMARK_MASTER_SIZE:-$MASTER_SIZE}
./test/kubemark/start-kubemark.sh
./test/kubemark/run-e2e-tests.sh && exitcode=0 || exitcode=$?
./test/kubemark/run-e2e-tests.sh --ginkgo.focus="should\sallow\sstarting\s30\spods\sper\snode" --delete-namespace="false"
Copy link

Choose a reason for hiding this comment

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

Preesumably you don't want this "focus" here? What if some people want to run other e2e tests on Kubemark?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's Jenkins configuration, so there's no problem with that.

Copy link
Member

Choose a reason for hiding this comment

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

I agree that's not a big deal - it's pure replacement of out variables like "***_SKIP_TESTS"

./test/kubemark/stop-kubemark.sh
NUM_MINIONS=${NUM_MINIONS_BKP}
MASTER_SIZE=${MASTER_SIZE_BKP}
Expand Down
4 changes: 2 additions & 2 deletions test/kubemark/run-e2e-tests.sh
View file
Open in desktop
Expand Up @@ -33,10 +33,10 @@ export KUBE_MASTER_URL="https://${KUBE_MASTER_IP}"
export KUBECONFIG="${ABSOLUTE_ROOT}/test/kubemark/kubeconfig.loc"
export E2E_MIN_STARTUP_PODS=0

if [ -z "$@" ]; then
if [[ -z "$@" ]]; then
ARGS='--ginkgo.focus=should\sallow\sstarting\s30\spods\sper\snode'
else
ARGS=$@
fi

${KUBE_ROOT}/hack/ginkgo-e2e.sh "--e2e-verify-service-account=false" "$ARGS"
${KUBE_ROOT}/hack/ginkgo-e2e.sh "--e2e-verify-service-account=false" $ARGS
Copy link
Member

Choose a reason for hiding this comment

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

Why are you removing "" here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Otherwise all ARGS will be passed as a single argument with whitespaces, not a "list" of them

Copy link
Member

Choose a reason for hiding this comment

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

OK - got it.