Merge pull request #18461 from bparees/nocache

Automatic merge from submit-queue. check all buildrequest options for validity against build type
openshift · Feb 7, 2018 · ebb59c4 · ebb59c4
2 parents c49e64b + e387676
commit ebb59c4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/pkg/build/generator/generator.go b/pkg/build/generator/generator.go
@@ -275,13 +275,16 @@ func (g *BuildGenerator) instantiate(ctx apirequest.Context, request *buildapi.B
 		// Update the Docker build args
 		if dockerOpts.BuildArgs != nil && len(dockerOpts.BuildArgs) > 0 {
 			if newBuild.Spec.Strategy.DockerStrategy == nil {
-				return nil, errors.NewBadRequest(fmt.Sprintf("Cannot specify build args on %s/%s, not a Docker build.", bc.Namespace, bc.ObjectMeta.Name))
+				return nil, errors.NewBadRequest(fmt.Sprintf("Cannot specify Docker build specific options on %s/%s, not a Docker build.", bc.Namespace, bc.ObjectMeta.Name))
 			}
 			newBuild.Spec.Strategy.DockerStrategy.BuildArgs = updateBuildArgs(&newBuild.Spec.Strategy.DockerStrategy.BuildArgs, dockerOpts.BuildArgs)
 		}
 
 		// Update the Docker noCache option
 		if dockerOpts.NoCache != nil {
+			if newBuild.Spec.Strategy.DockerStrategy == nil {
+				return nil, errors.NewBadRequest(fmt.Sprintf("Cannot specify Docker build specific options on %s/%s, not a Docker build.", bc.Namespace, bc.ObjectMeta.Name))
+			}
 			newBuild.Spec.Strategy.DockerStrategy.NoCache = *dockerOpts.NoCache
 		}
 	}
@@ -292,6 +295,9 @@ func (g *BuildGenerator) instantiate(ctx apirequest.Context, request *buildapi.B
 
 		// Update the Source incremental option
 		if sourceOpts.Incremental != nil {
+			if newBuild.Spec.Strategy.SourceStrategy == nil {
+				return nil, errors.NewBadRequest(fmt.Sprintf("Cannot specify Source build specific options on %s/%s, not a Source build.", bc.Namespace, bc.ObjectMeta.Name))
+			}
 			newBuild.Spec.Strategy.SourceStrategy.Incremental = sourceOpts.Incremental
 		}
 	}

diff --git a/test/cmd/builds.sh b/test/cmd/builds.sh
@@ -142,6 +142,8 @@ build_name="$(oc start-build -o=name test)"
 os::cmd::expect_success_and_not_text "oc describe ${build_name}" 'Incremental Build'
 build_name="$(oc start-build -o=name --incremental test)"
 os::cmd::expect_success_and_text "oc describe ${build_name}" 'Incremental Build'
+os::cmd::expect_failure_and_text "oc start-build test --no-cache" 'Cannot specify Docker build specific options'
+os::cmd::expect_failure_and_text "oc start-build test --build-arg=a=b" 'Cannot specify Docker build specific options'
 os::cmd::expect_success 'oc delete all --selector="name=test"'
 # --no-cache flag should override Spec.Strategy.SourceStrategy.NoCache
 os::cmd::expect_success 'oc create -f test/extended/testdata/builds/test-docker-build.json'
@@ -159,6 +161,7 @@ build_name="$(oc start-build -o=name test)"
 os::cmd::expect_success_and_not_text "oc describe ${build_name}" 'No Cache'
 build_name="$(oc start-build -o=name --no-cache test)"
 os::cmd::expect_success_and_text "oc describe ${build_name}" 'No Cache'
+os::cmd::expect_failure_and_text "oc start-build test --incremental" 'Cannot specify Source build specific options'
 os::cmd::expect_success 'oc delete all --selector="name=test"'
 echo "start-build: ok"
 os::test::junit::declare_suite_end