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: Reduce duplication in Collector Konflux pipelines #1676

Merged
merged 8 commits into from
May 23, 2024

Conversation

msugakov
Copy link
Contributor

@msugakov msugakov commented May 16, 2024

Description

Follows the pattern set in stackrox/stackrox#10866.
YAML formatting applied from stackrox/scanner#1515.

It's best to review this change by commits where I tried supplying meaningful messages.

Checklist

  • Investigated and inspected CI test results
  • [ ] Updated documentation accordingly

Automated testing

  • [ ] Added unit tests
  • [ ] Added integration tests
  • [ ] Added regression tests

If any of these don't apply, please comment below.

Testing Performed

Only looking at CI.

@msugakov msugakov changed the title ROX-20232: Extract common collector pipeline definition ROX-20232: Reduce duplication in Collector Konflux pipelines May 16, 2024
@msugakov msugakov force-pushed the misha/ROX-20232-groom-collector-konflux-pipelines branch 2 times, most recently from 0316110 to e8dd121 Compare May 22, 2024 12:31
@msugakov
Copy link
Contributor Author

/retest

@msugakov msugakov requested a review from tommartensen May 22, 2024 12:43
@msugakov msugakov force-pushed the misha/ROX-20232-groom-collector-konflux-pipelines branch from e8dd121 to 46e03ef Compare May 22, 2024 14:44
@msugakov
Copy link
Contributor Author

msugakov commented May 23, 2024

@msugakov msugakov force-pushed the misha/ROX-20232-groom-collector-konflux-pipelines branch from 46e03ef to 7ebd9e4 Compare May 23, 2024 09:15
@msugakov msugakov marked this pull request as ready for review May 23, 2024 10:08
@msugakov msugakov requested review from a team as code owners May 23, 2024 10:08
@msugakov
Copy link
Contributor Author

/retest

Copy link
Collaborator

@Molter73 Molter73 left a comment

Choose a reason for hiding this comment

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

Full disclosure, I understand very little of what's going on in this PR, so this is a "blind trust LGTM"

- name: TARGET_STAGE
value: $(params.build-target-stage)
runAfter:
- prefetch-dependencies
Copy link
Contributor

Choose a reason for hiding this comment

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

This seems to be slightly different from the original version, where prefetch-dependencies was run after prepare-rhel-rpm-subscriptions. Just out of curiosity, is the order here important?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The order matters in general but not here.

Both prefetch-dependencies and prepare-rhel-rpm-subscriptions (as well as earlier clone-repository and determine-image-tag) are prerequisites for build-container. They were put sequentially because, well, we could. They can also be put parallel because they don't have a dependency on each other.

In fact, in .tekton/collector-(pull-request|push).yaml they were already in parallel and this caused no issue.
.tekton/collector-slim-(pull-request|push).yaml were simply not made consistent.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

BTW, getting rid of these discrepancies was a side-goal of the task.

@msugakov
Copy link
Contributor Author

/retest

1 similar comment
@msugakov
Copy link
Contributor Author

/retest

@msugakov
Copy link
Contributor Author

Finally, green enough Konflux CI. Merging.

@msugakov msugakov merged commit d01b3a2 into master May 23, 2024
103 of 105 checks passed
@msugakov msugakov deleted the misha/ROX-20232-groom-collector-konflux-pipelines branch May 23, 2024 17:15
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.

4 participants