Merge pull request #11989 from bparees/fix_image_test

Merged by openshift-bot
openshift · Nov 23, 2016 · 00ec8d2 · 00ec8d2
2 parents 9996b77 + 4b1ca98
commit 00ec8d2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/pkg/build/generator/generator.go b/pkg/build/generator/generator.go
@@ -462,7 +462,7 @@ func (g *BuildGenerator) generateBuildFromConfig(ctx kapi.Context, bc *buildapi.
 		var sourceImageSpec string
 		// if the imagesource matches the strategy from, and we have a trigger for the strategy from,
 		// use the imageid from the trigger rather than resolving it.
-		if strategyFrom := buildutil.GetInputReference(bc.Spec.Strategy); reflect.DeepEqual(sourceImage.From, *strategyFrom) &&
+		if strategyFrom := buildutil.GetInputReference(bc.Spec.Strategy); strategyFrom != nil && reflect.DeepEqual(sourceImage.From, *strategyFrom) &&
 			strategyImageChangeTrigger != nil {
 			sourceImageSpec = strategyImageChangeTrigger.LastTriggeredImageID
 		} else {

diff --git a/test/extended/testdata/test-imagesource-build.yaml b/test/extended/testdata/test-imagesource-build.yaml
@@ -54,12 +54,7 @@ items:
         - destinationDir: injected/dir
           sourcePath: /usr/lib/jenkins/jenkins.war
     strategy:
-      sourceStrategy: 
-        forcePull: true
-        from: 
-          kind: ImageStreamTag
-          name: ruby:latest
-          namespace: openshift
+      dockerStrategy: {}
 - apiVersion: v1
   kind: ImageStream
   metadata: