Use main as primary branch

[lemeurherve]

Suggestion

We should use main instead of master as primary branch.

This will need updating not only this repo but also all references to master in Jenkinsfile(s) and job on ci.jenkins.io, infra.ci.jenkins.io and trusted.ci.jenkins.io

Links

• [INFRA-3125] Migrate jenkins-infra repositories from branch "master" to "main" helpdesk#2671

[biru-codeastromer]

Hello Sir @lemeurherve I am currently trying to solve this issue.But I have doubt regarding Updating jobs in ci.jenkins.io, infra.ci.jenkins.io, and trusted.ci.jenkins.io. For doing this part do I need more access or so? Please let me know

[dduportal]

Hello Sir @lemeurherve I am currently trying to solve this issue.But I have doubt regarding Updating jobs in ci.jenkins.io, infra.ci.jenkins.io, and trusted.ci.jenkins.io. For doing this part do I need more access or so? Please let me know

Hi @biru-codeastromer , you won't be given more accesses (as these resources are sensitive and require certain level of trust), but if you can elaborate a list of all locations in which you see code related to this change, you might be able to help by preparing PRs once we've given you the green light.
In other words, you will have to contribute by preparing the exhaustive list of locations in which it has to be changed:

• By code
• Or by "location" (such as "the job xxxx in yyyy).

Be aware that there are also private documents which might require updates (we'll take care of them).

[biru-codeastromer]

Hi @dduportal Sir ,

Thank you for the clarification and for trusting me with this contribution! I completely understand the sensitivity of these resources and appreciate the opportunity to assist within the provided scope.

I’ll begin by carefully analyzing the codebase to prepare an exhaustive list of all the locations where the changes are required, including code references and relevant "locations" like specific jobs or configurations. Btw I noticed that the sites infra.ci.jenkins.io, and trusted.ci.jenkins.io didn't open ;the links got errors.

Once I’ve compiled the list, I’ll share it for your review before moving forward with any PRs. Please feel free to let me know if there are any specific guidelines or additional considerations I should keep in mind while preparing the list.

Looking forward to your feedback!

[biru-codeastromer]

Hi @dduportal Sir,

I’ve prepared a document listing all instances of master in the codebase, job configurations, and documentation. Here’s the breakdown:

Code Changes

Jenkinsfile:

-Line 37: branch: 'master'

Jenkinsfile_k8s:

-Line 14: cron("${env.BRANCH_NAME == 'master' ? 'H/30 * * * *' : ''}")
-Line 49: changeRequest target: 'master'

scripts/fetch-external-resources:

-Line 30: 'https://github.com/jenkinsci/pipeline-examples/archive/master.zip'
-Line 31: 'content/_tmp/pipeline-examples-master.zip'

Documentation

README.adoc:

-Line 15: link:https://github.com/jenkins-infra/jenkins.io/blob/master/CONTRIBUTING.adoc[Contributing document]
-Line 17: Documentation for Jenkins website maintenance is in the maintainers guidelines.

CONTRIBUTING.adoc:

-Line 15: Fork this repository and ensure that you keep only the master branch.
-Line 16: Create a new branch from your master branch and perform your work on this new branch, avoiding direct changes to the master branch.
-Line 18: Create a pull request (PR) from your branch to the master branch of this repository.
-Line 58: Changes you make in your fork do not show up on the website until they are merged (via PR) to the master branch.
-Line 427: To add an event to the Jenkins event calendar, create a file in the content/_data/events folder.
-Line 429: To create a file in this folder using the GitHub web editor, open this page.
-Line 595: Jenkins core changelogs - Managed by the Jenkins core maintainers.

GitHub Workflows & Configurations

.github/workflows/compress-images.yaml:

-Line 3: # - on pushing of images to master (for forks)
-Line 18: - master

.github/workflows/updatecli.yaml:

-Line 27: if: github.ref == 'refs/heads/master'

.github/ISSUE_TEMPLATE/2-wiki-migration.yml:

-Line 27: Wiki Migration Guidelines

.github/ISSUE_TEMPLATE/1-documentation.yml:

-Line 21: More details on contributing.

.github/ISSUE_TEMPLATE/3-enhancement.yml:

-Line 25: More details on contributing.

.github/ISSUE_TEMPLATE/4-bug.yml:

-Line 37: More details on contributing.

.github/dependabot.yml:

-Line 7: target-branch: master

Please let me know if I’ve missed anything or if there are additional locations to consider. Let me know your feedbacks on this

Thanks!

[zbynek]

@biru-codeastromer for the pipeline examples the branch refers to another repository, so it shouldn't change in this issue. For the other findings it would be better if you prepared a pull request, then those changes can be reviewed more easily.

[biru-codeastromer]

@biru-codeastromer for the pipeline examples the branch refers to another repository, so it shouldn't change in this issue. For the other findings it would be better if you prepared a pull request, then those changes can be reviewed more easily.

Hi Sir,

Thank you for the feedback! I haven’t prepared the PR yet because initially,Damien Sir mentioned that I should first compile an exhaustive list of locations where changes are required before moving forward with PRs. Since the jobs on ci.jenkins.io, infra.ci.jenkins.io, and trusted.ci.jenkins.io are sensitive, I wanted to ensure that my list was complete and reviewed before making changes.

Now that I have confirmation on the required changes (except the pipeline examples reference), I will proceed with preparing the PR.

Thanks!

[biru-codeastromer]

Hi ,

I’ve prepared a PR to replace all instances of master with main in the codebase, documentation, and GitHub workflows. Here’s a summary of the changes:

Code Changes

• Updated Jenkinsfiles.
• Updated scripts.

Documentation

• Updated README.adoc and CONTRIBUTING.adoc.

GitHub Workflows & Configurations

• Updated workflows and dependabot configuration.

Additional Notes

• External links referencing the master branch might need updates. Please let me know if these should be included in this PR.
• CI/CD jobs on ci.jenkins.io, infra.ci.jenkins.io, and trusted.ci.jenkins.io might also need updates. Since I don’t have access to these, I’ve left them out of this PR.

Please let me know if improvements needed .

Thanks!

[kmartens27]

work is currently ongoing for this process and the infra team has been informed about the changes being developed