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

Add docker-workflow plugin to the managed set #2464

Merged
merged 4 commits into from
Sep 6, 2023

Conversation

MarkEWaite
Copy link
Contributor

Add docker-workflow plugin to the managed set

Testing done

Confirmed that PLUGINS=docker-workflow bash local-test.sh passes on a Debian machine with Java 21+34 (early access release).

Rely on ci.jenkins.io and the full-test label to confirm other tests are passing.

Fixes

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

@MarkEWaite MarkEWaite added the full-test Test all LTS lines in this PR and do not halt upon first error. label Sep 4, 2023
@MarkEWaite MarkEWaite requested a review from a team as a code owner September 4, 2023 20:20
@MarkEWaite MarkEWaite linked an issue Sep 4, 2023 that may be closed by this pull request
@basil basil added the enhancement New feature or request label Sep 5, 2023
@@ -429,6 +429,11 @@
<artifactId>docker-java-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>docker-workflow</artifactId>
Copy link
Member

Choose a reason for hiding this comment

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

Could then remove docker-commons.

Copy link
Contributor Author

@MarkEWaite MarkEWaite Sep 5, 2023

Choose a reason for hiding this comment

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

Thanks. I have removed docker-commons and confirmed that sample plugin tests pass locally. That has been pushed as commit f0bb487

Since docker-workflow depends on several other plugins, should I remove those other dependencies from the sample plugin as well?

docker-workflow Dependencies

I was able to remove the following plugins from the sample-plugin pom file and still pass mvn verify:

Is it OK to remove those five dependencies from the sample plugin?

Copy link
Member

Choose a reason for hiding this comment

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

Sure, you could.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks. If this run fails, I'll add those changes to the next run. If it succeeds and merges, I'll submit them as a separate pull request.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

#2470 is the pull request that removes several transitive dependencies from the pom of the sample plugin.

README advises that the dependencies in the sample plugin should be
maintained as we would any other plugin, with the top level
dependencies declared and the transitive dependencies calculated by
Maven.

Since docker-workflow depends on docker-commons, we don't need to
declare docker-commons in the sample plugin.
@MarkEWaite MarkEWaite enabled auto-merge (squash) September 5, 2023 23:59
@MarkEWaite MarkEWaite merged commit 3f87ffe into jenkinsci:master Sep 6, 2023
581 of 582 checks passed
@MarkEWaite MarkEWaite deleted the add-docker-workflow-plugin branch September 6, 2023 01:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request full-test Test all LTS lines in this PR and do not halt upon first error.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add Docker Pipeline to the managed set
3 participants