Merge pull request #20490 from adambkaplan/bugfix/s2i-fixes

bump(*) and s2i symlink fix

glide.yaml

@@ -45,12 +45,10 @@ import:
   version: master
 - package: github.com/openshift/library-go
   version: master
-# master already branched for 3.11
 - package: github.com/openshift/service-serving-cert-signer
   version: master
-# master already branched for 3.11
 - package: github.com/openshift/source-to-image
-  version: release-3.10
+  version: master
 
 # forks third
 # master

pkg/build/builder/sti.go

@@ -223,6 +223,8 @@ func (s *S2IBuilder) Build() error {
 		CGroupLimits:              s.cgLimits,
 		ScriptDownloadProxyConfig: scriptDownloadProxyConfig,
 		BlockOnBuild:              true,
+
+		KeepSymlinks: true,
 	}
 
 	if len(resolvConfHostPath) != 0 {

test/extended/builds/s2i_env.go

@@ -59,7 +59,7 @@ var _ = g.Describe("[Feature:Builds][Slow] s2i build with environment file in so
 				o.Expect(err).NotTo(o.HaveOccurred())
 
 				g.By("starting a test build")
-				path := exutil.FixturePath("testdata", "builds", "sti-environment-build-app")
+				path := exutil.FixturePath("testdata", "builds", "s2i-environment-build-app")
 				br, _ := exutil.StartBuildAndWait(oc, "test", "--from-dir", path)
 				br.AssertSuccess()
 

test/extended/builds/start.go

@@ -2,6 +2,7 @@ package builds
 
 import (
 	"fmt"
+	"os"
 	"os/exec"
 	"regexp"
 	"strings"
@@ -26,6 +27,7 @@ var _ = g.Describe("[Feature:Builds][Slow] starting a build using CLI", func() {
 		bcWithPRRef       = exutil.FixturePath("testdata", "builds", "test-bc-with-pr-ref.yaml")
 		exampleGemfile    = exutil.FixturePath("testdata", "builds", "test-build-app", "Gemfile")
 		exampleBuild      = exutil.FixturePath("testdata", "builds", "test-build-app")
+		symlinkFixture    = exutil.FixturePath("testdata", "builds", "test-symlink-build.yaml")
 		exampleGemfileURL = "https://raw.githubusercontent.com/openshift/ruby-hello-world/master/Gemfile"
 		exampleArchiveURL = "https://github.com/openshift/ruby-hello-world/archive/master.zip"
 		oc                = exutil.NewCLI("cli-start-build", exutil.KubeConfigPath())
@@ -450,6 +452,39 @@ var _ = g.Describe("[Feature:Builds][Slow] starting a build using CLI", func() {
 				})
 			})
 
+			g.Describe("s2i build maintaining symlinks", func() {
+				g.It(fmt.Sprintf("should s2i build image and maintain symlinks"), func() {
+					g.By("initializing local repo")
+					repo, err := exutil.NewGitRepo("symlinks")
+					o.Expect(err).NotTo(o.HaveOccurred())
+					defer repo.Remove()
+					err = repo.AddAndCommit("package.json", "{}")
+					o.Expect(err).NotTo(o.HaveOccurred())
+
+					err = os.Symlink(repo.RepoPath+"/package.json", repo.RepoPath+"/link")
+					o.Expect(err).NotTo(o.HaveOccurred())
+
+					exutil.CheckOpenShiftNamespaceImageStreams(oc)
+					g.By(fmt.Sprintf("calling oc create -f %q", symlinkFixture))
+					err = oc.Run("create").Args("-f", symlinkFixture).Execute()
+					o.Expect(err).NotTo(o.HaveOccurred())
+
+					g.By("starting a build")
+					err = oc.Run("start-build").Args("symlink-bc", "--from-dir", repo.RepoPath).Execute()
+					o.Expect(err).NotTo(o.HaveOccurred())
+
+					g.By("waiting for build to finish")
+					err = exutil.WaitForABuild(oc.BuildClient().Build().Builds(oc.Namespace()), "symlink-bc-1", exutil.CheckBuildSuccess, exutil.CheckBuildFailed, nil)
+					if err != nil {
+						exutil.DumpBuildLogs("symlink-bc", oc)
+					}
+					o.Expect(err).NotTo(o.HaveOccurred())
+
+					tag, err := oc.ImageClient().Image().ImageStreamTags(oc.Namespace()).Get("symlink-is:latest", metav1.GetOptions{})
+					err = oc.Run("run").Args("-i", "-t", "symlink-test", "--image="+tag.Image.DockerImageReference, "--restart=Never", "--command", "--", "bash", "-c", "if [ ! -L link ]; then ls -ltr; exit 1; fi").Execute()
+					o.Expect(err).NotTo(o.HaveOccurred())
+				})
+			})
 		})
 	})
 })