Merge "Remove devstack from triggers for openstack job"

diff --git a/jjb-templates/daily.yaml b/jjb-templates/daily.yaml
index beb1bd6ff1a2d12fbff2e9185a6233f0706a5983..3a1e3fa7f022535de3c1fbf4f8a71e816f03d7ce 100644 (file)
--- a/jjb-templates/daily.yaml
+++ b/jjb-templates/daily.yaml
@@ -43,7 +43,7 @@
 
     maven:
         maven-name: '{mvn32}'
-        root-pom: 'pom.xml'
+        root-pom: 'POM'
         goals: 'MAVEN_GOALS source:jar javadoc:jar'
         maven-opts: 'MAVEN_OPTS'
         settings: '{PROJECT-settings}'

diff --git a/jjb-templates/integration.yaml b/jjb-templates/integration.yaml
index ed74148202fbf819b0802083f4e574a6687a4955..3862fb4850ced6c8e7bdf9ea5a5cc0063cbefdce 100644 (file)
--- a/jjb-templates/integration.yaml
+++ b/jjb-templates/integration.yaml
@@ -46,7 +46,7 @@
 
     maven:
         maven-name: '{mvn32}'
-        root-pom: 'pom.xml'
+        root-pom: 'POM'
         goals: 'MAVEN_GOALS source:jar javadoc:jar'
         maven-opts: 'MAVEN_OPTS'
         settings: '{PROJECT-settings}'

diff --git a/jjb-templates/merge.yaml b/jjb-templates/merge.yaml
index 4ff297d0e1c3f72944e176e8254a57c608653147..5258acc9338c84b1a194e9e662c482a8d0090e90 100644 (file)
--- a/jjb-templates/merge.yaml
+++ b/jjb-templates/merge.yaml
@@ -45,7 +45,7 @@
 
     maven:
         maven-name: '{mvn32}'
-        root-pom: 'pom.xml'
+        root-pom: 'POM'
         goals: 'MAVEN_GOALS source:jar javadoc:jar'
         maven-opts: 'MAVEN_OPTS'
         settings: '{PROJECT-settings}'

diff --git a/jjb-templates/sonar.yaml b/jjb-templates/sonar.yaml
index dae9a8a460232a4f16a21db22b6e9758d1693079..6990cd20fab12417a24c4069d2d40a753677355e 100644 (file)
--- a/jjb-templates/sonar.yaml
+++ b/jjb-templates/sonar.yaml
@@ -31,7 +31,7 @@
 
     maven:
         maven-name: '{mvn32}'
-        root-pom: 'pom.xml'
+        root-pom: 'POM'
         goals: 'MAVEN_GOALS -Dsonar'
         maven-opts: 'MAVEN_OPTS'
         settings: '{PROJECT-settings}'

diff --git a/jjb-templates/verify.yaml b/jjb-templates/verify.yaml
index 62fc2518248371d103401e8f2ac4ab25d1caabdc..d2f80d7d0df100c00dc1b866284b55bd16f35f4f 100644 (file)
--- a/jjb-templates/verify.yaml
+++ b/jjb-templates/verify.yaml
@@ -22,7 +22,7 @@
         - axis:
             type: jdk
             values:
-                - openjdk7
+JDKS
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -56,7 +56,7 @@
         - wipe-org-opendaylight-repo
         - maven-target:
             maven-version: '{mvn32}'
-            pom: 'pom.xml'
+            pom: 'POM'
             goals: 'MAVEN_GOALS'
             java-opts:
                 - 'MAVEN_OPTS'

diff --git a/jjb/aaa/aaa-csit-authn-master.yaml b/jjb/aaa/aaa-csit-authn-master.yaml
index 60dcb332fe2af2ab994671db35e795e584a4e9ac..f4cc2b61e933c8f2ec3120b672239da43f91f2f2 100644 (file)
--- a/jjb/aaa/aaa-csit-authn-master.yaml
+++ b/jjb/aaa/aaa-csit-authn-master.yaml
@@ -3,6 +3,7 @@
     jobs:
         - '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-{functionality}-{stream}'
 
     # The project name
     project: 'aaa'

diff --git a/jjb/aaa/aaa-csit-authn-stable-helium.yaml b/jjb/aaa/aaa-csit-authn-stable-helium.yaml
index 4ffb0c69b2a0a5aadb9ae59471903ddea868b84a..8bb7f37eea06cf31e7f3ba92c11e5336a1029499 100644 (file)
--- a/jjb/aaa/aaa-csit-authn-stable-helium.yaml
+++ b/jjb/aaa/aaa-csit-authn-stable-helium.yaml
@@ -2,6 +2,7 @@
     name: aaa-csit-authn-stable-helium
     jobs:
         - '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-{functionality}-{stream}'
 
     # The project name
     project: 'aaa'

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 34e0553f9f4f7df9bd18fec28cc1d586c14d4165..47425963668d0cc7da6a105da9cd83eefab8e722 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -55,6 +55,7 @@
             values:
                 - openjdk7
 
+
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'

diff --git a/jjb/alto/alto.cfg b/jjb/alto/alto.cfg
new file mode 100644 (file)
index 0000000..ed90956
--- /dev/null
+++ b/jjb/alto/alto.cfg
@@ -0,0 +1,2 @@
+BRANCHES: master
+DEPENDENCIES: controller,yangtools,odlparent,bpgcep
\ No newline at end of file

diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml
new file mode 100644 (file)
index 0000000..deff8f1
--- /dev/null
+++ b/jjb/alto/alto.yaml
@@ -0,0 +1,338 @@
+# REMOVE THIS LINE IF YOU WANT TO CUSTOMIZE ANYTHING BELOW
+# Otherwise this file will be automatically overwritten by the template
+# autobuilder.
+
+# ODL Releng build templates
+- project:
+    name: alto
+    jobs:
+        - 'alto-verify-{stream}'
+        - 'alto-merge-{stream}'
+        - 'alto-daily-{stream}'
+        - 'alto-integration-{stream}'
+        - 'alto-sonar'
+
+
+    # stream:    branch with - in place of / (eg. stable-helium)
+    # branch:    branch (eg. stable/helium)
+    stream:
+        - master:
+            branch: 'master'
+
+    project: 'alto'
+    jdk: 'openjdk7'
+
+# For the Job templates below replace instances of:
+# PROJECT with your project name (eg. controller)
+# MAVEN_GOALS with your maven goals to build
+# MAVEN_OPTS with your maven options to build
+
+- job-template:
+    name: 'alto-verify-{stream}'
+
+    # Job template for ODL verify jobs
+    #
+    # The purpose of this job template is to setup a ODL verify job
+    #
+    # Required Variables:
+    #     stream:    branch with - in place of / (eg. stable-helium)
+    #     branch:    branch (eg. stable/helium)
+
+    project-type: matrix
+    node: matrix_master
+    concurrent: true
+
+    axes:
+        - axis:
+            type: slave
+            name: nodes
+            values:
+                - dynamic_verify
+        - axis:
+            type: jdk
+            values:
+                - openjdk7
+
+
+    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: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            user: '{ssh-credentials}'
+
+    triggers:
+        - gerrit-trigger-patch-submitted:
+            name: 'alto'
+            branch: '{branch}'
+
+    builders:
+        - wipe-org-opendaylight-repo
+        - maven-target:
+            maven-version: '{mvn32}'
+            pom: 'pom.xml'
+            goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+            java-opts:
+                - '-Xmx1024m -XX:MaxPermSize=256m'
+            settings: '{alto-settings}'
+            global-settings: '{odl-global-settings}'
+        - jacoco-nojava-workaround
+
+    publishers:
+        - email-notification:
+            email-prefix: '[alto]'
+        - jacoco-report
+
+- job-template:
+    name: 'alto-merge-{stream}'
+
+    # Job template for ODL merge jobs
+    #
+    # The purpose of this job template is to setup a ODL merge job
+    # and deploy artifacts to Nexus.
+    #
+    # Required Variables:
+    #     stream:    branch with - in place of / (eg. stable-helium)
+    #     branch:    branch (eg. stable/helium)
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    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: '{project}'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            choosing-strategy: 'default'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            user: '{ssh-credentials}'
+
+    triggers:
+        - gerrit-trigger-patch-merged:
+            name: 'alto'
+            branch: '{branch}'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+        settings: '{alto-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - jacoco-nojava-workaround
+
+    publishers:
+        
+        - email-notification:
+            email-prefix: '[alto]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+        - jacoco-report
+
+- job-template:
+    name: 'alto-daily-{stream}'
+
+    # Job template for daily builders
+    #
+    # The purpose of this job template is to setup a daily/nightly
+    # builder and pushes to Sonar analysis.
+    #
+    # Required Variables:
+    #     stream:    branch with - in place of / (eg. stable-helium)
+    #     branch:    branch (eg. stable/helium)
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    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: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            user: '{ssh-credentials}'
+
+    triggers:
+        - timed: 'H H * * *'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+        settings: '{alto-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - jacoco-nojava-workaround
+
+    publishers:
+        - email-notification:
+            email-prefix: '[alto]'
+        - jacoco-report
+
+- job-template:
+    name: 'alto-integration-{stream}'
+    disabled: false
+
+    # Job template for ODL merge jobs
+    #
+    # The purpose of this job template is to setup a ODL merge job
+    # and deploy artifacts to Nexus.
+    #
+    # Required Variables:
+    #     stream:    branch with - in place of / (eg. stable-helium)
+    #     branch:    branch (eg. stable/helium)
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    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: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            user: '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream},bpgcep-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+        settings: '{alto-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - jacoco-nojava-workaround
+
+    publishers:
+        - email-notification:
+            email-prefix: '[alto] [controller] [yangtools] [odlparent] [bpgcep]'
+        - jacoco-report
+
+- job-template:
+    name: 'alto-sonar'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '7'
+        numToKeep: '10'
+        artifactDaysToKeep: '1'
+        artifactNumToKeep: '1'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            user: '{ssh-credentials}'
+
+    triggers:
+        - timed: 'H H * * *'
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dsonar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+        settings: '{alto-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - jacoco-nojava-workaround
+
+    publishers:
+        - sonar:
+            language: 'java'
+            maven-opts: '-Xmx6144m -XX:MaxPermSize=1024m'
+        - email-notification:
+            email-prefix: '[alto]'
+        - jacoco-report
+

diff --git a/jjb/autorelease/autorelease-lithium.yaml b/jjb/autorelease/autorelease-lithium.yaml
index 9fce4f82d9320de7fdf27cbaf90e8402feb562e0..7c6705364962e8b2044acd7f3bc795adcf187cff 100644 (file)
--- a/jjb/autorelease/autorelease-lithium.yaml
+++ b/jjb/autorelease/autorelease-lithium.yaml
@@ -57,6 +57,19 @@
         settings: '{autorelease-settings}'
         global-settings: '{odl-global-settings}'
 
+    postbuilders:
+        - maven-target:
+            maven-version: '{mvn32}'
+            pom: 'pom.xml'
+            goals: 'dependency:sources -l sources.log -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+            java-opts:
+                - '-Xmx4096m -XX:MaxPermSize=1024m'
+            settings: '{autorelease-settings}'
+            global-settings: '{odl-global-settings}'
+        - jacoco-nojava-workaround
+
     publishers:
+        - archive-artifacts:
+            artifacts: 'sources.log'
         - email-notification:
             email-prefix: '[autorelease]'

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index 75d3b15466a1c10ea118019a449ff2b008ebdc93..667b2d0b23f1b00eacd6a8e602619aa9a06bf789 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -55,6 +55,7 @@
             values:
                 - openjdk7
 
+
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'

diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index af5fd77e3810196b2cf70122628d8cbd9622c511..4d3842789e0add0e381d5438620b8c721455b41e 100644 (file)
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -53,6 +53,7 @@
             values:
                 - openjdk7
 
+
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'

diff --git a/jjb/controller/controller-csit-nsf-stable-helium.yaml b/jjb/controller/controller-csit-nsf-stable-helium.yaml
index e7111ac4bcaac01860f1d244c7511ccd63000fe1..90452a35d5cbe59d4f17c7fc0f80762cede60519 100644 (file)
--- a/jjb/controller/controller-csit-nsf-stable-helium.yaml
+++ b/jjb/controller/controller-csit-nsf-stable-helium.yaml
@@ -2,6 +2,7 @@
     name: controller-csit-nsf-stable-helium
     jobs:
         - '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-{functionality}-{stream}'
 
     # The project name
     project: 'controller'

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 6c2a0a8756c8a1f6bd1bff4140ff69fc575821c8..a30ca69cd24599bc4329d4c7bcc2ef52fd2cd028 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -55,6 +55,7 @@
             values:
                 - openjdk7
 
+
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'

diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml
index eeec5fde0769f59050b232b62c1ac92dd371f48f..fcd1c1b489303144b24ac0edf01761fa2597463d 100644 (file)
--- a/jjb/coretutorials/coretutorials.yaml
+++ b/jjb/coretutorials/coretutorials.yaml
@@ -53,6 +53,7 @@
             values:
                 - openjdk7
 
+
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'

diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml
index a54ad1eafa3b87ddd0e02af9db089e051bf93e3e..e838b70ca4d15f2f54a1580c09f3687f548f3d3d 100644 (file)
--- a/jjb/didm/didm.yaml
+++ b/jjb/didm/didm.yaml
@@ -53,6 +53,7 @@
             values:
                 - openjdk7
 
+
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'

diff --git a/jjb/discovery/discovery.yaml b/jjb/discovery/discovery.yaml
index 8d496a34dbe01ec95bae1b7942c941c311b44492..34e88f13603304dc305d0d88bd7656f7e8412219 100644 (file)
--- a/jjb/discovery/discovery.yaml
+++ b/jjb/discovery/discovery.yaml
@@ -53,6 +53,7 @@
             values:
                 - openjdk7
 
+
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index bd17e2bf2d6ee39f55ae9dd0236755af99202fff..9011f5c85c615540fbb3ab117bdba38ca6fdcd33 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -55,6 +55,7 @@
             values:
                 - openjdk7
 
+
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'

diff --git a/jjb/docs/docs.yaml b/jjb/docs/docs.yaml
index 2d75cd670ae7df74338660289ce716a64a357e69..9814abe5f2ff0d7703242f66ad15f177c6528e76 100644 (file)
--- a/jjb/docs/docs.yaml
+++ b/jjb/docs/docs.yaml
@@ -55,6 +55,7 @@
             values:
                 - openjdk7
 
+
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index 79db7cbe430f849cb646cc2aae8895be184364bf..626d581707b2e7bb4a8fd0f6ce9c16322f8189a8 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -55,6 +55,7 @@
             values:
                 - openjdk7
 
+
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'

diff --git a/jjb/integration/integration-csit-basic-master.yaml b/jjb/integration/integration-csit-basic-master.yaml
new file mode 100644 (file)
index 0000000..b2735dd
--- /dev/null
+++ b/jjb/integration/integration-csit-basic-master.yaml
@@ -0,0 +1,31 @@
+- project:
+    name: integration-csit-basic-master
+    jobs:
+        - '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
+        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-{functionality}-{stream}'
+
+    # The project name
+    project: 'integration'
+
+    # The functionality under test
+    functionality: 'basic'
+
+    # Project branches
+    stream:
+        - master:
+            branch: 'master'
+
+    install:
+        - all:
+            scope: 'all'
+
+    # Features to install
+    install-features: 'odl-restconf'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},aaa-distribution-{stream},l2switch-distribution-{stream},ovsdb-distribution-{stream},vtn-distribution-{stream},lispflowmapping-distribution-{stream},integration-distribution-merge-{stream}'
+

diff --git a/jjb/integration/integration-csit-basic-stable-helium.yaml b/jjb/integration/integration-csit-basic-stable-helium.yaml
new file mode 100644 (file)
index 0000000..cb141d9
--- /dev/null
+++ b/jjb/integration/integration-csit-basic-stable-helium.yaml
@@ -0,0 +1,30 @@
+- project:
+    name: integration-csit-basic-stable-helium
+    jobs:
+        - '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-{functionality}-{stream}'
+
+    # The project name
+    project: 'integration'
+
+    # The functionality under test
+    functionality: 'basic'
+
+    # Project branches
+    stream:
+       - stable-helium:
+            branch: 'stable/helium'
+
+    install:
+        - all:
+            scope: 'all'
+
+    # Features to install
+    install-features: 'odl-restconf'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},aaa-distribution-{stream},l2switch-distribution-{stream},ovsdb-distribution-{stream},vtn-distribution-{stream},lispflowmapping-distribution-{stream},integration-distribution-merge-{stream}'
+

diff --git a/jjb/integration/integration-csit.yaml b/jjb/integration/integration-csit.yaml
index c690f27c28d4ef9650b20c415d1641798c80c971..8e497a0a39c837fa8c34631637d404e1fa9c3e84 100644 (file)
--- a/jjb/integration/integration-csit.yaml
+++ b/jjb/integration/integration-csit.yaml
@@ -1,3 +1,66 @@
+- job-template:
+    name: '{project}-csit-verify-{functionality}-{stream}'
+
+    project-type: freestyle
+    node: dynamic_robot
+
+    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'
+        - integration-branch:
+            branch: '{branch}'
+        - integration-bundleurl:
+            bundleurl: 'last'
+        - integration-controller-scope:
+            controller-scope: 'only'
+        - integration-controller-features:
+            controller-features: '{install-features}'
+        - integration-test-options:
+            test-options: '{robot-options}'
+        - integration-test-plan:
+            test-plan: '{project}-{functionality}.txt'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    wrappers:
+        - build-timeout
+        - integration-jclouds-controller-mininet:
+            controller-vms: 1
+            mininet-vms: 1
+        - ssh-agent-credentials:
+            user: '{ssh-credentials}'
+
+    triggers:
+        - integration-test-gerrit-trigger-patch-submitted:
+            name: 'integration'
+            branch: '{branch}'
+            project: '{project}'
+
+    builders:
+        - integration-get-slave-addresses
+        - inject:
+            properties-file: 'slave_addresses.txt'
+        - integration-deploy-controller-run-test
+
+    publishers:
+        - integration-robot:
+            unstable-if: 97.0
+            pass-if: 100.0
+        - archive:
+            artifacts: 'karaf.log'
+        - email-notification:
+            email-prefix: '[{project}]'
+
 - job-template:
     name: '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
 

diff --git a/jjb/integration/integration-jobs.yaml b/jjb/integration/integration-jobs.yaml
index dc00a762a0d65be547b90f0dce8fb9c74eb20cef..1ca529d25654336f23fce67303e36d43473cb837 100644 (file)
--- a/jjb/integration/integration-jobs.yaml
+++ b/jjb/integration/integration-jobs.yaml
@@ -74,7 +74,7 @@
         root-pom: 'pom.xml'
         goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-        settings: '{odlparent-settings}'
+        settings: '{integration-settings}'
         global-settings: '{odl-global-settings}'
         ignore-upstream-changes: true
 
@@ -132,7 +132,7 @@
         root-pom: 'pom.xml'
         goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  source:jar javadoc:jar'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-        settings: '{odlparent-settings}'
+        settings: '{integration-settings}'
         global-settings: '{odl-global-settings}'
 
     publishers:

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 48c63d51f65c81c3bd88d531eea594c7fad7fa48..3906c78f7d9c818144659044429a1b92a44c3edb 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -121,7 +121,7 @@
                     branch-pattern: '**/{branch}'
                 file-paths:
                   - compare-type: 'ANT'
-                    pattern: 'test/**'
+                    pattern: 'test/csit/suites/{project}/**'
 
 - trigger:
     name: integration-test-gerrit-trigger-patch-merged

diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml
index f4d3e6a69b8b2fadb2f3426885fa322cda000836..2e5f1a258feccae5519abae01e6c72edf699aeb7 100644 (file)
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@ -53,6 +53,7 @@
             values:
                 - openjdk7
 
+
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'

diff --git a/jjb/l2switch/l2switch-csit-switch-master.yaml b/jjb/l2switch/l2switch-csit-switch-master.yaml
index 013c96554e00d791e08e6981df04c792342e3bd3..a9374155f70b84286537b1594fe4810d1c6b75b0 100644 (file)
--- a/jjb/l2switch/l2switch-csit-switch-master.yaml
+++ b/jjb/l2switch/l2switch-csit-switch-master.yaml
@@ -3,6 +3,7 @@
     jobs:
         - '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-{functionality}-{stream}'
 
     # The project name
     project: 'l2switch'

diff --git a/jjb/l2switch/l2switch-csit-switch-stable-helium.yaml b/jjb/l2switch/l2switch-csit-switch-stable-helium.yaml
index 5996ae26926cb75a8a1af726815a1d34a999d5c2..e935d71c7fffe93c626ddfdd043ad61b25c6eadb 100644 (file)
--- a/jjb/l2switch/l2switch-csit-switch-stable-helium.yaml
+++ b/jjb/l2switch/l2switch-csit-switch-stable-helium.yaml
@@ -2,6 +2,7 @@
     name: l2switch-csit-switch-stable-helium
     jobs:
         - '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-{functionality}-{stream}'
 
     # The project name
     project: 'l2switch'

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index 0c49b630ae4fe0c5315dcc24d31aa1ef95323c95..7ae092aeed13ded8644db445996439602d2b4f95 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -55,6 +55,7 @@
             values:
                 - openjdk7
 
+
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'

diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
index 077794c811a99441c6dc51cd22476bbeaee08dd5..9c22e1ffd14d0cfea26cb14dc24a72b1580447e6 100644 (file)
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -53,6 +53,7 @@
             values:
                 - openjdk7
 
+
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-all-master.yaml b/jjb/lispflowmapping/lispflowmapping-csit-all-master.yaml
index 3e948dcd03b0c92a20ce7af0e84b26d28be5d194..973ac606c45457d65045a76ac34c3981c9945140 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-all-master.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-all-master.yaml
@@ -3,6 +3,7 @@
     jobs:
         - '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-{functionality}-{stream}'
 
     # The project name
     project: 'lispflowmapping'
@@ -22,7 +23,7 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-lispflowmapping-all'
+    install-features: 'odl-lispflowmapping-all,odl-restconf,odl-mdsal-apidocs'
 
     # Robot custom options
     robot-options: ''

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-all-stable-helium.yaml b/jjb/lispflowmapping/lispflowmapping-csit-all-stable-helium.yaml
index 663c6e615cf125f4fc9aae33cd54a8b546dc0d22..9bd92c7f135e02a65608f031cd82be9b93280f22 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-all-stable-helium.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-all-stable-helium.yaml
@@ -2,6 +2,7 @@
     name: lispflowmapping-csit-all-stable-helium
     jobs:
         - '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-{functionality}-{stream}'
 
     # The project name
     project: 'lispflowmapping'
@@ -21,7 +22,7 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-lispflowmapping-all'
+    install-features: 'odl-lispflowmapping-all,odl-restconf,odl-mdsal-apidocs'
 
     # Robot custom options
     robot-options: ''

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index 0ea4cfc6055367babcae546f16232bbf48adbf72..7cf81c3a577d6f42c2cdc5ab119eae09a793309f 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -55,6 +55,7 @@
             values:
                 - openjdk7
 
+
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index 3dbd79cba3a71b17da19173ad93fa66000e78bc9..9d83349bd5839f5d8af1a8430043702d3aaa3c1f 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -53,6 +53,7 @@
             values:
                 - openjdk7
 
+
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'

diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml
index 65dd4b03e5a68a15320ec8b061cdea82a6594e6e..fef046265b947583ad06dbccd2a2180d4def01ad 100644 (file)
--- a/jjb/nic/nic.yaml
+++ b/jjb/nic/nic.yaml
@@ -53,6 +53,7 @@
             values:
                 - openjdk7
 
+
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index c57dc615439406f8ba6bd40c4422130db0a8fa68..f90748f8ed42b0f3a9126287486255149a28c744 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -55,6 +55,7 @@
             values:
                 - openjdk7
 
+
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'

diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml
index 148cbb32e7188ade77c5c6503fd72b2e43dab250..251d325bcdc9051a88444ac2532e1172d9634664 100644 (file)
--- a/jjb/openflowjava/openflowjava.yaml
+++ b/jjb/openflowjava/openflowjava.yaml
@@ -55,6 +55,7 @@
             values:
                 - openjdk7
 
+
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-master.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-master.yaml
index 9daddd138a1f9adf52e33bd6c8efe21dcbcd7e18..bb4c6422b4236ab17c4ede001af4d80d1578f9b4 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-master.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-master.yaml
@@ -3,6 +3,7 @@
     jobs:
         - '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-{functionality}-{stream}'
 
     # The project name
     project: 'openflowplugin'

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-stable-helium.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-stable-helium.yaml
index 3f4d850e84b1ab74cdb5ac81a22e99898d4aa38a..d27d0f8b4f47ca0d5cda6c77e42ecf71d48ef513 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-stable-helium.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-stable-helium.yaml
@@ -2,6 +2,7 @@
     name: openflowplugin-csit-flow-services-stable-helium
     jobs:
         - '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-{functionality}-{stream}'
 
     # The project name
     project: 'openflowplugin'

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 9b40989d12b8f937cb33e676075d579b1ef676df..e855d691ef81cd457b718e8addf35171c418e049 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -55,6 +55,7 @@
             values:
                 - openjdk7
 
+
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index c99d80cab91412db472a7032dbd203e65728d186..7691338c64616793786c146dd868457e6379eeed 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -54,6 +54,7 @@
             values:
                 - openjdk7
 
+
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'

diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml
index c9125852be49804034a9e10cd8385d123d99b59a..72b1118a90ae153a810e89e93f6bc07962e16dde 100644 (file)
--- a/jjb/packetcable/packetcable.yaml
+++ b/jjb/packetcable/packetcable.yaml
@@ -55,6 +55,7 @@
             values:
                 - openjdk7
 
+
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'

diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml
index 94a92bb9a9ea748575b09abb75ad951b573f8b3b..ce7dc86acc42cd6849702fe5603e2a55dfb4404b 100644 (file)
--- a/jjb/persistence/persistence.yaml
+++ b/jjb/persistence/persistence.yaml
@@ -53,6 +53,7 @@
             values:
                 - openjdk7
 
+
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'

diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml
index f9c138165ae067de730202737312cd9fc1f42475..09f8ac1752cc187e02f232a793db5237f5932014 100644 (file)
--- a/jjb/reservation/reservation.yaml
+++ b/jjb/reservation/reservation.yaml
@@ -53,6 +53,7 @@
             values:
                 - openjdk7
 
+
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.cfg b/jjb/sdninterfaceapp/sdninterfaceapp.cfg
new file mode 100644 (file)
index 0000000..b008fb3
--- /dev/null
+++ b/jjb/sdninterfaceapp/sdninterfaceapp.cfg
@@ -0,0 +1,2 @@
+MAVEN_GOALS: clean install -Dcheckstyle.skip=true -Dmaven.repo.local=$WORKSPACE/.m2repo -Dorg.ops4j.pax.url.mvn.localRepository=$WORKSPACE/.m2repo
+DEPENDENCIES: odlparent,bgpcep
\ No newline at end of file

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
new file mode 100644 (file)
index 0000000..29624ae
--- /dev/null
+++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
@@ -0,0 +1,340 @@
+# REMOVE THIS LINE IF YOU WANT TO CUSTOMIZE ANYTHING BELOW
+# Otherwise this file will be automatically overwritten by the template
+# autobuilder.
+
+# ODL Releng build templates
+- project:
+    name: sdninterfaceapp
+    jobs:
+        - 'sdninterfaceapp-verify-{stream}'
+        - 'sdninterfaceapp-merge-{stream}'
+        - 'sdninterfaceapp-daily-{stream}'
+        - 'sdninterfaceapp-integration-{stream}'
+        - 'sdninterfaceapp-sonar'
+
+
+    # stream:    branch with - in place of / (eg. stable-helium)
+    # branch:    branch (eg. stable/helium)
+    stream:
+        - master:
+            branch: 'master'
+        - stable-helium:
+            branch: 'stable/helium'
+
+    project: 'sdninterfaceapp'
+    jdk: 'openjdk7'
+
+# For the Job templates below replace instances of:
+# PROJECT with your project name (eg. controller)
+# MAVEN_GOALS with your maven goals to build
+# MAVEN_OPTS with your maven options to build
+
+- job-template:
+    name: 'sdninterfaceapp-verify-{stream}'
+
+    # Job template for ODL verify jobs
+    #
+    # The purpose of this job template is to setup a ODL verify job
+    #
+    # Required Variables:
+    #     stream:    branch with - in place of / (eg. stable-helium)
+    #     branch:    branch (eg. stable/helium)
+
+    project-type: matrix
+    node: matrix_master
+    concurrent: true
+
+    axes:
+        - axis:
+            type: slave
+            name: nodes
+            values:
+                - dynamic_verify
+        - axis:
+            type: jdk
+            values:
+                - openjdk7
+
+
+    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: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            user: '{ssh-credentials}'
+
+    triggers:
+        - gerrit-trigger-patch-submitted:
+            name: 'sdninterfaceapp'
+            branch: '{branch}'
+
+    builders:
+        - wipe-org-opendaylight-repo
+        - maven-target:
+            maven-version: '{mvn32}'
+            pom: 'pom.xml'
+            goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+            java-opts:
+                - '-Xmx1024m -XX:MaxPermSize=256m'
+            settings: '{sdninterfaceapp-settings}'
+            global-settings: '{odl-global-settings}'
+        - jacoco-nojava-workaround
+
+    publishers:
+        - email-notification:
+            email-prefix: '[sdninterfaceapp]'
+        - jacoco-report
+
+- job-template:
+    name: 'sdninterfaceapp-merge-{stream}'
+
+    # Job template for ODL merge jobs
+    #
+    # The purpose of this job template is to setup a ODL merge job
+    # and deploy artifacts to Nexus.
+    #
+    # Required Variables:
+    #     stream:    branch with - in place of / (eg. stable-helium)
+    #     branch:    branch (eg. stable/helium)
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    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: '{project}'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            choosing-strategy: 'default'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            user: '{ssh-credentials}'
+
+    triggers:
+        - gerrit-trigger-patch-merged:
+            name: 'sdninterfaceapp'
+            branch: '{branch}'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+        settings: '{sdninterfaceapp-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - jacoco-nojava-workaround
+
+    publishers:
+        
+        - email-notification:
+            email-prefix: '[sdninterfaceapp]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+        - jacoco-report
+
+- job-template:
+    name: 'sdninterfaceapp-daily-{stream}'
+
+    # Job template for daily builders
+    #
+    # The purpose of this job template is to setup a daily/nightly
+    # builder and pushes to Sonar analysis.
+    #
+    # Required Variables:
+    #     stream:    branch with - in place of / (eg. stable-helium)
+    #     branch:    branch (eg. stable/helium)
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    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: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            user: '{ssh-credentials}'
+
+    triggers:
+        - timed: 'H H * * *'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+        settings: '{sdninterfaceapp-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - jacoco-nojava-workaround
+
+    publishers:
+        - email-notification:
+            email-prefix: '[sdninterfaceapp]'
+        - jacoco-report
+
+- job-template:
+    name: 'sdninterfaceapp-integration-{stream}'
+    disabled: false
+
+    # Job template for ODL merge jobs
+    #
+    # The purpose of this job template is to setup a ODL merge job
+    # and deploy artifacts to Nexus.
+    #
+    # Required Variables:
+    #     stream:    branch with - in place of / (eg. stable-helium)
+    #     branch:    branch (eg. stable/helium)
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    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: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            user: '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: 'odlparent-merge-{stream},bgpcep-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+        settings: '{sdninterfaceapp-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - jacoco-nojava-workaround
+
+    publishers:
+        - email-notification:
+            email-prefix: '[sdninterfaceapp] [odlparent] [bgpcep]'
+        - jacoco-report
+
+- job-template:
+    name: 'sdninterfaceapp-sonar'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '7'
+        numToKeep: '10'
+        artifactDaysToKeep: '1'
+        artifactNumToKeep: '1'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            user: '{ssh-credentials}'
+
+    triggers:
+        - timed: 'H H * * *'
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dsonar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+        settings: '{sdninterfaceapp-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - jacoco-nojava-workaround
+
+    publishers:
+        - sonar:
+            language: 'java'
+            maven-opts: '-Xmx6144m -XX:MaxPermSize=1024m'
+        - email-notification:
+            email-prefix: '[sdninterfaceapp]'
+        - jacoco-report
+

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index 6ead53f072aca64be0246bfa984f99643e894395..d2536699fc8657ae77f55182aa08c633dc525f10 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -55,6 +55,7 @@
             values:
                 - openjdk7
 
+
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'

diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml
index aff610dd01ad466cd13d7163d4c3faffacfce667..ec1c5b85f6b4cdfac09a384228ff13913ff03666 100644 (file)
--- a/jjb/snbi/snbi.yaml
+++ b/jjb/snbi/snbi.yaml
@@ -55,6 +55,7 @@
             values:
                 - openjdk7
 
+
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'

diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml
index 725f1e2f7c05632302978694223119df61357c5c..882a45cb73cbc066bcfd435115821217d19c55b6 100644 (file)
--- a/jjb/snmp/snmp.yaml
+++ b/jjb/snmp/snmp.yaml
@@ -53,6 +53,7 @@
             values:
                 - openjdk7
 
+
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'

diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml
index ab101c8ea2b6d41706dd1bdfecf5bffd622a6564..04a99bbbdbcc61c98a2d9790b0f21a2da6a3e719 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -55,6 +55,7 @@
             values:
                 - openjdk7
 
+
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index b22a9dcef6bd4fae3322ac728fe533b0b13e6b5e..e5d3297ce3d9f81dbff23ab897f18f17a45ea02d 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -55,6 +55,7 @@
             values:
                 - openjdk7
 
+
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'

diff --git a/jjb/tcpmd5/tcpmd5.yaml b/jjb/tcpmd5/tcpmd5.yaml
index 8ad4e06458a0c3e536ea884fdfedc700965f882c..381545dec5033a1a5ec1d5f9800b66794fd6682c 100644 (file)
--- a/jjb/tcpmd5/tcpmd5.yaml
+++ b/jjb/tcpmd5/tcpmd5.yaml
@@ -55,6 +55,7 @@
             values:
                 - openjdk7
 
+
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'

diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml
index f929e106e9929289e87f255813a950ebc987e02d..1ba752f3d1005e1ea359cb46fb0d9bded6517c71 100644 (file)
--- a/jjb/topoprocessing/topoprocessing.yaml
+++ b/jjb/topoprocessing/topoprocessing.yaml
@@ -53,6 +53,7 @@
             values:
                 - openjdk7
 
+
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index a034cc8d8a7e4ac482918b2cb1168b75935697b8..5f4ee2823c8dbe8f28c3b903f9472ffb29aa27fb 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -53,6 +53,7 @@
             values:
                 - openjdk7
 
+
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'

diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml
index cc5c3af77a1e2641d643c8d725a2b7cc20f20136..c628be7d2aa0fc926426113d69da4d7465a45ac0 100644 (file)
--- a/jjb/ttp/ttp.yaml
+++ b/jjb/ttp/ttp.yaml
@@ -55,6 +55,7 @@
             values:
                 - openjdk7
 
+
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'

diff --git a/jjb/usc/usc-distribution.yaml b/jjb/usc/usc-distribution.yaml
new file mode 100644 (file)
index 0000000..867c525
--- /dev/null
+++ b/jjb/usc/usc-distribution.yaml
@@ -0,0 +1,15 @@
+- project:
+    name: usc-distribution
+    jobs:
+        - '{project}-distribution-{stream}'
+
+    # The project name
+    project: 'usc'
+
+    # The project branches
+    stream:
+        - master:
+            branch: 'master'
+
+    jdk: 'openjdk7'
+

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index 437dfb60bbf12db2324f49b5e2dbd4f9ee0aa81f..bb5dfab613d855ad6e7400ce862a3d48a8452cad 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -53,6 +53,7 @@
             values:
                 - openjdk7
 
+
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'

diff --git a/jjb/vpnservice/vpnservice.yaml b/jjb/vpnservice/vpnservice.yaml
index c5fe92ff11676a22d3df6e1c9becd9cd5dde96cc..5c494bc27df9aaa10bf16398cc6314759790e2e4 100644 (file)
--- a/jjb/vpnservice/vpnservice.yaml
+++ b/jjb/vpnservice/vpnservice.yaml
@@ -53,6 +53,7 @@
             values:
                 - openjdk7
 
+
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'

diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml
index d0df4668db120f0bad4fc2b7668047c483efe06b..e54e49214674af4e6a32197022fa88247d08b8df 100644 (file)
--- a/jjb/vtn/vtn.yaml
+++ b/jjb/vtn/vtn.yaml
@@ -55,6 +55,7 @@
             values:
                 - openjdk7
 
+
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'

diff --git a/scripts/jjb-autoupdate-project.py b/scripts/jjb-autoupdate-project.py
index 8e35661cc9fb8da6013cd9397b2256a7c151c1bc..6950c70b0b289d1baa9ba6981363a8fc152337d6 100644 (file)
--- a/scripts/jjb-autoupdate-project.py
+++ b/scripts/jjb-autoupdate-project.py
@@ -47,6 +47,10 @@ def update_templates(projects):
                     parameters.append("-t '%s'" % v)
                 elif k == "BRANCHES" and v is not None:
                     parameters.append("-b '%s'" % v)
+                elif k == "JDKS" and v is not None:
+                    parameters.append("-j '%s'" % v)
+                elif k == "POM" and v is not None:
+                    parameters.append("-p '%s'" % v)
                 elif k == "MVN_GOALS" and v is not None:
                     parameters.append("-g '%s'" % v)
                 elif k == "MVN_OPTS" and v is not None:

diff --git a/scripts/jjb-init-project.py b/scripts/jjb-init-project.py
index 65d2754c935310257709a8ef676a8a671e82a8d5..1c12e8ef79cd6739ca5a817538c7a823aaa594db 100644 (file)
--- a/scripts/jjb-init-project.py
+++ b/scripts/jjb-init-project.py
@@ -29,6 +29,9 @@ parser.add_argument("-d", "--dependencies",
                           "Example: aaa,controller,yangtools"))
 parser.add_argument("-t", "--templates", help="Job templates to use")
 parser.add_argument("-b", "--branches", help="Git Branches to build")
+parser.add_argument("-j", "--jdks", help="JDKs to build against (for verify jobs)")  # noqa
+parser.add_argument("-p", "--pom", help="Path to pom.xml to use in Maven build"
+                                        "(Default: pom.xml")
 parser.add_argument("-g", "--mvn-goals", help="Maven Goals")
 parser.add_argument("-o", "--mvn-opts", help="Maven Options")
 parser.add_argument("-a", "--archive-artifacts",
@@ -44,6 +47,8 @@ project_dir = os.path.join("jjb", project)
 project_file = os.path.join(project_dir, "%s.yaml" % project)
 templates = args.templates  # Defaults to all templates
 branches = args.branches    # Defaults to "master,stable/helium" if not passed
+jdks = args.jdks            # Defaults to openjdk7
+pom = args.pom              # Defaults to pom.xml
 mvn_goals = args.mvn_goals  # Defaults to "clean install" if not passsed
 mvn_opts = args.mvn_opts    # Defaults to blank if not passed
 dependencies = args.dependencies
@@ -87,6 +92,21 @@ for branch in branches.split(","):
                          (branch.replace('/', '-'),
                           branch))
 
+if not jdks:
+    jdks = "openjdk7"
+else:
+    make_cfg = True
+    cfg_string.append("JDKS: %s" % jdks)
+use_jdks = ""
+for jdk in jdks.split(","):
+    use_jdks += "                - %s\n" % jdk
+
+if not pom:
+    pom = "pom.xml"
+else:
+    make_cfg = True
+    cfg_string.append("POM: %s" % pom)
+
 if not mvn_goals:
     mvn_goals = ("clean install "
                  "-V "  # Show Maven / Java version before building
@@ -164,6 +184,7 @@ for t in use_templates:
     else:
         job_templates_yaml = job_templates_yaml + \
             "        - '%s-%s-{stream}'\n" % (project, t)
+
 with open(project_file, "w") as outfile:
     for t in use_templates:
         template_file = "jjb-templates/%s.yaml" % t
@@ -174,6 +195,8 @@ with open(project_file, "w") as outfile:
                     line = re.sub("PROJECT", project, line)
                     line = re.sub("DISABLED", disabled, line)
                     line = re.sub("STREAMS", streams, line)
+                    line = re.sub("JDKS", use_jdks, line)
+                    line = re.sub("POM", pom, line)
                     line = re.sub("MAVEN_GOALS", mvn_goals, line)
                     line = re.sub("MAVEN_OPTS", mvn_opts, line)
                     line = re.sub("DEPENDENCIES", dependent_jobs, line)