You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by kw...@apache.org on 2022/03/15 13:24:05 UTC
[jackrabbit-filevault-jenkins-lib] branch master updated: add workaround for failing ITs due to https://bugs.openjdk.java.net/browse/JDK-8057894
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault-jenkins-lib.git
The following commit(s) were added to refs/heads/master by this push:
new 6e1e724 add workaround for failing ITs due to https://bugs.openjdk.java.net/browse/JDK-8057894
6e1e724 is described below
commit 6e1e724165bbf2026a67eed96663ea3f7ac59ffc
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Tue Mar 15 14:23:57 2022 +0100
add workaround for failing ITs due to
https://bugs.openjdk.java.net/browse/JDK-8057894
---
src/org/apache/jackrabbit/vault/PipelineSupport.groovy | 5 +++--
vars/vaultStageIT.groovy | 7 ++++++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/org/apache/jackrabbit/vault/PipelineSupport.groovy b/src/org/apache/jackrabbit/vault/PipelineSupport.groovy
index 4a353ec..cd31353 100644
--- a/src/org/apache/jackrabbit/vault/PipelineSupport.groovy
+++ b/src/org/apache/jackrabbit/vault/PipelineSupport.groovy
@@ -50,14 +50,15 @@ class PipelineSupport implements Serializable {
}
def executeMaven(pipeline, String mavenArguments, boolean enablePublishers) {
- executeMaven(pipeline, mainJdkVersion, mainMavenVersion, mavenArguments, enablePublishers)
+ executeMaven(pipeline, mainJdkVersion, mainMavenVersion, mavenArguments, '', enablePublishers)
}
- static def executeMaven(pipeline, Integer jdkVersion, String mavenVersion, String mavenArguments, boolean enablePublishers) {
+ static def executeMaven(pipeline, Integer jdkVersion, String mavenVersion, String mavenArguments, String mavenOpts = '', boolean enablePublishers) {
pipeline.withMaven(
maven: AsfCloudbeesJenkinsEnvironment.getMavenLabel(!pipeline.isUnix(), mavenVersion),
jdk: AsfCloudbeesJenkinsEnvironment.getJdkLabel(jdkVersion),
mavenLocalRepo: '.repository',
+ mavenOpts: mavenOpts,
publisherStrategy: enablePublishers?'IMPLICIT':'EXPLICIT') {
if (pipeline.isUnix()) {
pipeline.sh "mvn -B ${mavenArguments}"
diff --git a/vars/vaultStageIT.groovy b/vars/vaultStageIT.groovy
index 09cc9e5..4854796 100644
--- a/vars/vaultStageIT.groovy
+++ b/vars/vaultStageIT.groovy
@@ -43,8 +43,13 @@ def call(List<String> additionalNodeLabels, List<Integer> additionalJdkVersions,
} else {
pipelineSupport.executeMaven(this, "install:install-file -Dfile=${jarFiles[0].path} -DpomFile=pom.xml", false)
}
+ String mavenOpts = '';
+ // workaround for https://bugs.openjdk.java.net/browse/JDK-8057894
+ if (!isUnix()) {
+ mavenOpts = '-Djava.security.egd=file:/dev/urandom';
+ }
// execute ITs
- pipelineSupport.executeMaven(this, jdkVersion, mavenVersion, 'failsafe:integration-test failsafe:verify', false)
+ pipelineSupport.executeMaven(this, jdkVersion, mavenVersion, 'failsafe:integration-test failsafe:verify', mavenOpts, false)
} finally {
junit '**/target/failsafe-reports*/**/*.xml'
}