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

Split docker-jenkins-weekly and docker-jenkins-weekly.ci for infra.ci and weekly.ci #3887

Closed
3 tasks
NotMyFault opened this issue Jan 3, 2024 · 12 comments
Closed
3 tasks

Comments

@NotMyFault
Copy link
Member

Service(s)

infra.ci.jenkins.io, weekly.ci.jenkins.io, Docker Hub

Summary

As outlined in jenkins-infra/docker-jenkins-weekly#1459 (review), I'd like to split the docker images to create a minimalistic one for weekly.ci and leave infra.ci as-is.
Given both instances serve different needs, we don't need the majority of plugins on weekly.ci at all.

TODO:

  • Create a GH repository in jenkins-infra: docker-jenkins-weekly.ci (unless someone has a better name in mind)
  • Create a new docker repo with the same name in jenkinsciinfra on docker hub
  • Update kubernetes-management accordingly

I can take care of 1) and 3) :)

Reproduction steps

No response

@dduportal
Copy link
Contributor

@NotMyFault I believe we should be able to use a bake file instead and keep only 1 repository?

@NotMyFault
Copy link
Member Author

@NotMyFault I believe we should be able to use a bake file instead and keep only 1 repository?

Right right, we actually just need a different set of plugins 🤔
Everything else remains the same. Good catch!

Do you think you could come up with a simple bake file? I'm not that well-versed with the hashicorp config lang 😓

@NotMyFault NotMyFault removed their assignment Jan 4, 2024
@dduportal dduportal removed the triage Incoming issues that need review label Jan 8, 2024
@dduportal dduportal added this to the infra-team-sync-2024-01-09 milestone Jan 8, 2024
@lemeurherve lemeurherve self-assigned this Jan 8, 2024
@lemeurherve
Copy link
Member

@NotMyFault I'll prepare the docker bake 🙂

@lemeurherve
Copy link
Member

Instead of creating another docker image I plan to publish the weekly.ci.jenkins.io image variant as specific tag with a suffix like for example 1.23.1-2.439-weeklyci

(or 1.23.1-2.439-🦄 ? :trollface:)

@lemeurherve
Copy link
Member

Opened jenkins-infra/docker-jenkins-weekly#1462 cherry-picking jenkins-infra/docker-jenkins-weekly#1459 as a good candidate for differentiation between these variants.

Next steps:

  • Updating kubernetes-management config and updatecli manifest

@lemeurherve
Copy link
Member

weekly.ci.jenkins.io config has been updated to use its specific variant in jenkins-infra/kubernetes-management#4850

Updatecli manifest update verified with jenkins-infra/kubernetes-management#4849

Confirmed that Blue Ocean plugins and dependencies aren't available anymore on weekly.ci.jenkins.io:
image

Closing this issue.

@lemeurherve
Copy link
Member

Reopening as we need to get distinct lifecycle for these variants.

To do so, scripts and shared pipeline need to be updated to allow working on a specific target only (infra.ci.jenkins.io or weekly.ci.jenkins.io variant).

@lemeurherve
Copy link
Member

Opened a pull request to build none, one or both variants depending on the modified files, and to create distinct plugins update pull requests: jenkins-infra/docker-jenkins-weekly#1471

@smerle33 smerle33 modified the milestones: infra-team-sync-2024-01-16, infra-team-sync-2024-01-23 Jan 16, 2024
@lemeurherve
Copy link
Member

lemeurherve commented Jan 16, 2024

Result of the PR, from jenkins-infra/docker-jenkins-weekly#1471 (comment):

The merge of this PR on main has correctly triggered a build of both variants: https://infra.ci.jenkins.io/job/docker-jobs/job/docker-jenkins-weekly/job/main/365/

And the GHA has correctly opened two distinct pull requests:

Finally, these pull requests have themselves correctly triggered a build of only their corresponding variant.

Closing this issue as completed.

@lemeurherve
Copy link
Member

lemeurherve commented Jan 16, 2024

Note that running the last-weekly GHA results in a unique pull request containing the Jenkins version update and both plugins lists update, as both should be updated every time the Jenkins version changes:

@lemeurherve
Copy link
Member

Reopening as I need to adapt kubernetes-management updatecli manifests to update only infra.ci.jenkins.io or weekly.ci.jenkins.io if only one of them has a new version.

@lemeurherve
Copy link
Member

lemeurherve commented Jan 23, 2024

Update:

Closing this issue as both variants have their own lifecycles now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

4 participants