Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update pipelineTasks in Release-Pipeline to use Git Resolver #6565

Merged
merged 1 commit into from
Jun 20, 2023

Conversation

jsminem
Copy link
Contributor

@jsminem jsminem commented Apr 19, 2023

Update pipelineTasks in release-pipeline.yaml file
Fixes #6379
/kind misc

Submitter Checklist

As the author of this PR, please check off the items in this checklist:

  • Has Docs if any changes are user facing, including updates to minimum requirements e.g. Kubernetes version bumps
  • Has Tests included if any functionality added or changed
  • Follows the commit message standard
  • Meets the Tekton contributor standards (including functionality, content, code)
  • Has a kind label. You can add one by adding a comment on this PR that contains /kind <type>. Valid types are bug, cleanup, design, documentation, feature, flake, misc, question, tep
  • Release notes block below has been updated with any user facing changes (API changes, bug fixes, changes requiring upgrade notices or deprecation warnings)
  • Release notes contains the string "action required" if the change requires additional action from users switching to the new release

Release Notes

NONE

@tekton-robot tekton-robot added release-note-none Denotes a PR that doesnt merit a release note. kind/misc Categorizes issue or PR as a miscellaneuous one. labels Apr 19, 2023
@tekton-robot tekton-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 19, 2023
@tekton-robot
Copy link
Collaborator

Hi @jsminem. Thanks for your PR.

I'm waiting for a tektoncd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@afrittoli
Copy link
Member

/ok-to-test

@tekton-robot tekton-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 19, 2023
Copy link
Member

@afrittoli afrittoli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for your PR.
The only task hosted on pipeline side is the publish one.
Everything else comes from the catalog or the plumbing repo.
We could still switch to remote resolution, but the revision is not the pipeline one.
For catalog ones, I would suggest to use the bundles, since the version of the task is then visible in the tag.

Comment on lines 57 to 66
resolver: git
params:
- name: repo
value: pipeline
- name: org
value: tektoncd
- name: revision
value: $(params.gitRevision)
- name: pathInRepo
value: tekton/publish.yaml
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The git-clone task is defined in the catalog, not in the pipeline repo.
We could either pull it from there with the git resolver and pin it to a revision that matches the current sha of the tip of the main branch. Alternatively we could use the bundle remote resolver and consume it, as we do for in the plumbing repo, from the bundles published to grc.io - see https://github.com/tektoncd/plumbing/blob/2b2d5d06c8ffd885945feae76318ac8a153b3c8d/tekton/ci/jobs/tekton-golang-tests.yaml#L37-L44 for an example

Copy link
Contributor Author

@jsminem jsminem Apr 29, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks so much Andrea! This was very helpful.
As suggested, I've used the first approach to update prerelease-checks task in the plumbing repo and bundles for the tasks in the catalog repo. Any feedback would be greatly appreciated! 😊🙏

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should I also include package in params? Like in the example for bundles, https://github.com/tektoncd/catalog?

params:
  - name: package
    value: github.com/tektoncd/pipeline

@@ -66,7 +76,16 @@ spec:
- name: precheck
runAfter: [git-clone]
taskRef:
name: prerelease-checks
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The name here should not be deleted

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@afrittoli I'm curious why you suggested restoring taskRef.name? I don't think we allow it in combination with taskRef.resolver. Separately, do you think we could add tests verifying the release pipeline configuration is valid, in order to catch issues like this?

resolver: git
params:
- name: repo
value: pipeline
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The prerelease-check comes from the plumbing repo. It is deployed together with the pipeline to the cluster when the pipeline definition is installed, so maybe we don't need to change this for now.
If you wanted to use remote resolution here, this is the URL https://github.com/tektoncd/plumbing/blob/main/tekton/resources/release/base/prerelease_checks.yaml

tekton/release-pipeline.yaml Show resolved Hide resolved
tekton/release-pipeline.yaml Outdated Show resolved Hide resolved
tekton/release-pipeline.yaml Outdated Show resolved Hide resolved
tekton/release-pipeline.yaml Outdated Show resolved Hide resolved
tekton/release-pipeline.yaml Outdated Show resolved Hide resolved
@jsminem
Copy link
Contributor Author

jsminem commented Apr 20, 2023

Thanks so much for the feedback! 🙏

@jsminem jsminem marked this pull request as draft April 20, 2023 00:24
@tekton-robot tekton-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 20, 2023
@afrittoli
Copy link
Member

/ok-to-test

@jsminem jsminem closed this Apr 21, 2023
@jsminem jsminem reopened this Apr 29, 2023
@tekton-robot tekton-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 29, 2023
@jsminem jsminem requested a review from afrittoli April 29, 2023 14:57
@jsminem jsminem marked this pull request as ready for review April 29, 2023 14:58
@tekton-robot tekton-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 29, 2023
@jsminem jsminem force-pushed the update-release-pipeline branch 3 times, most recently from 5ea3497 to ecf0d9f Compare April 29, 2023 16:45
@jerop jerop mentioned this pull request May 24, 2023
3 tasks
@tekton-robot tekton-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 26, 2023
@tekton-robot tekton-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels May 26, 2023
…t resolver

update release pipeline to use remote resolution using bundles and git resolver

update release pipeline to use remote resolution using bundles and git resolver

update release pipeline to use remote resolution using bundles and git resolver

update release pipeline to use git resolver

update release pipeline to use git resolver

update release pipeline to use git resolver

update release pipeline

update release pipeline

update release pipeline to use remote resolution using bundles and git resolver
Copy link
Member

@afrittoli afrittoli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for all the updates @jsminem, the PR looks good now!
According to "tide", you may need to rebase it though
/approve

@tekton-robot tekton-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 9, 2023
@afrittoli
Copy link
Member

/cc @lbernick @vdemeester FYI

@tekton-robot
Copy link
Collaborator

@afrittoli: GitHub didn't allow me to request PR reviews from the following users: FYI.

Note that only tektoncd members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

/cc @lbernick @vdemeester FYI

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@tekton-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: afrittoli, vdemeester

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [afrittoli,vdemeester]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Copy link
Member

@jerop jerop left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@tekton-robot tekton-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 20, 2023
@tekton-robot tekton-robot merged commit c802069 into tektoncd:main Jun 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/misc Categorizes issue or PR as a miscellaneuous one. lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note-none Denotes a PR that doesnt merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

switch release-pipeline to use remote resolution
6 participants