prevent s2i from running onbuild images

Author: bparees

pkg/build/builder/sti.go

@@ -190,6 +190,7 @@ func (s *S2IBuilder) Build() error {
 		CGroupLimits:              s.cgLimits,
 		Injections:                injections,
 		ScriptDownloadProxyConfig: scriptDownloadProxyConfig,
+		BlockOnBuild:              true,
 	}
 
 	if s.build.Spec.Strategy.SourceStrategy.ForcePull {
@@ -343,13 +344,13 @@ func (d *downloader) Download(config *s2iapi.Config) (*s2iapi.SourceInfo, error)
 // 2. In case of repeated Keys, the last Value takes precedence right here,
 //    instead of deferring what to do with repeated environment variables to the
 //    Docker runtime.
-func buildEnvVars(build *api.Build) map[string]string {
+func buildEnvVars(build *api.Build) s2iapi.EnvironmentList {
 	bi := buildInfo(build)
-	envVars := make(map[string]string, len(bi))
+	envVars := &s2iapi.EnvironmentList{}
 	for _, item := range bi {
-		envVars[item.Key] = item.Value
+		envVars.Set(fmt.Sprintf("%s=%s", item.Key, item.Value))
 	}
-	return envVars
+	return *envVars
 }
 
 // scriptProxyConfig determines a proxy configuration for downloading

test/extended/builds/proxy.go

@@ -10,7 +10,7 @@ import (
 	exutil "github.com/openshift/origin/test/extended/util"
 )
 
-var _ = g.Describe("[builds][Slow] the source-to-image build should support proxies", func() {
+var _ = g.Describe("[builds][Slow] the s2i build should support proxies", func() {
 	defer g.GinkgoRecover()
 	var (
 		buildFixture = exutil.FixturePath("..", "extended", "fixtures", "test-build-proxy.json")

test/extended/builds/s2i_env.go

@@ -12,7 +12,7 @@ import (
 	exutil "github.com/openshift/origin/test/extended/util"
 )
 
-var _ = g.Describe("[builds][Slow] source-to-image build with environment file in sources", func() {
+var _ = g.Describe("[builds][Slow] s2i build with environment file in sources", func() {
 	defer g.GinkgoRecover()
 	const (
 		buildTestPod     = "build-test-pod"

test/extended/builds/s2i_incremental.go

@@ -11,7 +11,7 @@ import (
 	exutil "github.com/openshift/origin/test/extended/util"
 )
 
-var _ = g.Describe("[builds][Slow] incremental source-to-image build", func() {
+var _ = g.Describe("[builds][Slow] incremental s2i build", func() {
 	defer g.GinkgoRecover()
 
 	const (