@@ -186,7 +186,7 @@ function os::log::system::internal::plot() {

         printf '\n\n'

     } >> "${LOG_DIR}/gnuplot.log"

-    echo "[INFO] Stacked plot for log subset \"${plotname}\" written to ${LOG_DIR}/${plotname}.pdf"

+    os::log::info "Stacked plot for log subset \"${plotname}\" written to ${LOG_DIR}/${plotname}.pdf"

 }

 readonly -f os::log::system::internal::plot

@@ -192,7 +192,7 @@ function os::start::internal::patch_master_config() {

 	export ADMIN_KUBECONFIG="${MASTER_CONFIG_DIR}/admin.kubeconfig"

 	CLUSTER_ADMIN_CONTEXT=$(oc config view --config="${ADMIN_KUBECONFIG}" --flatten -o template --template='{{index . "current-context"}}'); export CLUSTER_ADMIN_CONTEXT

 	${sudo} chmod -R a+rwX "${ADMIN_KUBECONFIG}"

-	echo "[INFO] To debug: export KUBECONFIG=$ADMIN_KUBECONFIG"

+	os::log::info "To debug: export KUBECONFIG=$ADMIN_KUBECONFIG"

 }

 readonly -f os::start::internal::patch_master_config

@@ -230,7 +230,7 @@ function os::start::server() {

 	local controllers_version="${2:-}"

 	local skip_node="${3:-}"

-	echo "[INFO] Scan of OpenShift related processes already up via ps -ef	| grep openshift : "

+	os::log::info "Scan of OpenShift related processes already up via ps -ef	| grep openshift : "

 	ps -ef | grep openshift

 	mkdir -p "${LOG_DIR}"

@@ -278,10 +278,10 @@ function os::start::master() {

 	mkdir -p "${LOG_DIR}"

-	echo "[INFO] Scan of OpenShift related processes already up via ps -ef	| grep openshift : "

+	os::log::info "Scan of OpenShift related processes already up via ps -ef	| grep openshift : "

 	ps -ef | grep openshift

-	echo "[INFO] Starting OpenShift server"

+	os::log::info "Starting OpenShift server"

 	local openshift_env=( "OPENSHIFT_PROFILE=web" "OPENSHIFT_ON_PANIC=crash" )

 	$(os::start::internal::openshift_executable) start master \

 		--config="${MASTER_CONFIG_DIR}/master-config.yaml" \

@@ -289,7 +289,7 @@ function os::start::master() {

 	&>"${LOG_DIR}/openshift.log" &

 	export OS_PID=$!

-	echo "[INFO] OpenShift server start at: "

+	os::log::info "OpenShift server start at: "

 	date

 	os::test::junit::declare_suite_start "setup/start-master"

@@ -297,7 +297,7 @@ function os::start::master() {

 	os::cmd::try_until_text "oc get --raw /healthz/ready --config='${MASTER_CONFIG_DIR}/admin.kubeconfig'" 'ok' $(( 160 * second )) 0.25

 	os::test::junit::declare_suite_end

-	echo "[INFO] OpenShift server health checks done at: "

+	os::log::info "OpenShift server health checks done at: "

 	date

 }

 readonly -f os::start::master

@@ -331,7 +331,7 @@ function os::start::all_in_one() {

 		use_latest_images="false"

 	fi

-	echo "[INFO] Starting OpenShift server"

+	os::log::info "Starting OpenShift server"

 	local openshift_env=( "OPENSHIFT_PROFILE=web" "OPENSHIFT_ON_PANIC=crash" )

 	local openshift_executable

 	openshift_executable="$(os::start::internal::openshift_executable)"

@@ -344,7 +344,7 @@ function os::start::all_in_one() {

 		                      &>"${LOG_DIR}/openshift.log" &

 	export OS_PID=$!

-	echo "[INFO] OpenShift server start at: "

+	os::log::info "OpenShift server start at: "

 	date

 	os::test::junit::declare_suite_start "setup/start-all_in_one"

@@ -354,7 +354,7 @@ function os::start::all_in_one() {

 	os::cmd::try_until_success "oc get --raw /api/v1/nodes/${KUBELET_HOST} --config='${MASTER_CONFIG_DIR}/admin.kubeconfig'" $(( 80 * second )) 0.25

 	os::test::junit::declare_suite_end

-	echo "[INFO] OpenShift server health checks done at: "

+	os::log::info "OpenShift server health checks done at: "

 	date

 }

 readonly -f os::start::all_in_one

@@ -372,7 +372,7 @@ readonly -f os::start::all_in_one

 # Returns:

 #  - export ETCD_PID

 function os::start::etcd() {

-	echo "[INFO] Starting etcd"

+	os::log::info "Starting etcd"

 	local openshift_env=( "OPENSHIFT_ON_PANIC=crash" )

 	local openshift_executable

 	openshift_executable="$(os::start::internal::openshift_executable)"

@@ -380,14 +380,14 @@ function os::start::etcd() {

 		--config="${MASTER_CONFIG_DIR}/master-config.yaml" &>"${LOG_DIR}/etcd.log" &

 	export ETCD_PID=$!

-	echo "[INFO] etcd server start at: "

+	os::log::info "etcd server start at: "

 	date

 	os::test::junit::declare_suite_start "setup/start-etcd"

 	os::cmd::try_until_success "os::util::curl_etcd '/version'" $(( 10 * second ))

 	os::test::junit::declare_suite_end

-	echo "[INFO] etcd server health checks done at: "

+	os::log::info "etcd server health checks done at: "

 	date

 }

 readonly -f os::start::etcd

@@ -421,7 +421,7 @@ function os::start::api_server() {

 	export API_SERVER_PID=$!

-	echo "[INFO] OpenShift API server start at: "

+	os::log::info "OpenShift API server start at: "

 	date

 	os::test::junit::declare_suite_start "setup/start-api_server"

@@ -429,7 +429,7 @@ function os::start::api_server() {

 	os::cmd::try_until_text "oc get --raw /healthz/ready --config='${MASTER_CONFIG_DIR}/admin.kubeconfig'" 'ok' $(( 160 * second )) 0.25

 	os::test::junit::declare_suite_end

-	echo "[INFO] OpenShift API server health checks done at: "

+	os::log::info "OpenShift API server health checks done at: "

 	date

 }

 readonly -f os::start::api_server

@@ -456,7 +456,7 @@ function os::start::controllers() {

 	export CONTROLLERS_PID=$!

-	echo "[INFO] OpenShift controllers start at: "

+	os::log::info "OpenShift controllers start at: "

 	date

 }

 readonly -f os::start::controllers

@@ -485,7 +485,7 @@ function os::start::internal::start_node() {

 	mkdir -p "${LOG_DIR}"

-	echo "[INFO] Starting OpenShift node"

+	os::log::info "Starting OpenShift node"

 	local openshift_env=( "OPENSHIFT_ON_PANIC=crash" )

 	$(os::start::internal::openshift_executable) openshift start node \

 		--config="${NODE_CONFIG_DIR}/node-config.yaml" \

@@ -494,14 +494,14 @@ function os::start::internal::start_node() {

 	&>"${LOG_DIR}/node.log" &

 	export NODE_PID=$!

-	echo "[INFO] OpenShift node start at: "

+	os::log::info "OpenShift node start at: "

 	date

 	os::test::junit::declare_suite_start "setup/start-node"

 	os::cmd::try_until_text "oc get --raw ${KUBELET_SCHEME}://${KUBELET_HOST}:${KUBELET_PORT}/healthz --config='${MASTER_CONFIG_DIR}/admin.kubeconfig'" 'ok' $(( 80 * second )) 0.25

 	os::test::junit::declare_suite_end

-	echo "[INFO] OpenShift node health checks done at: "

+	os::log::info "OpenShift node health checks done at: "

 	date

 }

 readonly -f os::start::internal::start_node

@@ -589,9 +589,9 @@ readonly -f os::start::internal::determine_hostnames

 function os::start::internal::print_server_info() {

 	local openshift_executable

 	openshift_executable="$(os::start::internal::openshift_executable)"

-	echo "[INFO] $(${openshift_executable} version)"

-	echo "[INFO] Server logs will be at:   ${LOG_DIR}"

-	echo "[INFO] Config dir is:            ${SERVER_CONFIG_DIR}"

-	echo "[INFO] Using images:             ${USE_IMAGES}"

-	echo "[INFO] MasterIP is:              ${MASTER_ADDR}"

+	os::log::info "$(${openshift_executable} version)"

+	os::log::info "Server logs will be at:   ${LOG_DIR}"

+	os::log::info "Config dir is:            ${SERVER_CONFIG_DIR}"

+	os::log::info "Using images:             ${USE_IMAGES}"

+	os::log::info "MasterIP is:              ${MASTER_ADDR}"

 }

@@ -32,7 +32,7 @@ function cleanup()

         echo -------------------------------------

         echo

     elif go tool -n pprof >/dev/null 2>&1; then

-        echo "[INFO] \`pprof\` output logged to ${LOG_DIR}/pprof.out"

+        os::log::info "\`pprof\` output logged to ${LOG_DIR}/pprof.out"

         go tool pprof -text "./_output/local/bin/$(os::util::host_platform)/openshift" cpu.pprof >"${LOG_DIR}/pprof.out" 2>&1

     fi

@@ -65,7 +65,7 @@ function cleanup()

     fi

     ENDTIME=$(date +%s); echo "$0 took $(($ENDTIME - $STARTTIME)) seconds"

-    echo "[INFO] Exiting with ${out}"

+    os::log::info "Exiting with ${out}"

     exit $out

 }

@@ -147,7 +147,7 @@ oc version

 export OPENSHIFT_PROFILE="${WEB_PROFILE-}"

 # Specify the scheme and port for the listen address, but let the IP auto-discover. Set --public-master to localhost, for a stable link to the console.

-echo "[INFO] Create certificates for the OpenShift server to ${MASTER_CONFIG_DIR}"

+os::log::info "Create certificates for the OpenShift server to ${MASTER_CONFIG_DIR}"

 # find the same IP that openshift start will bind to.  This allows access from pods that have to talk back to master

 SERVER_HOSTNAME_LIST="${PUBLIC_MASTER_HOST},$(openshift start --print-ip),localhost"

@@ -355,6 +355,6 @@ for test in "${tests[@]}"; do

   cp ${KUBECONFIG}{.bak,}  # since nothing ever gets deleted from kubeconfig, reset it

 done

-echo "[INFO] Metrics information logged to ${LOG_DIR}/metrics.log"

+os::log::info "Metrics information logged to ${LOG_DIR}/metrics.log"

 oc get --raw /metrics > "${LOG_DIR}/metrics.log"

 echo "test-cmd: ok"

@@ -5,7 +5,7 @@

 STARTTIME=$(date +%s)

 source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

-echo "[INFO] Starting containerized end-to-end test"

+os::log::info "Starting containerized end-to-end test"

 unset KUBECONFIG

@@ -19,7 +19,7 @@ function cleanup()

 	if [ $out -ne 0 ]; then

 		echo "[FAIL] !!!!! Test Failed !!!!"

 	else

-		echo "[INFO] Test Succeeded"

+		os::log::info "Test Succeeded"

 	fi

 	echo

@@ -33,13 +33,13 @@ function cleanup()

 	os::cleanup::dump_etcd

 	if [[ -z "${SKIP_TEARDOWN-}" ]]; then

-		echo "[INFO] remove the openshift container"

+		os::log::info "remove the openshift container"

 		docker stop origin

 		docker rm origin

-		echo "[INFO] Stopping k8s docker containers"; docker ps | awk 'index($NF,"k8s_")==1 { print $1 }' | xargs -l -r docker stop

+		os::log::info "Stopping k8s docker containers"; docker ps | awk 'index($NF,"k8s_")==1 { print $1 }' | xargs -l -r docker stop

 		if [[ -z "${SKIP_IMAGE_CLEANUP-}" ]]; then

-			echo "[INFO] Removing k8s docker containers"; docker ps -a | awk 'index($NF,"k8s_")==1 { print $1 }' | xargs -l -r docker rm

+			os::log::info "Removing k8s docker containers"; docker ps -a | awk 'index($NF,"k8s_")==1 { print $1 }' | xargs -l -r docker rm

 		fi

 		set -u

 	fi

@@ -50,7 +50,7 @@ function cleanup()

 	truncate_large_logs

 	set -e

-	echo "[INFO] Exiting"

+	os::log::info "Exiting"

 	ENDTIME=$(date +%s); echo "$0 took $(($ENDTIME - $STARTTIME)) seconds"

 	exit $out

 }

@@ -67,11 +67,11 @@ out=$(

 )

 # Setup

-echo "[INFO] openshift version: `openshift version`"

-echo "[INFO] oc version:        `oc version`"

-echo "[INFO] Using images:							${USE_IMAGES}"

+os::log::info "openshift version: `openshift version`"

+os::log::info "oc version:        `oc version`"

+os::log::info "Using images:							${USE_IMAGES}"

-echo "[INFO] Starting OpenShift containerized server"

+os::log::info "Starting OpenShift containerized server"

 oc cluster up --server-loglevel=4 --version="${TAG}" \

         --host-data-dir="${VOLUME_DIR}/etcd" \

         --host-volumes-dir="${VOLUME_DIR}"

@@ -85,7 +85,7 @@ export ADMIN_KUBECONFIG="${MASTER_CONFIG_DIR}/admin.kubeconfig"

 export CLUSTER_ADMIN_CONTEXT=$(oc config view --config=${ADMIN_KUBECONFIG} --flatten -o template --template='{{index . "current-context"}}')

 sudo chmod -R a+rwX "${ADMIN_KUBECONFIG}"

 export KUBECONFIG="${ADMIN_KUBECONFIG}"

-echo "[INFO] To debug: export KUBECONFIG=$ADMIN_KUBECONFIG"

+os::log::info "To debug: export KUBECONFIG=$ADMIN_KUBECONFIG"

 ${OS_ROOT}/test/end-to-end/core.sh

@@ -18,7 +18,7 @@ fi

 ensure_iptables_or_die

-echo "[INFO] Starting end-to-end test"

+os::log::info "Starting end-to-end test"

 function cleanup()

 {

@@ -27,12 +27,12 @@ function cleanup()

 	if [ $out -ne 0 ]; then

 		echo "[FAIL] !!!!! Test Failed !!!!"

 	else

-		echo "[INFO] Test Succeeded"

+		os::log::info "Test Succeeded"

 	fi

 	echo

 	cleanup_openshift

-	echo "[INFO] Exiting"

+	os::log::info "Exiting"

 	ENDTIME=$(date +%s); echo "$0 took $(($ENDTIME - $STARTTIME)) seconds"

 	exit $out

 }

@@ -215,7 +215,7 @@ if [[ -n "${junit_report}" ]]; then

     test_error_file="${LOG_DIR}/test-go-err.log"

     junit_report_file="${ARTIFACT_DIR}/report.xml"

-    echo "[INFO] Running \`go test\`..."

+    os::log::info "Running \`go test\`..."

     # we don't care if the `go test` fails in this pipe, as we want to generate the report and summarize the output anyway

     set +o pipefail

@@ -258,8 +258,8 @@ if [[ -n "${junit_report}" ]]; then

         fi

     fi

-    echo "[INFO] Full output from \`go test\` logged at ${test_output_file}"

-    echo "[INFO] jUnit XML report placed at ${junit_report_file}"

+    os::log::info "Full output from \`go test\` logged at ${test_output_file}"

+    os::log::info "jUnit XML report placed at ${junit_report_file}"

     exit "${test_return_code}"

 elif [[ -n "${coverage_output_dir}" ]]; then

@@ -276,7 +276,7 @@ elif [[ -n "${coverage_output_dir}" ]]; then

     find "${coverage_output_dir}" -name profile.out | xargs sed '/^mode: atomic$/d' >> "${coverage_output_dir}/profiles.out"

     go tool cover "-html=${coverage_output_dir}/profiles.out" -o "${coverage_output_dir}/coverage.html"

-    echo "[INFO] Coverage profile written to ${coverage_output_dir}/coverage.html"

+    os::log::info "Coverage profile written to ${coverage_output_dir}/coverage.html"

     # clean up all of the individual coverage reports as they have been subsumed into the report at ${coverage_output_dir}/coverage.html

     # we can clean up all of the coverage reports at once as they all exist in subdirectories of ${coverage_output_dir}/${OS_GO_PACKAGE}

@@ -62,11 +62,11 @@ for file in ${source_files}; do

 				echo "[ERROR] Generated Swagger documentation at \"${swagger_file}\" is out of date."

 				failed='true'

 			else

-				echo "[INFO] Verified that generated Swagger documentation at \"${swagger_file}\" is up to date."

+				os::log::info "Verified that generated Swagger documentation at \"${swagger_file}\" is up to date."

 			fi

 		else

 			mv "${tmp_output_file}" "${swagger_file}"

-			echo "[INFO] Generated Swagger documentation written for \"${file}\" to \"${swagger_file}\""

+			os::log::info "Generated Swagger documentation written for \"${file}\" to \"${swagger_file}\""

 		fi

 	fi

 done

@@ -7,4 +7,4 @@ pushd "${OS_ROOT}/hack/swagger-doc" > /dev/null

 gradle gendocs --info

 popd > /dev/null

-echo "[INFO] Swagger doc generation successful"

+os::log::info "Swagger doc generation successful"

@@ -52,7 +52,7 @@ function dump_container_logs() {

 	mkdir -p ${LOG_DIR}

-	echo "[INFO] Dumping container logs to ${LOG_DIR}"

+	os::log::info "Dumping container logs to ${LOG_DIR}"

 	for container in $(docker ps -aq); do

 		container_name=$(docker inspect -f "{{.Name}}" $container)

 		# strip off leading /

@@ -114,17 +114,17 @@ function cleanup_openshift() {

 	os::cleanup::dump_etcd

 	if [[ -z "${SKIP_TEARDOWN-}" ]]; then

-		echo "[INFO] Tearing down test"

+		os::log::info "Tearing down test"

 		kill_all_processes

 		if docker version >/dev/null 2>&1; then

-			echo "[INFO] Stopping k8s docker containers"; docker ps | awk 'index($NF,"k8s_")==1 { print $1 }' | xargs -l -r docker stop -t 1 >/dev/null

+			os::log::info "Stopping k8s docker containers"; docker ps | awk 'index($NF,"k8s_")==1 { print $1 }' | xargs -l -r docker stop -t 1 >/dev/null

 			if [[ -z "${SKIP_IMAGE_CLEANUP-}" ]]; then

-				echo "[INFO] Removing k8s docker containers"; docker ps -a | awk 'index($NF,"k8s_")==1 { print $1 }' | xargs -l -r docker rm -v >/dev/null

+				os::log::info "Removing k8s docker containers"; docker ps -a | awk 'index($NF,"k8s_")==1 { print $1 }' | xargs -l -r docker rm -v >/dev/null

 			fi

 		fi

-		echo "[INFO] Pruning etcd data directory..."

+		os::log::info "Pruning etcd data directory..."

 		local sudo="${USE_SUDO:+sudo}"

 		${sudo} rm -rf "${ETCD_DATA_DIR}"

@@ -139,18 +139,18 @@ function cleanup_openshift() {

 	delete_empty_logs

 	truncate_large_logs

-	echo "[INFO] Cleanup complete"

+	os::log::info "Cleanup complete"

 	set -e

 }

 readonly -f cleanup_openshift

 # install the router for the extended tests

 function install_router() {

-	echo "[INFO] Installing the router"

+	os::log::info "Installing the router"

 	oadm policy add-scc-to-user privileged -z router --config="${ADMIN_KUBECONFIG}"

 	# Create a TLS certificate for the router

 	if [[ -n "${CREATE_ROUTER_CERT:-}" ]]; then

-		echo "[INFO] Generating router TLS certificate"

+		os::log::info "Generating router TLS certificate"

 		oadm ca create-server-cert --signer-cert=${MASTER_CONFIG_DIR}/ca.crt \

 			--signer-key=${MASTER_CONFIG_DIR}/ca.key \

 			--signer-serial=${MASTER_CONFIG_DIR}/ca.serial.txt \

@@ -165,7 +165,7 @@ function install_router() {

 	# Set the SYN eater to make router reloads more robust

 	if [[ -n "${DROP_SYN_DURING_RESTART:-}" ]]; then

 		# Rewrite the DC for the router to add the environment variable into the pod definition

-		echo "[INFO] Changing the router DC to drop SYN packets during a reload"

+		os::log::info "Changing the router DC to drop SYN packets during a reload"

 		oc set env dc/router -c router DROP_SYN_DURING_RESTART=true

 	fi

 }

@@ -174,7 +174,7 @@ readonly -f install_router

 # install registry for the extended tests

 function install_registry() {

 	# The --mount-host option is provided to reuse local storage.

-	echo "[INFO] Installing the registry"

+	os::log::info "Installing the registry"

 	# For testing purposes, ensure the quota objects are always up to date in the registry by

 	# disabling project cache.

 	openshift admin registry --config="${ADMIN_KUBECONFIG}" --images="${USE_IMAGES}" --enforce-quota -o json | \

@@ -4,7 +4,7 @@

 source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 # Open port scanning

-echo "[INFO] Checking open ports ('sudo openshift start' should already be running)"

+os::log::info "Checking open ports ('sudo openshift start' should already be running)"

 # 53 (DNS)

 # 4001,7001 (etcd)

@@ -10,30 +10,30 @@ trap os::test::junit::reconcile_output EXIT

 export VERBOSE=true

 function wait_for_app() {

-  echo "[INFO] Waiting for app in namespace $1"

-  echo "[INFO] Waiting for database pod to start"

+  os::log::info "Waiting for app in namespace $1"

+  os::log::info "Waiting for database pod to start"

   os::cmd::try_until_text "oc get -n $1 pods -l name=database" 'Running'

   os::cmd::expect_success "oc logs dc/database -n $1"

-  echo "[INFO] Waiting for database service to start"

+  os::log::info "Waiting for database service to start"

   os::cmd::try_until_text "oc get -n $1 services" 'database' "$(( 2 * TIME_MIN ))"

   DB_IP=$(oc get -n "$1" --output-version=v1 --template="{{ .spec.clusterIP }}" service database)

-  echo "[INFO] Waiting for frontend pod to start"

+  os::log::info "Waiting for frontend pod to start"

   os::cmd::try_until_text "oc get -n $1 pods -l name=frontend" 'Running' "$(( 2 * TIME_MIN ))"

   os::cmd::expect_success "oc logs dc/frontend -n $1"

-  echo "[INFO] Waiting for frontend service to start"

+  os::log::info "Waiting for frontend service to start"

   os::cmd::try_until_text "oc get -n $1 services" 'frontend' "$(( 2 * TIME_MIN ))"

   FRONTEND_IP=$(oc get -n "$1" --output-version=v1 --template="{{ .spec.clusterIP }}" service frontend)

-  echo "[INFO] Waiting for database to start..."

+  os::log::info "Waiting for database to start..."

   os::cmd::try_until_success "curl --max-time 2 --fail --silent 'http://${DB_IP}:5434'" "$((3*TIME_MIN))"

-  echo "[INFO] Waiting for app to start..."

+  os::log::info "Waiting for app to start..."

   os::cmd::try_until_success "curl --max-time 2 --fail --silent 'http://${FRONTEND_IP}:5432'" "$((2*TIME_MIN))"

-  echo "[INFO] Testing app"

+  os::log::info "Testing app"

   os::cmd::try_until_text "curl -s -X POST http://${FRONTEND_IP}:5432/keys/foo -d value=1337" "Key created"

   os::cmd::try_until_text "curl -s http://${FRONTEND_IP}:5432/keys/foo" "1337"

 }

@@ -48,8 +48,8 @@ function remove_docker_images() {

 os::test::junit::declare_suite_start "end-to-end/core"

-echo "[INFO] openshift version: `openshift version`"

-echo "[INFO] oc version:        `oc version`"

+os::log::info "openshift version: `openshift version`"

+os::log::info "oc version:        `oc version`"

 # service dns entry is visible via master service

 # find the IP of the master service by asking the API_HOST to verify DNS is running there

@@ -74,17 +74,17 @@ os::cmd::expect_success "openshift admin new-project cache --description='This i

 echo "The console should be available at ${API_SCHEME}://${PUBLIC_MASTER_HOST}:${API_PORT}/console."

 echo "Log in as 'e2e-user' to see the 'test' project."

-echo "[INFO] Pre-pulling and pushing ruby-22-centos7"

+os::log::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::log::info "Pulled ruby-22-centos7"

 os::cmd::expect_success "openshift admin policy add-scc-to-user privileged -z ipfailover"

 os::cmd::expect_success "openshift admin ipfailover --images='${USE_IMAGES}' --virtual-ips='1.2.3.4' --service-account=ipfailover"

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

+os::log::info "Waiting for Docker registry pod to start"

 os::cmd::expect_success 'oc rollout status dc/docker-registry'

-echo "[INFO] Waiting for IP failover to deploy"

+os::log::info "Waiting for IP failover to deploy"

 os::cmd::expect_success 'oc rollout status dc/ipfailover'

 os::cmd::expect_success "oc delete all -l ipfailover=ipfailover"

@@ -99,7 +99,7 @@ DOCKER_REGISTRY=$(oc get --output-version=v1 --template="{{ .spec.clusterIP }}:{

 os::cmd::expect_success_and_text "dig @${API_HOST} docker-registry.default.svc.cluster.local. +short A | head -n 1" "${DOCKER_REGISTRY/:5000}"

-echo "[INFO] Verifying the docker-registry is up at ${DOCKER_REGISTRY}"

+os::log::info "Verifying the docker-registry is up at ${DOCKER_REGISTRY}"

 os::cmd::try_until_success "curl --max-time 2 --fail --silent 'http://${DOCKER_REGISTRY}/'" "$((2*TIME_MIN))"

 # ensure original healthz route works as well

 os::cmd::expect_success "curl -f http://${DOCKER_REGISTRY}/healthz"

@@ -108,7 +108,7 @@ os::cmd::expect_success "dig @${API_HOST} docker-registry.default.local. A"

 # Client setup (log in as e2e-user and set 'test' as the default project)

 # This is required to be able to push to the registry!

-echo "[INFO] Logging in as a regular user (e2e-user:pass) with project 'test'..."

+os::log::info "Logging in as a regular user (e2e-user:pass) with project 'test'..."

 os::cmd::expect_success 'oc login -u e2e-user -p pass'

 os::cmd::expect_success_and_text 'oc whoami' 'e2e-user'

@@ -127,31 +127,31 @@ os::cmd::expect_success 'oc status -n default'

 os::cmd::expect_success 'oc project cache'

 e2e_user_token="$(oc whoami -t)"

-echo "[INFO] Docker login as e2e-user to ${DOCKER_REGISTRY}"

+os::log::info "Docker login as e2e-user to ${DOCKER_REGISTRY}"

 os::cmd::expect_success "docker login -u e2e-user -p ${e2e_user_token} -e e2e-user@openshift.com ${DOCKER_REGISTRY}"

-echo "[INFO] Docker login successful"

+os::log::info "Docker login successful"

-echo "[INFO] Tagging and pushing ruby-22-centos7 to ${DOCKER_REGISTRY}/cache/ruby-22-centos7:latest"

+os::log::info "Tagging and pushing ruby-22-centos7 to ${DOCKER_REGISTRY}/cache/ruby-22-centos7:latest"

 os::cmd::expect_success "docker tag centos/ruby-22-centos7:latest ${DOCKER_REGISTRY}/cache/ruby-22-centos7:latest"

 os::cmd::expect_success "docker push ${DOCKER_REGISTRY}/cache/ruby-22-centos7:latest"

-echo "[INFO] Pushed ruby-22-centos7"

+os::log::info "Pushed ruby-22-centos7"

 # get image's digest

 rubyimagedigest="$(oc get -o jsonpath='{.status.tags[?(@.tag=="latest")].items[0].image}' is/ruby-22-centos7)"

-echo "[INFO] Ruby image digest: $rubyimagedigest"

+os::log::info "Ruby image digest: $rubyimagedigest"

 # get a random, non-empty blob

 rubyimageblob="$(oc get isimage -o go-template='{{range .image.dockerImageLayers}}{{if gt .size 1024.}}{{.name}},{{end}}{{end}}' "ruby-22-centos7@${rubyimagedigest}" | cut -d , -f 1)"

-echo "[INFO] Ruby's testing blob digest: $rubyimageblob"

+os::log::info "Ruby's testing blob digest: $rubyimageblob"

 # verify remote images can be pulled directly from the local registry

-echo "[INFO] Docker pullthrough"

+os::log::info "Docker pullthrough"

 os::cmd::expect_success "oc import-image --confirm --from=mysql:latest mysql:pullthrough"

 os::cmd::expect_success "docker pull ${DOCKER_REGISTRY}/cache/mysql:pullthrough"

-echo "[INFO] Docker registry start with GCS"

+os::log::info "Docker registry start with GCS"

 os::cmd::expect_failure_and_text "docker run -e REGISTRY_STORAGE=\"gcs: {}\" openshift/origin-docker-registry:${TAG}" "No bucket parameter provided"

-echo "[INFO] Docker pull from istag"

+os::log::info "Docker pull from istag"

 os::cmd::expect_success "oc import-image --confirm --from=hello-world:latest -n test hello-world:pullthrough"

 os::cmd::expect_success "docker pull ${DOCKER_REGISTRY}/test/hello-world:pullthrough"

 os::cmd::expect_success "docker tag ${DOCKER_REGISTRY}/test/hello-world:pullthrough ${DOCKER_REGISTRY}/cache/hello-world:latest"

@@ -159,48 +159,48 @@ os::cmd::expect_success "docker push ${DOCKER_REGISTRY}/cache/hello-world:latest

 # verify we can pull from tagged image (using tag)

 remove_docker_images 'cache/hello-world'

-echo "[INFO] Tagging hello-world:latest to the same image stream and pulling it"

+os::log::info "Tagging hello-world:latest to the same image stream and pulling it"

 os::cmd::expect_success "oc tag hello-world:latest hello-world:new-tag"

 os::cmd::expect_success "docker pull ${DOCKER_REGISTRY}/cache/hello-world:new-tag"

-echo "[INFO] The same image stream pull successful"

+os::log::info "The same image stream pull successful"

 remove_docker_images "${DOCKER_REGISTRY}/cache/hello-world" new-tag

-echo "[INFO] Tagging hello-world:latest to cross repository and pulling it"

+os::log::info "Tagging hello-world:latest to cross repository and pulling it"

 os::cmd::expect_success "oc tag hello-world:latest cross:repo-pull"

 os::cmd::expect_success "docker pull ${DOCKER_REGISTRY}/cache/cross:repo-pull"

-echo "[INFO] Cross repository pull successful"

+os::log::info "Cross repository pull successful"

 remove_docker_images "${DOCKER_REGISTRY}/cache/cross" "repo-pull"

-echo "[INFO] Tagging hello-world:latest to cross namespace and pulling it"

+os::log::info "Tagging hello-world:latest to cross namespace and pulling it"

 os::cmd::expect_success "oc tag cache/hello-world:latest cross:namespace-pull -n custom"

 os::cmd::expect_success "docker pull ${DOCKER_REGISTRY}/custom/cross:namespace-pull"

-echo "[INFO] Cross namespace pull successful"

+os::log::info "Cross namespace pull successful"

 # verify we can pull from tagged image (using image digest)

 remove_docker_images "${DOCKER_REGISTRY}/custom/cross"  namespace-pull

 imagedigest="$(oc get istag hello-world:latest --template='{{.image.metadata.name}}')"

-echo "[INFO] Tagging hello-world@${imagedigest} to the same image stream and pulling it"

+os::log::info "Tagging hello-world@${imagedigest} to the same image stream and pulling it"

 os::cmd::expect_success "oc tag hello-world@${imagedigest} hello-world:new-id-tag"

 os::cmd::expect_success "docker pull ${DOCKER_REGISTRY}/cache/hello-world:new-id-tag"

-echo "[INFO] The same image stream pull successful"

+os::log::info "The same image stream pull successful"

 remove_docker_images "${DOCKER_REGISTRY}/cache/hello-world" new-id-tag

-echo "[INFO] Tagging hello-world@${imagedigest} to cross repository and pulling it"

+os::log::info "Tagging hello-world@${imagedigest} to cross repository and pulling it"

 os::cmd::expect_success "oc tag hello-world@${imagedigest} cross:repo-pull-id"

 os::cmd::expect_success "docker pull ${DOCKER_REGISTRY}/cache/cross:repo-pull-id"

-echo "[INFO] Cross repository pull successful"

+os::log::info "Cross repository pull successful"

 remove_docker_images "${DOCKER_REGISTRY}/cache/cross" repo-pull-id

-echo "[INFO] Tagging hello-world@${imagedigest} to cross repository and pulling it by id"

+os::log::info "Tagging hello-world@${imagedigest} to cross repository and pulling it by id"

 os::cmd::expect_success "oc tag hello-world@${imagedigest} cross:repo-pull-id"

 os::cmd::expect_success "docker pull ${DOCKER_REGISTRY}/cache/cross@${imagedigest}"

-echo "[INFO] Cross repository pull successful"

+os::log::info "Cross repository pull successful"

 remove_docker_images "${DOCKER_REGISTRY}/cache/cross"

-echo "[INFO] Tagging hello-world@${imagedigest} to cross namespace and pulling it"

+os::log::info "Tagging hello-world@${imagedigest} to cross namespace and pulling it"

 os::cmd::expect_success "oc tag cache/hello-world@${imagedigest} cross:namespace-pull-id -n custom"

 os::cmd::expect_success "docker pull ${DOCKER_REGISTRY}/custom/cross:namespace-pull-id"

-echo "[INFO] Cross namespace pull successful"

+os::log::info "Cross namespace pull successful"

 os::cmd::expect_success 'oc login -u schema2-user -p pass'

 os::cmd::expect_success "oc new-project schema2"

@@ -213,7 +213,7 @@ os::cmd::expect_failure_and_text "oc get --server='https://${KUBELET_HOST}:${KUB

 os::test::junit::declare_suite_end

-echo "[INFO] Fetch manifest V2 schema 2 image with old client using pullthrough"

+os::log::info "Fetch manifest V2 schema 2 image with old client using pullthrough"

 os::cmd::expect_success "oc import-image --confirm --from=hello-world:latest hello-world:pullthrough"

 os::cmd::expect_success_and_text "oc get -o jsonpath='{.image.dockerImageManifestMediaType}' istag hello-world:pullthrough" 'application/vnd\.docker\.distribution\.manifest\.v2\+json'

 hello_world_name="$(oc get -o 'jsonpath={.image.metadata.name}' istag hello-world:pullthrough)"

@@ -232,9 +232,9 @@ os::cmd::expect_success_and_text "jq -r '.schemaVersion' ${ARTIFACT_DIR}/hello-w

 os::cmd::expect_success_and_not_text "echo '${hello_world_schema1_digest}'" "${hello_world_name}"

 os::cmd::expect_success_and_text "echo '${hello_world_schema1_digest}'" ".+"

 os::cmd::expect_success_and_text "curl -I -u 'schema2-user:${schema2_user_token}' '${DOCKER_REGISTRY}/v2/schema2/hello-world/manifests/${hello_world_schema1_digest}'" "404 Not Found"

-echo "[INFO] Manifest V2 schema 2 image fetched successfully with old client"

+os::log::info "Manifest V2 schema 2 image fetched successfully with old client"

-echo "[INFO] Back to 'default' project with 'admin' user..."

+os::log::info "Back to 'default' project with 'admin' user..."

 os::cmd::expect_success "oc project ${CLUSTER_ADMIN_CONTEXT}"

 os::cmd::expect_success_and_text 'oc whoami' 'system:admin'

@@ -243,11 +243,11 @@ os::cmd::expect_success 'oc policy add-role-to-user system:image-pusher -n cache

 os::cmd::expect_success 'oc login -u pusher -p pass'

 pusher_token="$(oc whoami -t)"

-echo "[INFO] Docker login as pusher to ${DOCKER_REGISTRY}"

+os::log::info "Docker login as pusher to ${DOCKER_REGISTRY}"

 os::cmd::expect_success "docker login -u e2e-user -p ${pusher_token} -e pusher@openshift.com ${DOCKER_REGISTRY}"

-echo "[INFO] Docker login successful"

+os::log::info "Docker login successful"

-echo "[INFO] Anonymous registry access"

+os::log::info "Anonymous registry access"

 # setup: log out of docker, log into openshift as e2e-user to run policy commands, tag image to use for push attempts

 os::cmd::expect_success 'oc login -u e2e-user'

 os::cmd::expect_success 'docker pull busybox'

@@ -271,7 +271,7 @@ os::cmd::expect_success 'oc policy add-role-to-user system:image-pusher system:a

 os::cmd::try_until_text 'oc policy who-can update imagestreams/layers -n custom' 'system:anonymous'

 os::cmd::expect_success "docker push ${DOCKER_REGISTRY}/custom/cross:namespace-pull"

 os::cmd::expect_success "docker push ${DOCKER_REGISTRY}/custom/cross:namespace-pull-id"

-echo "[INFO] Anonymous registry access successfull"

+os::log::info "Anonymous registry access successfull"

 # log back into docker as e2e-user again

 os::cmd::expect_success "docker login -u e2e-user -p ${e2e_user_token} -e e2e-user@openshift.com ${DOCKER_REGISTRY}"

@@ -279,14 +279,14 @@ os::cmd::expect_success "docker login -u e2e-user -p ${e2e_user_token} -e e2e-us

 os::cmd::expect_success "oc new-project crossmount"

 os::cmd::expect_success "oc create imagestream repo"

-echo "[INFO] Back to 'default' project with 'admin' user..."

+os::log::info "Back to 'default' project with 'admin' user..."

 os::cmd::expect_success "oc project ${CLUSTER_ADMIN_CONTEXT}"

 os::cmd::expect_success_and_text 'oc whoami' 'system:admin'

 os::cmd::expect_success "oc tag --source docker centos/ruby-22-centos7:latest -n custom ruby-22-centos7:latest"

 os::cmd::expect_success 'oc policy add-role-to-user registry-viewer pusher -n custom'

 os::cmd::expect_success 'oc policy add-role-to-user system:image-pusher pusher -n crossmount'

-echo "[INFO] Docker cross-repo mount"

+os::log::info "Docker cross-repo mount"

 os::cmd::expect_success_and_text "curl -I -X HEAD -u 'pusher:${pusher_token}' '${DOCKER_REGISTRY}/v2/cache/ruby-22-centos7/blobs/$rubyimageblob'" "200 OK"

 os::cmd::try_until_text "oc get -n custom is/ruby-22-centos7 -o 'jsonpath={.status.tags[*].tag}'" "latest" $((20*TIME_SEC))

 os::cmd::expect_success_and_text "curl -I -X HEAD -u 'pusher:${pusher_token}' '${DOCKER_REGISTRY}/v2/custom/ruby-22-centos7/blobs/$rubyimageblob'" "200 OK"

@@ -303,15 +303,15 @@ os::cmd::expect_success "oc policy remove-role-from-user system:image-pusher pus

 os::cmd::try_until_text "oc policy can-i get imagestreams/layers -n cache '--token=${pusher_token}'" "no"

 # cross-repo mount failed because of access denied

 os::cmd::expect_success_and_text "curl -I -X POST -u 'pusher:${pusher_token}' '${DOCKER_REGISTRY}/v2/crossmount/repo/blobs/uploads/?mount=$rubyimageblob&from=cache/ruby-22-centos7'" "202 Accepted"

-echo "[INFO] Docker cross-repo mount successful"

+os::log::info "Docker cross-repo mount successful"

 # The build requires a dockercfg secret in the builder service account in order

 # to be able to push to the registry.  Make sure it exists first.

-echo "[INFO] Waiting for dockercfg secrets to be generated in project 'test' before building"

+os::log::info "Waiting for dockercfg secrets to be generated in project 'test' before building"

 os::cmd::try_until_text 'oc get -n test serviceaccount/builder -o yaml' 'dockercfg'

 # Process template and create

-echo "[INFO] Submitting application template json for processing..."

+os::log::info "Submitting application template json for processing..."

 STI_CONFIG_FILE="${ARTIFACT_DIR}/stiAppConfig.json"

 DOCKER_CONFIG_FILE="${ARTIFACT_DIR}/dockerAppConfig.json"

 CUSTOM_CONFIG_FILE="${ARTIFACT_DIR}/customAppConfig.json"

@@ -319,12 +319,12 @@ os::cmd::expect_success "oc process -n test -f examples/sample-app/application-t

 os::cmd::expect_success "oc process -n docker -f examples/sample-app/application-template-dockerbuild.json > '${DOCKER_CONFIG_FILE}'"

 os::cmd::expect_success "oc process -n custom -f examples/sample-app/application-template-custombuild.json > '${CUSTOM_CONFIG_FILE}'"

-echo "[INFO] Back to 'test' context with 'e2e-user' user"

+os::log::info "Back to 'test' context with 'e2e-user' user"

 os::cmd::expect_success 'oc login -u e2e-user'

 os::cmd::expect_success 'oc project test'

 os::cmd::expect_success 'oc whoami'

-echo "[INFO] Running a CLI command in a container using the service account"

+os::log::info "Running a CLI command in a container using the service account"

 os::cmd::expect_success 'oc policy add-role-to-user view -z default'

 oc run cli-with-token --attach --image="openshift/origin:${TAG}" --restart=Never -- cli status --loglevel=4 > "${LOG_DIR}/cli-with-token.log" 2>&1

 # TODO Switch back to using cat once https://github.com/docker/docker/pull/26718 is in our Godeps

@@ -345,7 +345,7 @@ oc run kubectl-with-token --attach --image="openshift/origin:${TAG}" --restart=N

 os::cmd::expect_success_and_text "oc logs kubectl-with-token" 'Using in-cluster configuration'

 os::cmd::expect_success_and_text "oc logs kubectl-with-token" 'kubectl-with-token'

-echo "[INFO] Testing deployment logs and failing pre and mid hooks ..."

+os::log::info "Testing deployment logs and failing pre and mid hooks ..."

 # test hook selectors

 os::cmd::expect_success "oc create -f ${OS_ROOT}/test/testdata/complete-dc-hooks.yaml"

 os::cmd::try_until_text 'oc get pods -l openshift.io/deployer-pod.type=hook-pre  -o jsonpath={.items[*].status.phase}' '^Succeeded$'

@@ -376,14 +376,14 @@ os::cmd::expect_success "oc patch dc/failing-dc-mid -p '{\"status\":{\"latestVer

 os::cmd::expect_success_and_text 'oc logs --version=1 dc/failing-dc-mid' 'test mid hook executed'

 os::cmd::expect_success_and_text 'oc logs --previous dc/failing-dc-mid'  'test mid hook executed'

-echo "[INFO] Run pod diagnostics"

+os::log::info "Run pod diagnostics"

 # Requires a node to run the origin-deployer pod; expects registry deployed, deployer image pulled

 # TODO: Find out why this would flake expecting PodCheckDns to run

 # https://github.com/openshift/origin/issues/9888

 #os::cmd::expect_success_and_text 'oadm diagnostics DiagnosticPod --images='"'""${USE_IMAGES}""'" 'Running diagnostic: PodCheckDns'

 os::cmd::expect_success_and_not_text "oadm diagnostics DiagnosticPod --images='${USE_IMAGES}'" ERROR

-echo "[INFO] Applying STI application config"

+os::log::info "Applying STI application config"

 os::cmd::expect_success "oc create -f ${STI_CONFIG_FILE}"

 # Wait for build which should have triggered automatically

@@ -408,11 +408,11 @@ os::cmd::expect_success 'oc logs buildconfigs/ruby-sample-build --loglevel=6'

 os::cmd::expect_success 'oc logs buildconfig/ruby-sample-build --loglevel=6'

 echo "logs: ok"

-echo "[INFO] Starting build from ${STI_CONFIG_FILE} with non-existing commit..."

+os::log::info "Starting build from ${STI_CONFIG_FILE} with non-existing commit..."

 os::cmd::expect_failure 'oc start-build test --commit=fffffff --wait'

 # Remote command execution

-echo "[INFO] Validating exec"

+os::log::info "Validating exec"

 frontend_pod=$(oc get pod -l deploymentconfig=frontend --template='{{(index .items 0).metadata.name}}')

 # when running as a restricted pod the registry will run with a pre-allocated

 # user in the neighborhood of 1000000+.  Look for a substring of the pre-allocated uid range

@@ -426,53 +426,53 @@ os::cmd::expect_success_and_text "oc logs dc/frontend" 'Connecting to production

 os::cmd::expect_success_and_text "oc deploy frontend" 'deployed'

 # Port forwarding

-echo "[INFO] Validating port-forward"

+os::log::info "Validating port-forward"

 os::cmd::expect_success "oc port-forward -p ${frontend_pod} 10080:8080  &> '${LOG_DIR}/port-forward.log' &"

 os::cmd::try_until_success "curl --max-time 2 --fail --silent 'http://localhost:10080'" "$((10*TIME_SEC))"

 # Rsync

-echo "[INFO] Validating rsync"

+os::log::info "Validating rsync"

 os::cmd::expect_success "oc rsync examples/sample-app ${frontend_pod}:/tmp"

 os::cmd::expect_success_and_text "oc rsh ${frontend_pod} ls /tmp/sample-app" 'application-template-stibuild'

-#echo "[INFO] Applying Docker application config"

+#os::log::info "Applying Docker application config"

 #oc create -n docker -f "${DOCKER_CONFIG_FILE}"

-#echo "[INFO] Invoking generic web hook to trigger new docker build using curl"

+#os::log::info "Invoking generic web hook to trigger new docker build using curl"

 #curl -k -X POST $API_SCHEME://$API_HOST:$API_PORT/oapi/v1/namespaces/docker/buildconfigs/ruby-sample-build/webhooks/secret101/generic && sleep 3

 # BUILD_ID="$( oc get builds --namespace docker -o jsonpath='{.items[0].metadata.name}' )"

 # os::cmd::try_until_text "oc get builds --namespace docker -o jsonpath='{.items[0].status.phase}'" "Complete" "$(( 10*TIME_MIN ))"

 # os::cmd::expect_success "oc build-logs --namespace docker '${BUILD_ID}' > '${LOG_DIR}/docker-build.log'"

 #wait_for_app "docker"

-#echo "[INFO] Applying Custom application config"

+#os::log::info "Applying Custom application config"

 #oc create -n custom -f "${CUSTOM_CONFIG_FILE}"

-#echo "[INFO] Invoking generic web hook to trigger new custom build using curl"

+#os::log::info "Invoking generic web hook to trigger new custom build using curl"

 #curl -k -X POST $API_SCHEME://$API_HOST:$API_PORT/oapi/v1/namespaces/custom/buildconfigs/ruby-sample-build/webhooks/secret101/generic && sleep 3

 # BUILD_ID="$( oc get builds --namespace custom -o jsonpath='{.items[0].metadata.name}' )"

 # os::cmd::try_until_text "oc get builds --namespace custom -o jsonpath='{.items[0].status.phase}'" "Complete" "$(( 10*TIME_MIN ))"

 # os::cmd::expect_success "oc build-logs --namespace custom '${BUILD_ID}' > '${LOG_DIR}/custom-build.log'"

 #wait_for_app "custom"

-echo "[INFO] Back to 'default' project with 'admin' user..."

+os::log::info "Back to 'default' project with 'admin' user..."

 os::cmd::expect_success "oc project ${CLUSTER_ADMIN_CONTEXT}"

 # ensure the router is started

 # TODO: simplify when #4702 is fixed upstream

 os::cmd::try_until_text "oc get endpoints router --output-version=v1 --template='{{ if .subsets }}{{ len .subsets }}{{ else }}0{{ end }}'" '[1-9]+' $((5*TIME_MIN))

-echo "[INFO] Waiting for router to start..."

+os::log::info "Waiting for router to start..."

 router_pod=$(oc get pod -n default -l deploymentconfig=router --template='{{(index .items 0).metadata.name}}')

 healthz_uri="http://$(oc get pod "${router_pod}" --template='{{.status.podIP}}'):1936/healthz"

 os::cmd::try_until_success "curl --max-time 2 --fail --silent '${healthz_uri}'" "$((5*TIME_MIN))"

 # Check for privileged exec limitations.

-echo "[INFO] Validating privileged pod exec"

+os::log::info "Validating privileged pod exec"

 os::cmd::expect_success 'oc policy add-role-to-user admin e2e-default-admin'

 # system:admin should be able to exec into it

 os::cmd::expect_success "oc project ${CLUSTER_ADMIN_CONTEXT}"

 os::cmd::expect_success "oc exec -n default -tip ${router_pod} ls"

-echo "[INFO] Validating routed app response..."

+os::log::info "Validating routed app response..."

 # 172.17.42.1 is no longer the default ip of the docker bridge as of

 # docker 1.9.  Since the router is using hostNetwork=true, the router

 # will be reachable via the ip of its pod.

@@ -488,7 +488,7 @@ os::cmd::expect_success "oc create route edge --service=frontend --cert=${MASTER

 os::cmd::try_until_text "curl -s -k --resolve 'www.example.com:443:${CONTAINER_ACCESSIBLE_API_HOST}' https://www.example.com" "Hello from OpenShift" "$((10*TIME_SEC))"

 # Pod node selection

-echo "[INFO] Validating pod.spec.nodeSelector rejections"

+os::log::info "Validating pod.spec.nodeSelector rejections"

 # Create a project that enforces an impossible to satisfy nodeSelector, and two pods, one of which has an explicit node name

 os::cmd::expect_success "openshift admin new-project node-selector --description='This is an example project to test node selection prevents deployment' --admin='e2e-user' --node-selector='impossible-label=true'"

 os::cmd::expect_success "oc process -n node-selector -v NODE_NAME='$(oc get node -o jsonpath='{.items[0].metadata.name}')' -f test/testdata/node-selector/pods.json | oc create -n node-selector -f -"

@@ -499,7 +499,7 @@ os::cmd::try_until_text 'oc get events -n node-selector' 'pod-with-node-name.+Ma

 # Image pruning

-echo "[INFO] Validating image pruning"

+os::log::info "Validating image pruning"

 # builder service account should have the power to create new image streams: prune in this case

 os::cmd::expect_success "docker login -u e2e-user -p $(oc sa get-token builder -n cache) -e builder@openshift.com ${DOCKER_REGISTRY}"

 os::cmd::expect_success 'docker pull busybox'

@@ -536,16 +536,16 @@ os::cmd::expect_success "oc exec -p ${registry_pod} du /registry > '${LOG_DIR}/p

 # make sure there were changes to the registry's storage

 os::cmd::expect_code "diff ${LOG_DIR}/prune-images.before.txt ${LOG_DIR}/prune-images.after.txt" 1

-echo "[INFO] Validated image pruning"

+os::log::info "Validated image pruning"

 # with registry's re-deployment we loose all the blobs stored in its storage until now

-echo "[INFO] Configure registry to accept manifest V2 schema 2"

+os::log::info "Configure registry to accept manifest V2 schema 2"

 os::cmd::expect_success "oc project '${CLUSTER_ADMIN_CONTEXT}'"

 os::cmd::expect_success 'oc env -n default dc/docker-registry REGISTRY_MIDDLEWARE_REPOSITORY_OPENSHIFT_ACCEPTSCHEMA2=true'

 os::cmd::expect_success 'oc rollout status dc/docker-registry'

-echo "[INFO] Registry configured to accept manifest V2 schema 2"

+os::log::info "Registry configured to accept manifest V2 schema 2"

-echo "[INFO] Accept manifest V2 schema 2"

+os::log::info "Accept manifest V2 schema 2"

 os::cmd::expect_success "oc login -u schema2-user -p pass"

 os::cmd::expect_success "oc project schema2"

 # tagging remote docker.io/busybox image

@@ -554,9 +554,9 @@ os::cmd::expect_success "docker login -u e2e-user -p '${schema2_user_token}' -e

 os::cmd::expect_success "docker push '${DOCKER_REGISTRY}/schema2/busybox'"

 # image accepted as schema 2

 os::cmd::expect_success_and_text "oc get -o jsonpath='{.image.dockerImageManifestMediaType}' istag busybox:latest" 'application/vnd\.docker\.distribution\.manifest\.v2\+json'

-echo "[INFO] Manifest V2 schema 2 successfully accepted"

+os::log::info "Manifest V2 schema 2 successfully accepted"

-echo "[INFO] Convert manifest V2 schema 2 to schema 1 for older client"

+os::log::info "Convert manifest V2 schema 2 to schema 1 for older client"

 os::cmd::expect_success 'oc login -u schema2-user -p pass'

 os::cmd::expect_success "oc new-project schema2tagged"

 os::cmd::expect_success "oc tag --source=istag schema2/busybox:latest busybox:latest"

@@ -572,14 +572,14 @@ os::cmd::expect_success_and_text "echo '${busybox_schema1_digest}'" ".+"

 os::cmd::expect_success_and_text "curl -I -u 'schema2-user:${schema2_user_token}' '${DOCKER_REGISTRY}/v2/schema2tagged/busybox/manifests/${busybox_schema1_digest}'" "404 Not Found"

 # ensure we can fetch it back as schema 2

 os::cmd::expect_success_and_text "curl -I -u 'schema2-user:${schema2_user_token}' -H 'Accept: application/vnd.docker.distribution.manifest.v2+json' '${DOCKER_REGISTRY}/v2/schema2tagged/busybox/manifests/latest'" "Docker-Content-Digest:\s*${busybox_name}"

-echo "[INFO] Manifest V2 schema 2 successfully converted to schema 1"

+os::log::info "Manifest V2 schema 2 successfully converted to schema 1"