diff --git a/pkg/build/api/types.go b/pkg/build/api/types.go index dc4b3b463f25..49bc7e59e3e9 100644 --- a/pkg/build/api/types.go +++ b/pkg/build/api/types.go @@ -205,8 +205,8 @@ type STIBuildStrategy struct { // Scripts is the location of STI scripts Scripts string `json:"scripts,omitempty"` - // Clean flag forces the STI build to not do incremental builds if true. - Clean bool `json:"clean,omitempty"` + // Incremental flag forces the STI build to do incremental builds if true. + Incremental bool `json:"incremental,omitempty"` } // BuildOutput is input to a build strategy and describes the Docker image that the strategy diff --git a/pkg/build/api/v1beta1/conversion.go b/pkg/build/api/v1beta1/conversion.go index 446e3e96279e..98019e625f20 100644 --- a/pkg/build/api/v1beta1/conversion.go +++ b/pkg/build/api/v1beta1/conversion.go @@ -54,13 +54,13 @@ func init() { out.BuilderImage = in.Image out.Image = in.Image out.Scripts = in.Scripts - out.Clean = in.Clean + out.Clean = !in.Incremental s.Convert(&in.Env, &out.Env, 0) return nil }, func(in *STIBuildStrategy, out *newer.STIBuildStrategy, s conversion.Scope) error { out.Scripts = in.Scripts - out.Clean = in.Clean + out.Incremental = !in.Clean s.Convert(&in.Env, &out.Env, 0) if len(in.Image) != 0 { out.Image = in.Image diff --git a/pkg/build/api/v1beta1/conversion_test.go b/pkg/build/api/v1beta1/conversion_test.go index fa068c2dcc85..f91126a1d9f9 100644 --- a/pkg/build/api/v1beta1/conversion_test.go +++ b/pkg/build/api/v1beta1/conversion_test.go @@ -16,7 +16,9 @@ func TestSTIBuildStrategyConversion(t *testing.T) { var actual newer.STIBuildStrategy oldVersion := current.STIBuildStrategy{ BuilderImage: "testimage", + Clean: true, } + err := Convert(&oldVersion, &actual) if err != nil { t.Fatalf("unexpected error: %v", err) @@ -24,6 +26,9 @@ func TestSTIBuildStrategyConversion(t *testing.T) { if actual.Image != oldVersion.BuilderImage { t.Errorf("expected %v, actual %v", oldVersion.BuilderImage, actual.Image) } + if actual.Incremental == oldVersion.Clean { + t.Errorf("expected %v, actual %v", oldVersion.Clean, actual.Incremental) + } } func TestImageChangeTriggerFromRename(t *testing.T) { diff --git a/pkg/build/api/v1beta1/types.go b/pkg/build/api/v1beta1/types.go index 577f9a05f17f..9c1d2ea25ccd 100644 --- a/pkg/build/api/v1beta1/types.go +++ b/pkg/build/api/v1beta1/types.go @@ -205,6 +205,7 @@ type STIBuildStrategy struct { Scripts string `json:"scripts,omitempty"` // Clean flag forces the STI build to not do incremental builds if true. + // Deprecated: in v1beta2 it will be replaced by Incremental. Clean bool `json:"clean,omitempty"` } diff --git a/pkg/build/builder/sti.go b/pkg/build/builder/sti.go index 5fb8d2821d36..06ff90c1a53d 100644 --- a/pkg/build/builder/sti.go +++ b/pkg/build/builder/sti.go @@ -40,7 +40,7 @@ func (s *STIBuilder) Build() error { Tag: tag, ScriptsURL: s.build.Parameters.Strategy.STIStrategy.Scripts, Environment: getBuildEnvVars(s.build), - Clean: s.build.Parameters.Strategy.STIStrategy.Clean, + Clean: !s.build.Parameters.Strategy.STIStrategy.Incremental, } if s.build.Parameters.Revision != nil && s.build.Parameters.Revision.Git != nil && s.build.Parameters.Revision.Git.Commit != "" { diff --git a/pkg/cmd/cli/describe/describer.go b/pkg/cmd/cli/describe/describer.go index 7f7206ef2480..b21c47e4b01f 100644 --- a/pkg/cmd/cli/describe/describer.go +++ b/pkg/cmd/cli/describe/describer.go @@ -76,8 +76,8 @@ func (d *BuildDescriber) DescribeParameters(p buildapi.BuildParameters, out *tab } case buildapi.STIBuildStrategyType: formatString(out, "Builder Image", p.Strategy.STIStrategy.Image) - if p.Strategy.STIStrategy.Clean { - formatString(out, "Clean Build", "yes") + if p.Strategy.STIStrategy.Incremental { + formatString(out, "Incremental Build", "yes") } case buildapi.CustomBuildStrategyType: formatString(out, "Builder Image", p.Strategy.CustomStrategy.Image)