@@ -118,7 +118,6 @@ test:

 	hack/test-cmd.sh

 	KUBE_RACE=" " hack/test-integration-docker.sh

 	hack/test-end-to-end-docker.sh

-	hack/test-end-to-end.sh

 ifeq ($(EXTENDED),true)

 	hack/test-extended.sh

 endif

@@ -12,183 +12,103 @@ source "${OS_ROOT}/hack/util.sh"

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

-# Use either the latest release built images, or latest.

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

-  tag="latest"

-  if [[ -e "${OS_ROOT}/_output/local/releases/.commit" ]]; then

-    COMMIT="$(cat "${OS_ROOT}/_output/local/releases/.commit")"

-    tag="${COMMIT}"

-  fi

-  USE_IMAGES="openshift/origin-\${component}:${tag}"

-fi

-

 unset KUBECONFIG

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

-  TMPDIR="${TMPDIR:-"/tmp"}"

-  BASETMPDIR="${TMPDIR}/openshift-e2e-containerized"

-  sudo rm -rf "${BASETMPDIR}"

-  mkdir -p "${BASETMPDIR}"

-fi

+TMPDIR="${TMPDIR:-"/tmp"}"

+BASETMPDIR="${BASETMPDIR:-${TMPDIR}/openshift-e2e-containerized}"

+setup_env_vars

+reset_tmp_dir

-VOLUME_DIR="${BASETMPDIR}/volumes"

 # when selinux is enforcing, the volume dir selinux label needs to be

 # svirt_sandbox_file_t

 #

 # TODO: fix the selinux policy to either allow openshift_var_lib_dir_t

 # or to default the volume dir to svirt_sandbox_file_t.

-sudo mkdir -p ${VOLUME_DIR}

 if selinuxenabled; then

-  sudo chcon -t svirt_sandbox_file_t ${VOLUME_DIR}

+	sudo chcon -t svirt_sandbox_file_t ${VOLUME_DIR}

 fi

-FAKE_HOME_DIR="${BASETMPDIR}/openshift.local.home"

-LOG_DIR="${LOG_DIR:-${BASETMPDIR}/logs}"

-ARTIFACT_DIR="${ARTIFACT_DIR:-${BASETMPDIR}/artifacts}"

-mkdir -p $LOG_DIR

-mkdir -p $ARTIFACT_DIR

-

-GO_OUT="${OS_ROOT}/_output/local/go/bin"

-

-# set path so OpenShift is available

-export PATH="${GO_OUT}:${PATH}"

-

-

 function cleanup()

 {

-  out=$?

-  echo

-  if [ $out -ne 0 ]; then

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

-  else

-    echo "[INFO] Test Succeeded"

-  fi

-  echo

-

-  set +e

-  dump_container_logs

-

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

-    echo "[INFO] Deleting test constructs"

-    sudo docker exec origin oc delete -n test all --all

-    sudo docker exec origin oc delete -n default all --all

-

-    echo "[INFO] Waiting for volume mounts to be cleaned up"

-    wait_for_command '[[ "$(mount | grep pods | grep ${VOLUME_DIR} | wc -l)" = "0" ]]' $((120*TIME_SEC))

-

-    echo "[INFO] Tearing down test"

-    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

-    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

-    fi

-    set -u

-  fi

-  set -e

-

-  delete_large_and_empty_logs

-

-  echo "[INFO] Exiting"

-  exit $out

+	out=$?

+	echo

+	if [ $out -ne 0 ]; then

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

+	else

+		echo "[INFO] Test Succeeded"

+	fi

+	echo

+

+	set +e

+	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

+

+	echo "[INFO] Dumping etcd contents to ${ARTIFACT_DIR}/etcd_dump.json"

+	set_curl_args 0 1

+	ETCD_PORT="${ETCD_PORT:-4001}"

+	curl ${clientcert_args} -L "${API_SCHEME}://${API_HOST}:${ETCD_PORT}/v2/keys/?recursive=true" > "${ARTIFACT_DIR}/etcd_dump.json"

+	echo

+

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

+		echo "[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

+		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

+		fi

+		set -u

+	fi

+

+	delete_large_and_empty_logs

+	set -e

+

+	echo "[INFO] Exiting"

+	exit $out

 }

 trap "exit" INT TERM

 trap "cleanup" EXIT

-function wait_for_app() {

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

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

-  wait_for_command "oc get -n $1 pods -l name=database | grep -i Running" $((60*TIME_SEC))

-

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

-  wait_for_command "oc get -n $1 services | grep database" $((20*TIME_SEC))

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

-

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

-  wait_for_command "oc get -n $1 pods | grep frontend | grep -i Running" $((120*TIME_SEC))

-

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

-  wait_for_command "oc get -n $1 services | grep frontend" $((20*TIME_SEC))

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

-

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

-  wait_for_url_timed "http://${DB_IP}:5434" "[INFO] Database says: " $((3*TIME_MIN))

-

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

-  wait_for_url_timed "http://${FRONTEND_IP}:5432" "[INFO] Frontend says: " $((2*TIME_MIN))

-

-  echo "[INFO] Testing app"

-  wait_for_command '[[ "$(curl -s -X POST http://${FRONTEND_IP}:5432/keys/foo -d value=1337)" = "Key created" ]]'

-  wait_for_command '[[ "$(curl -s http://${FRONTEND_IP}:5432/keys/foo)" = "1337" ]]'

-}

-

-# Wait for builds to complete

-# $1 namespace

-function wait_for_build() {

-  echo "[INFO] Waiting for $1 namespace build to complete"

-  wait_for_command "oc get -n $1 builds | grep -i complete" $((10*TIME_MIN)) "oc get -n $1 builds | grep -i -e failed -e error"

-  BUILD_ID=`oc get -n $1 builds --output-version=v1beta3 -t "{{with index .items 0}}{{.metadata.name}}{{end}}"`

-  echo "[INFO] Build ${BUILD_ID} finished"

-  # TODO: fix

-  set +e

-  oc build-logs -n $1 $BUILD_ID > $LOG_DIR/$1build.log

-  set -e

-}

-

 out=$(

-  set +e

-  docker stop origin 2>&1

-  docker rm origin 2>&1

-  set -e

+	set +e

+	docker stop origin 2>&1

+	docker rm origin 2>&1

+	set -e

 )

 # Setup

 echo "[INFO] `openshift version`"

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

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

 echo "[INFO] Starting OpenShift containerized server"

 sudo docker run -d --name="origin" \

-  --privileged --net=host \

-  -v /:/rootfs:ro -v /var/run:/var/run:rw -v /sys:/sys:ro -v /var/lib/docker:/var/lib/docker:rw \

-  -v "${VOLUME_DIR}:${VOLUME_DIR}" \

-  "openshift/origin:${tag}" start --volume-dir=${VOLUME_DIR} --images="${USE_IMAGES}"

+	--privileged --net=host --pid=host \

+	-v /:/rootfs:ro -v /var/run:/var/run:rw -v /sys:/sys:ro -v /var/lib/docker:/var/lib/docker:rw \

+	-v "${VOLUME_DIR}:${VOLUME_DIR}" \

+	"openshift/origin:${TAG}" start --loglevel=4 --volume-dir=${VOLUME_DIR} --images="${USE_IMAGES}"

-export HOME="${FAKE_HOME_DIR}"

-# This directory must exist so Docker can store credentials in $HOME/.dockercfg

-mkdir -p ${FAKE_HOME_DIR}

+# the CA is in the container, log in as a different cluster admin to run the test

 CURL_EXTRA="-k"

-

 wait_for_url "https://localhost:8443/healthz/ready" "apiserver(ready): " 0.25 160

-# install the router

-echo "[INFO] Installing the router"

-sudo docker exec origin bash -c "echo '{\"kind\":\"ServiceAccount\",\"apiVersion\":\"v1\",\"metadata\":{\"name\":\"router\"}}' | openshift cli create -f -"

-sudo docker exec origin bash -c "openshift cli get scc privileged -o json | sed '/\"users\"/a \"system:serviceaccount:default:router\",' | openshift cli replace scc privileged -f -"

-sudo docker exec origin openshift admin router --create --credentials="./openshift.local.config/master/openshift-router.kubeconfig" --images="${USE_IMAGES}" --service-account=router

-

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

-echo "[INFO] Installing the registry"

-sudo docker exec origin openshift admin registry --create --credentials="./openshift.local.config/master/openshift-registry.kubeconfig" --images="${USE_IMAGES}"

-

-registry="$(dig @localhost "docker-registry.default.svc.cluster.local." +short A | head -n 1)"

-[ -n "${registry}" ]

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

-wait_for_url_timed "http://${registry}:5000/healthz" "[INFO] Docker registry says: " $((2*TIME_MIN))

+IMAGE_WORKING_DIR=/var/lib/openshift

+docker cp origin:${IMAGE_WORKING_DIR}/openshift.local.config ${BASETMPDIR}

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

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

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

+export KUBECONFIG="${ADMIN_KUBECONFIG}"

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

-echo "[INFO] Login"

-oc login localhost:8443 -u test -p test --insecure-skip-tls-verify

-oc new-project test

-echo "[INFO] Applying STI application config"

-oc new-app -f examples/sample-app/application-template-stibuild.json

+wait_for_url "${KUBELET_SCHEME}://${KUBELET_HOST}:${KUBELET_PORT}/healthz" "[INFO] kubelet: " 0.5 60

+wait_for_url "${API_SCHEME}://${API_HOST}:${API_PORT}/healthz" "apiserver: " 0.25 80

+wait_for_url "${API_SCHEME}://${API_HOST}:${API_PORT}/healthz/ready" "apiserver(ready): " 0.25 80

-# Wait for build which should have triggered automatically

-echo "[INFO] Starting build..."

-#oc start-build -n test ruby-sample-build --follow

-wait_for_build "test"

-wait_for_app "test"

+${OS_ROOT}/hack/test-end-to-end-scenario.sh

\ No newline at end of file

new file mode 100755

@@ -0,0 +1,258 @@

+#!/bin/bash

+

+# This script tests the high level end-to-end functionality demonstrated

+# as part of the examples/sample-app

+

+set -o errexit

+set -o nounset

+set -o pipefail

+

+OS_ROOT=$(dirname "${BASH_SOURCE}")/..

+source "${OS_ROOT}/hack/util.sh"

+

+ROUTER_TESTS_ENABLED="${ROUTER_TESTS_ENABLED:-true}"

+TEST_ASSETS="${TEST_ASSETS:-false}"

+

+

+function wait_for_app() {

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

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

+	wait_for_command "oc get -n $1 pods -l name=database | grep -i Running" $((60*TIME_SEC))

+

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

+	wait_for_command "oc get -n $1 services | grep database" $((20*TIME_SEC))

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

+

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

+	wait_for_command "oc get -n $1 pods | grep frontend | grep -i Running" $((120*TIME_SEC))

+

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

+	wait_for_command "oc get -n $1 services | grep frontend" $((20*TIME_SEC))

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

+

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

+	wait_for_url_timed "http://${DB_IP}:5434" "[INFO] Database says: " $((3*TIME_MIN))

+

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

+	wait_for_url_timed "http://${FRONTEND_IP}:5432" "[INFO] Frontend says: " $((2*TIME_MIN))

+

+	echo "[INFO] Testing app"

+	wait_for_command '[[ "$(curl -s -X POST http://${FRONTEND_IP}:5432/keys/foo -d value=1337)" = "Key created" ]]'

+	wait_for_command '[[ "$(curl -s http://${FRONTEND_IP}:5432/keys/foo)" = "1337" ]]'

+}

+

+# add e2e-user as a viewer for the default namespace so we can see infrastructure pieces appear

+openshift admin policy add-role-to-user view e2e-user --namespace=default

+

+# pre-load some image streams and templates

+oc create -f examples/image-streams/image-streams-centos7.json --namespace=openshift

+oc create -f examples/sample-app/application-template-stibuild.json --namespace=openshift

+oc create -f examples/jenkins/application-template.json --namespace=openshift

+oc create -f examples/db-templates/mongodb-ephemeral-template.json --namespace=openshift

+oc create -f examples/db-templates/mysql-ephemeral-template.json --namespace=openshift

+oc create -f examples/db-templates/postgresql-ephemeral-template.json --namespace=openshift

+

+# create test project so that this shows up in the console

+openshift admin new-project test --description="This is an example project to demonstrate OpenShift v3" --admin="e2e-user"

+openshift admin new-project docker --description="This is an example project to demonstrate OpenShift v3" --admin="e2e-user"

+openshift admin new-project custom --description="This is an example project to demonstrate OpenShift v3" --admin="e2e-user"

+openshift admin new-project cache --description="This is an example project to demonstrate OpenShift v3" --admin="e2e-user"

+

+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."

+

+install_router

+install_registry

+

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

+docker pull openshift/ruby-20-centos7:latest

+echo "[INFO] Pulled ruby-20-centos7"

+

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

+wait_for_registry

+

+# services can end up on any IP.	Make sure we get the IP we need for the docker registry

+DOCKER_REGISTRY=$(oc get --output-version=v1beta3 --template="{{ .spec.portalIP }}:{{ with index .spec.ports 0 }}{{ .port }}{{ end }}" service docker-registry)

+

+registry="$(dig @${API_HOST} "docker-registry.default.svc.cluster.local." +short A | head -n 1)"

+[[ -n "${registry}" && "${registry}:5000" == "${DOCKER_REGISTRY}" ]]

+

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

+wait_for_url_timed "http://${DOCKER_REGISTRY}/healthz" "[INFO] Docker registry says: " $((2*TIME_MIN))

+

+[ "$(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'..."

+oc login -u e2e-user -p pass

+[ "$(oc whoami | grep 'e2e-user')" ]

+ 

+# make sure viewers can see oc status

+oc status -n default

+

+oc project cache

+token=$(oc config view --flatten -o template -t '{{with index .users 0}}{{.user.token}}{{end}}')

+[[ -n ${token} ]]

+

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

+docker login -u e2e-user -p ${token} -e e2e-user@openshift.com ${DOCKER_REGISTRY}

+echo "[INFO] Docker login successful"

+

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

+docker tag -f openshift/ruby-20-centos7:latest ${DOCKER_REGISTRY}/cache/ruby-20-centos7:latest

+docker push ${DOCKER_REGISTRY}/cache/ruby-20-centos7:latest

+echo "[INFO] Pushed ruby-20-centos7"

+

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

+oc project ${CLUSTER_ADMIN_CONTEXT}

+[ "$(oc whoami | grep 'system:admin')" ]

+

+# 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"

+wait_for_command "oc get -n test serviceaccount/builder -o yaml | grep dockercfg > /dev/null" $((60*TIME_SEC))

+

+# Process template and create

+echo "[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"

+oc process -n test -f examples/sample-app/application-template-stibuild.json > "${STI_CONFIG_FILE}"

+oc process -n docker -f examples/sample-app/application-template-dockerbuild.json > "${DOCKER_CONFIG_FILE}"

+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"

+oc login -u e2e-user

+oc project test

+oc whoami

+

+echo "[INFO] Applying STI application config"

+oc create -f "${STI_CONFIG_FILE}"

+

+# Wait for build which should have triggered automatically

+echo "[INFO] Starting build from ${STI_CONFIG_FILE} and streaming its logs..."

+#oc start-build -n test ruby-sample-build --follow

+os::build:wait_for_start "test"

+# Ensure that the build pod doesn't allow exec

+[ "$(oc rsh ${BUILD_ID}-build 2>&1 | grep 'forbidden')" ]

+os::build:wait_for_end "test"

+wait_for_app "test"

+

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

+set +e

+oc start-build test --commit=fffffff --wait && echo "The build was supposed to fail, but it succeeded." && exit 1

+set -e

+

+# Remote command execution

+echo "[INFO] Validating exec"

+frontend_pod=$(oc get pod -l deploymentconfig=frontend -t '{{(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

+oc exec -p ${frontend_pod} id | grep 10

+

+# Port forwarding

+echo "[INFO] Validating port-forward"

+oc port-forward -p ${frontend_pod} 10080:8080  &> "${LOG_DIR}/port-forward.log" &

+wait_for_url_timed "http://localhost:10080" "[INFO] Frontend says: " $((10*TIME_SEC))

+

+

+

+#echo "[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"

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

+#os::build:wait_for_end "docker"

+#wait_for_app "docker"

+

+#echo "[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"

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

+#os::build:wait_for_end "custom"

+#wait_for_app "custom"

+

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

+oc project ${CLUSTER_ADMIN_CONTEXT}

+

+# ensure the router is started

+# TODO: simplify when #4702 is fixed upstream

+wait_for_command '[[ "$(oc get endpoints router --output-version=v1beta3 -t "{{ if .subsets }}{{ len .subsets }}{{ else }}0{{ end }}" || echo "0")" != "0" ]]' $((5*TIME_MIN))

+

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

+# use the docker bridge ip address until there is a good way to get the auto-selected address from master

+# this address is considered stable

+# used as a resolve IP to test routing

+CONTAINER_ACCESSIBLE_API_HOST="${CONTAINER_ACCESSIBLE_API_HOST:-172.17.42.1}"

+validate_response "-s -k --resolve www.example.com:443:${CONTAINER_ACCESSIBLE_API_HOST} https://www.example.com" "Hello from OpenShift" 0.2 50

+

+

+# Pod node selection

+echo "[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

+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"

+NODE_NAME=`oc get node --no-headers | awk '{print $1}'`

+oc process -n node-selector -v NODE_NAME="${NODE_NAME}" -f test/node-selector/pods.json | oc create -n node-selector -f -

+# The pod without a node name should fail to schedule

+wait_for_command "oc get events -n node-selector | grep pod-without-node-name | grep failedScheduling"        $((20*TIME_SEC))

+# The pod with a node name should be rejected by the kubelet

+wait_for_command "oc get events -n node-selector | grep pod-with-node-name    | grep NodeSelectorMismatching" $((20*TIME_SEC))

+

+

+# Image pruning

+echo "[INFO] Validating image pruning"

+docker pull busybox

+docker pull gcr.io/google_containers/pause

+docker pull openshift/hello-openshift

+

+# tag and push 1st image - layers unique to this image will be pruned

+docker tag -f busybox ${DOCKER_REGISTRY}/cache/prune

+docker push ${DOCKER_REGISTRY}/cache/prune

+

+# tag and push 2nd image - layers unique to this image will be pruned

+docker tag -f openshift/hello-openshift ${DOCKER_REGISTRY}/cache/prune

+docker push ${DOCKER_REGISTRY}/cache/prune

+

+# tag and push 3rd image - it won't be pruned

+docker tag -f gcr.io/google_containers/pause ${DOCKER_REGISTRY}/cache/prune

+docker push ${DOCKER_REGISTRY}/cache/prune

+

+# record the storage before pruning

+registry_pod=$(oc get pod -l deploymentconfig=docker-registry -t '{{(index .items 0).metadata.name}}')

+oc exec -p ${registry_pod} du /registry > ${LOG_DIR}/prune-images.before.txt

+

+# set up pruner user

+oadm policy add-cluster-role-to-user system:image-pruner e2e-pruner

+oc login -u e2e-pruner -p pass

+

+# run image pruning

+oadm prune images --keep-younger-than=0 --keep-tag-revisions=1 --confirm &> ${LOG_DIR}/prune-images.log

+! grep error ${LOG_DIR}/prune-images.log

+

+oc project ${CLUSTER_ADMIN_CONTEXT}

+# record the storage after pruning

+oc exec -p ${registry_pod} du /registry > ${LOG_DIR}/prune-images.after.txt

+

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

+[ -n "$(diff ${LOG_DIR}/prune-images.before.txt ${LOG_DIR}/prune-images.after.txt)" ]

+

+

+# UI e2e tests can be found in assets/test/e2e

+if [[ "$TEST_ASSETS" == "true" ]]; then

+

+	if [[ "$TEST_ASSETS_HEADLESS" == "true" ]]; then

+		echo "[INFO] Starting virtual framebuffer for headless tests..."

+		export DISPLAY=:10

+		Xvfb :10 -screen 0 1024x768x24 -ac &

+	fi

+

+	echo "[INFO] Running UI e2e tests at time..."

+	echo `date`

+	pushd ${OS_ROOT}/assets > /dev/null

+		grunt test-e2e

+	echo "UI  e2e done at time "

+	echo `date`

+

+	popd > /dev/null

+

+fi

@@ -14,9 +14,6 @@ ensure_iptables_or_die

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

-ROUTER_TESTS_ENABLED="${ROUTER_TESTS_ENABLED:-true}"

-TEST_ASSETS="${TEST_ASSETS:-false}"

-

 function cleanup()

 {

 	out=$?

@@ -36,55 +33,6 @@ function cleanup()

 trap "exit" INT TERM

 trap "cleanup" EXIT

-function wait_for_app() {

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

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

-	wait_for_command "oc get -n $1 pods -l name=database | grep -i Running" $((60*TIME_SEC))

-

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

-	wait_for_command "oc get -n $1 services | grep database" $((20*TIME_SEC))

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

-

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

-	wait_for_command "oc get -n $1 pods | grep frontend | grep -i Running" $((120*TIME_SEC))

-

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

-	wait_for_command "oc get -n $1 services | grep frontend" $((20*TIME_SEC))

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

-

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

-	wait_for_url_timed "http://${DB_IP}:5434" "[INFO] Database says: " $((3*TIME_MIN))

-

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

-	wait_for_url_timed "http://${FRONTEND_IP}:5432" "[INFO] Frontend says: " $((2*TIME_MIN))

-

-	echo "[INFO] Testing app"

-	wait_for_command '[[ "$(curl -s -X POST http://${FRONTEND_IP}:5432/keys/foo -d value=1337)" = "Key created" ]]'

-	wait_for_command '[[ "$(curl -s http://${FRONTEND_IP}:5432/keys/foo)" = "1337" ]]'

-}

-

-# Wait for builds to start

-# $1 namespace

-function wait_for_build_start() {

-        echo "[INFO] Waiting for $1 namespace build to start"

-        wait_for_command "oc get -n $1 builds | grep -i running" $((10*TIME_MIN)) "oc get -n $1 builds | grep -i -e failed -e error"

-        BUILD_ID=`oc get -n $1 builds  --output-version=v1 -t "{{with index .items 0}}{{.metadata.name}}{{end}}"`

-        echo "[INFO] Build ${BUILD_ID} started"

-}

-

-# Wait for builds to complete

-# $1 namespace

-function wait_for_build() {

-	echo "[INFO] Waiting for $1 namespace build to complete"

-	wait_for_command "oc get -n $1 builds | grep -i complete" $((10*TIME_MIN)) "oc get -n $1 builds | grep -i -e failed -e error"

-	BUILD_ID=`oc get -n $1 builds --output-version=v1beta3 -t "{{with index .items 0}}{{.metadata.name}}{{end}}"`

-	echo "[INFO] Build ${BUILD_ID} finished"

-  # TODO: fix

-  set +e

-	oc build-logs -n $1 $BUILD_ID > $LOG_DIR/$1build.log

-  set -e

-}

-

 # Start All-in-one server and wait for health

 TMPDIR="${TMPDIR:-"/tmp"}"

@@ -98,217 +46,5 @@ start_os_server

 export KUBECONFIG="${ADMIN_KUBECONFIG}"

-# add e2e-user as a viewer for the default namespace so we can see infrastructure pieces appear

-openshift admin policy add-role-to-user view e2e-user --namespace=default

-

-# pre-load some image streams and templates

-oc create -f examples/image-streams/image-streams-centos7.json --namespace=openshift

-oc create -f examples/sample-app/application-template-stibuild.json --namespace=openshift

-oc create -f examples/jenkins/application-template.json --namespace=openshift

-oc create -f examples/db-templates/mongodb-ephemeral-template.json --namespace=openshift

-oc create -f examples/db-templates/mysql-ephemeral-template.json --namespace=openshift

-oc create -f examples/db-templates/postgresql-ephemeral-template.json --namespace=openshift

-

-# create test project so that this shows up in the console

-openshift admin new-project test --description="This is an example project to demonstrate OpenShift v3" --admin="e2e-user"

-openshift admin new-project docker --description="This is an example project to demonstrate OpenShift v3" --admin="e2e-user"

-openshift admin new-project custom --description="This is an example project to demonstrate OpenShift v3" --admin="e2e-user"

-openshift admin new-project cache --description="This is an example project to demonstrate OpenShift v3" --admin="e2e-user"

-

-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."

-

-install_router

-install_registry

-

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

-docker pull openshift/ruby-20-centos7:latest

-echo "[INFO] Pulled ruby-20-centos7"

-

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

-wait_for_registry

-

-# services can end up on any IP.	Make sure we get the IP we need for the docker registry

-DOCKER_REGISTRY=$(oc get --output-version=v1beta3 --template="{{ .spec.portalIP }}:{{ with index .spec.ports 0 }}{{ .port }}{{ end }}" service docker-registry)

-

-registry="$(dig @${API_HOST} "docker-registry.default.svc.cluster.local." +short A | head -n 1)"

-[[ -n "${registry}" && "${registry}:5000" == "${DOCKER_REGISTRY}" ]]

-

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

-wait_for_url_timed "http://${DOCKER_REGISTRY}/healthz" "[INFO] Docker registry says: " $((2*TIME_MIN))

-

-[ "$(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'..."

-oc login -u e2e-user -p pass

-[ "$(oc whoami | grep 'e2e-user')" ]

- 

-# make sure viewers can see oc status

-oc status -n default

-

-oc project cache

-token=$(oc config view --flatten -o template -t '{{with index .users 0}}{{.user.token}}{{end}}')

-[[ -n ${token} ]]

-

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

-docker login -u e2e-user -p ${token} -e e2e-user@openshift.com ${DOCKER_REGISTRY}

-echo "[INFO] Docker login successful"

-

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

-docker tag -f openshift/ruby-20-centos7:latest ${DOCKER_REGISTRY}/cache/ruby-20-centos7:latest

-docker push ${DOCKER_REGISTRY}/cache/ruby-20-centos7:latest

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

-

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

-oc project ${CLUSTER_ADMIN_CONTEXT}

-[ "$(oc whoami | grep 'system:admin')" ]

-

-# 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"

-wait_for_command "oc get -n test serviceaccount/builder -o yaml | grep dockercfg > /dev/null" $((60*TIME_SEC))

-

-# Process template and create

-echo "[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"

-oc process -n test -f examples/sample-app/application-template-stibuild.json > "${STI_CONFIG_FILE}"

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

-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"

-oc login -u e2e-user

-oc project test

-oc whoami

-

-echo "[INFO] Applying STI application config"

-oc create -f "${STI_CONFIG_FILE}"

-

-# Wait for build which should have triggered automatically

-echo "[INFO] Starting build from ${STI_CONFIG_FILE} and streaming its logs..."

-#oc start-build -n test ruby-sample-build --follow

-wait_for_build_start "test"

-# Ensure that the build pod doesn't allow exec

-[ "$(oc rsh ${BUILD_ID}-build 2>&1 | grep 'forbidden')" ]

-wait_for_build "test"

-wait_for_app "test"

-

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

-set +e

-oc start-build test --commit=fffffff --wait && echo "The build was supposed to fail, but it succeeded." && exit 1

-set -e

-

-# Remote command execution

-echo "[INFO] Validating exec"

-frontend_pod=$(oc get pod -l deploymentconfig=frontend -t '{{(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

-oc exec -p ${frontend_pod} id | grep 10

-

-# Port forwarding

-echo "[INFO] Validating port-forward"

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

-wait_for_url_timed "http://localhost:10080" "[INFO] Frontend says: " $((10*TIME_SEC))

-

-

-

-#echo "[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"

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

-#wait_for_build "docker"

-#wait_for_app "docker"

-

-#echo "[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"

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

-#wait_for_build "custom"

-#wait_for_app "custom"

-

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

-oc project ${CLUSTER_ADMIN_CONTEXT}

-

-# ensure the router is started

-# TODO: simplify when #4702 is fixed upstream

-wait_for_command '[[ "$(oc get endpoints router --output-version=v1beta3 -t "{{ if .subsets }}{{ len .subsets }}{{ else }}0{{ end }}" || echo "0")" != "0" ]]' $((5*TIME_MIN))

-

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

-# use the docker bridge ip address until there is a good way to get the auto-selected address from master

-# this address is considered stable

-# used as a resolve IP to test routing

-CONTAINER_ACCESSIBLE_API_HOST="${CONTAINER_ACCESSIBLE_API_HOST:-172.17.42.1}"

-validate_response "-s -k --resolve www.example.com:443:${CONTAINER_ACCESSIBLE_API_HOST} https://www.example.com" "Hello from OpenShift" 0.2 50

-

-

-# Pod node selection

-echo "[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

-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"

-oc process -n node-selector -v NODE_NAME="${KUBELET_HOST}" -f test/node-selector/pods.json | oc create -n node-selector -f -

-# The pod without a node name should fail to schedule

-wait_for_command "oc get events -n node-selector | grep pod-without-node-name | grep failedScheduling"        $((20*TIME_SEC))

-# The pod with a node name should be rejected by the kubelet

-wait_for_command "oc get events -n node-selector | grep pod-with-node-name    | grep NodeSelectorMismatching" $((20*TIME_SEC))

-

-

-# Image pruning

-echo "[INFO] Validating image pruning"

-docker pull busybox

-docker pull gcr.io/google_containers/pause

-docker pull openshift/hello-openshift

-

-# tag and push 1st image - layers unique to this image will be pruned

-docker tag -f busybox ${DOCKER_REGISTRY}/cache/prune

-docker push ${DOCKER_REGISTRY}/cache/prune

-

-# tag and push 2nd image - layers unique to this image will be pruned

-docker tag -f openshift/hello-openshift ${DOCKER_REGISTRY}/cache/prune

-docker push ${DOCKER_REGISTRY}/cache/prune

-

-# tag and push 3rd image - it won't be pruned

-docker tag -f gcr.io/google_containers/pause ${DOCKER_REGISTRY}/cache/prune

-docker push ${DOCKER_REGISTRY}/cache/prune

-

-# record the storage before pruning

-registry_pod=$(oc get pod -l deploymentconfig=docker-registry -t '{{(index .items 0).metadata.name}}')

-oc exec -p ${registry_pod} du /registry > ${LOG_DIR}/prune-images.before.txt

-

-# set up pruner user

-oadm policy add-cluster-role-to-user system:image-pruner e2e-pruner

-oc login -u e2e-pruner -p pass

-

-# run image pruning

-oadm prune images --keep-younger-than=0 --keep-tag-revisions=1 --confirm &> ${LOG_DIR}/prune-images.log

-! grep error ${LOG_DIR}/prune-images.log

-

-oc project ${CLUSTER_ADMIN_CONTEXT}

-# record the storage after pruning

-oc exec -p ${registry_pod} du /registry > ${LOG_DIR}/prune-images.after.txt

-

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

-[ -n "$(diff ${LOG_DIR}/prune-images.before.txt ${LOG_DIR}/prune-images.after.txt)" ]

-

-

-# UI e2e tests can be found in assets/test/e2e

-if [[ "$TEST_ASSETS" == "true" ]]; then

-

-	if [[ "$TEST_ASSETS_HEADLESS" == "true" ]]; then

-		echo "[INFO] Starting virtual framebuffer for headless tests..."

-		export DISPLAY=:10

-		Xvfb :10 -screen 0 1024x768x24 -ac &

-	fi

-

-	echo "[INFO] Running UI e2e tests at time..."

-	echo `date`

-	pushd ${OS_ROOT}/assets > /dev/null

-		grunt test-e2e

-	echo "UI  e2e done at time "

-	echo `date`

-

-	popd > /dev/null

+${OS_ROOT}/hack/test-end-to-end-scenario.sh

-fi

@@ -31,10 +31,12 @@ function setup_env_vars {

 	# Use either the latest release built images, or latest.

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

 		IMAGES='openshift/origin-${component}:latest'

+		export TAG=latest

 		export USE_IMAGES=${IMAGES}

 		if [[ -e "${OS_ROOT}/_output/local/releases/.commit" ]]; then

 			COMMIT="$(cat "${OS_ROOT}/_output/local/releases/.commit")"

 			IMAGES="openshift/origin-\${component}:${COMMIT}"

+			export TAG=${COMMIT}

 			export USE_IMAGES=${IMAGES}

 		fi

 	fi

@@ -381,7 +383,7 @@ reset_tmp_dir() {

 		sudo rm -rf ${BASETMPDIR}

 	fi

-	mkdir -p ${BASETMPDIR} ${LOG_DIR} ${ARTIFACT_DIR} ${FAKE_HOME_DIR}

+	mkdir -p ${BASETMPDIR} ${LOG_DIR} ${ARTIFACT_DIR} ${FAKE_HOME_DIR} ${VOLUME_DIR}

 	set -e

 }

@@ -500,6 +502,30 @@ function wait_for_registry {

 	wait_for_command '[[ "$(oc get endpoints docker-registry --output-version=v1 -t "{{ if .subsets }}{{ len .subsets }}{{ else }}0{{ end }}" --config=${ADMIN_KUBECONFIG} || echo "0")" != "0" ]]' $((5*TIME_MIN))

 }

+

+# Wait for builds to start

+# $1 namespace

+function os::build:wait_for_start() {

+	echo "[INFO] Waiting for $1 namespace build to start"

+	wait_for_command "oc get -n $1 builds | grep -i running" $((10*TIME_MIN)) "oc get -n $1 builds | grep -i -e failed -e error"

+	BUILD_ID=`oc get -n $1 builds  --output-version=v1 -t "{{with index .items 0}}{{.metadata.name}}{{end}}"`

+	echo "[INFO] Build ${BUILD_ID} started"

+}

+

+# Wait for builds to complete

+# $1 namespace

+function os::build:wait_for_end() {

+	echo "[INFO] Waiting for $1 namespace build to complete"

+	wait_for_command "oc get -n $1 builds | grep -i complete" $((10*TIME_MIN)) "oc get -n $1 builds | grep -i -e failed -e error"

+	BUILD_ID=`oc get -n $1 builds --output-version=v1beta3 -t "{{with index .items 0}}{{.metadata.name}}{{end}}"`

+	echo "[INFO] Build ${BUILD_ID} finished"

+	# TODO: fix

+	set +e

+	oc build-logs -n $1 $BUILD_ID > $LOG_DIR/$1build.log

+	set -e

+}

+

+

 ######

 # end of common functions for extended test group's run.sh scripts

 ######