diff --git a/docs/gangplank/usage.md b/docs/gangplank/usage.md index f36fc5f117..56f1b43b04 100644 --- a/docs/gangplank/usage.md +++ b/docs/gangplank/usage.md @@ -181,13 +181,13 @@ To illustrate this, consider: - oscontainer request_cache_repo: true request_cache: true - returns_cache: true - returns_cache_repo: true + return_cache: true + return_cache_repo: true - id: oscontainer build_artifacts: - ostree - requires_cache: true - requires_cache_repo: true + require_cache: true + require_cache_repo: true - id: clouds concurrent_execution: true build_artifacts: diff --git a/gangplank/ocp/bc.go b/gangplank/ocp/bc.go index 78eaea1b5d..67bbcc37ec 100644 --- a/gangplank/ocp/bc.go +++ b/gangplank/ocp/bc.go @@ -247,7 +247,7 @@ binary build interface.`) l := log.WithFields(log.Fields{ "stage": s.ID, - "required_artifacts": s.RequireArtifacts, + "require_artifacts": s.RequireArtifacts, }) cpod, err := NewCosaPodder(podCtx, apiBuild, idx) diff --git a/gangplank/spec/stages.go b/gangplank/spec/stages.go index 923a2ba205..c1c21979e8 100644 --- a/gangplank/spec/stages.go +++ b/gangplank/spec/stages.go @@ -50,12 +50,12 @@ type Stage struct { // required artifact is missing (per the meta.json), the stage // will not be executed. RequireArticts _implies_ sending builds/builds.json // and builds//meta.json. - RequireArtifacts []string `yaml:"requires_artifacts,flow,omitempty" json:"requires_artifacts,omitempty"` + RequireArtifacts []string `yaml:"require_artifacts,flow,omitempty" json:"require_artifacts,omitempty"` // RequestArtifacts are files that are provided if they are there. Examples include // 'caches' for `/srv/cache` and `/srv/tmp/repo` tarballs or `ostree` which are really useful // for base builds. - RequestArtifacts []string `yaml:"optional_artifacts,flow,omitempty" json:"optional_artifacts,omitempty"` + RequestArtifacts []string `yaml:"request_artifacts,flow,omitempty" json:"request_artifacts,omitempty"` // BuildArtifacts produces "known" artifacts. The special "base" // will produce an OSTree and QCOWs.