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 2020/05/09 18:47:56 UTC
[directory-studio] branch DIRSTUDIO-1250-fix-paged-search updated:
DIRSTUDIO-1250: Adjust jenkins pipeline to run OpenLDAP container for tests
This is an automated email from the ASF dual-hosted git repository.
seelmann pushed a commit to branch DIRSTUDIO-1250-fix-paged-search
in repository https://gitbox.apache.org/repos/asf/directory-studio.git
The following commit(s) were added to refs/heads/DIRSTUDIO-1250-fix-paged-search by this push:
new 5a96c57 DIRSTUDIO-1250: Adjust jenkins pipeline to run OpenLDAP container for tests
5a96c57 is described below
commit 5a96c57d21a0ce7ca44fae1e1c65a532d36d9f4b
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
AuthorDate: Sat May 9 20:47:44 2020 +0200
DIRSTUDIO-1250: Adjust jenkins pipeline to run OpenLDAP container for tests
---
Jenkinsfile | 56 ++++++++++++++++++++++++++++++++------------------------
1 file changed, 32 insertions(+), 24 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index c6052fb..3ff4535 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -33,14 +33,16 @@ pipeline {
retry(2)
}
agent {
- docker {
- label 'ubuntu && !H28 && !H36 && !H40'
- image 'apachedirectory/maven-build:jdk-8'
- //args '-v $HOME/.m2:/home/hnelson/.m2'
- }
+ label 'ubuntu && !H28 && !H36 && !H40'
}
steps {
- sh 'export DISPLAY=:99; env; ps aux'
+ script {
+ docker.image('osixia/openldap:1.3.0').withRun() { openldap ->
+ docker.image('apachedirectory/maven-build:jdk-8').inside("--link=${openldap.id}:openldap -e OPENLDAP_HOST=openldap -e OPENLDAP_PORT=389") {
+ sh 'export DISPLAY=:99; env; ps aux'
+ }
+ }
+ }
}
post {
always {
@@ -56,14 +58,16 @@ pipeline {
retry(2)
}
agent {
- docker {
- label 'ubuntu && !H28 && !H36 && !H40'
- image 'apachedirectory/maven-build:jdk-8'
- //args '-v $HOME/.m2:/home/hnelson/.m2'
- }
+ label 'ubuntu && !H28 && !H36 && !H40'
}
steps {
- sh 'export DISPLAY=:99; mvn -V -U -f pom-first.xml clean install && mvn -V clean install -Dorg.eclipse.swtbot.search.timeout=20000 -Denable-ui-tests'
+ script {
+ docker.image('osixia/openldap:1.3.0').withRun() { openldap ->
+ docker.image('apachedirectory/maven-build:jdk-8').inside("--link=${openldap.id}:openldap -e OPENLDAP_HOST=openldap -e OPENLDAP_PORT=389") {
+ sh 'export DISPLAY=:99; mvn -V -U -f pom-first.xml clean install && mvn -V clean install -Dorg.eclipse.swtbot.search.timeout=20000 -Denable-ui-tests'
+ }
+ }
+ }
}
post {
always {
@@ -79,14 +83,16 @@ pipeline {
retry(2)
}
agent {
- docker {
- label 'ubuntu && !H28 && !H36 && !H40'
- image 'apachedirectory/maven-build:jdk-11'
- //args '-v $HOME/.m2:/home/hnelson/.m2'
- }
+ label 'ubuntu && !H28 && !H36 && !H40'
}
steps {
- sh 'export DISPLAY=:99; mvn -V -U -f pom-first.xml clean install && mvn -V clean install -Dorg.eclipse.swtbot.search.timeout=20000 -Denable-ui-tests'
+ script {
+ docker.image('osixia/openldap:1.3.0').withRun() { openldap ->
+ docker.image('apachedirectory/maven-build:jdk-11').inside("--link=${openldap.id}:openldap -e OPENLDAP_HOST=openldap -e OPENLDAP_PORT=389") {
+ sh 'export DISPLAY=:99; mvn -V -U -f pom-first.xml clean install && mvn -V clean install -Dorg.eclipse.swtbot.search.timeout=20000 -Denable-ui-tests'
+ }
+ }
+ }
}
post {
always {
@@ -102,14 +108,16 @@ pipeline {
retry(2)
}
agent {
- docker {
- label 'ubuntu && !H28 && !H36 && !H40'
- image 'apachedirectory/maven-build:jdk-14'
- //args '-v $HOME/.m2:/home/hnelson/.m2'
- }
+ label 'ubuntu && !H28 && !H36 && !H40'
}
steps {
- sh 'export DISPLAY=:99; mvn -V -U -f pom-first.xml clean install && mvn -V clean install -Dorg.eclipse.swtbot.search.timeout=20000 -Denable-ui-tests'
+ script {
+ docker.image('osixia/openldap:1.3.0').withRun() { openldap ->
+ docker.image('apachedirectory/maven-build:jdk-14').inside("--link=${openldap.id}:openldap -e OPENLDAP_HOST=openldap -e OPENLDAP_PORT=389") {
+ sh 'export DISPLAY=:99; mvn -V -U -f pom-first.xml clean install && mvn -V clean install -Dorg.eclipse.swtbot.search.timeout=20000 -Denable-ui-tests'
+ }
+ }
+ }
}
post {
always {