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 the e2e scripts after PR 1284 which added a new file. #1286

Merged
merged 1 commit into from
Sep 11, 2014
Merged

Fix the e2e scripts after PR 1284 which added a new file. #1286

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
10 changes: 5 additions & 5 deletions hack/e2e-suite/update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,26 +61,26 @@ function validate() {
export DOCKER_HUB_USER=jbeda

# Launch a container
${KUBE_REPO_ROOT}/examples/update-demo/1-create-replication-controller.sh
${KUBE_REPO_ROOT}/examples/update-demo/2-create-replication-controller.sh

function teardown() {
echo "Cleaning up test artifacts"
${KUBE_REPO_ROOT}/examples/update-demo/4-down.sh
${KUBE_REPO_ROOT}/examples/update-demo/5-down.sh
}

trap "teardown" EXIT

validate 2 nautilus

${KUBE_REPO_ROOT}/examples/update-demo/2-scale.sh 1
${KUBE_REPO_ROOT}/examples/update-demo/3-scale.sh 1
sleep 2
validate 1 nautilus

${KUBE_REPO_ROOT}/examples/update-demo/2-scale.sh 2
${KUBE_REPO_ROOT}/examples/update-demo/3-scale.sh 2
sleep 2
validate 2 nautilus

${KUBE_REPO_ROOT}/examples/update-demo/3-rolling-update.sh kitten 1s
${KUBE_REPO_ROOT}/examples/update-demo/4-rolling-update.sh kitten 1s
sleep 2
validate 2 kitten

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.