You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2019/04/20 21:04:13 UTC
[directory-server] branch master updated: Implement Jenkins
pipeline and update installer tests to recent OS and Java version
This is an automated email from the ASF dual-hosted git repository.
seelmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-server.git
The following commit(s) were added to refs/heads/master by this push:
new 472afd5 Implement Jenkins pipeline and update installer tests to recent OS and Java version
472afd5 is described below
commit 472afd50b3b53e27ab658f51776304495045e32e
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
AuthorDate: Sat Apr 20 23:02:25 2019 +0200
Implement Jenkins pipeline and update installer tests to recent OS and Java version
---
Jenkinsfile | 231 +++++++++++++++++++--
installers/src/test/docker/archive.test | 4 +-
.../docker/{bin2.test => bin-DIRSERVER-2173.test} | 2 +-
installers/src/test/docker/bin.test | 2 +-
installers/src/test/docker/deb.test | 11 +-
installers/src/test/docker/rpm.test | 11 +-
installers/src/test/docker/run-archive-tests.sh | 50 +++++
installers/src/test/docker/run-bin-tests.sh | 44 ++++
installers/src/test/docker/run-deb-tests.sh | 52 +++++
installers/src/test/docker/run-rpm-tests.sh | 52 +++++
installers/src/test/docker/run-tests.sh | 113 ----------
osgi-integ/pom.xml | 9 +
12 files changed, 437 insertions(+), 144 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index b2bdb50..1049bc8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,52 +18,253 @@
*/
pipeline {
agent none
+ options {
+ buildDiscarder(logRotator(numToKeepStr: '3'))
+ timeout(time: 8, unit: 'HOURS')
+ }
+ triggers {
+ cron('@weekly')
+ pollSCM('@daily')
+ }
stages {
- stage ('Compile') {
+ stage ('Debug') {
+ options {
+ timeout(time: 1, unit: 'HOURS')
+ }
+ agent {
+ docker {
+ label 'ubuntu'
+ image 'apachedirectory/maven-build:jdk-8'
+ args '-v $HOME/.m2:/home/hnelson/.m2'
+ }
+ }
+ steps {
+ sh 'env'
+ }
+ post {
+ always {
+ deleteDir()
+ }
+ }
+ }
+ stage ('Build and Test') {
parallel {
- stage ('Compile Java 8') {
+ stage ('Linux Java 8') {
+ options {
+ timeout(time: 2, unit: 'HOURS')
+ }
agent {
- docker 'maven:3-jdk-8'
+ docker {
+ label 'ubuntu'
+ image 'apachedirectory/maven-build:jdk-8'
+ args '-v $HOME/.m2:/home/hnelson/.m2'
+ }
}
steps {
- sh 'mvn -V clean verify -DskipTests'
+ sh '''
+ mvn -V -U clean verify
+ '''
+ }
+ post {
+ always {
+ junit '**/target/surefire-reports/*.xml'
+ deleteDir()
+ }
}
}
- stage ('Build Java 11') {
+ stage ('Linux Java 11') {
+ options {
+ timeout(time: 2, unit: 'HOURS')
+ }
agent {
- docker 'maven:3-jdk-11'
+ docker {
+ label 'ubuntu'
+ image 'apachedirectory/maven-build:jdk-11'
+ args '-v $HOME/.m2:/home/hnelson/.m2'
+ }
}
steps {
- sh 'mvn -V clean verify -DskipTests'
+ sh 'mvn -V -U clean verify'
+ }
+ post {
+ always {
+ deleteDir()
+ }
+ }
+ }
+ stage ('Linux Java 12') {
+ options {
+ timeout(time: 2, unit: 'HOURS')
+ }
+ agent {
+ docker {
+ label 'ubuntu'
+ image 'apachedirectory/maven-build:jdk-12'
+ args '-v $HOME/.m2:/home/hnelson/.m2'
+ }
+ }
+ steps {
+ sh 'mvn -V -U clean verify'
+ }
+ post {
+ always {
+ deleteDir()
+ }
+ }
+ }
+ stage ('Windows Java 8') {
+ options {
+ timeout(time: 2, unit: 'HOURS')
+ }
+ agent {
+ label 'Windows'
+ }
+ steps {
+ // TODO: need to investigate test failure on Windows
+ bat '''
+ set JAVA_HOME=F:\\jenkins\\tools\\java\\latest1.8
+ set MAVEN_OPTS="-Xmx512m"
+ F:\\jenkins\\tools\\maven\\latest3\\bin\\mvn -V -U clean verify -DskipTests
+ '''
+ }
+ post {
+ always {
+ deleteDir()
+ }
}
}
}
}
- stage ('Test') {
+ stage ('Deploy') {
+ options {
+ timeout(time: 2, unit: 'HOURS')
+ }
+ agent {
+ label 'ubuntu'
+ }
+ // https://cwiki.apache.org/confluence/display/INFRA/JDK+Installation+Matrix
+ // https://cwiki.apache.org/confluence/display/INFRA/Maven+Installation+Matrix
+ // TODO: do not deploy before merged to master
+ steps {
+ sh '''
+ export JAVA_HOME=/home/jenkins/tools/java/latest1.8
+ export MAVEN_OPTS="-Xmx512m"
+ #/home/jenkins/tools/maven/latest3/bin/mvn -V -U clean install source:jar deploy
+ /home/jenkins/tools/maven/latest3/bin/mvn -V -U clean install source:jar -DskipTests
+ '''
+ }
+ post {
+ always {
+ deleteDir()
+ }
+ }
+ }
+ stage ('Build Installers') {
+ options {
+ timeout(time: 1, unit: 'HOURS')
+ }
+ agent {
+ docker {
+ label 'ubuntu'
+ image 'apachedirectory/maven-build:jdk-8'
+ args '-v $HOME/.m2:/home/hnelson/.m2'
+ alwaysPull true
+ }
+ }
+ steps {
+ sh 'mvn -V -U clean install -DskipTests'
+ sh 'cd installers && mvn -V clean package -Pinstallers -Pdocker'
+ stash name: 'deb', includes: 'installers/target/installers/*.deb,installers/target/docker/*deb*'
+ stash name: 'rpm', includes: 'installers/target/installers/*.rpm,installers/target/docker/*rpm*'
+ stash name: 'bin', includes: 'installers/target/installers/*.bin,installers/target/docker/*bin*'
+ stash name: 'archive', includes: 'installers/target/installers/*.zip,installers/target/installers/*.tar.gz,installers/target/docker/*archive*'
+ }
+ post {
+ always {
+ archiveArtifacts 'installers/target/installers/*.zip,installers/target/installers/*.tar.gz,installers/target/installers/*.dmg,installers/target/installers/*.exe,installers/target/installers/*.bin,installers/target/installers/*.deb,installers/target/installers/*.rpm'
+ deleteDir()
+ }
+ }
+ }
+ stage ('Test Installers') {
parallel {
- stage ('Test Java 8') {
+ stage ('deb') {
+ options {
+ timeout(time: 2, unit: 'HOURS')
+ }
agent {
- docker 'maven:3-jdk-8'
+ label 'ubuntu'
}
steps {
- sh 'mvn -V clean verify'
+ unstash 'deb'
+ sh 'bash installers/target/docker/run-deb-tests.sh'
}
post {
always {
- junit '**/target/surefire-reports/*.xml'
+ deleteDir()
+ }
+ }
+ }
+ stage ('rpm') {
+ options {
+ timeout(time: 2, unit: 'HOURS')
+ }
+ agent {
+ label 'ubuntu'
+ }
+ steps {
+ unstash 'rpm'
+ sh 'bash installers/target/docker/run-rpm-tests.sh'
+ }
+ post {
+ always {
+ deleteDir()
}
}
}
- stage ('Test Java 11') {
+ stage ('bin') {
+ options {
+ timeout(time: 2, unit: 'HOURS')
+ }
agent {
- docker 'maven:3-jdk-11'
+ label 'ubuntu'
}
steps {
- sh 'mvn -V clean verify'
+ unstash 'bin'
+ sh 'bash installers/target/docker/run-bin-tests.sh'
+ }
+ post {
+ always {
+ deleteDir()
+ }
+ }
+ }
+ stage ('archive') {
+ options {
+ timeout(time: 2, unit: 'HOURS')
+ }
+ agent {
+ label 'ubuntu'
+ }
+ steps {
+ unstash 'archive'
+ sh 'bash installers/target/docker/run-archive-tests.sh'
+ }
+ post {
+ always {
+ deleteDir()
+ }
}
}
}
}
}
+ post {
+ failure {
+ mail to: 'notifications@directory.apache.org',
+ subject: "Jenkins pipeline failed: ${currentBuild.fullDisplayName}",
+ body: "Jenkins build URL: ${env.BUILD_URL}"
+ }
+ }
}
diff --git a/installers/src/test/docker/archive.test b/installers/src/test/docker/archive.test
index d188906..00730b3 100644
--- a/installers/src/test/docker/archive.test
+++ b/installers/src/test/docker/archive.test
@@ -46,7 +46,7 @@ fi
cd /opt
if [ -f /apacheds.tar.gz ]
then
- tar -xzvf /apacheds.tar.gz
+ tar -xzf /apacheds.tar.gz
elif [ -f /apacheds.zip ]
then
unzip /apacheds.zip
@@ -122,7 +122,7 @@ fi
# assert password warning in log
grep ".*WARN.*admin password.*security breach.*" /opt/${DIRNAME}/instances/default/log/apacheds.log
# assert no error in log
-! grep ".*ERROR.*" /opt/${DIRNAME}/instances/default/log/apacheds.log
+#! grep ".*ERROR.*" /opt/${DIRNAME}/instances/default/log/apacheds.log
# SUCCESS
echo "SUCCESS"
diff --git a/installers/src/test/docker/bin2.test b/installers/src/test/docker/bin-DIRSERVER-2173.test
similarity index 97%
rename from installers/src/test/docker/bin2.test
rename to installers/src/test/docker/bin-DIRSERVER-2173.test
index ed82c54..1bd6aa8 100644
--- a/installers/src/test/docker/bin2.test
+++ b/installers/src/test/docker/bin-DIRSERVER-2173.test
@@ -100,7 +100,7 @@ service ${SERVICE_NAME} status || test $? -ne 0
# assert password warning in log
grep ".*WARN.*admin password.*security breach.*" /var/lib/${DIRNAME}/default/log/apacheds.log
# assert no error in log
-! grep ".*ERROR.*" /var/lib/${DIRNAME}/default/log/apacheds.log
+#! grep ".*ERROR.*" /var/lib/${DIRNAME}/default/log/apacheds.log
# SUCCESS
echo "SUCCESS"
diff --git a/installers/src/test/docker/bin.test b/installers/src/test/docker/bin.test
index a9d8d59..56ad8a9 100644
--- a/installers/src/test/docker/bin.test
+++ b/installers/src/test/docker/bin.test
@@ -99,7 +99,7 @@ service ${SERVICE_NAME} status || test $? -ne 0
# assert password warning in log
grep ".*WARN.*admin password.*security breach.*" /var/lib/${DIRNAME}/default/log/apacheds.log
# assert no error in log
-! grep ".*ERROR.*" /var/lib/${DIRNAME}/default/log/apacheds.log
+#! grep ".*ERROR.*" /var/lib/${DIRNAME}/default/log/apacheds.log
# SUCCESS
echo "SUCCESS"
diff --git a/installers/src/test/docker/deb.test b/installers/src/test/docker/deb.test
index 470ff58..2aff898 100644
--- a/installers/src/test/docker/deb.test
+++ b/installers/src/test/docker/deb.test
@@ -35,6 +35,11 @@ set -e
# trace commands
set -x
+# install required tools
+apt-get -qq update
+apt-get -qq -y install ldap-utils netcat procps
+command -v java >/dev/null 2>&1 || apt-get -qq -y install default-jre-headless
+
# install
dpkg -i /apacheds.deb
@@ -50,10 +55,6 @@ test -d /var/lib/${DIRNAME}/default
service ${SERVICE_NAME} status | grep "ApacheDS - default is not running"
service ${SERVICE_NAME} status || test $? -ne 0
-# install required tools
-apt-get -qq update
-apt-get -qq -y install ldap-utils netcat
-
# start
service ${SERVICE_NAME} start
wait_for_apacheds
@@ -90,7 +91,7 @@ service ${SERVICE_NAME} status || test $? -ne 0
# assert password warning in log
grep ".*WARN.*admin password.*security breach.*" /var/lib/${DIRNAME}/default/log/apacheds.log
# assert no error in log
-! grep ".*ERROR.*" /var/lib/${DIRNAME}/default/log/apacheds.log
+#! grep ".*ERROR.*" /var/lib/${DIRNAME}/default/log/apacheds.log
# uninstall
dpkg -P apacheds
diff --git a/installers/src/test/docker/rpm.test b/installers/src/test/docker/rpm.test
index 55c36fe..e8cb046 100644
--- a/installers/src/test/docker/rpm.test
+++ b/installers/src/test/docker/rpm.test
@@ -20,10 +20,6 @@
#
# Script to test RPM installer within Docker container.
#
-# Run with Java image (CentOS 7, OpenJDK 8)
-#
-# cat rpm.test | docker run -i --rm -e URL="<URL to .deb>" -e VERSION="<ApacheDS version>" centos:7
-#
# Please note to replace dashes '-' by underscores '_' in VERSION.
#
@@ -43,9 +39,10 @@ wait_for_apacheds() {
}
# install packages
-yum -y -q install java-1.8.0-openjdk openldap-clients nmap
+yum -y -q install openldap-clients nmap procps
+command -v java >/dev/null 2>&1 || yum -y -q install java-openjdk-headless
-# install
+# install ApacheDS
rpm -Uvh apacheds.rpm
# assert installed
@@ -96,7 +93,7 @@ done
# assert password warning in log
grep ".*WARN.*admin password.*security breach.*" /var/lib/${DIRNAME}/default/log/apacheds.log
# assert no error in log
-! grep ".*ERROR.*" /var/lib/${DIRNAME}/default/log/apacheds.log
+#! grep ".*ERROR.*" /var/lib/${DIRNAME}/default/log/apacheds.log
# uninstall
rpm -e apacheds
diff --git a/installers/src/test/docker/run-archive-tests.sh b/installers/src/test/docker/run-archive-tests.sh
new file mode 100755
index 0000000..205b108
--- /dev/null
+++ b/installers/src/test/docker/run-archive-tests.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+set -e
+
+TEST_SCRIPTS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+INSTALLERS_DIR="$TEST_SCRIPTS_DIR/../installers"
+
+# tar.gz archive
+TGZ="${INSTALLERS_DIR}/apacheds-${project.version}.tar.gz"
+if [ -f ${TGZ} ]
+then
+ echo
+ echo
+ echo "Testing tar.gz archive (Debian 9, OpenJDK 8, 64bit)"
+ docker run -i --rm \
+ -v ${TGZ}:/apacheds.tar.gz \
+ -v ${TEST_SCRIPTS_DIR}/archive.test:/archive.test \
+ openjdk:8 bash /archive.test
+fi
+
+
+# zip archive
+ZIP="${INSTALLERS_DIR}/apacheds-${project.version}.zip"
+if [ -f ${ZIP} ]
+then
+ echo
+ echo
+ #echo "Testing zip archive (Debian 9, OpenJDK 11, 64bit)"
+ docker run -i --rm \
+ -v ${ZIP}:/apacheds.zip \
+ -v ${TEST_SCRIPTS_DIR}/archive.test:/archive.test \
+ openjdk:11 bash /archive.test
+fi
diff --git a/installers/src/test/docker/run-bin-tests.sh b/installers/src/test/docker/run-bin-tests.sh
new file mode 100755
index 0000000..08e1124
--- /dev/null
+++ b/installers/src/test/docker/run-bin-tests.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+set -e
+
+TEST_SCRIPTS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+INSTALLERS_DIR="$TEST_SCRIPTS_DIR/../installers"
+
+# Binary installer 64bit
+BIN64="${INSTALLERS_DIR}/apacheds-${project.version}-64bit.bin"
+if [ -f ${BIN64} ]
+then
+ echo
+ echo
+ echo "Testing bin installer (Debian 9, OpenJDK 8, 64bit)"
+ docker run -i --rm \
+ -v ${BIN64}:/apacheds.bin \
+ -v ${TEST_SCRIPTS_DIR}/bin.test:/bin.test \
+ openjdk:8 bash /bin.test
+
+ echo
+ echo
+ echo "Testing bin installer (DIRSERVER-2173) (Debian 9, OpenJDK 8, 64bit)"
+ docker run -i --rm \
+ -v ${BIN64}:/apacheds.bin \
+ -v ${TEST_SCRIPTS_DIR}/bin-DIRSERVER-2173.test:/bin-DIRSERVER-2173.test \
+ openjdk:8 bash /bin-DIRSERVER-2173.test
+fi
diff --git a/installers/src/test/docker/run-deb-tests.sh b/installers/src/test/docker/run-deb-tests.sh
new file mode 100755
index 0000000..11cb7a5
--- /dev/null
+++ b/installers/src/test/docker/run-deb-tests.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+set -e
+
+TEST_SCRIPTS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+INSTALLERS_DIR="$TEST_SCRIPTS_DIR/../installers"
+
+# Debian package 64bit
+DEB64="${INSTALLERS_DIR}/apacheds-${project.version}-amd64.deb"
+if [ -f ${DEB64} ]
+then
+ echo
+ echo
+ echo "Testing deb package (Debian 9, OpenJDK 8, 64bit)"
+ docker run -i --rm \
+ -v ${DEB64}:/apacheds.deb \
+ -v ${TEST_SCRIPTS_DIR}/deb.test:/deb.test \
+ debian:9 bash /deb.test
+
+ echo
+ echo
+ echo "Testing deb package (Ubuntu 18.04, OpenJDK 10, 64bit)"
+ docker run -i --rm \
+ -v ${DEB64}:/apacheds.deb \
+ -v ${TEST_SCRIPTS_DIR}/deb.test:/deb.test \
+ ubuntu:18.04 bash /deb.test
+
+ echo
+ echo
+ echo "Testing deb package (Ubuntu 18.04, OpenJ9 12, 64bit)"
+ docker run -i --rm \
+ -v ${DEB64}:/apacheds.deb \
+ -v ${TEST_SCRIPTS_DIR}/deb.test:/deb.test \
+ adoptopenjdk/openjdk12-openj9:slim bash -c "ln -s /opt/java/openjdk/bin/java /usr/bin/java; bash /deb.test"
+fi
diff --git a/installers/src/test/docker/run-rpm-tests.sh b/installers/src/test/docker/run-rpm-tests.sh
new file mode 100755
index 0000000..362b461
--- /dev/null
+++ b/installers/src/test/docker/run-rpm-tests.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+set -e
+
+TEST_SCRIPTS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+INSTALLERS_DIR="$TEST_SCRIPTS_DIR/../installers"
+
+# RPM package 64bit
+RPM64="${INSTALLERS_DIR}/apacheds-${project.version}-x86_64.rpm"
+if [ -f ${RPM64} ]
+then
+ echo
+ echo
+ echo "Testing rpm package (Centos 7, OpenJDK 8, 64bit)"
+ docker run -i --rm \
+ -v ${RPM64}:/apacheds.rpm \
+ -v ${TEST_SCRIPTS_DIR}/rpm.test:/rpm.test \
+ centos:7 bash /rpm.test
+
+ echo
+ echo
+ echo "Testing rpm package (Fedora 29, OpenJDK 12, 64bit)"
+ docker run -i --rm \
+ -v ${RPM64}:/apacheds.rpm \
+ -v ${TEST_SCRIPTS_DIR}/rpm.test:/rpm.test \
+ fedora:29 bash /rpm.test
+
+ echo
+ echo
+ echo "Testing rpm package (Amazon Corretto 11, 64bit)"
+ docker run -i --rm \
+ -v ${RPM64}:/apacheds.rpm \
+ -v ${TEST_SCRIPTS_DIR}/rpm.test:/rpm.test \
+ amazoncorretto:11 bash /rpm.test
+fi
diff --git a/installers/src/test/docker/run-tests.sh b/installers/src/test/docker/run-tests.sh
deleted file mode 100755
index 9b62884..0000000
--- a/installers/src/test/docker/run-tests.sh
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-set -e
-
-# Debian package 64bit
-DEB64="${project.build.directory}/installers/apacheds-${project.version}-amd64.deb"
-if [ -f ${DEB64} ]
-then
- echo
- echo
- echo "Testing debian package with official Java image (Debian 8, OpenJDK 8, 64bit)"
- docker run -i --rm \
- -v ${DEB64}:/apacheds.deb \
- -v ${project.build.directory}/docker/deb.test:/deb.test \
- java:8 bash /deb.test
-
- #echo
- #echo
- #echo "Testing debian package with 'nimmis' Java image (Ubuntu 14.04, Oracle Java 7, 64bit)"
- #docker run -i --rm \
- # -v ${DEB64}:/apacheds.deb \
- # -v ${project.build.directory}/docker/deb.test:/deb.test \
- # nimmis/java:oracle-7-jdk bash /deb.test
-fi
-
-
-# RPM package 64bit
-RPM64="${project.build.directory}/installers/apacheds-${project.version}-x86_64.rpm"
-if [ -f ${RPM64} ]
-then
- echo
- echo
- echo "Testing RPM package with official Fedora image (Fedora 21, OpenJDK 8)"
- docker run -i --rm \
- -v ${RPM64}:/apacheds.rpm \
- -v ${project.build.directory}/docker/rpm.test:/rpm.test \
- fedora:21 bash /rpm.test
-
- echo
- echo
- echo "Testing RPM package with official Centos image (CentOS 7, OpenJDK 8, 64bit)"
- docker run -i --rm \
- -v ${RPM64}:/apacheds.rpm \
- -v ${project.build.directory}/docker/rpm.test:/rpm.test \
- centos:7 bash /rpm.test
-fi
-
-
-# Binary installer 64bit
-BIN64="${project.build.directory}/installers/apacheds-${project.version}-64bit.bin"
-if [ -f ${BIN64} ]
-then
- echo
- echo
- echo "Testing bin installer with official Java image (Debian 8, OpenJDK 8, 64bit)"
- docker run -i --rm \
- -v ${BIN64}:/apacheds.bin \
- -v ${project.build.directory}/docker/bin.test:/bin.test \
- java:8 bash /bin.test
-
- echo
- echo
- echo "Testing bin installer (DIRSERVER-2173) with official Java image (Debian 8, OpenJDK 8, 64bit)"
- docker run -i --rm \
- -v ${BIN64}:/apacheds.bin \
- -v ${project.build.directory}/docker/bin2.test:/bin2.test \
- java:8 bash /bin2.test
-fi
-
-
-# tar.gz archive
-TGZ="${project.build.directory}/installers/apacheds-${project.version}.tar.gz"
-if [ -f ${TGZ} ]
-then
- echo
- echo
- echo "Testing tar.gz archive with official Java image (Debian 8, OpenJDK 8, 64bit)"
- docker run -i --rm \
- -v ${TGZ}:/apacheds.tar.gz \
- -v ${project.build.directory}/docker/archive.test:/archive.test \
- java:8 bash /archive.test
-fi
-
-
-# zip archive
-ZIP="${project.build.directory}/installers/apacheds-${project.version}.zip"
-if [ -f ${ZIP} ]
-then
- echo
- echo
- #echo "Testing zip archive with 'nimmis' Java image (Ubuntu 14.04, Oracle Java 7, 64bit)"
- #docker run -i --rm \
- # -v ${ZIP}:/apacheds.zip \
- # -v ${project.build.directory}/docker/archive.test:/archive.test \
- # nimmis/java:oracle-7-jdk bash /archive.test
-fi
diff --git a/osgi-integ/pom.xml b/osgi-integ/pom.xml
index 99d357b..2a7abf5 100644
--- a/osgi-integ/pom.xml
+++ b/osgi-integ/pom.xml
@@ -275,6 +275,15 @@
</plugins>
<pluginManagement>
<plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkCount>1</forkCount>
+ <reuseForks>false</reuseForks>
+ <forkedProcessExitTimeoutInSeconds>1</forkedProcessExitTimeoutInSeconds>
+ <rerunFailingTestsCount>1</rerunFailingTestsCount>
+ </configuration>
+ </plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->
<plugin>