@@ -16,3 +16,4 @@ origin.iml

 *.pyc

 .tag*

 .project

+*.go~

@@ -385,6 +385,7 @@ 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

@@ -394,8 +395,13 @@ if [[ "$TEST_ASSETS" == "true" ]]; then

 		Xvfb :10 -screen 0 1024x768x24 -ac &

 	fi

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

+	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,136 +14,38 @@ source ${OS_ROOT}/hack/util.sh

 source ${OS_ROOT}/hack/common.sh

-cleanup() {

-	out=$?

-	set +e

-	

-	echo "[INFO] Tearing down test"

-	kill_all_processes

-	rm -rf ${ETCD_DIR-}

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

-	echo "[INFO] Cleanup complete"

-	echo "[INFO] Exiting"

-	exit $out

-}

-

-# Check if we have ginkgo command

 set -e

-which ginkgo &>/dev/null || (echo 'Run: "go get github.com/onsi/ginkgo/ginkgo"' && exit 1)

+ginkgo_check_extended

 set +e

-# Compile the extended tests first to avoid waiting for OpenShift server to

-# start and fail sooner on compilation errors.

-echo "[INFO] Compiling test/extended package ..."

-GOPATH="${OS_ROOT}/Godeps/_workspace:${GOPATH}" \

-  go test -c ./test/extended -o ${OS_OUTPUT_BINPATH}/extended.test || exit 1

+compile_extended

 test_privileges

 echo "[INFO] Starting 'default' extended tests"

-TIME_SEC=1000

-TIME_MIN=$((60 * $TIME_SEC))

+dirs_image_env_setup_extended

-TEST_TYPE="openshift-extended-tests"

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

-BASETMPDIR="${TMPDIR}/${TEST_TYPE}"

-

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

-	remove_tmp_dir $TEST_TYPE

-fi

-

-mkdir -p ${BASETMPDIR}

-

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

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

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

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

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

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

-	fi

-fi

-

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

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

-DEFAULT_SERVER_IP=`ifconfig | grep -Ev "(127.0.0.1|172.17.42.1)" | grep "inet " | head -n 1 | sed 's/adr://' | awk '{print $2}'`

-API_HOST="${API_HOST:-${DEFAULT_SERVER_IP}}"

 setup_env_vars

-mkdir -p $LOG_DIR $ARTIFACT_DIR

-

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

-

-STI_CONFIG_FILE="${LOG_DIR}/stiAppConfig.json"

-DOCKER_CONFIG_FILE="${LOG_DIR}/dockerAppConfig.json"

-CUSTOM_CONFIG_FILE="${LOG_DIR}/customAppConfig.json"

 trap "exit" INT TERM

-trap "cleanup" EXIT

-

-# Setup

-echo "[INFO] `openshift version`"

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

-echo "[INFO] Test artifacts will be in: ${ARTIFACT_DIR}"

-echo "[INFO] Volumes dir is:            ${VOLUME_DIR}"

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

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

-

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

-echo "[INFO] Create certificates for the OpenShift server"

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

-ALL_IP_ADDRESSES=`ifconfig | grep "inet " | sed 's/adr://' | awk '{print $2}'`

-SERVER_HOSTNAME_LIST="${PUBLIC_MASTER_HOST},localhost"

-while read -r IP_ADDRESS

-do

-	SERVER_HOSTNAME_LIST="${SERVER_HOSTNAME_LIST},${IP_ADDRESS}"

-done <<< "${ALL_IP_ADDRESSES}"

+trap "cleanup_extended" EXIT

-configure_os_server

-

-export HOME="${FAKE_HOME_DIR}"

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

-mkdir -p ${FAKE_HOME_DIR}

-

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

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

+info_msgs_ip_host_setup_extended

-if [[ "${API_SCHEME}" == "https" ]]; then

-	export CURL_CA_BUNDLE="${MASTER_CONFIG_DIR}/ca.crt"

-	export CURL_CERT="${MASTER_CONFIG_DIR}/admin.crt"

-	export CURL_KEY="${MASTER_CONFIG_DIR}/admin.key"

+configure_os_server

-	# Make oc use ${MASTER_CONFIG_DIR}/admin.kubeconfig, and ignore anything in the running user's $HOME dir

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

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

-fi

+auth_setup_extended

 start_os_server

-# install the router

-echo "[INFO] Installing the router"

-echo '{"kind":"ServiceAccount","apiVersion":"v1","metadata":{"name":"router"}}' | oc create -f - --config="${ADMIN_KUBECONFIG}"

-oc get scc privileged -o json --config="${ADMIN_KUBECONFIG}" | sed '/\"users\"/a \"system:serviceaccount:default:router\",' | oc replace scc privileged -f - --config="${ADMIN_KUBECONFIG}"

-openshift admin router --create --credentials="${MASTER_CONFIG_DIR}/openshift-router.kubeconfig" --config="${ADMIN_KUBECONFIG}" --images="${USE_IMAGES}" --service-account=router

+install_router_extended

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

-echo "[INFO] Installing the registry"

-openshift admin registry --create --credentials="${MASTER_CONFIG_DIR}/openshift-registry.kubeconfig" --config="${ADMIN_KUBECONFIG}" --images="${USE_IMAGES}"

+install_registry_extended

 wait_for_command '[[ "$(oc get endpoints docker-registry --output-version=v1 -t "{{ if .subsets }}{{ len .subsets }}{{ else }}0{{ end }}" --config=/tmp/openshift-extended-tests/openshift.local.config/master/admin.kubeconfig || echo "0")" != "0" ]]' $((5*TIME_MIN))

-echo "[INFO] Creating image streams"

-oc create -n openshift -f examples/image-streams/image-streams-centos7.json --config="${ADMIN_KUBECONFIG}"

-

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

-echo "[INFO] Registry IP - ${registry}"

+create_image_streams_extended

 echo "[INFO] MASTER IP - ${MASTER_ADDR}"

 echo "[INFO] SERVER CONFIG PATH - ${SERVER_CONFIG_DIR}"

new file mode 100755

@@ -0,0 +1,64 @@

+#!/bin/bash

+#

+# This scripts starts the OpenShift server where

+# the OpenShift Docker registry and router are installed,

+# and then the forcepull tests are launched.

+# We intentionally do not run the force pull tests in parallel

+# given the tagging based image corruption that occurs - do not

+# want 2 tests corrupting an image differently at the same time.

+

+set -o nounset

+set -o pipefail

+

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

+cd "${OS_ROOT}"

+

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

+source ${OS_ROOT}/hack/common.sh

+

+

+set -e

+ginkgo_check_extended

+set +e

+

+compile_extended

+

+test_privileges

+

+echo "[INFO] Starting 'forcepull' extended tests"

+

+dirs_image_env_setup_extended

+

+setup_env_vars

+

+trap "exit" INT TERM

+trap "cleanup_extended" EXIT

+

+info_msgs_ip_host_setup_extended

+

+configure_os_server

+

+auth_setup_extended

+

+start_os_server

+

+install_router_extended

+

+install_registry_extended

+

+# I've seen this hang, even though when I run it manually concurrently it works ... simply bypassing this check has simply accelerated the test ... so far, not seeing value in this verification ... the registry seems to come up consistently

+#wait_for_command '[[ "$(oc get endpoints docker-registry --output-version=v1 -t "{{ if .subsets }}{{ len .subsets }}{{ else }}0{{ end }}" --config=/tmp/openshift-extended-tests/openshift.local.config/master/admin.kubeconfig || echo "0")" != "0" ]]' $((5*TIME_MIN))

+

+create_image_streams_extended

+

+echo "[INFO] MASTER IP - ${MASTER_ADDR}"

+echo "[INFO] SERVER CONFIG PATH - ${SERVER_CONFIG_DIR}"

+echo "[INFO] Starting extended tests for forcepull ..."

+

+# Run the tests

+pushd ${OS_ROOT}/test/extended >/dev/null

+export KUBECONFIG="${ADMIN_KUBECONFIG}"

+export EXTENDED_TEST_PATH="${OS_ROOT}/test/extended"

+# we don't run in parallel with this suite - do not want different tests tagging the same image in different was at the same time

+ginkgo -progress -stream -v -focus="forcepull:" ${OS_OUTPUT_BINPATH}/extended.test

+popd >/dev/null

@@ -71,18 +71,26 @@ function configure_os_server {

 # start_os_server starts the OS server, exports the PID of the OS server

 # and waits until OS server endpoints are available

 function start_os_server {

-  echo "[INFO] Starting OpenShift server"

-  sudo env "PATH=${PATH}" OPENSHIFT_PROFILE=web OPENSHIFT_ON_PANIC=crash openshift start \

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

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

-    --loglevel=4 \

-    &> "${BASETMPDIR}/openshift.log" &

-  export OS_PID=$!

-

-  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_url "${API_SCHEME}://${API_HOST}:${API_PORT}/api/v1/nodes/${KUBELET_HOST}" "apiserver(nodes): " 0.25 80

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

+    ps -ef | grep openshift

+    echo "[INFO] Starting OpenShift server"

+    sudo env "PATH=${PATH}" OPENSHIFT_PROFILE=web OPENSHIFT_ON_PANIC=crash openshift start \

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

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

+	 --loglevel=4 \

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

+    export OS_PID=$!

+

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

+    echo `date`

+  

+    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_url "${API_SCHEME}://${API_HOST}:${API_PORT}/api/v1/nodes/${KUBELET_HOST}" "apiserver(nodes): " 0.25 80

+    

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

+    echo `date`

 }

 # test_privileges tests if the testing machine has iptables available

@@ -217,7 +225,7 @@ function wait_for_url {

   set +e

   cmd="env -i CURL_CA_BUNDLE=${CURL_CA_BUNDLE:-} $(which curl) ${clientcert_args} -fs ${url}"

-  #echo "run: ${cmd}"

+  echo "wait_for_url - run: ${cmd}"

   for i in $(seq 1 $times); do

     out=$(${cmd})

     if [ $? -eq 0 ]; then

@@ -225,6 +233,7 @@ function wait_for_url {

       echo "${prefix}${out}"

       return 0

     fi

+    echo " wait_for_url: ${cmd} non zero rc: ${out}"

     sleep $wait

   done

   echo "ERROR: gave up waiting for ${url}"

@@ -403,6 +412,146 @@ function delete_large_and_empty_logs()

   find ${LOG_DIR} -name *.log -size 0 -exec echo Deleting {} because it is empty. \; -exec rm -f {} \;

 }

+######

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

+######

+

+# exit run if ginkgo not installed

+function ginkgo_check_extended {

+    which ginkgo &>/dev/null || (echo 'Run: "go get github.com/onsi/ginkgo/ginkgo"' && exit 1)

+}

+

+# create extended.test binary to run extended tests

+function compile_extended {

+    # Compile the extended tests first to avoid waiting for OpenShift server to

+    # start and fail sooner on compilation errors.

+    echo "[INFO] Compiling test/extended package ..."

+    GOPATH="${OS_ROOT}/Godeps/_workspace:${GOPATH}" \

+	  go test -c ./test/extended -o ${OS_OUTPUT_BINPATH}/extended.test || exit 1

+    export GOPATH

+}

+

+# various env var and setup for directories and image related information

+function dirs_image_env_setup_extended {

+    export TIME_SEC=1000

+    export TIME_MIN=$((60 * $TIME_SEC))

+

+    export TEST_TYPE="openshift-extended-tests"

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

+    export BASETMPDIR="${TMPDIR}/${TEST_TYPE}"

+

+    if [[ -d "${BASETMPDIR}" ]]; then

+	remove_tmp_dir $TEST_TYPE

+    fi

+

+    mkdir -p ${BASETMPDIR}

+

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

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

+	export USE_IMAGES='openshift/origin-${component}:latest'

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

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

+	    export USE_IMAGES="openshift/origin-\${component}:${COMMIT}"

+	fi

+    fi

+

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

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

+    export DEFAULT_SERVER_IP=`ifconfig | grep -Ev "(127.0.0.1|172.17.42.1)" | grep "inet " | head -n 1 | sed 's/adr://' | awk '{print $2}'`

+    export API_HOST="${API_HOST:-${DEFAULT_SERVER_IP}}"

+    mkdir -p $LOG_DIR $ARTIFACT_DIR

+}

+

+# cleanup function for the extended tests

+function cleanup_extended {

+	out=$?

+	set +e

+	

+	echo "[INFO] Tearing down test"

+	kill_all_processes

+	rm -rf ${ETCD_DIR-}

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

+	echo "[INFO] Cleanup complete"

+	echo "[INFO] Exiting"

+	exit $out

+}    

+

+# ip/host setup function for the extended tests, along with some debug

+function info_msgs_ip_host_setup_extended {

+    echo "[INFO] `openshift version`"

+    echo "[INFO] Server logs will be at:    ${LOG_DIR}/openshift.log"

+    echo "[INFO] Test artifacts will be in: ${ARTIFACT_DIR}"

+    echo "[INFO] Volumes dir is:            ${VOLUME_DIR}"

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

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

+

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

+    echo "[INFO] Create certificates for the OpenShift server"

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

+    ALL_IP_ADDRESSES=`ifconfig | grep "inet " | sed 's/adr://' | awk '{print $2}'`

+    SERVER_HOSTNAME_LIST="${PUBLIC_MASTER_HOST},localhost"

+    while read -r IP_ADDRESS

+    do

+	SERVER_HOSTNAME_LIST="${SERVER_HOSTNAME_LIST},${IP_ADDRESS}"

+    done <<< "${ALL_IP_ADDRESSES}"

+    export ALL_IP_ADDRESSES

+    export SERVER_HOSTNAME_LIST

+}

+

+# auth set up for extended tests

+function auth_setup_extended {

+    export HOME="${FAKE_HOME_DIR}"

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

+    mkdir -p ${FAKE_HOME_DIR}

+

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

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

+

+    if [[ "${API_SCHEME}" == "https" ]]; then

+	export CURL_CA_BUNDLE="${MASTER_CONFIG_DIR}/ca.crt"

+	export CURL_CERT="${MASTER_CONFIG_DIR}/admin.crt"

+	export CURL_KEY="${MASTER_CONFIG_DIR}/admin.key"

+

+	# Make oc use ${MASTER_CONFIG_DIR}/admin.kubeconfig, and ignore anything in the running user's $HOME dir

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

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

+    fi

+

+}

+

+# install the router for the extended tests

+function install_router_extended {

+    echo "[INFO] Installing the router"

+    echo '{"kind":"ServiceAccount","apiVersion":"v1","metadata":{"name":"router"}}' | oc create -f - --config="${ADMIN_KUBECONFIG}"

+    oc get scc privileged -o json --config="${ADMIN_KUBECONFIG}" | sed '/\"users\"/a \"system:serviceaccount:default:router\",' | oc replace scc privileged -f - --config="${ADMIN_KUBECONFIG}"

+    openshift admin router --create --credentials="${MASTER_CONFIG_DIR}/openshift-router.kubeconfig" --config="${ADMIN_KUBECONFIG}" --images="${USE_IMAGES}" --service-account=router

+}

+

+# install registry for the extended tests

+function install_registry_extended {

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

+    echo "[INFO] Installing the registry"

+    openshift admin registry --create --credentials="${MASTER_CONFIG_DIR}/openshift-registry.kubeconfig" --config="${ADMIN_KUBECONFIG}" --images="${USE_IMAGES}"

+}

+

+# create the images streams for the extended tests suites

+function create_image_streams_extended {

+    echo "[INFO] Creating image streams"

+    oc create -n openshift -f examples/image-streams/image-streams-centos7.json --config="${ADMIN_KUBECONFIG}"

+

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

+    echo "[INFO] Registry IP - ${registry}"

+}

+

+######

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

+######

+

 # Handler for when we exit automatically on an error.

 # Borrowed from https://gist.github.com/ahendrix/7030300

 os::log::errexit() {

@@ -539,4 +688,4 @@ find_files() {

         -o -wholename '*/Godeps/*' \

       \) -prune \

     \) -name '*.go' | sort -u

-}

\ No newline at end of file

+}

new file mode 100644

@@ -0,0 +1,190 @@

+package builds

+

+/*

+This particular builds test suite is not part of the "default" group,  because its testing

+centers around manipulation of images tags to confirm whether the `docker pull` invocation occurs

+correctly based on `forcePull` setting in the BuildConfig, and rather than spend time creating / pulling down separate, test only,

+images for each test scenario, we reuse existing images and ensure that the tests do not run in parallel, and step on each

+others toes by tagging the same, existing images in ways which conflict.

+*/

+

+import (

+	"fmt"

+

+	g "github.com/onsi/ginkgo"

+	o "github.com/onsi/gomega"

+

+	exutil "github.com/openshift/origin/test/extended/util"

+	"time"

+)

+

+var (

+	resetData map[string]string

+)

+

+const (

+	buildPrefix = "ruby-sample-build"

+	buildName   = buildPrefix + "-1"

+	s2iDockBldr = "docker.io/openshift/ruby-20-centos7"

+	custBldr    = "docker.io/openshift/origin-custom-docker-builder"

+)

+

+/*

+If docker.io is not responding to requests in a timely manner, this test suite will be adversely affected.

+

+If you suspect such a situation, attempt pulling some openshift images other than ruby-20-centos7 or origin-custom-docker-builder

+while this test is running and compare results.  Restarting your docker daemon, assuming you can ping docker.io quickly, could

+be a quick fix.

+*/

+

+var _ = g.BeforeSuite(func() {

+	// do a pull initially just to insure have the latest version

+	exutil.PullImage(s2iDockBldr)

+	exutil.PullImage(custBldr)

+	// save hex image IDs for image reset after corruption

+	tags := []string{s2iDockBldr + ":latest", custBldr + ":latest"}

+	hexIDs, ierr := exutil.GetImageIDForTags(tags)

+	o.Expect(ierr).NotTo(o.HaveOccurred())

+	for _, hexID := range hexIDs {

+		g.By(fmt.Sprintf("\n%s FORCE PULL TEST:  hex id %s ", time.Now().Format(time.RFC850), hexID))

+	}

+	o.Expect(len(hexIDs)).To(o.Equal(2))

+	resetData = map[string]string{s2iDockBldr: hexIDs[0], custBldr: hexIDs[1]}

+	g.By(fmt.Sprintf("\n%s FORCE PULL TEST:  hex id for s2i/docker %s and for custom %s ", time.Now().Format(time.RFC850), hexIDs[0], hexIDs[1]))

+})

+

+var _ = g.Describe("forcepull: ForcePull from OpenShift induced builds (vs. sti)", func() {

+	defer g.GinkgoRecover()

+

+	g.Describe("\n FORCE PULL TEST:  Force pull and s2i builder", func() {

+		// corrupt the s2i builder image

+		g.BeforeEach(func() {

+			exutil.CorruptImage(s2iDockBldr, custBldr, "s21")

+		})

+

+		g.AfterEach(func() {

+			exutil.ResetImage(resetData)

+		})

+

+		g.Context("\n FORCE PULL TEST:  when s2i force pull is false and the image is bad", func() {

+			var (

+				oc = exutil.NewCLI("force-pull-s2i-false-env", exutil.KubeConfigPath())

+			)

+			g.It("\n FORCE PULL TEST s2i false", func() {

+				fpFalseS2I := exutil.FixturePath("fixtures", "forcepull-false-s2i.json")

+				g.By(fmt.Sprintf("\n%s FORCE PULL TEST s2i false:  calling create on %s", time.Now().Format(time.RFC850), fpFalseS2I))

+				exutil.StartBuild(fpFalseS2I, buildPrefix, oc)

+

+				exutil.WaitForBuild("FORCE PULL TEST s2i false:  ", buildName, oc)

+

+				exutil.VerifyImagesSame(s2iDockBldr, custBldr, "FORCE PULL TEST s2i false:  ")

+

+			})

+		})

+

+		g.Context("\n FORCE PULL TEST:  when s2i force pull is true and the image is bad", func() {

+			var (

+				oc = exutil.NewCLI("force-pull-s2i-true-env", exutil.KubeConfigPath())

+			)

+			g.It("\n FORCE PULL TEST s2i true", func() {

+				fpTrueS2I := exutil.FixturePath("fixtures", "forcepull-true-s2i.json")

+				g.By(fmt.Sprintf("\n%s FORCE PULL TEST s2i true:  calling create on %s", time.Now().Format(time.RFC850), fpTrueS2I))

+				exutil.StartBuild(fpTrueS2I, buildPrefix, oc)

+

+				exutil.WaitForBuild("FORCE PULL TEST s2i true: ", buildName, oc)

+

+				exutil.VerifyImagesDifferent(s2iDockBldr, custBldr, "FORCE PULL TEST s2i true:  ")

+			})

+		})

+	})

+

+	g.Describe("\n FORCE PULL TEST:  Force pull and docker builder", func() {

+		// corrupt the docker builder image

+		g.BeforeEach(func() {

+			exutil.CorruptImage(s2iDockBldr, custBldr, "docker")

+		})

+

+		g.AfterEach(func() {

+			exutil.ResetImage(resetData)

+		})

+

+		g.Context("\n FORCE PULL TEST:  when docker force pull is false and the image is bad", func() {

+			var (

+				oc = exutil.NewCLI("force-pull-dock-false-env", exutil.KubeConfigPath())

+			)

+			g.It("\n FORCE PULL TEST dock false", func() {

+				fpFalseDock := exutil.FixturePath("fixtures", "forcepull-false-dock.json")

+				g.By(fmt.Sprintf("\n%s FORCE PULL TEST dock false:  calling create on %s", time.Now().Format(time.RFC850), fpFalseDock))

+				exutil.StartBuild(fpFalseDock, buildPrefix, oc)

+

+				exutil.WaitForBuild("FORCE PULL TEST dock false", buildName, oc)

+

+				exutil.VerifyImagesSame(s2iDockBldr, custBldr, "FORCE PULL TEST docker false:  ")

+

+			})

+		})

+

+		g.Context("\n FORCE PULL TEST:  docker when force pull is true and the image is bad", func() {

+			var (

+				oc = exutil.NewCLI("force-pull-dock-true-env", exutil.KubeConfigPath())

+			)

+			g.It("\n FORCE PULL TEST dock true", func() {

+				fpTrueDock := exutil.FixturePath("fixtures", "forcepull-true-dock.json")

+				g.By(fmt.Sprintf("\n%s FORCE PULL TEST dock true:  calling create on %s", time.Now().Format(time.RFC850), fpTrueDock))

+				exutil.StartBuild(fpTrueDock, buildPrefix, oc)

+

+				exutil.WaitForBuild("FORCE PULL TEST dock true", buildName, oc)

+

+				exutil.VerifyImagesDifferent(s2iDockBldr, custBldr, "FORCE PULL TEST docker true:  ")

+

+			})

+		})

+	})

+

+	g.Describe("\n FORCE PULL TEST:  Force pull and custom builder", func() {

+		// corrupt the custom builder image

+		g.BeforeEach(func() {

+			exutil.CorruptImage(custBldr, s2iDockBldr, "custom")

+		})

+

+		g.AfterEach(func() {

+			exutil.ResetImage(resetData)

+		})

+

+		g.Context("\n FORCE PULL TEST:  when custom force pull is false and the image is bad", func() {

+			var (

+				oc = exutil.NewCLI("force-pull-cust-false-env", exutil.KubeConfigPath())

+			)

+			g.It("\nFORCE PULL TEST cust false", func() {

+				fpFalseCust := exutil.FixturePath("fixtures", "forcepull-false-cust.json")

+				g.By(fmt.Sprintf("\n%s FORCE PULL TEST cust false:  calling create on %s", time.Now().Format(time.RFC850), fpFalseCust))

+				exutil.StartBuild(fpFalseCust, buildPrefix, oc)

+

+				g.By("\nFORCE PULL TEST cust false:  expecting the image is not refreshed")

+

+				exutil.WaitForBuild("FORCE PULL TEST cust false", buildName, oc)

+

+				exutil.VerifyImagesSame(s2iDockBldr, custBldr, "FORCE PULL TEST custom false:  ")

+			})

+		})

+

+		g.Context("\n FORCE PULL TEST:  when custom force pull is true and the image is bad", func() {

+			var (

+				oc = exutil.NewCLI("force-pull-cust-true-env", exutil.KubeConfigPath())

+			)

+			g.It("\n FORCE PULL TEST cust true", func() {

+				fpTrueCust := exutil.FixturePath("fixtures", "forcepull-true-cust.json")

+				g.By(fmt.Sprintf("\n%s FORCE PULL TEST cust true:  calling create on %s", time.Now().Format(time.RFC850), fpTrueCust))

+				exutil.StartBuild(fpTrueCust, buildPrefix, oc)

+

+				g.By("\n FORCE PULL TEST cust true:  expecting the image is refreshed")

+

+				exutil.WaitForBuild("FORCE PULL TEST cust true", buildName, oc)

+

+				exutil.VerifyImagesDifferent(s2iDockBldr, custBldr, "FORCE PULL TEST custom true:  ")

+

+			})

+		})

+

+	})

+})

new file mode 100644

@@ -0,0 +1,37 @@

+{

+    "kind": "BuildConfig",

+    "apiVersion": "v1",

+    "metadata": {

+        "name": "ruby-sample-build",

+        "creationTimestamp": null,

+        "labels": {

+            "name": "ruby-sample-build"

+        }

+    },

+    "spec": {

+        "triggers": [],

+        "source": {

+            "type": "Git",

+            "git": {

+		"uri": "https://github.com/openshift/ruby-hello-world.git"

+            }

+        },

+        "strategy": {

+            "type": "Custom",

+            "customStrategy": {

+		"from": {

+		    "kind": "DockerImage",

+		    "name": "docker.io/openshift/origin-custom-docker-builder"

+		},

+		"env": [

+		    {

+			"name": "OPENSHIFT_CUSTOM_BUILD_BASE_IMAGE",

+			"value": "docker.io/openshift/origin-custom-docker-builder"

+		    }

+		],

+		"exposeDockerSocket": true,

+		"forcePull":false

+            }

+        }

+    }

+}

new file mode 100644

@@ -0,0 +1,30 @@

+{

+    "kind": "BuildConfig",

+    "apiVersion": "v1",

+    "metadata": {

+        "name": "ruby-sample-build",

+        "creationTimestamp": null,

+        "labels": {

+            "name": "ruby-sample-build"

+        }

+    },

+    "spec": {

+        "triggers": [],

+        "source": {

+            "type": "Git",

+            "git": {

+		"uri": "https://github.com/openshift/ruby-hello-world.git"

+            }

+        },

+        "strategy": {

+            "type": "Docker",

+            "dockerStrategy": {

+		"from": {

+		    "kind": "DockerImage",

+		    "name": "docker.io/openshift/ruby-20-centos7"

+		},

+		"forcePull": false

+            }

+        }

+    }

+}

new file mode 100644

@@ -0,0 +1,30 @@

+{

+    "kind": "BuildConfig",

+    "apiVersion": "v1",

+    "metadata": {

+        "name": "ruby-sample-build",

+        "creationTimestamp": null,

+        "labels": {

+            "name": "ruby-sample-build"

+        }

+    },

+    "spec": {

+        "triggers": [],

+        "source": {

+            "type": "Git",

+            "git": {

+		"uri": "https://github.com/openshift/ruby-hello-world.git"

+            }

+        },

+        "strategy": {

+            "type": "Source",

+            "sourceStrategy": {

+		"from": {

+		    "kind": "DockerImage",

+		    "name": "docker.io/openshift/ruby-20-centos7"

+		},

+		"forcePull": false

+            }

+        }

+    }

+}

new file mode 100644

@@ -0,0 +1,37 @@

+{

+    "kind": "BuildConfig",

+    "apiVersion": "v1",

+    "metadata": {

+        "name": "ruby-sample-build",

+        "creationTimestamp": null,

+        "labels": {

+            "name": "ruby-sample-build"

+        }

+    },

+    "spec": {

+        "triggers": [],

+        "source": {

+            "type": "Git",

+            "git": {

+		"uri": "https://github.com/openshift/ruby-hello-world.git"

+            }

+        },

+        "strategy": {

+            "type": "Custom",

+            "customStrategy": {

+		"from": {

+		    "kind": "DockerImage",

+		    "name": "docker.io/openshift/origin-custom-docker-builder"

+		},

+		"env": [

+		    {

+			"name": "OPENSHIFT_CUSTOM_BUILD_BASE_IMAGE",

+			"value": "docker.io/openshift/origin-custom-docker-builder"

+		    }

+		],

+		"exposeDockerSocket": true,

+		"forcePull":true

+            }

+        }

+    }

+}

new file mode 100644

@@ -0,0 +1,30 @@

+{

+    "kind": "BuildConfig",

+    "apiVersion": "v1",

+    "metadata": {

+        "name": "ruby-sample-build",

+        "creationTimestamp": null,

+        "labels": {

+            "name": "ruby-sample-build"

+        }

+    },

+    "spec": {

+        "triggers": [],

+        "source": {

+            "type": "Git",

+            "git": {

+		"uri": "https://github.com/openshift/ruby-hello-world.git"

+            }

+        },

+        "strategy": {

+            "type": "Docker",

+            "dockerStrategy": {

+		"from": {

+		    "kind": "DockerImage",

+		    "name": "docker.io/openshift/ruby-20-centos7"

+		},

+		"forcePull": true

+            }

+        }

+    }

+}

new file mode 100644

@@ -0,0 +1,30 @@

+{

+    "kind": "BuildConfig",

+    "apiVersion": "v1",

+    "metadata": {

+        "name": "ruby-sample-build",

+        "creationTimestamp": null,

+        "labels": {

+            "name": "ruby-sample-build"

+        }

+    },

+    "spec": {

+        "triggers": [],

+        "source": {

+            "type": "Git",

+            "git": {

+		"uri": "https://github.com/openshift/ruby-hello-world.git"

+            }

+        },

+        "strategy": {

+            "type": "Source",

+            "sourceStrategy": {

+		"from": {

+		    "kind": "DockerImage",

+		    "name": "docker.io/openshift/ruby-20-centos7"

+		},

+		"forcePull": true

+            }

+        }

+    }

+}

new file mode 100644

@@ -0,0 +1,86 @@

+package util

+

+import (

+	"fmt"

+	dockerClient "github.com/fsouza/go-dockerclient"

+	tutil "github.com/openshift/origin/test/util"

+)

+

+//TagImage, as the name implies, will apply the "tagor" tag string to the image current tagged by "tagee"

+func TagImage(tagee, tagor string) error {

+	client, dcerr := tutil.NewDockerClient()

+	if dcerr != nil {

+		return dcerr

+	}

+	opts := dockerClient.TagImageOptions{

+		Repo:  tagee,