Skip to content

Commit

Permalink
Add GcsFetcher and GcsUploader images to release task and pipeline
Browse files Browse the repository at this point in the history
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 <dibyo@google.com>
  • Loading branch information
dibyom committed Aug 14, 2019
1 parent c105b68 commit f585d30
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 7 deletions.
26 changes: 26 additions & 0 deletions tekton/publish-run.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
6 changes: 6 additions & 0 deletions tekton/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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[@]}) )
Expand Down
15 changes: 10 additions & 5 deletions tekton/release-pipeline-run.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
9 changes: 8 additions & 1 deletion tekton/release-pipeline.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ spec:
type: image
- name: builtPullRequestInitImage
type: image
- name: builtGcsFetcherImage
type: image
- name: builtGcsUploaderImage
type: image
tasks:
- name: lint
taskRef:
Expand Down Expand Up @@ -120,4 +124,7 @@ spec:
resource: builtDigestExporterImage
- name: builtPullRequestInitImage
resource: builtPullRequestInitImage

- name: builtGcsFetcherImage
resource: builtGcsFetcherImage
- name: builtGcsUploaderImage
resource: builtGcsUploaderImage
22 changes: 21 additions & 1 deletion tekton/resources.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit f585d30

Please sign in to comment.