Merge pull request #20090 from wozniakjan/test/extended/speedup_contextdir

extended tests: use leaner repo for contextdir test

Author: openshift-merge-robot

test/extended/builds/contextdir.go

@@ -98,14 +98,20 @@ var _ = g.Describe("[Feature:Builds][Slow] builds with a context directory", fun
 
 		g.Describe("docker context directory build", func() {
 			g.It(fmt.Sprintf("should docker build an application using a context directory"), func() {
+				g.By("initializing local repo")
+				repo, err := exutil.NewGitRepo("contextdir")
+				o.Expect(err).NotTo(o.HaveOccurred())
+				defer repo.Remove()
+				err = repo.AddAndCommit("2.3/Dockerfile", "FROM busybox")
+				o.Expect(err).NotTo(o.HaveOccurred())
 
 				exutil.CheckOpenShiftNamespaceImageStreams(oc)
 				g.By(fmt.Sprintf("calling oc create -f %q", appFixture))
-				err := oc.Run("create").Args("-f", appFixture).Execute()
+				err = oc.Run("create").Args("-f", appFixture).Execute()
 				o.Expect(err).NotTo(o.HaveOccurred())
 
 				g.By("starting a build")
-				err = oc.Run("start-build").Args(dockerBuildConfigName).Execute()
+				err = oc.Run("start-build").Args(dockerBuildConfigName, "--from-repo", repo.RepoPath).Execute()
 				o.Expect(err).NotTo(o.HaveOccurred())
 
 				// build will fail if we don't use the right context dir because there won't be a dockerfile present.

test/extended/testdata/bindata.go

@@ -12,10 +12,8 @@
       "spec": {
         "triggers": [],
         "source": {
-          "type": "Git",
-          "git": {
-            "uri":"https://github.com/sclorg/s2i-ruby-container"
-          },
+          "type": "binary",
+          "binary": {},
           "contextDir": "2.3"
         },
         "strategy": {
@@ -152,4 +150,4 @@
       }
     }
   ]
-}
+}

test/extended/testdata/builds/test-context-build.json

@@ -1327,6 +1327,10 @@ type GitRepo struct {
 
 // AddAndCommit commits a file with its content to local repo
 func (r GitRepo) AddAndCommit(file, content string) error {
+	dir := filepath.Dir(file)
+	if err := os.MkdirAll(filepath.Join(r.RepoPath, dir), 0777); err != nil {
+		return err
+	}
 	if err := ioutil.WriteFile(filepath.Join(r.RepoPath, file), []byte(content), 0666); err != nil {
 		return err
 	}