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

Setup the teps CI job with git rebase on master #655

Merged
merged 1 commit into from
Mar 1, 2021

Conversation

afrittoli
Copy link
Member

@afrittoli afrittoli commented Dec 4, 2020

Changes

The "git batch merge" task in the catalog already does the job of
rebasing (or actually merging) the commits from a PR on top of
master - see https://hub.tekton.dev/tekton/task/git-batch-merge.

Using that task though requires workspaces. I'm using this CI job
then to start the work of removing deprecated resources from our
dogfooding and switching to workspaces and when expressions.

This PR adds a new endpoint for webhooks so that we may
migrate jobs over time from one webhook to the other.

Signed-off-by: Andrea Frittoli andrea.frittoli@uk.ibm.com

Submitter Checklist

These are the criteria that every PR should meet, please check them off as you
review them:

See the contribution guide
for more details.

/kind feature

@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. kind/feature Categorizes issue or PR as related to a new feature. labels Dec 4, 2020
@tekton-robot tekton-robot requested review from dlorenc and a user December 4, 2020 18:59
@tekton-robot tekton-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Dec 4, 2020
@afrittoli
Copy link
Member Author

Note that this uses a new ingress, a new event listener and a new folder in git to keep the workspace based CI separated from the pipeline resources based one.

@tekton-robot tekton-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 23, 2020
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

This looks good to me although I will say that I don't think I'm expert enough to tell whether it's ready to merge and use yet?

tekton/ci-workspace/eventlistener.yaml Outdated Show resolved Hide resolved
tekton/ci-workspace/eventlistener.yaml Outdated Show resolved Hide resolved
@afrittoli
Copy link
Member Author

/test check-pr-has-kind-label

1 similar comment
@afrittoli
Copy link
Member Author

/test check-pr-has-kind-label

Base automatically changed from master to main February 4, 2021 09:16
@tekton-robot tekton-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Feb 26, 2021
@afrittoli afrittoli marked this pull request as ready for review February 26, 2021 15:25
@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 Feb 26, 2021
@ghost
Copy link

ghost commented Feb 26, 2021

/lgtm

@tekton-robot tekton-robot assigned ghost Feb 26, 2021
@tekton-robot tekton-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 26, 2021
@tekton-robot tekton-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Feb 26, 2021
@afrittoli
Copy link
Member Author

@afrittoli
Copy link
Member Author

Uhm, something is not right with the git-batch-merge task yet: https://dashboard.dogfooding.tekton.dev/#/namespaces/tekton-ci/pipelineruns/pull-community-teps-lint-5xhsw?pipelineTask=clone-repo&step=clone

Heh, the problem is that the base branch in the community repo is main, and the task defaults all to master :)

@tekton-robot tekton-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Feb 27, 2021
@afrittoli afrittoli closed this Mar 1, 2021
@afrittoli afrittoli reopened this Mar 1, 2021
@afrittoli
Copy link
Member Author

/test .*

@afrittoli afrittoli force-pushed the ci_workspaces branch 3 times, most recently from 12bf992 to ffc699d Compare March 1, 2021 15:06
The "git batch merge" task in the catalog already does the job of
rebasing (or actually merging) the commits from a PR on top of
master - see https://hub.tekton.dev/tekton/task/git-batch-merge.

Using that task though requires workspaces. I'm using this CI job
then to start the work of removing deprecated resources from our
dogfooding and switching to workspaces and when expressions.

This PR adds a new endpoint for webhooks so that we may
migrate jobs over time from one webhook to the other.

Signed-off-by: Andrea Frittoli <andrea.frittoli@uk.ibm.com>
Copy link
Member

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

/meow

@tekton-robot
Copy link
Contributor

@vdemeester: cat image

In response to this:

/meow

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
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 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:

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

@tekton-robot tekton-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 1, 2021
@ghost
Copy link

ghost commented Mar 1, 2021

/lgtm

@tekton-robot tekton-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 1, 2021
@tekton-robot tekton-robot merged commit bcb46a7 into tektoncd:main Mar 1, 2021
bobcatfish added a commit to bobcatfish/plumbing that referenced this pull request Oct 14, 2021
In tektoncd#655 a version of the teps
linter was added which uses workspaces instead of PipelineResources.
Looking through pipelineruns, it looks like this older version of the
linter is no longer triggered, and the new one is, so it should be safe
to delete.
bobcatfish added a commit to bobcatfish/plumbing that referenced this pull request Oct 14, 2021
In tektoncd#655 a version of the teps
linter was added which uses workspaces instead of PipelineResources.
Looking through pipelineruns, it looks like this older version of the
linter is no longer triggered, and the new one is, so it should be safe
to delete.
tekton-robot pushed a commit that referenced this pull request Oct 28, 2021
In #655 a version of the teps
linter was added which uses workspaces instead of PipelineResources.
Looking through pipelineruns, it looks like this older version of the
linter is no longer triggered, and the new one is, so it should be safe
to delete.
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/feature Categorizes issue or PR as related to a new feature. lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants