diff options
| author | Pierre-Charles David | 2019-05-10 15:09:08 +0000 |
|---|---|---|
| committer | Pierre-Charles David | 2019-05-10 15:09:15 +0000 |
| commit | f37b542fd4c5edc17742113d57c588cc69ecd984 (patch) | |
| tree | 98902a390a653748c92618d20b3dfb34ee09d222 /Jenkinsfile | |
| parent | 6b9c81ddb7f938c9f7638a89996ad5d7187eea54 (diff) | |
| download | org.eclipse.sirius-f37b542fd4c5edc17742113d57c588cc69ecd984.tar.gz org.eclipse.sirius-f37b542fd4c5edc17742113d57c588cc69ecd984.tar.xz org.eclipse.sirius-f37b542fd4c5edc17742113d57c588cc69ecd984.zip | |
[releng] Use mickaelistria/eclipse-acute-build-test-env image for tests, jnlp for the rest
Change-Id: If600e3af4a8c71c38b7d4699af1a969a6014fbdb
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
Diffstat (limited to 'Jenkinsfile')
| -rw-r--r-- | Jenkinsfile | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index e587ef4cde..f1091a898d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,14 +2,14 @@ pipeline { agent { kubernetes { label 'sirius-buildtest' - defaultContainer 'environment' + defaultContainer 'jnlp' yaml """ apiVersion: v1 kind: Pod spec: containers: - - name: environment - image: eclipsecbi/ubuntu-gtk3-metacity + - name: uitests + image: mickaelistria/eclipse-acute-build-test-env:test tty: true command: [ "uid_entrypoint", "cat" ] resources: @@ -45,8 +45,10 @@ spec: } stage('Test') { steps { - wrap([$class: 'Xvnc', useXauthority: true]) { - sh "JAVA_HOME=/opt/tools/java/oracle/jdk-8/latest /opt/tools/apache-maven/latest/bin/mvn -B -Dplatform-version-name=${env.PLATFORM} -f packaging/org.eclipse.sirius.parent/pom.xml -P full,headless,headless-server,gerrit-junit verify" + container('uitests') { + wrap([$class: 'Xvnc', useXauthority: true]) { + sh "mvn -B -Dplatform-version-name=${env.PLATFORM} -f packaging/org.eclipse.sirius.parent/pom.xml -P full,headless,headless-server,gerrit-junit verify" + } } } // post { |