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

ROX-20232: Unify PR and push PipelineRun-s #1526

Merged
merged 6 commits into from
May 27, 2024

Conversation

msugakov
Copy link
Contributor

@msugakov msugakov commented May 23, 2024

After seeing very little difference between <blah>-push.yaml and <blah>-pull-request.yaml, I went ahead and merged the two.

build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}' remains literally that on pushes as opposed to PRs where {{pull_request_number}} gets replaced with a number (like 1526 here). I think, it should be fine since it's not something that gets in a final image.

The only thing I regret is that the activity page would not let easily distinguish pushes from pull requests.
image

Copy link

openshift-ci bot commented May 23, 2024

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@msugakov msugakov force-pushed the misha/join-konflux-pipeline-files branch from 502b4a8 to 1c7f92f Compare May 23, 2024 16:32
@msugakov msugakov changed the title DO NOT MERGE Try have different pipelines in one file ROX-20232: Unify PipelineRun-s May 23, 2024
msugakov added 2 commits May 23, 2024 18:38
since this name shows up in GitHub checks UI and I think "build" is
more direct.
@msugakov msugakov changed the title ROX-20232: Unify PipelineRun-s ROX-20232: Unify PR and push PipelineRun-s May 23, 2024
@msugakov msugakov requested review from kylape and tommartensen May 23, 2024 16:50
@msugakov
Copy link
Contributor Author

/retest

@msugakov msugakov marked this pull request as ready for review May 23, 2024 21:16
@msugakov msugakov requested a review from a team as a code owner May 23, 2024 21:16
Copy link
Contributor

@tommartensen tommartensen left a comment

Choose a reason for hiding this comment

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

This change LGTM.

What about the tags though? Should we do implement it the same way as in the collector repository?

In this PR or another one, both is fine for me.

@msugakov
Copy link
Contributor Author

What about the tags though?

I suppose you mean https://issues.redhat.com/browse/ROX-24116 . I want to do it in a separate PR because the approach may be slightly different. I'll try to get by without additional apply-tags task for Scanner.

@msugakov msugakov merged commit 239f537 into master May 27, 2024
33 of 37 checks passed
@msugakov msugakov deleted the misha/join-konflux-pipeline-files branch May 27, 2024 17:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants