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.

Sign up for GitHub

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

Jump to bottom

Bump Maven to 3.6.3 as builder for PCT Dockerfile #277

Merged
merged 5 commits into from
Mar 22, 2021
Merged

Bump Maven to 3.6.3 as builder for PCT Dockerfile #277

merged 5 commits into from
Mar 22, 2021

Conversation

imonteroperez
Copy link
Contributor

  • Let's update the Maven version for PCT Dockerfile
  • Previous to this change some plugins are not tested properly, such as artifact-manager-s3 using Maven 3.6.0
09:22:00  Failed while enforcing RequireUpperBoundDeps. The error(s) are [
09:22:00  Require upper bound dependencies error for org.slf4j:slf4j-api:1.7.26 paths to dependency are:
09:22:00  +-io.jenkins.plugins:artifact-manager-s3:1.13
09:22:00    +-org.testcontainers:testcontainers:1.15.2
09:22:00      +-org.slf4j:slf4j-api:1.7.26
09:22:00  and
09:22:00  +-io.jenkins.plugins:artifact-manager-s3:1.13
09:22:00    +-io.findify:s3mock_2.12:0.2.5
09:22:00      +-com.typesafe.scala-logging:scala-logging_2.12:3.8.0
09:22:00        +-org.slf4j:slf4j-api:1.7.26 (managed) <-- org.slf4j:slf4j-api:1.7.30
09:22:00  and
09:22:00  +-io.jenkins.plugins:artifact-manager-s3:1.13
09:22:00    +-org.testcontainers:testcontainers:1.15.2
09:22:00      +-com.github.docker-java:docker-java-api:3.2.7
09:22:00        +-org.slf4j:slf4j-api:1.7.26 (managed) <-- org.slf4j:slf4j-api:1.7.30
09:22:00  and
09:22:00  +-io.jenkins.plugins:artifact-manager-s3:1.13
09:22:00    +-org.testcontainers:testcontainers:1.15.2
09:22:00      +-com.github.docker-java:docker-java-transport-zerodep:3.2.7
09:22:00        +-org.slf4j:slf4j-api:1.7.26 (managed) <-- org.slf4j:slf4j-api:1.7.25
09:22:00  and
09:22:00  +-io.jenkins.plugins:artifact-manager-s3:1.13
09:22:00    +-org.jenkins-ci.main:jenkins-core:2.235.2
09:22:00      +-org.slf4j:jcl-over-slf4j:1.7.26
09:22:00        +-org.slf4j:slf4j-api:1.7.26 (managed) <-- org.slf4j:slf4j-api:1.7.25
09:22:00  and
09:22:00  +-io.jenkins.plugins:artifact-manager-s3:1.13
09:22:00    +-org.jenkins-ci.main:jenkins-core:2.235.2
09:22:00      +-org.slf4j:log4j-over-slf4j:1.7.26
09:22:00        +-org.slf4j:slf4j-api:1.7.26 (managed) <-- org.slf4j:slf4j-api:1.7.25
09:22:00  and
09:22:00  +-io.jenkins.plugins:artifact-manager-s3:1.13
09:22:00    +-org.jenkins-ci.main:jenkins-war:2.235.2
09:22:00      +-org.slf4j:slf4j-jdk14:1.7.26
09:22:00        +-org.slf4j:slf4j-api:1.7.26 (managed) <-- org.slf4j:slf4j-api:1.7.25
09:22:00  and
09:22:00  +-io.jenkins.plugins:artifact-manager-s3:1.13
09:22:00    +-org.jenkins-ci.main:jenkins-war:2.235.2
09:22:00      +-org.jenkins-ci.modules:sshd:2.6
09:22:00        +-org.apache.sshd:sshd-core:1.7.0
09:22:00          +-org.slf4j:slf4j-api:1.7.26 (managed) <-- org.slf4j:slf4j-api:1.7.25
  • After this PR, plugins are properly evaluated/tested by the PCT as expected (tested with Maven 3.6.2 and Maven 3.6.3)

@imonteroperez imonteroperez self-assigned this Mar 19, 2021
jglick
jglick approved these changes Mar 19, 2021
View reviewed changes
Copy link
Member

@jglick jglick left a comment

Choose a reason for hiding this comment

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

Yes please, we should not be running anything other than the current Maven release on any infrastructure.

While you are here please replace

plugin-compat-tester/plugins-compat-tester/src/main/java/org/jenkins/tools/test/maven/ExternalMavenRunner.java

Line 31 in df60aee

private static final String DISABLE_DOWNLOAD_LOGS = "-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn";
with -ntp to follow up from #216.

@imonteroperez
Copy link
Contributor Author

Yes please, we should not be running anything other than the current Maven release on any infrastructure.

While you are here please replace

plugin-compat-tester/plugins-compat-tester/src/main/java/org/jenkins/tools/test/maven/ExternalMavenRunner.java

Line 31 in df60aee

private static final String DISABLE_DOWNLOAD_LOGS = "-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn";

with -ntp to follow up from #216.

Updated in 838cc64

@imonteroperez
Copy link
Contributor Author

@jglick any hint about ci/dockercloud-stage check failure? link redirects me to a 404 😕

@jglick
Copy link
Member

jglick commented Mar 19, 2021

I guess somebody set up Docker automated builds at some point. It is a 404 for me too. Maybe the repo owner can see it.

@imonteroperez @jglick
Update plugins-compat-tester/src/main/java/org/jenkins/tools/test/mav…
261b778 
…en/ExternalMavenRunner.java

Co-authored-by: Jesse Glick <jglick@cloudbees.com>
jglick
jglick reviewed Mar 22, 2021
View reviewed changes
Copy link
Member

@jglick jglick left a comment

Choose a reason for hiding this comment

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

I think you need to patch

plugin-compat-tester/src/main/docker/run-pct.sh

Line 160 in bb4f15c

TEST_JDK_HOME=${TEST_JAVA_ARGS:-"/usr/lib/jvm/java-${JDK_VERSION:-8}-openjdk-amd64"} 

$ docker run --rm --entrypoint bash maven:3.6.0-jdk-8 -c 'realpath $(which java)'
/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
$ docker run --rm --entrypoint bash maven:3.6.3-jdk-8 -c 'realpath $(which java)'
/usr/local/openjdk-8/bin/java

jglick
jglick reviewed Mar 22, 2021
View reviewed changes
src/main/docker/run-pct.sh
@@ -157,7 +157,7 @@ mkdir -p "${PCT_OUTPUT_DIR}"
###
# Determine if we test the plugin against another JDK
###
TEST_JDK_HOME=${TEST_JAVA_ARGS:-"/usr/lib/jvm/java-${JDK_VERSION:-8}-openjdk-amd64"}
TEST_JDK_HOME=${TEST_JAVA_ARGS:-"/usr/local/openjdk-${JDK_VERSION:-8}"}
Copy link
Member

Choose a reason for hiding this comment

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

AFAICT not going to work for JDK 11 as installed in

plugin-compat-tester/Dockerfile

Line 53 in 1f0ced6

mv jdk-11.0.1/ /usr/lib/jvm/java-11-openjdk-amd64 && \

Copy link
Member

Choose a reason for hiding this comment

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

Cannot run program "/usr/local/openjdk-11/bin/java": error=2, No such file or directory

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yep, updated in https://github.com/jenkinsci/plugin-compat-tester/pull/277/files#diff-dd2c0eb6ea5cfc6c4bd4eac30934e2d5746747af48fef6da689e85b752f39557R53 to make it happen :-)

@imonteroperez imonteroperez merged commit 230b644 into master Mar 22, 2021
@jglick jglick deleted the maven-bump-3.6.3 branch March 22, 2021 19:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jglick jglick jglick approved these changes

@olamy olamy olamy approved these changes

@amuniz amuniz amuniz approved these changes

@oleg-nenashev oleg-nenashev oleg-nenashev approved these changes

@cathychan cathychan cathychan approved these changes

@bmunozm bmunozm bmunozm approved these changes

@raul-arabaolaza raul-arabaolaza Awaiting requested review from raul-arabaolaza

Assignees

@imonteroperez imonteroperez

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@imonteroperez @jglick @olamy @amuniz @oleg-nenashev @cathychan @bmunozm