Merge pull request #5478 from smarterclayton/fix_binary_build_extended_tests

Fix extended tests for --from-* binary

Author: smarterclayton

test/extended/builds/start_build.go

@@ -17,10 +17,10 @@ import (
 var _ = g.Describe("builds: parallel: oc start-build", func() {
 	defer g.GinkgoRecover()
 	var (
-		buildFixture      = exutil.FixturePath("..", "extended", "fixtures", "test-build.json")
-		exampleDockerfile = exutil.FixturePath("..", "extended", "fixtures", "test-build-app", "Dockerfile")
-		exampleBuild      = exutil.FixturePath("..", "extended", "fixtures", "test-build-app")
-		oc                = exutil.NewCLI("cli-start-build", exutil.KubeConfigPath())
+		buildFixture   = exutil.FixturePath("..", "extended", "fixtures", "test-build.json")
+		exampleGemfile = exutil.FixturePath("..", "extended", "fixtures", "test-build-app", "Gemfile")
+		exampleBuild   = exutil.FixturePath("..", "extended", "fixtures", "test-build-app")
+		oc             = exutil.NewCLI("cli-start-build", exutil.KubeConfigPath())
 	)
 
 	g.JustBeforeEach(func() {
@@ -55,12 +55,12 @@ var _ = g.Describe("builds: parallel: oc start-build", func() {
 	g.Describe("binary builds", func() {
 		g.It("should accept --from-file as input", func() {
 			g.By("starting the build with a Dockerfile")
-			out, err := oc.Run("start-build").Args("sample-build", "--follow", "--wait", fmt.Sprintf("--from-file=%s", exampleDockerfile)).Output()
+			out, err := oc.Run("start-build").Args("sample-build", "--follow", "--wait", fmt.Sprintf("--from-file=%s", exampleGemfile)).Output()
 			g.By(fmt.Sprintf("verifying the build %q status", out))
 			o.Expect(err).NotTo(o.HaveOccurred())
 			o.Expect(out).To(o.ContainSubstring("Uploading file"))
 			o.Expect(out).To(o.ContainSubstring("as binary input for the build ..."))
-			o.Expect(out).To(o.ContainSubstring("Successfully built"))
+			o.Expect(out).To(o.ContainSubstring("Your bundle is complete"))
 
 			build, err := oc.REST().Builds(oc.Namespace()).Get("sample-build-1")
 			o.Expect(err).NotTo(o.HaveOccurred())
@@ -74,7 +74,7 @@ var _ = g.Describe("builds: parallel: oc start-build", func() {
 			o.Expect(err).NotTo(o.HaveOccurred())
 			o.Expect(out).To(o.ContainSubstring("Uploading directory"))
 			o.Expect(out).To(o.ContainSubstring("as binary input for the build ..."))
-			o.Expect(out).To(o.ContainSubstring("Successfully built"))
+			o.Expect(out).To(o.ContainSubstring("Your bundle is complete"))
 
 			build, err := oc.REST().Builds(oc.Namespace()).Get("sample-build-1")
 			o.Expect(err).NotTo(o.HaveOccurred())
@@ -88,7 +88,7 @@ var _ = g.Describe("builds: parallel: oc start-build", func() {
 			o.Expect(err).NotTo(o.HaveOccurred())
 			o.Expect(out).To(o.ContainSubstring("Uploading Git repository"))
 			o.Expect(out).To(o.ContainSubstring("as binary input for the build ..."))
-			o.Expect(out).To(o.ContainSubstring("Successfully built"))
+			o.Expect(out).To(o.ContainSubstring("Your bundle is complete"))
 
 			build, err := oc.REST().Builds(oc.Namespace()).Get("sample-build-1")
 			o.Expect(err).NotTo(o.HaveOccurred())