@@ -2,43 +2,46 @@ package builds

 import (

 	"fmt"

+	"strings"

 	g "github.com/onsi/ginkgo"

 	o "github.com/onsi/gomega"

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

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

 )

 const (

-	buildPrefixFS = "ruby-sample-build-fs"

 	buildPrefixTS = "ruby-sample-build-ts"

-	buildPrefixFD = "ruby-sample-build-fd"

 	buildPrefixTD = "ruby-sample-build-td"

-	buildPrefixFC = "ruby-sample-build-fc"

 	buildPrefixTC = "ruby-sample-build-tc"

+)

-	corruptor = "docker.io/openshift/origin-deployer"

-

-	varSubSrc = "SERVICE_REGISTRY_IP"

+func scrapeLogs(bldPrefix string, oc *exutil.CLI) {

+	// kick off the app/lang build and verify the builder image accordingly

+	br, err := exutil.StartBuildAndWait(oc, bldPrefix)

+	o.ExpectWithOffset(1, err).NotTo(o.HaveOccurred())

-	bldr       = "forcepull-extended-test-builder"

-	bldrPrefix = "forcepull-bldr"

-)

+	out, err := br.Logs()

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

+	lines := strings.Split(out, "\n")

+	found := false

+	for _, line := range lines {

+		if strings.Contains(line, "Pulling image") && strings.Contains(line, "centos/ruby") {

+			fmt.Fprintf(g.GinkgoWriter, "\n\nfound pull image line %s\n\n", line)

+			found = true

+			break

+		}

+	}

-var (

-	resetData     map[string]string

-	authCfg       *dockerClient.AuthConfiguration

-	fullImageName string

-	tags          []string

-	varSubDest    string

-)

+	if !found {

+		fmt.Fprintf(g.GinkgoWriter, "\n\n build log dump on failed test:  %s\n\n", out)

+		o.Expect(found).To(o.BeTrue())

+	}

-func doTest(bldPrefix, debugStr string, same bool, oc *exutil.CLI) {

-	// corrupt the builder image

-	exutil.CorruptImage(fullImageName, corruptor)

+}

-	if bldPrefix == buildPrefixFC || bldPrefix == buildPrefixTC {

+func checkPodFlag(bldPrefix string, oc *exutil.CLI) {

+	if bldPrefix == buildPrefixTC {

 		// grant access to the custom build strategy

 		err := oc.AsAdmin().Run("adm").Args("policy", "add-cluster-role-to-user", "system:build-strategy-custom", oc.Username()).Execute()

 		o.Expect(err).NotTo(o.HaveOccurred())

@@ -52,78 +55,29 @@ func doTest(bldPrefix, debugStr string, same bool, oc *exutil.CLI) {

 	_, err := exutil.StartBuildAndWait(oc, bldPrefix)

 	o.ExpectWithOffset(1, err).NotTo(o.HaveOccurred())

-	if same {

-		exutil.VerifyImagesSame(fullImageName, corruptor, debugStr)

-	} else {

-		exutil.VerifyImagesDifferent(fullImageName, corruptor, debugStr)

-	}

+	out, err := oc.Run("get").Args("pods", bldPrefix+"-1-build", "-o", "jsonpath='{.spec.containers[0].imagePullPolicy}'").Output()

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

+	o.Expect(out).To(o.Equal("'Always'"))

-	// reset corrupted tagging for next test

-	exutil.ResetImage(resetData)

-	// dump tags/hexids for debug

-	_, err = exutil.DumpAndReturnTagging(tags)

-	o.ExpectWithOffset(1, err).NotTo(o.HaveOccurred())

 }

 /*

 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-22-centos7 or origin-custom-docker-builder

+If you suspect such a situation, attempt pulling some openshift images other than ruby-22-centos7

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

 be a quick fix.

-

-Also, in order to build the test case specific builder images only once, we currently have to do all the testing within a single g.It block.

-The project/namespace were being destroyed between tests, and that includes removal of the specific builder images

-we built.  The credentials also are recycled between those points.

-

-Dumping of the ImageStreams and Secrets JSON output at the various points proved this out.

 */

-var _ = g.Describe("[LocalNode][builds] forcePull should affect pulling builder images", func() {

+var _ = g.Describe("[builds] forcePull should affect pulling builder images", func() {

 	defer g.GinkgoRecover()

 	var oc = exutil.NewCLI("forcepull", exutil.KubeConfigPath())

 	g.BeforeEach(func() {

-		g.By("refresh corruptor, prep forcepull builder")

-		exutil.PullImage(corruptor, dockerClient.AuthConfiguration{})

-

-		exutil.DumpImage(corruptor)

-

-		// create the image streams and build configs for a test case specific builders

-		setupPath := exutil.FixturePath("testdata", "forcepull-setup.json")

-		err := exutil.CreateResource(setupPath, oc)

-

-		// kick off the build for the new builder image just for force pull so we can corrupt them without conflicting with

-		// any other tests potentially running in parallel

-		br, _ := exutil.StartBuildAndWait(oc, bldrPrefix)

-		br.AssertSuccess()

-

-		serviceIP, err := oc.Run("get").Args("svc", "docker-registry", "-n", "default", "--config", exutil.KubeConfigPath()).Template("{{.spec.clusterIP}}").Output()

-		o.Expect(err).NotTo(o.HaveOccurred())

-		port, err := oc.Run("get").Args("svc", "docker-registry", "-n", "default", "--config", exutil.KubeConfigPath()).Template("{{ $x := index .spec.ports 0}}{{$x.port}}").Output()

-		o.Expect(err).NotTo(o.HaveOccurred())

-		g.By(fmt.Sprintf("docker-registry service IP is %s and port %s ", serviceIP, port))

-

-		// get the auth so we can pull the build image from the internal docker registry since the builder controller will  remove it

-		// from the docker daemon cache when the docker build completes;

-		authCfg, err = exutil.BuildAuthConfiguration(serviceIP+":"+port, oc)

-

-		// now actually pull the image back in from the openshift internal docker registry

-		fullImageName = authCfg.ServerAddress + "/" + oc.Namespace() + "/" + bldr

-		err = exutil.PullImage(fullImageName, *authCfg)

-		o.Expect(err).NotTo(o.HaveOccurred())

-		exutil.DumpImage(fullImageName)

-

-		//update the build configs in the json for the app/lang builds to point to the builder images in the internal docker registry

-		// and then create the build config resources

-		pre := exutil.FixturePath("testdata", "forcepull-test.json")

-		post := exutil.ArtifactPath("forcepull-test.json")

-		varSubDest = authCfg.ServerAddress + "/" + oc.Namespace()

-

 		// grant access to the custom build strategy

 		g.By("granting system:build-strategy-custom")

-		err = oc.AsAdmin().Run("adm").Args("policy", "add-cluster-role-to-user", "system:build-strategy-custom", oc.Username()).Execute()

+		err := oc.AsAdmin().Run("adm").Args("policy", "add-cluster-role-to-user", "system:build-strategy-custom", oc.Username()).Execute()

 		o.Expect(err).NotTo(o.HaveOccurred())

 		defer func() {

@@ -131,17 +85,11 @@ var _ = g.Describe("[LocalNode][builds] forcePull should affect pulling builder

 			o.Expect(err).NotTo(o.HaveOccurred())

 		}()

-		err = exutil.VarSubOnFile(pre, post, map[string]string{varSubSrc: varSubDest})

-		o.Expect(err).NotTo(o.HaveOccurred())

-		err = exutil.CreateResource(post, oc)

+		g.By("create application build configs for 3 strategies")

+		apps := exutil.FixturePath("testdata", "forcepull-test.json")

+		err = exutil.CreateResource(apps, oc)

 		o.Expect(err).NotTo(o.HaveOccurred())

-		// dump the image textual tags and hex ids out for debug

-		tags = []string{fullImageName + ":latest", corruptor + ":latest"}

-		hexIDs, err := exutil.DumpAndReturnTagging(tags)

-		o.Expect(err).NotTo(o.HaveOccurred())

-		resetData = map[string]string{fullImageName: hexIDs[0], corruptor: hexIDs[1]}

-

 	})

 	g.Context("ForcePull test context  ", func() {

@@ -152,31 +100,29 @@ var _ = g.Describe("[LocalNode][builds] forcePull should affect pulling builder

 			o.Expect(err).NotTo(o.HaveOccurred())

 		})

-		g.It("ForcePull test case execution", func() {

-

-			g.By("when s2i force pull is false")

-

-			doTest(buildPrefixFS, "s2i false app/lang build", true, oc)

+		g.It("ForcePull test case execution s2i", func() {

 			g.By("when s2i force pull is true")

+			// run twice to ensure the builder image gets pulled even if it already exists on the node

+			scrapeLogs(buildPrefixTS, oc)

+			scrapeLogs(buildPrefixTS, oc)

-			doTest(buildPrefixTS, "s2i true app/lang build", false, oc)

-

-			g.By("when docker force pull is false")

+		})

-			doTest(buildPrefixFD, "dock false app/lang build", true, oc)

+		g.It("ForcePull test case execution docker", func() {

 			g.By("docker when force pull is true")

+			// run twice to ensure the builder image gets pulled even if it already exists on the node

+			scrapeLogs(buildPrefixTD, oc)

+			scrapeLogs(buildPrefixTD, oc)

-			doTest(buildPrefixTD, "dock true app/lang build", false, oc)

-

-			g.By("when custom force pull is false")

+		})

-			doTest(buildPrefixFC, "cust false app/lang build", true, oc)

+		g.It("ForcePull test case execution custom", func() {

 			g.By("when custom force pull is true")

-			doTest(buildPrefixTC, "cust true app/lang build", false, oc)

+			checkPodFlag(buildPrefixTC, oc)

 		})

deleted file mode 100644

@@ -1,56 +0,0 @@

-{

-	"kind": "List",

-	"apiVersion": "v1",

-	"metadata": {},

-	"items": [

-		{

-			"kind": "ImageStream",

-			"apiVersion": "v1",

-			"metadata": {

-				"name": "forcepull-extended-test-builder",

-				"creationTimestamp": null

-			},

-			"spec": {},

-			"status": {

-				"dockerImageRepository": ""

-			}

-		},

-		{

-			"kind": "BuildConfig",

-			"apiVersion": "v1",

-			"metadata": {

-				"name": "forcepull-bldr",

-				"creationTimestamp": null,

-				"labels": {

-					"name": "forcepull-bldr"

-				}

-			},

-			"spec": {

-				"triggers": [],

-				"source": {

-					"type": "Git",

-					"git": {

-						"uri": "https://github.com/gabemontero/forcepull-extended-test-builder.git"

-					}

-				},

-				"strategy": {

-					"type": "Docker",

-					"dockerStrategy": {

-						"env": [

-							{

-								"name": "BUILD_LOGLEVEL",

-								"value": "5"

-							}

-						]

-					}

-				},

-				"output": {

-					"to": {

-						"kind": "ImageStreamTag",

-						"name": "forcepull-extended-test-builder:latest"

-					}

-				}

-			}

-		}

-	]

-}

\ No newline at end of file

@@ -7,119 +7,6 @@

 			"kind": "BuildConfig",

 			"apiVersion": "v1",

 			"metadata": {

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

-				"creationTimestamp": null,

-				"labels": {

-					"name": "ruby-sample-build-fc"

-				}

-			},

-			"spec": {

-				"triggers": [],

-				"source": {

-					"type": "Git",

-					"git": {

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

-					}

-				},

-				"strategy": {

-					"type": "Custom",

-					"customStrategy": {

-						"from": {

-							"kind": "DockerImage",

-							"name": "${SERVICE_REGISTRY_IP}/forcepull-extended-test-builder"

-						},

-						"env": [

-							{

-								"name": "OPENSHIFT_CUSTOM_BUILD_BASE_IMAGE",

-								"value": "${SERVICE_REGISTRY_IP}/forcepull-extended-test-builder"

-							},

-							{

-								"name": "BUILD_LOGLEVEL",

-								"value": "5"

-							}

-						],

-						"exposeDockerSocket": true,

-						"forcePull": false

-					}

-				}

-			}

-		},

-		{

-			"kind": "BuildConfig",

-			"apiVersion": "v1",

-			"metadata": {

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

-				"creationTimestamp": null,

-				"labels": {

-					"name": "ruby-sample-build-fd"

-				}

-			},

-			"spec": {

-				"triggers": [],

-				"source": {

-					"type": "Git",

-					"git": {

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

-					}

-				},

-				"strategy": {

-					"type": "Docker",

-					"dockerStrategy": {

-						"from": {

-							"kind": "DockerImage",

-							"name": "${SERVICE_REGISTRY_IP}/forcepull-extended-test-builder"

-						},

-						"env": [

-							{

-								"name": "BUILD_LOGLEVEL",

-								"value": "5"

-							}

-						],

-						"forcePull": false

-					}

-				}

-			}

-		},

-		{

-			"kind": "BuildConfig",

-			"apiVersion": "v1",

-			"metadata": {

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

-				"creationTimestamp": null,

-				"labels": {

-					"name": "ruby-sample-build-fs"

-				}

-			},

-			"spec": {

-				"triggers": [],

-				"source": {

-					"type": "Git",

-					"git": {

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

-					}

-				},

-				"strategy": {

-					"type": "Source",

-					"sourceStrategy": {

-						"from": {

-							"kind": "DockerImage",

-							"name": "${SERVICE_REGISTRY_IP}/forcepull-extended-test-builder"

-						},

-						"env": [

-							{

-								"name": "BUILD_LOGLEVEL",

-								"value": "5"

-							}

-						],

-						"forcePull": false

-					}

-				}

-			}

-		},

-		{

-			"kind": "BuildConfig",

-			"apiVersion": "v1",

-			"metadata": {

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

 				"creationTimestamp": null,

 				"labels": {

@@ -138,13 +25,14 @@

 					"type": "Custom",

 					"customStrategy": {

 						"from": {

-							"kind": "DockerImage",

-							"name": "${SERVICE_REGISTRY_IP}/forcepull-extended-test-builder"

+						        "kind": "ImageStreamTag",

+						        "namespace": "openshift",

+							"name": "ruby:latest"

 						},

 						"env": [

 							{

 								"name": "OPENSHIFT_CUSTOM_BUILD_BASE_IMAGE",

-								"value": "${SERVICE_REGISTRY_IP}/forcepull-extended-test-builder"

+								"value": "ruby:latest"

 							},

 							{

 								"name": "BUILD_LOGLEVEL",

@@ -179,8 +67,9 @@

 					"type": "Docker",

 					"dockerStrategy": {

 						"from": {

-							"kind": "DockerImage",

-							"name": "${SERVICE_REGISTRY_IP}/forcepull-extended-test-builder"

+							"kind": "ImageStreamTag",

+						        "namespace": "openshift",

+							"name": "ruby:latest"

 						},

 						"env": [

 							{

@@ -215,8 +104,9 @@

 					"type": "Source",

 					"sourceStrategy": {

 						"from": {

-							"kind": "DockerImage",

-							"name": "${SERVICE_REGISTRY_IP}/forcepull-extended-test-builder"

+							"kind": "ImageStreamTag",

+						        "namespace": "openshift",

+							"name": "ruby:latest"

 						},

 						"env": [

 							{

@@ -230,4 +120,4 @@

 			}

 		}

 	]

-}

\ No newline at end of file

+}

@@ -14,55 +14,6 @@ import (

 	"k8s.io/kubernetes/pkg/credentialprovider"

 )

-//TagImage 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,

-		Tag:   "latest",

-		Force: true,

-	}

-	return client.TagImage(tagor, opts)

-}

-

-//InspectImage initiates the equivalent of a `docker inspect` for the "name" parameter

-func InspectImage(name string) (*dockerClient.Image, error) {

-	client, err := tutil.NewDockerClient()

-	if err != nil {

-		return nil, err

-	}

-	return client.InspectImage(name)

-}

-

-//PullImage initiates the equivalent of a `docker pull` for the "name" parameter

-func PullImage(name string, authCfg dockerClient.AuthConfiguration) error {

-	client, err := tutil.NewDockerClient()

-	if err != nil {

-		return err

-	}

-	opts := dockerClient.PullImageOptions{

-		Repository: name,

-		Tag:        "latest",

-	}

-	return client.PullImage(opts, authCfg)

-}

-

-//PushImage initiates the equivalent of a `docker push` for the "name" parameter to the local registry

-func PushImage(name string, authCfg dockerClient.AuthConfiguration) error {

-	client, err := tutil.NewDockerClient()

-	if err != nil {

-		return err

-	}

-	opts := dockerClient.PushImageOptions{

-		Name: name,

-		Tag:  "latest",

-	}

-	return client.PushImage(opts, authCfg)

-}

-

 //ListImages initiates the equivalent of a `docker images`

 func ListImages() ([]string, error) {

 	client, err := tutil.NewDockerClient()

@@ -4,47 +4,8 @@ import (

 	"fmt"

 	g "github.com/onsi/ginkgo"

-	o "github.com/onsi/gomega"

 )

-//CorruptImage is a helper that tags the image to be corrupted, the corruptee, as the corruptor string, resulting in the wrong image being used when corruptee is referenced later on;  strategy is for ginkgo debug; ginkgo error checking leveraged

-func CorruptImage(corruptee, corruptor string) {

-	fmt.Fprintf(g.GinkgoWriter, "Calling docker tag to corrupt builder image %s by tagging %s", corruptee, corruptor)

-

-	cerr := TagImage(corruptee, corruptor)

-

-	fmt.Fprintf(g.GinkgoWriter, "Tagging %s to %s complete with err %v", corruptor, corruptee, cerr)

-	o.Expect(cerr).NotTo(o.HaveOccurred())

-	VerifyImagesSame(corruptee, corruptor, "image corruption")

-}

-

-//ResetImage is a helper the allows the programmer to undo any corruption performed by CorruptImage; ginkgo error checking leveraged

-func ResetImage(tags map[string]string) {

-	fmt.Fprintf(g.GinkgoWriter, "Calling docker tag to reset images")

-

-	for corruptedTag, goodTag := range tags {

-		err := TagImage(corruptedTag, goodTag)

-		fmt.Fprintf(g.GinkgoWriter, "Reset for %s to %s complete with err %v", corruptedTag, goodTag, err)

-		o.Expect(err).NotTo(o.HaveOccurred())

-	}

-

-}

-

-//DumpImage is a helper that inspects the image along with some ginkgo debug

-func DumpImage(name string) {

-	fmt.Fprintf(g.GinkgoWriter, "Calling docker inspect for image %s", name)

-

-	image, err := InspectImage(name)

-	o.Expect(err).NotTo(o.HaveOccurred())

-	if image != nil {

-		fmt.Fprintf(g.GinkgoWriter, "Returned docker image %+v", image)

-		fmt.Fprintf(g.GinkgoWriter, "Container config %+v and user %s", image.ContainerConfig, image.ContainerConfig.User)

-		if image.Config != nil {

-			fmt.Fprintf(g.GinkgoWriter, "Image config %+v and user %s", image.Config, image.Config.User)

-		}

-	}

-}

-

 //DumpAndReturnTagging takes and array of tags and obtains the hex image IDs, dumps them to ginkgo for printing, and then returns them

 func DumpAndReturnTagging(tags []string) ([]string, error) {

 	hexIDs, err := GetImageIDForTags(tags)

@@ -57,36 +18,6 @@ func DumpAndReturnTagging(tags []string) ([]string, error) {

 	return hexIDs, nil

 }

-//VerifyImagesSame will take the two supplied image tags and see if they reference the same hexadecimal image ID;  strategy is for debug

-func VerifyImagesSame(comp1, comp2, strategy string) {

-	tag1 := comp1 + ":latest"

-	tag2 := comp2 + ":latest"

-

-	comps := []string{tag1, tag2}

-	retIDs, gerr := GetImageIDForTags(comps)

-

-	o.Expect(gerr).NotTo(o.HaveOccurred())

-	fmt.Fprintf(g.GinkgoWriter, "%s  compare image - %s, %s, %s, %s", strategy, tag1, tag2, retIDs[0], retIDs[1])

-	o.Ω(len(retIDs[0])).Should(o.BeNumerically(">", 0))

-	o.Ω(len(retIDs[1])).Should(o.BeNumerically(">", 0))

-	o.Ω(retIDs[0]).Should(o.Equal(retIDs[1]))

-}

-

-//VerifyImagesDifferent will that the two supplied image tags and see if they reference different hexadecimal image IDs; strategy is for ginkgo debug, also leverage ginkgo error checking

-func VerifyImagesDifferent(comp1, comp2, strategy string) {

-	tag1 := comp1 + ":latest"

-	tag2 := comp2 + ":latest"

-

-	comps := []string{tag1, tag2}

-	retIDs, gerr := GetImageIDForTags(comps)

-

-	o.Expect(gerr).NotTo(o.HaveOccurred())

-	fmt.Fprintf(g.GinkgoWriter, "%s  compare image - %s, %s, %s, %s", strategy, tag1, tag2, retIDs[0], retIDs[1])

-	o.Ω(len(retIDs[0])).Should(o.BeNumerically(">", 0))

-	o.Ω(len(retIDs[1])).Should(o.BeNumerically(">", 0))

-	o.Ω(retIDs[0] != retIDs[1]).Should(o.BeTrue())

-}

-

 //CreateResource creates the resources from the supplied json file (not a template); ginkgo error checking included

 func CreateResource(jsonFilePath string, oc *CLI) error {

 	err := oc.Run("create").Args("-f", jsonFilePath).Execute()