Merge "BUG-2625: activate JDK8 verification for docs"

[releng/builder.git] / jjb / armoury / armoury.yaml

diff --git a/jjb/armoury/armoury.yaml b/jjb/armoury/armoury.yaml
index 331ba3cec7ef12cfdc6dcd9b3170535bafd04bf9..f30d1de9e094b931f712c8d188e987fa871700b4 100644 (file)
--- a/jjb/armoury/armoury.yaml
+++ b/jjb/armoury/armoury.yaml
@@ -20,18 +20,9 @@
     stream:
         - beryllium:
             branch: 'master'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-        - stable-helium:
-            branch: 'stable/helium'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
+                - openjdk8
                 - openjdk7
 
     project: 'armoury'
@@ -301,7 +292,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - git-scm:
@@ -511,7 +502,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{armoury-settings}'
         global-settings: '{odl-global-settings}'