@@ -1,14 +1,11 @@

 package builds

 import (

-	"fmt"

 	"path/filepath"

-	"time"

 	g "github.com/onsi/ginkgo"

 	o "github.com/onsi/gomega"

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

-	"k8s.io/kubernetes/pkg/util/wait"

 	e2e "k8s.io/kubernetes/test/e2e/framework"

 )

@@ -16,43 +13,46 @@ var _ = g.Describe("[builds][Slow] s2i extended build", func() {

 	defer g.GinkgoRecover()

 	var (

-		oc                 = exutil.NewCLI("extended-build", exutil.KubeConfigPath())

-		testDataDir        = exutil.FixturePath("testdata", "build-extended")

-		scriptsFromRepoBc  = filepath.Join(testDataDir, "bc-scripts-in-repo.json")

-		scriptsFromUrlBc   = filepath.Join(testDataDir, "bc-scripts-by-url.json")

-		scriptsFromImageBc = filepath.Join(testDataDir, "bc-scripts-in-the-image.json")

+		oc                    = exutil.NewCLI("extended-build", exutil.KubeConfigPath())

+		testDataDir           = exutil.FixturePath("testdata", "build-extended")

+		runnerConf            = filepath.Join(testDataDir, "jvm-runner.yaml")

+		runnerWithScriptsConf = filepath.Join(testDataDir, "jvm-runner-with-scripts.yaml")

+		scriptsFromRepoBc     = filepath.Join(testDataDir, "bc-scripts-in-repo.yaml")

+		scriptsFromUrlBc      = filepath.Join(testDataDir, "bc-scripts-by-url.yaml")

+		scriptsFromImageBc    = filepath.Join(testDataDir, "bc-scripts-in-the-image.yaml")

 	)

+	g.JustBeforeEach(func() {

+		g.By("waiting for builder service account")

+		err := exutil.WaitForBuilderAccount(oc.KubeREST().ServiceAccounts(oc.Namespace()))

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

+

+		// we have to wait until image stream tag will be available, otherwise

+		// `oc start-build` will fail with 'imagestreamtags "wildfly:10.0" not found' error.

+		// See this issue for details: https://github.com/openshift/origin/issues/10103

+		err = exutil.WaitForAnImageStreamTag(oc, "openshift", "wildfly", "10.0")

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

+	})

+

 	g.Describe("with scripts from the source repository", func() {

 		oc.SetOutputDir(exutil.TestContext.OutputDir)

 		g.It("should use assemble-runtime script from the source repository", func() {

-			const buildConfigName = "java-extended-build-from-repo"

-			g.By("creating build config")

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

+			g.By("creating jvm-runner configuration")

+			err := exutil.CreateResource(runnerConf, oc)

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

-			// we have to wait until image stream tag will be available, otherwise

-			// `oc start-build` will fail with 'imagestreamtags "wildfly:10.0" not found' error.

-			// See this issue for details: https://github.com/openshift/origin/issues/10103

-			g.By("waiting when image stream tag for wildfly will be available")

-			wait.Poll(1*time.Second, 1*time.Minute, func() (bool, error) {

-				out, err := oc.Run("get").Args("imagestreamtags", "--namespace", "openshift", "--output", `jsonpath='{.items[?(@.metadata.name=="wildfly:10.0")].image.dockerImageReference}'`).Output()

-				if err != nil {

-					fmt.Fprintf(g.GinkgoWriter, "Could not get image stream tag for wildfly: %v\n", err)

-					return false, err

-				}

-				if len(out) > 0 && out != "''" {

-					fmt.Fprintf(g.GinkgoWriter, "Using image stream tag for wildfly: %s\n", out)

-					return true, nil

-				}

-

-				return false, nil

-			})

+			g.By("building jvm-runner image")

+			br, _ := exutil.StartBuildAndWait(oc, "jvm-runner")

+			br.AssertSuccess()

+

+			g.By("creating build config")

+			err = exutil.CreateResource(scriptsFromRepoBc, oc)

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

 			g.By("running the build")

-			br, _ := exutil.StartBuildAndWait(oc, buildConfigName, "--build-loglevel=5")

+			br, _ = exutil.StartBuildAndWait(oc, "java-extended-build-from-repo", "--build-loglevel=5")

 			br.AssertSuccess()

 			buildLog, err := br.Logs()

 			if err != nil {

@@ -75,14 +75,21 @@ var _ = g.Describe("[builds][Slow] s2i extended build", func() {

 		oc.SetOutputDir(exutil.TestContext.OutputDir)

 		g.It("should use assemble-runtime script from URL", func() {

-			const buildConfigName = "java-extended-build-from-url"

+

+			g.By("creating jvm-runner configuration")

+			err := exutil.CreateResource(runnerConf, oc)

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

+

+			g.By("building jvm-runner image")

+			br, _ := exutil.StartBuildAndWait(oc, "jvm-runner")

+			br.AssertSuccess()

 			g.By("creating build config")

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

+			err = exutil.CreateResource(scriptsFromUrlBc, oc)

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

 			g.By("running the build")

-			br, _ := exutil.StartBuildAndWait(oc, buildConfigName, "--build-loglevel=5")

+			br, _ = exutil.StartBuildAndWait(oc, "java-extended-build-from-url", "--build-loglevel=5")

 			br.AssertSuccess()

 			buildLog, err := br.Logs()

 			if err != nil {

@@ -105,15 +112,21 @@ var _ = g.Describe("[builds][Slow] s2i extended build", func() {

 		oc.SetOutputDir(exutil.TestContext.OutputDir)

 		g.It("should use assemble-runtime script from that image", func() {

-			const buildConfigName = "java-extended-build-from-image"

-			const buildName = buildConfigName + "-1"

+

+			g.By("creating jvm-runner-with-scripts configuration")

+			err := exutil.CreateResource(runnerWithScriptsConf, oc)

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

+

+			g.By("building jvm-runner-with-scripts image")

+			br, _ := exutil.StartBuildAndWait(oc, "jvm-runner-with-scripts")

+			br.AssertSuccess()

 			g.By("creating build config")

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

+			err = exutil.CreateResource(scriptsFromImageBc, oc)

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

 			g.By("running the build")

-			br, _ := exutil.StartBuildAndWait(oc, buildConfigName, "--build-loglevel=5")

+			br, _ = exutil.StartBuildAndWait(oc, "java-extended-build-from-image", "--build-loglevel=5")

 			br.AssertSuccess()

 			buildLog, err := br.Logs()

 			if err != nil {

@@ -4,7 +4,6 @@ import (

 	"fmt"

 	"os"

 	"strconv"

-	"time"

 	kapi "k8s.io/kubernetes/pkg/api"

 	"k8s.io/kubernetes/pkg/api/resource"

@@ -144,7 +143,7 @@ var _ = g.Describe("[images] openshift limit range admission", func() {

 		g.By(fmt.Sprintf("trying to tag a docker image below limit %v", limit))

 		err = oc.Run("import-image").Args("stream:dockerimage", "--confirm", "--insecure", "--from", tag2Image["tag1"].DockerImageReference).Execute()

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

-		err = waitForAnImageStreamTag(oc, "stream", "dockerimage")

+		err = exutil.WaitForAnImageStreamTag(oc, oc.Namespace(), "stream", "dockerimage")

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

 		g.By(fmt.Sprintf("trying to tag a docker image exceeding limit %v", limit))

@@ -211,7 +210,7 @@ var _ = g.Describe("[images] openshift limit range admission", func() {

 		g.By(fmt.Sprintf("trying to import from repository %q below quota %v", s1ref.Exact(), limit))

 		err = oc.Run("import-image").Args("bulkimport", "--confirm", "--insecure", "--all", "--from", s1ref.Exact()).Execute()

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

-		err = waitForAnImageStreamTag(oc, "bulkimport", "tag1")

+		err = exutil.WaitForAnImageStreamTag(oc, oc.Namespace(), "bulkimport", "tag1")

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

 		g.By(fmt.Sprintf("trying to import tags from repository %q exceeding quota %v", s2ref.Exact(), limit))

@@ -303,35 +302,6 @@ func bumpLimit(oc *exutil.CLI, resourceName kapi.ResourceName, limit string) (ka

 	return res, err

 }

-// waitForAnImageStreamTag waits until an image stream with given name has non-empty history for given tag

-func waitForAnImageStreamTag(oc *exutil.CLI, name, tag string) error {

-	g.By(fmt.Sprintf("waiting for an is importer to import a tag %s into a stream %s", tag, name))

-	start := time.Now()

-	c := make(chan error)

-	go func() {

-		err := exutil.WaitForAnImageStream(

-			oc.REST().ImageStreams(oc.Namespace()),

-			name,

-			func(is *imageapi.ImageStream) bool {

-				if history, exists := is.Status.Tags[tag]; !exists || len(history.Items) == 0 {

-					return false

-				}

-				return true

-			},

-			func(is *imageapi.ImageStream) bool {

-				return time.Now().After(start.Add(waitTimeout))

-			})

-		c <- err

-	}()

-

-	select {

-	case e := <-c:

-		return e

-	case <-time.After(waitTimeout):

-		return fmt.Errorf("timed out while waiting of an image stream tag %s/%s:%s", oc.Namespace(), name, tag)

-	}

-}

-

 // getMaxImagesBulkImportedPerRepository returns a maximum numbers of images that can be imported from

 // repository at once. The value is obtained from environment variable which must be set.

 func getMaxImagesBulkImportedPerRepository() (int, error) {

deleted file mode 100644

@@ -1,39 +0,0 @@

-{

-  "kind": "BuildConfig",

-  "apiVersion": "v1",

-  "metadata": {

-    "name": "java-extended-build-from-url"

-  },

-  "spec": {

-    "source": {

-      "git": {

-        "uri": "https://github.com/php-coder/java-maven-hello-world.git"

-      }

-    },

-    "strategy": {

-      "sourceStrategy": {

-        "from": {

-          "kind": "ImageStreamTag",

-          "name": "wildfly:10.0",

-          "namespace": "openshift"

-        },

-        "runtimeImage": {

-          "kind": "DockerImage",

-          "name": "phpcoder/base-jdk:8"

-        },

-        "runtimeArtifacts": [

-          {

-            "sourcePath": "/opt/s2i/destination/src/target/hello.jar"

-          }

-        ],

-        "env": [

-          {

-            "name": "USING_ENV_FROM_BUILD_CONFIG",

-            "value": "yes"

-          }

-        ],

-        "scripts": "https://raw.githubusercontent.com/php-coder/java-maven-hello-world/s2i-assemble-and-assemble-runtime/.s2i/bin"

-      }

-    }

-  }

-}

new file mode 100644

@@ -0,0 +1,23 @@

+kind: BuildConfig

+apiVersion: v1

+metadata:

+  name: java-extended-build-from-url

+spec:

+  source:

+    git:

+      uri: "https://github.com/php-coder/java-maven-hello-world.git"

+  strategy:

+    sourceStrategy:

+      from:

+        kind: ImageStreamTag

+        name: "wildfly:10.0"

+        namespace: openshift

+      runtimeImage:

+        kind: ImageStreamTag

+        name: "jvm-runner:0.1"

+      runtimeArtifacts:

+        - sourcePath: /opt/s2i/destination/src/target/hello.jar

+      env:

+        - name: USING_ENV_FROM_BUILD_CONFIG

+          value: "yes"

+      scripts: "https://raw.githubusercontent.com/php-coder/java-maven-hello-world/s2i-assemble-and-assemble-runtime/.s2i/bin"

deleted file mode 100644

@@ -1,39 +0,0 @@

-{

-  "kind": "BuildConfig",

-  "apiVersion": "v1",

-  "metadata": {

-    "name": "java-extended-build-from-repo"

-  },

-  "spec": {

-    "source": {

-      "git": {

-        "uri": "https://github.com/php-coder/java-maven-hello-world.git",

-        "ref": "s2i-assemble-and-assemble-runtime"

-      }

-    },

-    "strategy": {

-      "sourceStrategy": {

-        "from": {

-          "kind": "ImageStreamTag",

-          "name": "wildfly:10.0",

-          "namespace": "openshift"

-        },

-        "runtimeImage": {

-          "kind": "DockerImage",

-          "name": "phpcoder/base-jdk:8"

-        },

-        "runtimeArtifacts": [

-          {

-            "sourcePath": "/opt/s2i/destination/src/target/hello.jar"

-          }

-        ],

-        "env": [

-          {

-            "name": "USING_ENV_FROM_BUILD_CONFIG",

-            "value": "yes"

-          }

-        ]

-      }

-    }

-  }

-}

new file mode 100644

@@ -0,0 +1,23 @@

+kind: BuildConfig

+apiVersion: v1

+metadata:

+  name: java-extended-build-from-repo

+spec:

+  source:

+    git:

+      uri: "https://github.com/php-coder/java-maven-hello-world.git"

+      ref: s2i-assemble-and-assemble-runtime

+  strategy:

+    sourceStrategy:

+      from:

+        kind: ImageStreamTag

+        name: "wildfly:10.0"

+        namespace: openshift

+      runtimeImage:

+        kind: ImageStreamTag

+        name: "jvm-runner:0.1"

+      runtimeArtifacts:

+        - sourcePath: /opt/s2i/destination/src/target/hello.jar

+      env:

+        - name: USING_ENV_FROM_BUILD_CONFIG

+          value: "yes"

deleted file mode 100644

@@ -1,34 +0,0 @@

-{

-  "kind": "BuildConfig",

-  "apiVersion": "v1",

-  "metadata": {

-    "name": "java-extended-build-from-image"

-  },

-  "spec": {

-    "source": {

-      "git": {

-        "uri": "https://github.com/php-coder/java-maven-hello-world.git",

-        "ref": "s2i-assemble-only"

-      }

-    },

-    "strategy": {

-      "sourceStrategy": {

-        "from": {

-          "kind": "ImageStreamTag",

-          "name": "wildfly:10.0",

-          "namespace": "openshift"

-        },

-        "runtimeImage": {

-          "kind": "DockerImage",

-          "name": "phpcoder/hello-world-runtime:0.2"

-        },

-        "env": [

-          {

-            "name": "USING_ENV_FROM_BUILD_CONFIG",

-            "value": "yes"

-          }

-        ]

-      }

-    }

-  }

-}

new file mode 100644

@@ -0,0 +1,21 @@

+kind: BuildConfig

+apiVersion: v1

+metadata:

+  name: java-extended-build-from-image

+spec:

+  source:

+    git:

+      uri: "https://github.com/php-coder/java-maven-hello-world.git"

+      ref: s2i-assemble-only

+  strategy:

+    sourceStrategy:

+      from:

+        kind: ImageStreamTag

+        name: "wildfly:10.0"

+        namespace: openshift

+      runtimeImage:

+        kind: ImageStreamTag

+        name: "jvm-runner-with-scripts:0.1"

+      env:

+        - name: USING_ENV_FROM_BUILD_CONFIG

+          value: "yes"

new file mode 100644

@@ -0,0 +1,32 @@

+kind: List

+apiVersion: v1

+items:

+

+- kind: ImageStream

+  apiVersion: v1

+  metadata:

+    name: jvm-runner-with-scripts

+

+- kind: BuildConfig

+  apiVersion: v1

+  metadata:

+    name: jvm-runner-with-scripts

+  spec:

+    source:

+      dockerfile: |

+        FROM jboss/base-jdk:8

+        LABEL io.openshift.s2i.scripts-url "image:///usr/libexec/s2i"

+        LABEL io.openshift.s2i.assemble-input-files "/opt/s2i/destination/src/target/hello.jar"

+        USER root

+        RUN mkdir -p /usr/libexec/s2i && \

+            curl -s https://raw.githubusercontent.com/php-coder/java-maven-hello-world/s2i-assemble-and-assemble-runtime/.s2i/bin/assemble-runtime | tee /usr/libexec/s2i/assemble-runtime && \

+            chmod +x /usr/libexec/s2i/assemble-runtime && \

+            curl -s https://raw.githubusercontent.com/php-coder/java-maven-hello-world/s2i-assemble-and-assemble-runtime/.s2i/bin/run | tee /usr/libexec/s2i/run && \

+            chmod +x /usr/libexec/s2i/run

+        USER 1000

+    strategy:

+      type: Docker

+    output:

+      to:

+        kind: ImageStreamTag

+        name: jvm-runner-with-scripts:0.1

new file mode 100644

@@ -0,0 +1,24 @@

+kind: List

+apiVersion: v1

+items:

+

+- kind: ImageStream

+  apiVersion: v1

+  metadata:

+    name: jvm-runner

+

+- kind: BuildConfig

+  apiVersion: v1

+  metadata:

+    name: jvm-runner

+  spec:

+    source:

+      dockerfile: |

+        FROM jboss/base-jdk:8

+        USER 1000

+    strategy:

+      type: Docker

+    output:

+      to:

+        kind: ImageStreamTag

+        name: jvm-runner:0.1

@@ -379,7 +379,7 @@ func (c *CLI) OutputToFile(filename string) (string, error) {

 func (c *CLI) Execute() error {

 	out, err := c.Output()

 	if _, err := io.Copy(g.GinkgoWriter, strings.NewReader(out+"\n")); err != nil {

-		fmt.Printf("ERROR: Unable to copy the output to ginkgo writer")

+		fmt.Fprintln(os.Stderr, "ERROR: Unable to copy the output to ginkgo writer")

 	}

 	os.Stdout.Sync()

 	return err

@@ -565,6 +565,36 @@ func WaitForAnImageStream(client client.ImageStreamInterface,

 	}

 }

+// WaitForAnImageStreamTag waits until an image stream with given name has non-empty history for given tag.

+func WaitForAnImageStreamTag(oc *CLI, namespace, name, tag string) error {

+	waitTimeout := time.Second * 60

+	g.By(fmt.Sprintf("waiting for an is importer to import a tag %s into a stream %s", tag, name))

+	start := time.Now()

+	c := make(chan error)

+	go func() {

+		err := WaitForAnImageStream(

+			oc.REST().ImageStreams(namespace),

+			name,

+			func(is *imageapi.ImageStream) bool {

+				if history, exists := is.Status.Tags[tag]; !exists || len(history.Items) == 0 {

+					return false

+				}

+				return true

+			},

+			func(is *imageapi.ImageStream) bool {

+				return time.Now().After(start.Add(waitTimeout))

+			})

+		c <- err

+	}()

+

+	select {

+	case e := <-c:

+		return e

+	case <-time.After(waitTimeout):

+		return fmt.Errorf("timed out while waiting of an image stream tag %s/%s:%s", namespace, name, tag)

+	}

+}

+

 // CheckImageStreamLatestTagPopulatedFn returns true if the imagestream has a ':latest' tag filed

 var CheckImageStreamLatestTagPopulatedFn = func(i *imageapi.ImageStream) bool {

 	_, ok := i.Status.Tags["latest"]