From f585d301b0a258c4847af7e495b1488dbe272345 Mon Sep 17 00:00:00 2001 From: Dibyo Mukherjee Date: Wed, 14 Aug 2019 18:04:24 -0400 Subject: [PATCH] Add GcsFetcher and GcsUploader images to release task and pipeline These two images were added in #1159 and the release task and pipeline have to be updated for a release to be successful. Also, fixes a typo in the pull request resource image name. Signed-off-by: Dibyo Mukherjee --- tekton/publish-run.yaml | 26 ++++++++++++++++++++++++++ tekton/publish.yaml | 6 ++++++ tekton/release-pipeline-run.yaml | 15 ++++++++++----- tekton/release-pipeline.yaml | 9 ++++++++- tekton/resources.yaml | 22 +++++++++++++++++++++- 5 files changed, 71 insertions(+), 7 deletions(-) diff --git a/tekton/publish-run.yaml b/tekton/publish-run.yaml index 029d45bfa26..671be2a7876 100644 --- a/tekton/publish-run.yaml +++ b/tekton/publish-run.yaml @@ -145,6 +145,26 @@ spec: value: cmd/pullrequest-init # Registry is provided via parameter, this is a hack see #569 --- apiVersion: tekton.dev/v1alpha1 +kind: PipelineResource +metadata: + name: gcs-fetcher-image +spec: + type: image + params: + - name: url + value: vendor/github.com/googlecloudplatform/cloud-builders/gcs-fetcher/cmd/gcs-fetcher # Registry is provided via parameter, this is a hack see #569 +--- +apiVersion: tekton.dev/v1alpha1 +kind: PipelineResource +metadata: + name: gcs-uploader-image +spec: + type: image + params: + - name: url + value: vendor/github.com/googlecloudplatform/cloud-builders/gcs-fetcher/cmd/gcs-uploader # Registry is provided via parameter, this is a hack see #569 +--- +apiVersion: tekton.dev/v1alpha1 kind: TaskRun metadata: name: publish-run @@ -208,3 +228,9 @@ spec: - name: builtPullRequestInitImage resourceRef: name: pullrequest-init-image + - name: builtGcsFetcherImage + resourceRef: + name: gcs-fetcher-image + - name: builtGcsUploaderImage + resourceRef: + name: gcs-uploader-image \ No newline at end of file diff --git a/tekton/publish.yaml b/tekton/publish.yaml index e5b0309f93a..0d689cd76a7 100644 --- a/tekton/publish.yaml +++ b/tekton/publish.yaml @@ -45,6 +45,10 @@ spec: type: image - name: builtPullRequestInitImage type: image + - name: builtGcsFetcherImage + type: image + - name: builtGcsUploaderImage + type: image steps: - name: build-push-base-images @@ -160,6 +164,8 @@ spec: $(inputs.params.imageRegistry)/$(inputs.params.pathToProject)/$(outputs.resources.builtWebhookImage.url) $(inputs.params.imageRegistry)/$(inputs.params.pathToProject)/$(outputs.resources.builtDigestExporterImage.url) $(inputs.params.imageRegistry)/$(inputs.params.pathToProject)/$(outputs.resources.builtPullRequestInitImage.url) + $(inputs.params.imageRegistry)/$(inputs.params.pathToProject)/$(outputs.resources.builtGcsFetcherImage.url) + $(inputs.params.imageRegistry)/$(inputs.params.pathToProject)/$(outputs.resources.builtGcsUploaderImage.url) ) # Parse the built images from the release.yaml generated by ko BUILT_IMAGES=( $(/workspace/go/src/github.com/tektoncd/pipeline/tekton/koparse/koparse.py --path /workspace/bucket/latest/release.yaml --base $(inputs.params.imageRegistry)/$(inputs.params.pathToProject) --images ${IMAGES[@]}) ) diff --git a/tekton/release-pipeline-run.yaml b/tekton/release-pipeline-run.yaml index 4346cfd7211..fe740927add 100644 --- a/tekton/release-pipeline-run.yaml +++ b/tekton/release-pipeline-run.yaml @@ -11,9 +11,9 @@ spec: - name: versionTag value: v0.X.Y # REPLACE with the version you want to release, including `v`. For nightly releases, we might want to use `vYYYYMMDD-commit` - name: imageRegistry - value: gcr.io/tekton-releases # REPLACE with your own registry - - name: package - value: github.com/tektoncd/pipeline + value: gcr.io/tekton-releases # REPLACE with your own registry + - name: package + value: github.com/tektoncd/pipeline resources: - name: source-repo resourceRef: @@ -56,5 +56,10 @@ spec: name: digest-exporter-image - name: builtPullRequestInitImage resourceRef: - name: pullrequest-init-image - + name: pull-request-init-image + - name: builtGcsFetcherImage + resourceRef: + name: gcs-fetcher-image + - name: builtGcsUploaderImage + resourceRef: + name: gcs-uploader-image \ No newline at end of file diff --git a/tekton/release-pipeline.yaml b/tekton/release-pipeline.yaml index f21b425faf0..405eb5f0f33 100644 --- a/tekton/release-pipeline.yaml +++ b/tekton/release-pipeline.yaml @@ -41,6 +41,10 @@ spec: type: image - name: builtPullRequestInitImage type: image + - name: builtGcsFetcherImage + type: image + - name: builtGcsUploaderImage + type: image tasks: - name: lint taskRef: @@ -120,4 +124,7 @@ spec: resource: builtDigestExporterImage - name: builtPullRequestInitImage resource: builtPullRequestInitImage - + - name: builtGcsFetcherImage + resource: builtGcsFetcherImage + - name: builtGcsUploaderImage + resource: builtGcsUploaderImage diff --git a/tekton/resources.yaml b/tekton/resources.yaml index cd7cb58697c..e93023a33ba 100644 --- a/tekton/resources.yaml +++ b/tekton/resources.yaml @@ -137,9 +137,29 @@ spec: apiVersion: tekton.dev/v1alpha1 kind: PipelineResource metadata: - name: pull-request-init-image + name: gcs-fetcher-image spec: type: image params: - name: url value: cmd/pullrequest-init # Registry is provided via parameter, this is a hack see #569 +--- +apiVersion: tekton.dev/v1alpha1 +kind: PipelineResource +metadata: + name: gcs-fetcher-image +spec: + type: image + params: + - name: url + value: vendor/github.com/googlecloudplatform/cloud-builders/gcs-fetcher/cmd/gcs-fetcher # Registry is provided via parameter, this is a hack see #569 +--- +apiVersion: tekton.dev/v1alpha1 +kind: PipelineResource +metadata: + name: gcs-uploader-image +spec: + type: image + params: + - name: url + value: vendor/github.com/googlecloudplatform/cloud-builders/gcs-fetcher/cmd/gcs-uploader # Registry is provided via parameter, this is a hack see #569 \ No newline at end of file