Merge pull request #9117 from deads2k/fix-e2e

Merged by openshift-bot

Author: OpenShift Bot

hack/test-end-to-end.sh

@@ -22,6 +22,7 @@ fi
 source "${OS_ROOT}/hack/util.sh"
 source "${OS_ROOT}/hack/lib/log.sh"
 source "${OS_ROOT}/hack/lib/util/environment.sh"
+source "${OS_ROOT}/hack/cmd_util.sh"
 os::log::install_errexit
 
 ensure_iptables_or_die
@@ -62,4 +63,10 @@ start_os_server
 # set our default KUBECONFIG location
 export KUBECONFIG="${ADMIN_KUBECONFIG}"
 
+os::test::junit::declare_suite_start "end-to-end/startup"
+os::cmd::expect_success 'oadm registry'
+os::cmd::expect_success 'oadm policy add-scc-to-user hostnetwork -z router'
+os::cmd::expect_success 'oadm router'
+os::test::junit::declare_suite_end
+
 ${OS_ROOT}/test/end-to-end/core.sh

hack/util.sh

@@ -74,6 +74,7 @@ function configure_os_server {
 	openshift start \
 	--write-config=${SERVER_CONFIG_DIR} \
 	--create-certs=false \
+	--dns="tcp://${API_HOST}:53" \
 	--listen="${API_SCHEME}://${API_BIND_HOST}:${API_PORT}" \
 	--master="${MASTER_ADDR}" \
 	--public-master="${API_SCHEME}://${PUBLIC_MASTER_HOST}:${API_PORT}" \
@@ -144,7 +145,6 @@ function start_os_server {
 	ps -ef | grep openshift
 	echo "[INFO] Starting OpenShift server"
 	${sudo} env "PATH=${PATH}" OPENSHIFT_PROFILE=web OPENSHIFT_ON_PANIC=crash openshift start \
-	 --dns="tcp://${API_HOST}:53" \
 	 --master-config=${MASTER_CONFIG_DIR}/master-config.yaml \
 	 --node-config=${NODE_CONFIG_DIR}/node-config.yaml \
 	 --loglevel=4 --logspec='*importer=5' \
@@ -198,7 +198,6 @@ function start_os_master {
 	ps -ef | grep openshift
 	echo "[INFO] Starting OpenShift server"
 	${sudo} env "PATH=${PATH}" OPENSHIFT_PROFILE=web OPENSHIFT_ON_PANIC=crash openshift start master \
-	 --dns="tcp://${API_HOST}:53" \
 	 --config=${MASTER_CONFIG_DIR}/master-config.yaml \
 	 --loglevel=4 --logspec='*importer=5' \
 	&>"${LOG_DIR}/openshift.log" &