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

chore(pipeline) switch to dedicated agent resources #2032

Merged
merged 3 commits into from
Apr 29, 2023

Conversation

dduportal
Copy link
Contributor

@dduportal dduportal commented Apr 29, 2023

This PR is motivated by jenkins-infra/helpdesk#3521.

This PR switches to a set of resources dedciated to the BOM, to avoid blocking other plugins/projects builds on ci.jenkins.io.

Unlike the experiments in #1969, there is no change in the VM or agent sizing to deliver one change at a time.

Please note there are 2 minors changes in this PR:

  • Removing the "Digital Ocean Artifact Caching Proxy" exception as this PR forces all builds to run in AWS only (and it should stay like this)
  • Merge the mvn -v SH steps into the principal steps

  • Make sure you are opening from a topic/feature/bugfix branch (right side) and not your main branch!
  • Ensure that the pull request title represents the desired changelog entry
  • Please describe what you did
  • Link to relevant issues in GitHub or Jira
  • Link to relevant pull requests, esp. upstream and downstream changes
  • [ ] Ensure you have provided tests - that demonstrates feature works or fixes the issue

Signed-off-by: Damien Duportal <damien.duportal@gmail.com>
Signed-off-by: Damien Duportal <damien.duportal@gmail.com>
Signed-off-by: Damien Duportal <damien.duportal@gmail.com>
@dduportal
Copy link
Contributor Author

Merging as the expected outcome is present:

  • Build was handled as usual (e.g. same "slowness" in pipeline steps) but in the expected node pool
  • Errors are (still) due to evicted pods/spot nodes

But the expected goal is there: no more competition with the normal node pool

@dduportal dduportal merged commit 6ee6f33 into jenkinsci:master Apr 29, 2023
timeout(120) {
sh 'mvn -version'
// Exclude DigitalOcean artifact caching proxy provider, currently unreliable on BOM builds
// TODO: remove when https://github.com/jenkins-infra/helpdesk/issues/3481 is fixed
Copy link
Member

Choose a reason for hiding this comment

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

Comment on lines +15 to +18
withEnv(["JAVA_HOME=/opt/jdk-$params.jdk"]) {
infra.withArtifactCachingProxy {
withEnv([
"MAVEN_ARGS=${env.MAVEN_ARGS != null ? MAVEN_ARGS : ''} -B -ntp -Dmaven.repo.local=${WORKSPACE_TMP}/m2repo"
Copy link
Member

Choose a reason for hiding this comment

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

Slightly clearer and more efficient to combine the two withEnv steps.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch, thanks for the post review!

Opened #2033 for this one

Comment on lines +101 to +103
sh '''
mvn -v
bash pct.sh
Copy link
Member

Choose a reason for hiding this comment

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

Saving a sh step per branch 👍

@dduportal dduportal deleted the helpdesk-3521 branch May 2, 2023 08:34
MarkEWaite pushed a commit that referenced this pull request May 3, 2023
* Skip PCT by default on PRs

* Run full tests weekly

* Empty commit should suffice

* `git branch -D` might be necessary

Co-authored-by: Joseph Petersen <me@jetersen.dev>

* Copying DB automerge workflow from #2031

* Revert #2032 for `prep` phase, retaining node pool for PCT #2034 (comment)

---------

Co-authored-by: Joseph Petersen <me@jetersen.dev>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
chore Reduces future maintenance
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants