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

Remove git client plugin test exclusions #1541

Merged
merged 13 commits into from
Nov 3, 2022

Conversation

MarkEWaite
Copy link
Contributor

Remove git client plugin test exclusions

Command line git 2.38.1 and backports to earlier versions now exclude submodule clones from a file:// URL. The tests in the git client plugin rely on submodule clones from a file:// URL for some of the tests. Git client plugin 2.13.0 includes test changes to allow the tests to run on git 2.38.1 successfully. These exclusions should not be needed any longer.

See #1484 for the original addition of the exclusions.

jenkinsci/git-client-plugin#920 (comment) reminds us to remove the exclusion.

jenkinsci/git-client-plugin#923 implements the fix in the tests to allow file:// protocol clones during the submodule operations in the tests.

  • 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

dependabot bot and others added 6 commits October 31, 2022 22:33
Bumps `git-plugin.version` from 4.11.5 to 4.13.0.

Updates `git` from 4.11.5 to 4.13.0
- [Release notes](https://github.com/jenkinsci/git-plugin/releases)
- [Changelog](https://github.com/jenkinsci/git-plugin/blob/master/CHANGELOG.adoc)
- [Commits](jenkinsci/git-plugin@git-4.11.5...git-4.13.0)

Updates `git` from 4.11.5 to 4.13.0
- [Release notes](https://github.com/jenkinsci/git-plugin/releases)
- [Changelog](https://github.com/jenkinsci/git-plugin/blob/master/CHANGELOG.adoc)
- [Commits](jenkinsci/git-plugin@git-4.11.5...git-4.13.0)

---
updated-dependencies:
- dependency-name: org.jenkins-ci.plugins:git
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.jenkins-ci.plugins:git:tests
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [git-client](https://github.com/jenkinsci/git-client-plugin) from 3.11.0 to 3.13.0.
- [Release notes](https://github.com/jenkinsci/git-client-plugin/releases)
- [Commits](jenkinsci/git-client-plugin@git-client-3.11.0...git-client-3.13.0)

---
updated-dependencies:
- dependency-name: org.jenkins-ci.plugins:git-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Command line git 2.38.1 and backports to earlier versions now exclude
submodule clones from a file:// URL. The tests in the git client
plugin rely on submodule clones from a file:// URL for some of the
tests.  Git client plugin 2.13.0 includes test changes to allow the
tests to run on git 2.38.1 successfully.  These exclusions should not
be needed any longer.

See jenkinsci#1484 for the original addition
of the exclusions.

jenkinsci/git-client-plugin#920 (comment)
reminds us to remove the exclusion.

jenkinsci/git-client-plugin#923 implements the
fix in the tests to allow file:// protocol clones during the submodule
operations in the tests.
…' and 'dependabot/maven/bom-weekly/org.jenkins-ci.plugins-git-client-3.13.0' into remove-git-client-test-exclusions
@timja
Copy link
Member

timja commented Nov 1, 2022

This should fix it #1543

@MarkEWaite
Copy link
Contributor Author

This should fix it #1543

Thanks very much! Since git client plugin 2.13.0 requires Jenkins 2.346.3 as its minimum version, won't the earlier git client plugin version still need to be pinned for 2.332.x?

@@ -13,7 +13,7 @@
<configuration-as-code-plugin.version>1559.v38a_b_2e3b_6b_b_7</configuration-as-code-plugin.version>
<data-tables-api.version>1.12.1-4</data-tables-api.version>
<forensics-api.version>1.15.1</forensics-api.version>
<git-plugin.version>4.11.5</git-plugin.version>
<git-plugin.version>4.13.0</git-plugin.version>
Copy link
Member

Choose a reason for hiding this comment

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

superseding #1536

@@ -343,7 +343,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>git-client</artifactId>
<version>3.11.0</version>
<version>3.13.0</version>
Copy link
Member

Choose a reason for hiding this comment

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

superseding #1539

@@ -12,9 +12,3 @@ org.jenkinsci.plugins.gitclient.FilePermissionsTest

# TODO tends to run out of memory
org.jenkinsci.plugins.pipeline.modeldefinition.TriggersTest

# TODO https://github.com/jenkinsci/git-client-plugin/pull/920
Copy link
Member

Choose a reason for hiding this comment

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

@jglick jglick added the dependencies Pull requests that update a dependency file label Nov 1, 2022
@jglick jglick enabled auto-merge (squash) November 1, 2022 12:09
auto-merge was automatically disabled November 2, 2022 18:02

Head branch was pushed to by a user without write access

@jglick
Copy link
Member

jglick commented Nov 2, 2022

I do not think you want to merge #1543 in here when that PR does not yet work!

@MarkEWaite
Copy link
Contributor Author

I do not think you want to merge #1543 in here when that PR does not yet work!

I was hoping that the single 2.319.x failure displayed previously in this pull request was an indicator that all that was needed was to drop 2.319.x. Unfortunately, experiment failed. I'll revert that change and look at ways to pin the versions on 2.332.x and 2.319.x.

@jglick
Copy link
Member

jglick commented Nov 2, 2022

Maybe just sit tight—I am trying to fix #1543.

@jglick
Copy link
Member

jglick commented Nov 2, 2022

Merged, so just try merging in master now.

@jglick jglick enabled auto-merge (squash) November 2, 2022 22:31
bom-2.332.x/pom.xml Outdated Show resolved Hide resolved
auto-merge was automatically disabled November 3, 2022 17:58

Head branch was pushed to by a user without write access

@jglick jglick enabled auto-merge (squash) November 3, 2022 18:04
@jglick jglick merged commit f0f1fa1 into jenkinsci:master Nov 3, 2022
@MarkEWaite MarkEWaite deleted the remove-git-client-test-exclusions branch November 3, 2022 21:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants