Rework the way Java version is set in CSIT jobs

[releng/builder.git] / jjb / integration / integration-distribution-jobs.yaml

diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml
index b49aa88f013ef2a9b7464456f0ad0141215ae0e9..d0908fd6989c341022205ad620a1fb814c261b1b 100644 (file)
--- a/jjb/integration/integration-distribution-jobs.yaml
+++ b/jjb/integration/integration-distribution-jobs.yaml
@@ -4,18 +4,22 @@
     jobs:
         - 'integration-distribution-verify-{stream}'
         - 'integration-distribution-merge-{stream}'
+        - 'integration-distribution-deploy-{stream}'
+        - 'integration-distribution-offline-{stream}'
 
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
-
+            jre: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-
+            jre: 'openjdk7'
         - stable-helium:
             branch: 'stable/helium'
-
-    jdk: 'openjdk7'
+            jre: 'openjdk7'
 
 
 - job-template:
@@ -24,7 +28,7 @@
     project-type: maven
     node: dynamic_verify
     concurrent: true
-    jdk: '{jdk}'
+    jdk: '{jre}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -37,11 +41,13 @@
             project: 'integration/distribution'
         - gerrit-parameter:
             branch: '{branch}'
+        - integration-patch-refspec:
+            branch: '$GERRIT_REFSPEC'
 
     scm:
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
+            refspec: '$PATCHREFSPEC'
             choosing-strategy: 'gerrit'
 
     wrappers:
@@ -64,7 +70,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r source:jar javadoc:jar'
+        goals: 'clean install -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r source:jar javadoc:jar'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
         settings: '{integration-settings}'
         global-settings: '{odl-global-settings}'
@@ -73,7 +79,7 @@
 
     postbuilders:
         - trigger-builds:
-            - project: 'integration-csit-1node-basic-all-{stream}'
+            - project: 'integration-distribution-deploy-{stream}'
               block: true
               predefined-parameters:
                   BUNDLEURL=$BUNDLEURL
@@ -87,7 +93,7 @@
 
     project-type: maven
     node: dynamic_merge
-    jdk: '{jdk}'
+    jdk: '{jre}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -122,7 +128,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  source:jar javadoc:jar'
+        goals: 'clean install -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  source:jar javadoc:jar'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
         settings: '{integration-settings}'
         global-settings: '{odl-global-settings}'
@@ -135,3 +141,99 @@
             unique-version: true
             deploy-unstable: false
 
+# Template: integration-distribution-deploy-{stream}
+# Goal: Verify distribution starts with no issues when all features are loaded
+# Operation: This job deploys the controller installing odl-integration-all
+
+- job-template:
+    name: 'integration-distribution-deploy-{stream}'
+
+    project-type: freestyle
+    node: dynamic_verify
+    concurrent: true
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration/distribution'
+        - integration-branch:
+            branch: '{branch}'
+        - integration-bundleurl:
+            bundleurl: 'last'
+        - integration-jdk-version:
+            jdkversion: '{jre}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: 'H H * * *'
+
+    builders:
+        - integration-get-bundle-vars
+        - inject:
+            properties-file: 'bundle_vars.txt'
+        - integration-deploy-controller-verify
+
+    publishers:
+        - archive:
+            artifacts: 'karaf.log'
+        - archive:
+            artifacts: 'karaf_console.log'
+        - email-notification:
+            email-prefix: '[integration]'
+
+# Template: integration-distribution-offline-{stream}
+# Goal: Verify distribution can start with no internet connection
+# Operation: This job deploys the controller removing any external repository definition
+
+- job-template:
+    name: 'integration-distribution-offline-{stream}'
+
+    project-type: freestyle
+    node: dynamic_verify
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration/distribution'
+        - integration-branch:
+            branch: '{branch}'
+        - integration-bundleurl:
+            bundleurl: 'last'
+        - integration-jdk-version:
+            jdkversion: '{jre}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: 'H H * * *'
+
+    builders:
+        - integration-get-bundle-vars
+        - inject:
+            properties-file: 'bundle_vars.txt'
+        - integration-deploy-controller-offline
+
+    publishers:
+        - archive:
+            artifacts: 'karaf.log'
+        - email-notification:
+            email-prefix: '[integration]'