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

Revert to GitLab branch source 677.x for JCasC compatibility #2552

Conversation

MarkEWaite
Copy link
Contributor

@MarkEWaite MarkEWaite commented Sep 30, 2023

Revert to GitLab branch source 677.v0b_63b_038322b_ for JCasC compatibility

The 679.v1dfd3604d46e release of the GitLab branch source plugin adds the symbol gitLab to its implementation of a repository browser in PR-360. The repository browser implementation is used by the git plugin to allow the user to choose the preferred way of displaying links to changes.

Unfortunately, the git plugin already defines the symbol gitLab for a repository browser implementation. The addition of the new symbol to the GitLab branch source plugin breaks the configuration as code definitions of git plugin users if they have used the gitLab symbol in their definition of global Pipeline libraries.

jenkinsci/gitlab-branch-source-plugin#360 (comment) has more details including screenshots.

https://github.com/jenkinsci/bom/runs/17272883656 detected the failure while testing the plugin bill of materials with git plugin 5.2.0 and GitLab branch source plugin 679.v1dfd3604d46e.

JENKINS-72104 records the GitLab branch source plugin bug that this is reverting.

This reverts commit d5e912b.

Testing done

Confirmed that git plugin configuration as code tests fail with GitLab branch source 679.v1dfd3604d46e. They pass with GitLab branch source plugin 677.v0b_63b_038322b_.

Submitted pull request to resolve the issue in GitLab branch source plugin:

Submitter checklist

  • 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

…enkinsci#2548)"

The 679.v1dfd3604d46e release of the GitLab branch source plugin adds
the symbol `gitLab` to its implementation of a repository browser in
PR-360. The repository browser implementation is used by the git plugin to
allow the user to choose the preferred way of displaying links to changes.

Unfortunately, the git plugin already defines the symbol `gitLab` for
a repository browser implementation. The addition of the new symbol
to the GitLab branch source plugin breaks the configuration as code
definitions of git plugin users if they have used the gitLab symbol in
their definition of global Pipeline libraries.

jenkinsci/gitlab-branch-source-plugin#360 (comment)
has more details including screenshots.

https://github.com/jenkinsci/bom/runs/17272883656 detected the failure
while testing the plugin bill of materials with git plugin 5.2.0 and
GitLab branch source plugin 679.v1dfd3604d46e.

https://issues.jenkins.io/browse/JENKINS-72104 records the GitLab branch
source plugin bug that this is reverting.

This reverts commit d5e912b.
@MarkEWaite MarkEWaite requested a review from a team as a code owner September 30, 2023 11:52
@MarkEWaite MarkEWaite added the bug Something isn't working label Sep 30, 2023
@MarkEWaite MarkEWaite changed the title Revert to gitlab branch source 677.v0b_63b_038322b_ Revert to gitlab branch source 677.v0b_63b_038322b_ for JCasC compatibility Sep 30, 2023
@MarkEWaite MarkEWaite changed the title Revert to gitlab branch source 677.v0b_63b_038322b_ for JCasC compatibility Revert to gitlab branch source 677.x for JCasC compatibility Sep 30, 2023
@MarkEWaite MarkEWaite changed the title Revert to gitlab branch source 677.x for JCasC compatibility Revert to GitLab branch source 677.x for JCasC compatibility Sep 30, 2023
@MarkEWaite MarkEWaite merged commit 4583a9a into jenkinsci:master Sep 30, 2023
5 checks passed
@MarkEWaite MarkEWaite deleted the revert-gitlab-branch-source-for-JCasC-compatibility branch September 30, 2023 12:11
@MarkEWaite MarkEWaite added skip-changelog and removed bug Something isn't working labels Sep 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant