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

Do not require docker socket access in test #138

Merged
merged 9 commits into from
Jul 8, 2023

Conversation

MarkEWaite
Copy link
Contributor

Do not require docker socket access in test

In order to include the docker-commons plugin in the plugin bill of materials, the tests need to pass on agents that do not have access to the docker socket. One of the tests in the plugin assumed access to the docker socket, but did not do anything relevant with that access.

Remove the requirement for docker socket access from the test.

Also includes several other pull requests in the same request, since I think they should be included in the next release of the docker-commons plugin

  • Bump authentication-tokens from 1.4 to 1.53.v1c90fd9191a_b_
  • EOL JSR 305
  • Bump plugin from 4.67 to 4.68
  • Adapt test to not require docker socket access
  • Use parent pom 4.70
  • Use separate stream for stderr
  • Use bom 2230.v0cb_4040cde55

If it will increase the chances of this being merged, I'm happy to provide a pull request that only makes the minimum changes necessary. I wanted this larger set of changes so that the incremental build can be tested in the plugin BOM.

Testing done

Automated tests confirmed to run as expected on Linux without docker socket access and Linux with docker socket access.

Submitter checklist

Preview Give feedback

dependabot bot and others added 8 commits April 1, 2023 10:58
Bumps [authentication-tokens](https://github.com/jenkinsci/authentication-tokens-plugin) from 1.4 to 1.53.v1c90fd9191a_b_.
- [Release notes](https://github.com/jenkinsci/authentication-tokens-plugin/releases)
- [Changelog](https://github.com/jenkinsci/authentication-tokens-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jenkinsci/authentication-tokens-plugin/commits)

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

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [plugin](https://github.com/jenkinsci/plugin-pom) from 4.67 to 4.68.
- [Release notes](https://github.com/jenkinsci/plugin-pom/releases)
- [Changelog](https://github.com/jenkinsci/plugin-pom/blob/master/CHANGELOG.md)
- [Commits](jenkinsci/plugin-pom@plugin-4.67...plugin-4.68)

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

Signed-off-by: dependabot[bot] <support@github.com>
…gin-4.68' and 'dependabot/maven/org.jenkins-ci.plugins-authentication-tokens-1.53.v1c90fd9191a_b_' into octopus
Most recent version
@MarkEWaite
Copy link
Contributor Author

@jglick I'd love to have the following pull requests merged before this pull request, with this one being labeled as a developer change:

The following pull request is no longer needed

@jglick
Copy link
Member

jglick commented Jul 8, 2023

Unfortunately this repo is not configured to allow merging of the base branch in the absence of conflicts, and I lack admin permission to enable that, so the diff will look larger than it really is.

@jglick jglick merged commit 3dc5357 into jenkinsci:master Jul 8, 2023
@MarkEWaite
Copy link
Contributor Author

Unfortunately this repo is not configured to allow merging of the base branch in the absence of conflicts, and I lack admin permission to enable that, so the diff will look larger than it really is.

I'm happy to rework or replace the pull request with a much smaller diff if that will help the merge.

@MarkEWaite MarkEWaite deleted the octopus branch July 8, 2023 17:29
@MarkEWaite
Copy link
Contributor Author

Thanks!

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.

3 participants