Skip to content

Commit

Permalink
Add a test to validate ipfailover starts
Browse files Browse the repository at this point in the history
  • Loading branch information
smarterclayton committed Jun 1, 2016
1 parent 5c29554 commit 5ac8cc9
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
3 changes: 1 addition & 2 deletions hack/test-end-to-end-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function cleanup()
dump_container_logs

echo "[INFO] Dumping all resources to ${LOG_DIR}/export_all.json"
oc export all --all-namespaces --raw -o json --config=${ADMIN_KUBECONFIG} > ${LOG_DIR}/export_all.json
oc export all --all-namespaces --raw -o json --config=${ADMIN_KUBECONFIG-} > ${LOG_DIR}/export_all.json

echo "[INFO] Dumping etcd contents to ${ARTIFACT_DIR}/etcd_dump.json"
set_curl_args 0 1
Expand All @@ -56,7 +56,6 @@ function cleanup()
set -u
fi

# TODO soltysh: restore the if back once #8399 is resolved
journalctl --unit docker.service --since -15minutes > "${LOG_DIR}/docker.log"

delete_empty_logs
Expand Down
6 changes: 6 additions & 0 deletions test/end-to-end/core.sh
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,15 @@ echo "[INFO] Pre-pulling and pushing ruby-22-centos7"
os::cmd::expect_success 'docker pull centos/ruby-22-centos7:latest'
echo "[INFO] Pulled ruby-22-centos7"

os::cmd::expect_success "openshift admin ipfailover --virtual-ips=\"1.2.3.4\" --credentials=${KUBECONFIG} --service-account=ipfailover"

echo "[INFO] Waiting for Docker registry pod to start"
wait_for_registry

echo "[INFO] Waiting for IP failover pod to start"
os::cmd::try_until_text "oc get rc/ipfailover-1 --template \"{{ index .metadata.annotations 'openshift.io/deployment.phase' }}\"" "Complete"
os::cmd::expect_success "oc delete all -l ipfailover=ipfailover"

# check to make sure that logs for rc works
os::cmd::expect_success "oc logs rc/docker-registry-1 > /dev/null"
# check that we can get a remote shell to a dc or rc
Expand Down

0 comments on commit 5ac8cc9

Please sign in to comment.