Merge "Add stable/lithium jobs for sxp"
authorAndrew Grimberg <agrimberg@linuxfoundation.org>
Thu, 28 May 2015 21:01:57 +0000 (21:01 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Thu, 28 May 2015 21:01:57 +0000 (21:01 +0000)
129 files changed:
jenkins-scripts/builder.sh
jenkins-scripts/mininet-fedora.sh [new file with mode: 0755]
jenkins-scripts/mininet.sh
jjb-templates/distribution.yaml [new file with mode: 0644]
jjb-templates/integration.yaml
jjb/aaa/aaa-distribution.yaml [deleted file]
jjb/aaa/aaa.yaml
jjb/alto/alto.cfg
jjb/alto/alto.yaml
jjb/autorelease/autorelease-lithium.yaml
jjb/autorelease/autorelease-macros.yaml
jjb/autorelease/autorelease-master.yaml
jjb/autorelease/include-raw-autorelease-release-versions.sh
jjb/bgpcep/bgpcep-csit-userfeatures.yaml [moved from jjb/bgpcep/bgpcep-csit-userfeatures-master.yaml with 83% similarity]
jjb/bgpcep/bgpcep-distribution.yaml [deleted file]
jjb/bgpcep/bgpcep-python.yaml
jjb/bgpcep/bgpcep-verify.yaml [deleted file]
jjb/bgpcep/bgpcep.cfg
jjb/bgpcep/bgpcep.yaml
jjb/capwap/capwap.yaml
jjb/controller/controller-csit-netconf-master.yaml
jjb/controller/controller-csit-netconf-stable-helium.yaml
jjb/controller/controller-distribution.yaml [deleted file]
jjb/controller/controller.cfg
jjb/controller/controller.yaml
jjb/coretutorials/coretutorials.yaml
jjb/defense4all/defense4all.cfg
jjb/defense4all/defense4all.yaml
jjb/didm/didm.yaml
jjb/discovery/discovery.yaml
jjb/dlux/dlux.yaml
jjb/docs/docs.yaml
jjb/groupbasedpolicy/groupbasedpolicy.cfg
jjb/groupbasedpolicy/groupbasedpolicy.yaml
jjb/integration/include-raw-integration-configure-clustering.sh
jjb/integration/include-raw-integration-deploy-controller-offline.sh
jjb/integration/include-raw-integration-deploy-controller-run-test.sh
jjb/integration/include-raw-integration-deploy-controller.sh
jjb/integration/include-raw-integration-get-bundle-vars.sh
jjb/integration/include-raw-integration-start-cluster-run-test.sh
jjb/integration/integration-csit-basic-stable-helium.yaml
jjb/integration/integration-csit-basic.yaml [moved from jjb/integration/integration-csit-basic-master.yaml with 87% similarity]
jjb/integration/integration-jobs.yaml
jjb/integration/integration-python.yaml
jjb/integration/integration-templates.yaml
jjb/iotdm/iotdm-csit-basic.yaml [new file with mode: 0644]
jjb/iotdm/iotdm.cfg
jjb/iotdm/iotdm.yaml
jjb/l2switch/l2switch-csit-host-scalability-daily.yaml [new file with mode: 0644]
jjb/l2switch/l2switch-csit-scalability.yaml [moved from jjb/l2switch/l2switch-csit-scalability-master.yaml with 89% similarity]
jjb/l2switch/l2switch-csit-switch.yaml [moved from jjb/l2switch/l2switch-csit-switch-master.yaml with 89% similarity]
jjb/l2switch/l2switch-distribution.yaml [deleted file]
jjb/l2switch/l2switch.yaml
jjb/lacp/lacp-csit-lacp-master.yaml [new file with mode: 0644]
jjb/lacp/lacp.cfg
jjb/lacp/lacp.yaml
jjb/lispflowmapping/lispflowmapping-csit-all.yaml [moved from jjb/lispflowmapping/lispflowmapping-csit-all-master.yaml with 89% similarity]
jjb/lispflowmapping/lispflowmapping-distribution.yaml [deleted file]
jjb/lispflowmapping/lispflowmapping.yaml
jjb/neutron/neutron.cfg
jjb/neutron/neutron.yaml
jjb/nic/nic.cfg
jjb/nic/nic.yaml
jjb/odlparent/odlparent.yaml
jjb/openflowjava/openflowjava-distribution.yaml [deleted file]
jjb/openflowjava/openflowjava.yaml
jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml [moved from jjb/openflowplugin/openflowplugin-csit-cbench-daily-master.yaml with 89% similarity]
jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml [moved from jjb/openflowplugin/openflowplugin-csit-cbench-performance-master.yaml with 90% similarity]
jjb/openflowplugin/openflowplugin-csit-config-performance.yaml [moved from jjb/openflowplugin/openflowplugin-csit-config-performance-master.yaml with 88% similarity]
jjb/openflowplugin/openflowplugin-csit-flow-services-more-lithium-redesign.yaml [new file with mode: 0644]
jjb/openflowplugin/openflowplugin-csit-flow-services-more.yaml [new file with mode: 0644]
jjb/openflowplugin/openflowplugin-csit-flow-services.yaml [moved from jjb/openflowplugin/openflowplugin-csit-flow-services-master.yaml with 88% similarity]
jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml [moved from jjb/openflowplugin/openflowplugin-csit-scalability-daily-master.yaml with 87% similarity]
jjb/openflowplugin/openflowplugin-csit-scalability.yaml [moved from jjb/openflowplugin/openflowplugin-csit-scalability-master.yaml with 88% similarity]
jjb/openflowplugin/openflowplugin-csit-statistics-basic-lithium-redesign.yaml [new file with mode: 0644]
jjb/openflowplugin/openflowplugin-distribution.yaml [deleted file]
jjb/openflowplugin/openflowplugin.cfg
jjb/openflowplugin/openflowplugin.yaml
jjb/ovsdb/ovsdb-distribution.yaml [deleted file]
jjb/ovsdb/ovsdb.cfg
jjb/ovsdb/ovsdb.yaml
jjb/packetcable/packetcable.cfg
jjb/packetcable/packetcable.yaml
jjb/persistence/persistence.yaml
jjb/reservation/reservation.cfg
jjb/reservation/reservation.yaml
jjb/sdninterfaceapp/sdninterfaceapp.yaml
jjb/sfc/sfc.cfg
jjb/sfc/sfc.yaml
jjb/snbi/snbi.yaml
jjb/snmp/snmp-csit-basic.yaml [moved from jjb/snmp/snmp-csit-basic-master.yaml with 89% similarity]
jjb/snmp/snmp-distribution.yaml [deleted file]
jjb/snmp/snmp.yaml
jjb/snmp4sdn/snmp4sdn.cfg
jjb/snmp4sdn/snmp4sdn.yaml
jjb/sxp/sxp.yaml
jjb/tcpmd5/tcpmd5-distribution.yaml [deleted file]
jjb/tcpmd5/tcpmd5.yaml
jjb/toolkit/toolkit.yaml
jjb/topoprocessing/topoprocessing.yaml
jjb/tsdr/tsdr-csit-tsdr-h2-master.yaml [new file with mode: 0644]
jjb/tsdr/tsdr-csit-tsdr.yaml [new file with mode: 0644]
jjb/tsdr/tsdr.cfg
jjb/tsdr/tsdr.yaml
jjb/ttp/ttp.cfg [new file with mode: 0644]
jjb/ttp/ttp.yaml
jjb/usc/usc-csit-channel.yaml [moved from jjb/usc/usc-csit-channel-master.yaml with 89% similarity]
jjb/usc/usc-distribution.yaml [deleted file]
jjb/usc/usc.cfg
jjb/usc/usc.yaml
jjb/vpnservice/vpnservice-csit-vpnservice.yaml [new file with mode: 0644]
jjb/vpnservice/vpnservice.cfg
jjb/vpnservice/vpnservice.yaml
jjb/vtn/vtn-csit-manager.yaml [moved from jjb/vtn/vtn-csit-manager-master.yaml with 82% similarity]
jjb/vtn/vtn-distribution.yaml [deleted file]
jjb/vtn/vtn.cfg
jjb/vtn/vtn.yaml
jjb/yangtools/yangtools-distribution.yaml [deleted file]
jjb/yangtools/yangtools.cfg
jjb/yangtools/yangtools.yaml
scripts/jjb-init-project.py
vagrant/basic-builder/bootstrap.sh
vagrant/basic-java-node/bootstrap.sh
vagrant/basic-mininet-fedora-node/README.md [new file with mode: 0644]
vagrant/basic-mininet-fedora-node/Vagrantfile [new file with mode: 0644]
vagrant/basic-mininet-fedora-node/bootstrap.sh [new file with mode: 0644]
vagrant/basic-mininet-fedora-node/system_reseal.sh [new file with mode: 0644]
vagrant/lf-networking/configure_lf_infra.sh
vagrant/rackspace-convert-base/bootstrap.sh

index e2f5f13535cdc5bf6dae49d76ff39873d2a6f59e..967cfe9706591313d1fef275bd6a8167a3892689 100755 (executable)
@@ -3,4 +3,16 @@
 yum clean all
 yum install -y python-{tox,virtualenv} xmlstarlet
 
+# add in mono components for VTN
+yum install -y yum-utils
+#The following is needed for the new code in vtn project.
+#these packages will enable C# compilation.
+rpm --import "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF"
+#Added the mono tools repository
+yum-config-manager -q -y --add-repo http://origin-download.mono-project.com/repo/centos6
+#Install the nuget binary
+yum install -q -y http://origin-download.mono-project.com/repo/centos/n/nuget/nuget-2.8.3+md58+dhx1-0.noarch.rpm
+#install the mono toolchain
+yum -q -y install mono-complete
+
 # vim: sw=2 ts=2 sts=2 et :
diff --git a/jenkins-scripts/mininet-fedora.sh b/jenkins-scripts/mininet-fedora.sh
new file mode 100755 (executable)
index 0000000..5fc0579
--- /dev/null
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# make sure we don't require tty for sudo operations
+cat <<EOF >/etc/sudoers.d/89-jenkins-user-defaults
+Defaults:jenkins !requiretty
+jenkins     ALL = NOPASSWD: ALL
+EOF
+
+# make sure the firewall is stopped
+service iptables stop
+
+# vim: sw=2 ts=2 sts=2 et :
index 7f7a20e6f5e1b5f38d8e53d1209121afedeb6b33..0b58d4ae229a143f0776b915568fc1d0441979d6 100755 (executable)
@@ -11,6 +11,11 @@ EOF
 # built, they are now. Make sure they're install
 yum install -q -y netopeer-server-sl CPqD-ofsoftswitch13
 
+# netaddr and ipaddress libraries can be useful on this system as
+# some tests are starting to push pyhon scripts/tools to this VM
+# during CI tests
+yum install -q -y python-{ipaddr,iptools,netaddr}
+
 # the vagrant configuration for netopeer doesn't configure SSH correctly
 # as it uses and here document via echo and not cat fix that
 cat << EOSSH >> /etc/ssh/sshd_config
diff --git a/jjb-templates/distribution.yaml b/jjb-templates/distribution.yaml
new file mode 100644 (file)
index 0000000..a6067b9
--- /dev/null
@@ -0,0 +1,52 @@
+- job-template:
+    name: 'PROJECT-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
index cbe6e7422cf03a89afdc0683a027ef8cb0e5ea61..deed83ae9aed8dd519899a289c927eaa77b68095 100644 (file)
@@ -2,10 +2,11 @@
     name: 'PROJECT-integration-{stream}'
     disabled: DISABLED
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
diff --git a/jjb/aaa/aaa-distribution.yaml b/jjb/aaa/aaa-distribution.yaml
deleted file mode 100644 (file)
index 707e563..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-- project:
-    name: aaa-distribution
-    jobs:
-        - '{project}-distribution-{stream}'
-
-    # The project name
-    project: 'aaa'
-
-    # The project branches
-    stream:
-        - master:
-            branch: 'master'
-        - stable-helium:
-            branch: 'stable/helium'
-
-    jdk: 'openjdk7'
-
index 0ae5421b3dea244051d7286014ba1842e913bbee..ea4a55d400abd50a096c3d1ef1cc6a05fef93f7a 100644 (file)
@@ -9,6 +9,7 @@
         - 'aaa-verify-{stream}'
         - 'aaa-merge-{stream}'
         - 'aaa-daily-{stream}'
+        - 'aaa-distribution-{stream}'
         - 'aaa-integration-{stream}'
         - 'aaa-sonar'
         - 'aaa-clm'
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[aaa]'
         - maven-deploy:
             email-prefix: '[aaa]'
         - jacoco-report
 
+- job-template:
+    name: 'aaa-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'aaa-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
index 711182d2eb54908e5a5858ed19050cf026f6e3cb..f398810a6f4871de3c447cc247052f89440ad41b 100644 (file)
@@ -1,4 +1,6 @@
 BRANCHES:
 - master:
     jdks: openjdk7
-DEPENDENCIES: controller,yangtools,odlparent,bpgcep
\ No newline at end of file
+- stable/lithium:
+    jdks: openjdk7
+DEPENDENCIES: controller,yangtools,odlparent,l2switch
index 6ba615cef1e2599d072213c88304ebce3c8fbe66..74ccd9d423ab88b4ac335a7f4bb07bad6fac38ca 100644 (file)
@@ -9,6 +9,7 @@
         - 'alto-verify-{stream}'
         - 'alto-merge-{stream}'
         - 'alto-daily-{stream}'
+        - 'alto-distribution-{stream}'
         - 'alto-integration-{stream}'
         - 'alto-sonar'
         - 'alto-clm'
             jdk: openjdk7
             jdks:
                 - openjdk7
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'alto'
 
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[alto]'
         - maven-deploy:
             email-prefix: '[alto]'
         - jacoco-report
 
+- job-template:
+    name: 'alto-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'alto-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
 
     triggers:
         - reverse:
-            jobs: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream},bpgcep-merge-{stream}'
+            jobs: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream},l2switch-merge-{stream}'
             result: 'success'
 
     prebuilders:
 
     publishers:
         - email-notification:
-            email-prefix: '[alto] [controller] [yangtools] [odlparent] [bpgcep]'
+            email-prefix: '[alto] [controller] [yangtools] [odlparent] [l2switch]'
         - jacoco-report
 
 - job-template:
index d7b8325f3b1de7769b49629c169e329f808a649b..5bb12797a1a08e93c8a6add7b44d541f9b1c4801 100644 (file)
         maven-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
         settings: '{autorelease-settings}'
         global-settings: '{odl-global-settings}'
+        automatic-archiving: false
 
     postbuilders:
+        - shell: "./scripts/list-project-dependencies.sh"
         - autorelease-maven-sources:
             maven-version: '{mvn32}'
             settings: '{autorelease-settings}'
             global-settings: '{odl-global-settings}'
+        - autorelease-maven-sources-post-process
         - jacoco-nojava-workaround
 
     publishers:
         - archive-artifacts:
-            artifacts: 'sources.log,patches/*.patch'
+            artifacts: '*.log,patches/*.patch'
         - email-notification:
             email-prefix: '[autorelease]'
 
         maven-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
         settings: '{autorelease-settings}'
         global-settings: '{odl-global-settings}'
+        automatic-archiving: false
 
     postbuilders:
         - autorelease-cfp:
             autorelease-settings: '{autorelease-settings}'
             odl-global-settings: '{odl-global-settings}'
         - autorelease-maven-deploy
+        - shell: "./scripts/list-project-dependencies.sh"
         - autorelease-maven-sources:
             maven-version: '{mvn32}'
             settings: '{autorelease-settings}'
             global-settings: '{odl-global-settings}'
+        - autorelease-maven-sources-post-process
         - jacoco-nojava-workaround
 
     publishers:
         - archive-artifacts:
-            artifacts: 'sources.log,patches/*.patch'
+            artifacts: '*.log,patches/*.patch'
         - email-notification:
             email-prefix: '[autorelease]'
index c144bbfd5cf89eac8cb07fb398f6b0b657a635e1..e9b9f1fd236130579fbeabeba10bac946d2fd037 100644 (file)
         - maven-target:
             maven-version: '{maven-version}'
             pom: 'pom.xml'
-            goals: 'dependency:sources -l sources.log -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+            goals: 'dependency:sources -DoutputFile=$WORKSPACE/sources.log -DappendOutput -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
             java-opts:
                 - '-Xmx4096m -XX:MaxPermSize=1024m'
             settings: '{settings}'
             global-settings: '{global-settings}'
+- builder:
+    name: autorelease-maven-sources-post-process
+    builders:
+        - shell: |
+            awk '/The following files have NOT been resolved:/,/^$/' sources.log > missing-sources.log
index cb5df6270d52597610315cb1674e6a46f038584d..1b03ac1a3078a5e9b5b01e50d80d1295bdfb968a 100644 (file)
         maven-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
         settings: '{autorelease-settings}'
         global-settings: '{odl-global-settings}'
+        automatic-archiving: false
 
     postbuilders:
+        - shell: "./scripts/list-project-dependencies.sh"
         - autorelease-maven-sources:
             maven-version: '{mvn32}'
             settings: '{autorelease-settings}'
             global-settings: '{odl-global-settings}'
+        - autorelease-maven-sources-post-process
         - jacoco-nojava-workaround
 
     publishers:
         - archive-artifacts:
-            artifacts: 'sources.log,patches/*.patch'
+            artifacts: '*.log,patches/*.patch'
         - email-notification:
             email-prefix: '[autorelease]'
index bef3204c0d569090a7b3c687494871d6b72e42c5..7fdab6412654923602214a762898cb9650c7d092 100644 (file)
@@ -17,6 +17,11 @@ git submodule foreach "git commit -am \"Release $RELEASE_TAG\" || true"
 git commit -am "Release $RELEASE_TAG"
 
 mkdir patches
-git submodule foreach 'git format-patch --stdout origin/$RELEASE_BRANCH > ../patches/$name.patch'
+modules=`xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -m '//x:modules' -v '//x:module' pom.xml`
+for module in $modules; do
+    cd $module
+    git format-patch --stdout origin/$RELEASE_BRANCH > ../patches/$module.patch
+    cd ..
+done
 
 ./scripts/fix-relativepaths.sh
similarity index 83%
rename from jjb/bgpcep/bgpcep-csit-userfeatures-master.yaml
rename to jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index 81bb0b86532cd3b6a316a715d1e85187cf25c672..8442d11dd63c18806b88859b8ca7f003eae794a6 100644 (file)
@@ -1,7 +1,8 @@
 - project:
-    name: bgpcep-csit-userfeatures-master
+    name: bgpcep-csit-userfeatures
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-{functionality}-{stream}'
 
     # The project name
     project: 'bgpcep'
@@ -13,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:
diff --git a/jjb/bgpcep/bgpcep-distribution.yaml b/jjb/bgpcep/bgpcep-distribution.yaml
deleted file mode 100644 (file)
index db4b6d2..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-- project:
-    name: bgpcep-distribution
-    jobs:
-        - '{project}-distribution-{stream}'
-
-    # The project name
-    project: 'bgpcep'
-
-    # The project branches
-    stream:
-        - master:
-            branch: 'master'
-        - stable-helium:
-            branch: 'stable/helium'
-
-    jdk: 'openjdk7'
-
index 894f5ef5eebd2ef62c5d9b3ea54a971d244d98ed..14fe151731c985bbf8fda15d6ac95e8d25934534 100644 (file)
@@ -8,6 +8,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     project: 'bgpcep'
     jdk: 'openjdk7'
diff --git a/jjb/bgpcep/bgpcep-verify.yaml b/jjb/bgpcep/bgpcep-verify.yaml
deleted file mode 100644 (file)
index 0ae4d88..0000000
+++ /dev/null
@@ -1,157 +0,0 @@
-- project:
-    name: bgpcep-verify
-    jobs:
-        - 'bgpcep-verify-{stream}'
-        - 'bgpcep-verify-stable-helium'
-
-
-    # stream:    branch with - in place of / (eg. stable-helium)
-    # branch:    branch (eg. stable/helium)
-    stream:
-        - master:
-            branch: 'master'
-        - stable-lithium:
-            branch: 'stable/lithium'
-
-    project: 'bgpcep'
-
-- job-template:
-    name: 'bgpcep-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
-                - openjdk8
-
-
-    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:
-            users:
-                - '{ssh-credentials}'
-
-    triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'bgpcep'
-            branch: '{branch}'
-
-    builders:
-        - wipe-org-opendaylight-repo
-        - maven-target:
-            maven-version: '{mvn32}'
-            pom: 'pom.xml'
-            goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean -DrepoBuild install javadoc:aggregate'
-            java-opts:
-                - '-Xmx1024m -XX:MaxPermSize=256m'
-            settings: '{bgpcep-settings}'
-            global-settings: '{odl-global-settings}'
-        - jacoco-nojava-workaround
-
-    publishers:
-        - findbugs
-        - email-notification:
-            email-prefix: '[bgpcep]'
-        - jacoco-report
-
-- job-template:
-    name: 'bgpcep-verify-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: 'stable/helium'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
-    wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-
-    triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'bgpcep'
-            branch: 'stable/helium'
-
-    builders:
-        - wipe-org-opendaylight-repo
-        - maven-target:
-            maven-version: '{mvn32}'
-            pom: 'pom.xml'
-            goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean -DrepoBuild install javadoc:aggregate'
-            java-opts:
-                - '-Xmx1024m -XX:MaxPermSize=256m'
-            settings: '{bgpcep-settings}'
-            global-settings: '{odl-global-settings}'
-        - jacoco-nojava-workaround
-
-    publishers:
-        - findbugs
-        - email-notification:
-            email-prefix: '[bgpcep]'
-        - jacoco-report
index 1c5f9c62742d175e2b2ba52375784ef0ea484b93..eef55629c6dfc1caa5cf1cab7d083915672f6ac3 100644 (file)
@@ -1,4 +1,3 @@
-JOB_TEMPLATES: merge,daily,integration,sonar
 BRANCHES:
 - master:
     jdks: openjdk7,openjdk8
index aca876c0c7b71dca1d3def1d8b0369e4634ad664..721563ef03de5362e45bdb515e280e32b6b360e2 100644 (file)
@@ -6,8 +6,10 @@
 - project:
     name: bgpcep
     jobs:
+        - 'bgpcep-verify-{stream}'
         - 'bgpcep-merge-{stream}'
         - 'bgpcep-daily-{stream}'
+        - 'bgpcep-distribution-{stream}'
         - 'bgpcep-integration-{stream}'
         - 'bgpcep-sonar'
         - 'bgpcep-clm'
 # MAVEN_GOALS with your maven goals to build
 # MAVEN_OPTS with your maven options to build
 
+- job-template:
+    name: 'bgpcep-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: '{obj:jdks}'
+
+    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:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - gerrit-trigger-patch-submitted:
+            name: 'bgpcep'
+            branch: '{branch}'
+
+    builders:
+        - wipe-org-opendaylight-repo
+        - maven-target:
+            maven-version: '{mvn32}'
+            pom: 'pom.xml'
+            goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean -DrepoBuild install javadoc:aggregate'
+            java-opts:
+                - '-Xmx1024m -XX:MaxPermSize=256m'
+            settings: '{bgpcep-settings}'
+            global-settings: '{odl-global-settings}'
+        - jacoco-nojava-workaround
+
+    publishers:
+        - findbugs
+        - email-notification:
+            email-prefix: '[bgpcep]'
+        - jacoco-report
+
 - job-template:
     name: 'bgpcep-merge-{stream}'
 
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[bgpcep]'
         - maven-deploy:
             email-prefix: '[bgpcep]'
         - jacoco-report
 
+- job-template:
+    name: 'bgpcep-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'bgpcep-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
index a386872d566a4997921da792f762b32ff6c0e98b..853a0b9742383106511600ef9f1158cb487621fa 100644 (file)
@@ -9,6 +9,7 @@
         - 'capwap-verify-{stream}'
         - 'capwap-merge-{stream}'
         - 'capwap-daily-{stream}'
+        - 'capwap-distribution-{stream}'
         - 'capwap-integration-{stream}'
         - 'capwap-sonar'
         - 'capwap-clm'
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[capwap]'
         - maven-deploy:
             email-prefix: '[capwap]'
         - jacoco-report
 
+- job-template:
+    name: 'capwap-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'capwap-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
index 4e5ec925529d60f665478aec350d59f1d598f5a9..98c124ed7245e6a1e51801f8539a7234d9ee9a48 100644 (file)
@@ -25,7 +25,7 @@
     install-features: 'odl-netconf-connector-all,odl-restconf-all'
 
     # Robot custom options
-    robot-options: ''
+    robot-options: '-v NETOPEER_USER:root'
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream}'
index f5a60f251382a7f8e077df1e98ce57d0414d6930..190a93e0b2da698b6d2fd0299eff4b1f9a1e2750 100644 (file)
@@ -25,7 +25,7 @@
     install-features: 'odl-netconf-connector-all,odl-restconf-all'
 
     # Robot custom options
-    robot-options: ''
+    robot-options: '-v NETOPEER_USER:root'
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream}'
diff --git a/jjb/controller/controller-distribution.yaml b/jjb/controller/controller-distribution.yaml
deleted file mode 100644 (file)
index efee9d4..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-- project:
-    name: controller-distribution
-    jobs:
-        - '{project}-distribution-{stream}'
-
-    # The project name
-    project: 'controller'
-
-    # The project branches
-    stream:
-        - master:
-            branch: 'master'
-        - stable-helium:
-            branch: 'stable/helium'
-
-    jdk: 'openjdk7'
-
index 66124c945e633aa083403691a5b32f774d7cd268..463063a944b290194efba643eee9cf30eaab459e 100644 (file)
@@ -1,4 +1,4 @@
-JOB_TEMPLATES: merge,daily,integration,sonar
+JOB_TEMPLATES: merge,daily,distribution,integration,sonar
 BRANCHES:
 - master:
     jdks: openjdk7,openjdk8
index d2380adf9e1265dac64cf1e8f2e277914677337c..1db26b0dcd269203f807f0fa458d1731c9d84dfa 100644 (file)
@@ -8,6 +8,7 @@
     jobs:
         - 'controller-merge-{stream}'
         - 'controller-daily-{stream}'
+        - 'controller-distribution-{stream}'
         - 'controller-integration-{stream}'
         - 'controller-sonar'
         - 'controller-clm'
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[controller]'
         - maven-deploy:
             email-prefix: '[controller]'
         - jacoco-report
 
+- job-template:
+    name: 'controller-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'controller-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
index feac174c8dd35006ec833b0040113adaac0de393..f46b06436e4e887b2477979fc3dc113ca931df95 100644 (file)
@@ -9,6 +9,7 @@
         - 'coretutorials-verify-{stream}'
         - 'coretutorials-merge-{stream}'
         - 'coretutorials-daily-{stream}'
+        - 'coretutorials-distribution-{stream}'
         - 'coretutorials-integration-{stream}'
         - 'coretutorials-sonar'
         - 'coretutorials-clm'
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[coretutorials]'
         - maven-deploy:
             email-prefix: '[coretutorials]'
         - jacoco-report
 
+- job-template:
+    name: 'coretutorials-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'coretutorials-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
index c81757526ccf269684ed19d6cc6b321e7dc04dd0..42ddd11be2f71b3edc10d2beb6dbc8f1d6656d40 100644 (file)
@@ -1,2 +1,9 @@
+BRANCHES:
+- master:
+    jdks: openjdk7
+- stable/helium:
+    jdks: openjdk7
+- stable/lithium:
+    jdks: openjdk7
 DEPENDENCIES: odlparent
 POM: dfapp/pom.xml
index da1e4d1007662e034c030d13b1c46677e95fad53..bda7667157e8d76e1d8842049375da6b699cb88f 100644 (file)
@@ -9,6 +9,7 @@
         - 'defense4all-verify-{stream}'
         - 'defense4all-merge-{stream}'
         - 'defense4all-daily-{stream}'
+        - 'defense4all-distribution-{stream}'
         - 'defense4all-integration-{stream}'
         - 'defense4all-sonar'
         - 'defense4all-clm'
             jdk: openjdk7
             jdks:
                 - openjdk7
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'defense4all'
 
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[defense4all]'
         - maven-deploy:
             email-prefix: '[defense4all]'
         - jacoco-report
 
+- job-template:
+    name: 'defense4all-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'defense4all-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
index 13896354fc010a0168ffc2ac10bc78a4de9584e2..cb0a6032321e73a5e7f640c6334cc1df1de23e8e 100644 (file)
@@ -9,6 +9,7 @@
         - 'didm-verify-{stream}'
         - 'didm-merge-{stream}'
         - 'didm-daily-{stream}'
+        - 'didm-distribution-{stream}'
         - 'didm-integration-{stream}'
         - 'didm-sonar'
         - 'didm-clm'
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[didm]'
         - maven-deploy:
             email-prefix: '[didm]'
         - jacoco-report
 
+- job-template:
+    name: 'didm-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'didm-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
index 7e9d809f650bb598f3a34f0fe74020f2a288b081..986db49da671e1cbc2c6b05cb2115cfaf2391f92 100644 (file)
@@ -9,6 +9,7 @@
         - 'discovery-verify-{stream}'
         - 'discovery-merge-{stream}'
         - 'discovery-daily-{stream}'
+        - 'discovery-distribution-{stream}'
         - 'discovery-integration-{stream}'
         - 'discovery-sonar'
         - 'discovery-clm'
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[discovery]'
         - maven-deploy:
             email-prefix: '[discovery]'
         - jacoco-report
 
+- job-template:
+    name: 'discovery-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'discovery-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
index d009cbc0cf8f24650ca55d253f89d244e971eeef..1b32879061413386d76db4f2a91c83ef7dc276cc 100644 (file)
@@ -9,6 +9,7 @@
         - 'dlux-verify-{stream}'
         - 'dlux-merge-{stream}'
         - 'dlux-daily-{stream}'
+        - 'dlux-distribution-{stream}'
         - 'dlux-integration-{stream}'
         - 'dlux-sonar'
         - 'dlux-clm'
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[dlux]'
         - maven-deploy:
             email-prefix: '[dlux]'
         - jacoco-report
 
+- job-template:
+    name: 'dlux-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'dlux-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
index de3a4cc34f42d9219f5d0ddb9a18b8bbea5a94c1..2b4b5c04033576d67b75efd05f8047e35b34b8a2 100644 (file)
@@ -9,6 +9,7 @@
         - 'docs-verify-{stream}'
         - 'docs-merge-{stream}'
         - 'docs-daily-{stream}'
+        - 'docs-distribution-{stream}'
         - 'docs-integration-{stream}'
         - 'docs-sonar'
         - 'docs-clm'
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[docs]'
         - maven-deploy:
             email-prefix: '[docs]'
         - jacoco-report
 
+- job-template:
+    name: 'docs-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'docs-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
index f2519b9f9ba575f8add9173f1fe8e58abf9d2788..3a1b40530323713670da577eacc31bcfb464e7e8 100644 (file)
@@ -1,3 +1,10 @@
+BRANCHES:
+- master:
+    jdks: openjdk7
+- stable/helium:
+    jdks: openjdk7
+- stable/lithium:
+    jdks: openjdk7
 MVN_GOALS: -U clean install findbugs:findbugs -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
 MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m
 DEPENDENCIES: odlparent,yangtools,controller,openflowjava,openflowplugin
index 9659d1927d91ef3371a9d5b76b89baaae80770d1..784b56088f24b8832b6f2acdbe75a626ef7473f1 100644 (file)
@@ -9,6 +9,7 @@
         - 'groupbasedpolicy-verify-{stream}'
         - 'groupbasedpolicy-merge-{stream}'
         - 'groupbasedpolicy-daily-{stream}'
+        - 'groupbasedpolicy-distribution-{stream}'
         - 'groupbasedpolicy-integration-{stream}'
         - 'groupbasedpolicy-sonar'
         - 'groupbasedpolicy-clm'
             jdk: openjdk7
             jdks:
                 - openjdk7
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'groupbasedpolicy'
 
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[groupbasedpolicy]'
         - maven-deploy:
             email-prefix: '[groupbasedpolicy]'
         - jacoco-report
 
+- job-template:
+    name: 'groupbasedpolicy-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'groupbasedpolicy-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
index f758b51df603b15817cbe2c2e109bad85b6d21ad..949bb5e0148fd2cf9943e1995e19824c607d88db 100644 (file)
-echo "##################################################"
-echo "## include-raw-integration-configure-clustering ##"
-echo "##################################################"
+echo "#################################################"
+echo "##         Configure Cluster and Start         ##"
+echo "#################################################"
 
-#  this script configures replication on a single ODL controller.
-#  files touched are akka.conf modules-shards.conf
+AKKACONF=/tmp/${BUNDLEFOLDER}/configuration/initial/akka.conf
+MODULESHARDSCONF=/tmp/${BUNDLEFOLDER}/configuration/initial/module-shards.conf
+JOLOKIACONF=/tmp/${BUNDLEFOLDER}/deploy/jolokia.xml
 
+cat > ${WORKSPACE}/configuration-script.sh <<EOF
 
+CONTROLLERID="member-\$1"
+CONTROLLERIP=\$2
 
-echo "##################################"
-echo "##  Loop through controller IPs  #"
-echo "##################################"
-
-declare CONTROLLERIPS=($(cat slave_addresses.txt | grep CONTROLLER | awk -F = '{print $2}'))
-declare -p CONTROLLERIPS
-
-echo "######################################################"
-echo "##  include-raw-integration-configuration_functions ##"
-echo "######################################################"
-
-# writes the  functions needed for configuring clustering to
-# configuration-functions  in the  WORKSPACE
-env
-
-set -x
-
-cat > ${WORKSPACE}/configuration-functions  <<EOF
-
-
-function getslaveaddresses
-{
-   declare -a CONTROLLERIPS=($CONTROLLER0, $CONTROLLER1, $CONTROLLER2)
-   declare -p CONTROLLERIPS
-   export CONTROLLERIPS
-}
-
-
-function editakkaconf
-{
-set -x
- echo "#####  editakkaconf #####"
- echo "The number of args recieved \${#} \${1} \${2}"
-# Expects 2 argument \$LOOPINCR and IPADDRESS of  controller.
-# \$CONTROLLERIPS[] is set by getslaveaddresses().
-# \$BUNDLEFOLDER is set in "include-raw-integration-deploy-controller.sh"
-# A single copy of akka.conf is assumed to be available in \$BUNDLEFOLDER
-
-if [ -z ${BUNDLEFOLDER} ] || [ -f ${BUNDLEFOLDER} ]; then
-    echo "WARNING: Location of ODL BUNDLEFOLDER:\$BUNDLEFOLDER is not defined"
-
-fi
-if [ -z \${CONTROLLERIPS} ]; then
-    echo "WARNING: Cluster IPs not known due to UNBOUND varible: CONTROLLERIPS[@] does not exist"
-    echo "WARNING: Calling getslaveaddresses to populate  CONTROLLERIPS[@]"
-    getslaveaddresses
-fi
-
-
-
-
-############################
-# BEGIN function variables #
-############################
-
-  # make local copies of global varibles because globals may produce interesting bugs.
-  echo "# set the IP of the current controller."
-
-  local LOOPINCR=\$1
-  local CURRENTCONTROLLERIPADDR=\$2
-  local AKKACONF=\$(find /tmp/${BUNDLEFOLDER} -name akka.conf)
-
-  # used to verify IP address of current VM
-  local HOSTIPADDR0=\$(/sbin/ifconfig eth0 | grep "inet " | awk '{print \$2}' | awk '{print \$1}')
-  local HOSTIPADDR=\${HOSTIPADDR0#'addr:'}
-  local TEMPIP = \$(/sbin/ifconfig eth0 | grep "inet " | awk '{print \$0}' )
-  local CLUSTERDATAORIG="\"akka.tcp:\/\/opendaylight-cluster-data@127.0.0.1:2550"\"
-  local CLUSTERDATANEW="\"akka.tcp:\/\/opendaylight-cluster-data@$CONTROLLER0:2550\",\"akka.tcp:\/\/opendaylight-cluster-data@$CONTROLLER1:2550\",\"akka.tcp:\/\/opendaylight-cluster-data@$CONTROLLER2:2550"\"
-
-  local CLUSTERRPCORIG="\"akka.tcp:\/\/odl-cluster-rpc@127.0.0.1:2551"\"
-  local CLUSTERRPCNEW="\"akka.tcp:\/\/odl-cluster-rpc@$CONTROLLER0:2551\",\"akka.tcp:\/\/odl-cluster-rpc@$CONTROLLER1:2551\",\"akka.tcp:\/\/odl-cluster-rpc@$CONTROLLER2:2551\""
-
-  local UIDORIG="member-1"
-  local UIDNEW="member-\$1"
-
-##########################
-# END function variables #
-##########################
-
-#####################################
-# sanity test hostname in akka.conf #
-#####################################
-# probably overkill as SCP depends on IPaddress being correct.
-
-#set -x
-  if [ -z \${HOSTIPADDR} ]; then
-    echo "WARNING:  HOSTIPADDR is empty."
-  fi
-
-#set +x
-
-  if [ "\${CURRENTCONTROLLERIPADDR}" == "\${HOSTIPADDR}" ]
-  then
-    echo "CURRENTCONTROLLERIPADRR:\${CURRENTCONTROLLERIPADDR} == HOSTIPADDR:\${HOSTIPADDR}"
-  else
-    echo "WARNING: CURRENTCONTROLLERIPADRR:\${CURRENTCONTROLLERIPADDR} != HOSTIPADDR:\${HOSTIPADDR}"
-  fi
-
-####################################
-# configure  hostname in akka.conf #
-####################################
-
-  cp \${AKKACONF} \${AKKACONF}.bak
-  sed -ri "s:hostname = \"([0-9]{1,3}[\.]){3}[0-9]{1,3}\":hostname = \
-\$HOSTIPADDR:" \${AKKACONF}.bak
-
-####################################
-# configure  seednode in akka.conf #
-####################################
-
-  sed -i "s/\$CLUSTERDATAORIG/\$CLUSTERDATANEW/g" \${AKKACONF}.bak
-  sed -i "s/\$CLUSTERRPCORIG/\$CLUSTERRPCNEW/g" \${AKKACONF}.bak
-
-####################################
-# define unique name for each node #
-####################################
-
-  sed -i "s/\$UIDORIG/\$UIDNEW/g" \${AKKACONF}.bak
-  cp \${AKKACONF}.bak \${AKKACONF}
-  cat \${AKKACONF}
-echo "#####  END editakkaconf #####"
-set +x
-}
-function configuremoduleshardsconf
-{
-  echo"### configuremoduleshardsconf ###"
-  set -x
-  if [ -z ${BUNDLEFOLDER} ] || [ -f ${BUNDLEFOLDER} ]; then
-    echo "MODULESHARDSCONF WARNING:  Location of ODL BUNDLEFOLDER:\$BUNDLEFOLDER is not defined"
-  fi
-
-  local REPLICACONFORIG='"member-1"'
-  local REPLICACONFNEW='"member-0",\n\t\t\t"member-1",\n\t\t\t"member-2"'
-
-
-  MODULESHARDSCONF=\$(find /tmp/${BUNDLEFOLDER} -name module-shards.conf)
-
-  if [ -z \${MODULESHARDSCONF} ]
-  then
-    printf "source file module-shards.conf  was not found\n"
-  else
-    printf "MODULESHARDSCONF: \${MODULESHARDSCONF}"
-    cp \${MODULESHARDSCONF} \${MODULESHARDSCONF}.bak
-    printf \$REPLICACONFNEW
-    sed -i "s/\$REPLICACONFORIG/\$REPLICACONFNEW/g" \${MODULESHARDSCONF}.bak
-
-    cp \${MODULESHARDSCONF}.bak  \${MODULESHARDSCONF}
-    cat \${MODULESHARDSCONF}
- fi
- set +x
-}
-
-
-
-function runcontrollerscript
-{
-  local CONTROLLERIP=\$1
-  local SCRIPT=\$2
-  echo "run controller \$CONTROLLERIP on \$i"
-  ssh -v \$CONTROLLERIP 'bash /tmp/\$SCRIPT'
-}
-
-EOF
-set +x
-
-
-#less configuration-functions
-echo "#########################################################"
-echo "## END include-raw-integration-configuration_functions ##"
-echo "#########################################################"
+echo "Configuring hostname in akka.conf"
+sed -ie "s:{{HOST}}:\${CONTROLLERIP}:" ${AKKACONF}
 
-echo "##################################"
-echo "##  Less configuration functions #"
-echo "##################################"
+echo "Configuring data seed nodes in akka.conf"
+sed -ie "s/{{{DS_SEED_NODES}}}/[\"akka.tcp:\/\/opendaylight-cluster-data@$CONTROLLER0:2550\",\"akka.tcp:\/\/opendaylight-cluster-data@$CONTROLLER1:2550\",\"akka.tcp:\/\/opendaylight-cluster-data@$CONTROLLER2:2550\"]/g" ${AKKACONF}
 
-#less ${WORKSPACE}/configuration-functions
+echo "Configuring rpc seed nodes in akka.conf"
+sed -ie "s/{{{RPC_SEED_NODES}}}/[\"akka.tcp:\/\/odl-cluster-rpc@$CONTROLLER0:2551\",\"akka.tcp:\/\/odl-cluster-rpc@$CONTROLLER1:2551\",\"akka.tcp:\/\/odl-cluster-rpc@$CONTROLLER2:2551\"]/g" ${AKKACONF}
 
-echo "######################################"
-echo "##  END Less configuration functions #"
-echo "######################################"
+echo "Define unique name in akka.conf"
+sed -ie "s/{{MEMBER_NAME}}/\$CONTROLLERID/g" ${AKKACONF}
 
-## Describe  the script run on guest vm (node) to configure clustering
+echo "Define replication type in module-shards.conf"
+sed -ie "s/{{{REPLICAS_1}}}/[\"member-0\",\n\t\t\t\"member-1\",\n\t\t\t\"member-2\"]/g" ${MODULESHARDSCONF}
+sed -ie "s/{{{REPLICAS_2}}}/[\"member-0\",\n\t\t\t\"member-1\",\n\t\t\t\"member-2\"]/g" ${MODULESHARDSCONF}
+sed -ie "s/{{{REPLICAS_3}}}/[\"member-0\",\n\t\t\t\"member-1\",\n\t\t\t\"member-2\"]/g" ${MODULESHARDSCONF}
+sed -ie "s/{{{REPLICAS_4}}}/[\"member-0\",\n\t\t\t\"member-1\",\n\t\t\t\"member-2\"]/g" ${MODULESHARDSCONF}
 
+echo "Dump akka.conf"
+cat ${AKKACONF}
 
-cat > ${WORKSPACE}/configuration-script.sh <<EOF
-   source /tmp/configuration-functions
-   source /tmp/bundle_vars.txt
-   source /tmp/slave_addresses.txt
+echo "Dump module-shards.conf"
+cat ${MODULESHARDSCONF}
 
-   # Calling the Functions used to edit akka.comf and module-shards
-   # $1  is loop increment  and $2 is the ipaddress of current
-   # controller
-
-   editakkaconf \$1 \$2
-   configuremoduleshardsconf \$1 \$2
+echo "Starting controller..."
+/tmp/${BUNDLEFOLDER}/bin/start
 
 EOF
 
-
-
-# Describe CONFIGURATION FUNCTIONS  available for the  script above
-# CONFIGURATIONFUNCTIONS='configuration-functions'
-
-set -x
-for  i in "${!CONTROLLERIPS[@]}"
+CONTROLLERIPS=(${CONTROLLER0} ${CONTROLLER1} ${CONTROLLER2})
+for i in "${!CONTROLLERIPS[@]}"
 do
-   echo "IP address of node is: ${CONTROLLERIPS[$i]} and index is $i"
-   scp  ${WORKSPACE}/slave_addresses.txt  ${CONTROLLERIPS[$i]}:/tmp
-   scp  ${WORKSPACE}/bundle_vars.txt  ${CONTROLLERIPS[$i]}:/tmp
-
-   scp  ${WORKSPACE}/configuration-functions ${CONTROLLERIPS[$i]}:/tmp
-   scp  ${WORKSPACE}/configuration-script.sh    ${CONTROLLERIPS[$i]}:/tmp
-
-   echo "configure controller ${CONTROLLERIPS[$i]} on $i"
-
-
-   ssh -v ${CONTROLLERIPS[$i]} "bash /tmp/configuration-script.sh $i ${CONTROLLERIPS[$i]}"
+    echo "Configuring member-$i with IP address ${CONTROLLERIPS[$i]}"
+    ssh ${CONTROLLERIPS[$i]} "mkdir /tmp/${BUNDLEFOLDER}/configuration/initial"
+    scp  ${WORKSPACE}/test/tools/clustering/cluster-deployer/templates/multi-node-test/akka.conf.template ${CONTROLLERIPS[$i]}:${AKKACONF}
+    scp  ${WORKSPACE}/test/tools/clustering/cluster-deployer/templates/multi-node-test/module-shards.conf.template ${CONTROLLERIPS[$i]}:${MODULESHARDSCONF}
+    scp  ${WORKSPACE}/test/tools/clustering/cluster-deployer/templates/multi-node-test/jolokia.xml.template ${CONTROLLERIPS[$i]}:${JOLOKIACONF}
+    scp  ${WORKSPACE}/configuration-script.sh    ${CONTROLLERIPS[$i]}:/tmp/
+    ssh ${CONTROLLERIPS[$i]} "bash /tmp/configuration-script.sh $i ${CONTROLLERIPS[$i]}"
 done
-set +x
-
 
-echo "######################################################"
-echo "## END include-raw-integration-configure-clustering ##"
-echo "######################################################"
+# vim: ts=4 sw=4 sts=4 et ft=sh :
 
index e5ff0e759060212145f2b51088279d09a26b97dc..860256f458215f22cb25c54dd86c7750dc69e5fe 100644 (file)
@@ -1,12 +1,9 @@
-# Create a script to run controller inside a dynamic jenkins slave
-DISTRIBUTION="karaf"
-CONTROLLERFEATURES="odl-integration-compatible-with-all"
-CONTROLLERMEM="3072m"
-
 NEXUSURL_PREFIX=${ODLNEXUSPROXY:-https://nexus.opendaylight.org}
+CONTROLLERMEM="3072m"
+ACTUALFEATURES="odl-integration-compatible-with-all"
 
 if [ ${BUNDLEURL} == 'last' ]; then
-    NEXUSPATH="${NEXUSURL_PREFIX}/content/repositories/opendaylight.snapshot/org/opendaylight/integration/distribution-${DISTRIBUTION}"
+    NEXUSPATH="${NEXUSURL_PREFIX}/content/repositories/opendaylight.snapshot/org/opendaylight/integration/distribution-karaf"
     # Extract the BUNDLEVERSION from the pom.xml
     BUNDLEVERSION=`xpath pom.xml '/project/version/text()' 2> /dev/null`
     echo "Bundle version is ${BUNDLEVERSION}"
@@ -14,64 +11,60 @@ if [ ${BUNDLEURL} == 'last' ]; then
     wget ${NEXUSPATH}/${BUNDLEVERSION}/maven-metadata.xml
     TIMESTAMP=`xpath maven-metadata.xml "//snapshotVersion[extension='zip'][1]/value/text()" 2>/dev/null`
     echo "Nexus timestamp is ${TIMESTAMP}"
-    BUNDLEFOLDER="distribution-${DISTRIBUTION}-${BUNDLEVERSION}"
-    BUNDLE="distribution-${DISTRIBUTION}-${TIMESTAMP}.zip"
-    BUNDLEURL="${NEXUSPATH}/${BUNDLEVERSION}/${BUNDLE}"
+    BUNDLEFOLDER="distribution-karaf-${BUNDLEVERSION}"
+    BUNDLE="distribution-karaf-${TIMESTAMP}.zip"
+    ACTUALBUNDLEURL="${NEXUSPATH}/${BUNDLEVERSION}/${BUNDLE}"
 else
+    ACTUALBUNDLEURL="${BUNDLEURL}"
     BUNDLE="${BUNDLEURL##*/}"
     BUNDLEVERSION="$(basename $(dirname $BUNDLEURL))"
-    BUNDLEFOLDER="distribution-${DISTRIBUTION}-${BUNDLEVERSION}"
+    BUNDLEFOLDER="distribution-karaf-${BUNDLEVERSION}"
 fi
 
-echo "Distribution bundle URL is ${BUNDLEURL}"
+echo "Distribution bundle URL is ${ACTUALBUNDLEURL}"
 echo "Distribution bundle is ${BUNDLE}"
+echo "Distribution bundle version is ${BUNDLEVERSION}"
 echo "Distribution folder is ${BUNDLEFOLDER}"
+echo "Nexus prefix is ${NEXUSURL_PREFIX}"
 
 echo "Downloading the distribution..."
-wget --no-verbose  ${BUNDLEURL}
+wget --no-verbose  ${ACTUALBUNDLEURL}
 
 echo "Extracting the new controller..."
 unzip -q ${BUNDLE}
 
 echo "Configuring the startup features..."
-cd ${BUNDLEFOLDER}/etc
-CFG=org.apache.karaf.features.cfg
-cp ${CFG} ${CFG}.bak
-cat ${CFG}.bak | sed "s/^featuresBoot=.*/featuresBoot=config,standard,region,package,kar,ssh,management,${CONTROLLERFEATURES}/" > ${CFG}.1
-cat ${CFG}.1 | sed "s%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features%" > ${CFG}
-cat ${CFG}
+FEATURESCONF=${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg
+sed -ie "s%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features%g" ${FEATURESCONF}
+cat ${FEATURESCONF}
 
 echo "Configuring the log..."
-LOG=org.ops4j.pax.logging.cfg
-cp ${LOG} ${LOG}.bak
-cat ${LOG}.bak | sed 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=20MB/' > ${LOG}
-cat ${LOG}
+LOGCONF=${WORKSPACE}/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg
+sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=20MB/g' ${LOGCONF}
+cat ${LOGCONF}
 
 echo "Configure the repos..."
-REPO=org.ops4j.pax.url.mvn.cfg
-cp ${REPO} ${REPO}.bak
-cat ${REPO}.bak | sed '/http/d' | sed '$s/...$//'> ${REPO}
-cat ${REPO}
+REPOCONF=${WORKSPACE}/${BUNDLEFOLDER}/etc/org.ops4j.pax.url.mvn.cfg
+sed -ie '/http/d' ${REPOCONF}
+sed -ie '$s/...$//' ${REPOCONF}
+cat ${REPOCONF}
 
 echo "Configure max memory..."
-MEM=setenv
-cd ../bin
-cp ${MEM} ${MEM}.bak
-cat ${MEM}.bak | sed 's/JAVA_MAX_MEM="2048m"/JAVA_MAX_MEM="${CONTROLLERMEM}"/' > ${MEM}
-cat ${MEM}
+MEMCONF=${WORKSPACE}/${BUNDLEFOLDER}/bin/setenv
+sed -ie 's/JAVA_MAX_MEM="2048m"/JAVA_MAX_MEM="${CONTROLLERMEM}"/g' ${MEMCONF}
+cat ${MEMCONF}
 
 echo "Starting controller..."
-./start &
+${WORKSPACE}/${BUNDLEFOLDER}/bin/start
 
-echo "sleeping for 20 seconds..."
-sleep 20
+echo "sleeping for 10 seconds..."
+sleep 10
 
 echo "Check OSGi bundles..."
-sshpass -p karaf ./client -u karaf "feature:install ${CONTROLLERFEATURES}" || echo $? > ${WORKSPACE}/error.txt
+sshpass -p karaf ${WORKSPACE}/${BUNDLEFOLDER}/bin/client -u karaf "feature:install ${ACTUALFEATURES}" || echo $? > ${WORKSPACE}/error.txt
 
 echo "Fetching Karaf log"
-cd ${WORKSPACE}
-cp ${BUNDLEFOLDER}/data/log/karaf.log .
+cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log .
 
 echo "Exit with error"
 if [ `cat error.txt` -ne 0 ]; then
index 60e6d02219d770bea584a1c4740e32e40e7431f9..eb62b19583b6ae3d9674fcbbd46e87cad543ddce 100644 (file)
@@ -1,67 +1,78 @@
-# Create a script to run controller inside a dynamic jenkins slave
+export NEXUSURL_PREFIX=${ODLNEXUSPROXY:-https://nexus.opendaylight.org}
 CONTROLLERMEM="2048m"
-DISTRIBUTION="karaf"
 
 if [ ${CONTROLLERSCOPE} == 'all' ]; then
-    CONTROLLERFEATURES="odl-integration-compatible-with-all,${CONTROLLERFEATURES}"
+    ACTUALFEATURES="odl-integration-compatible-with-all,${CONTROLLERFEATURES}"
     CONTROLLERMEM="3072m"
+else
+    ACTUALFEATURES="${CONTROLLERFEATURES}"
 fi
 
-NEXUSURL_PREFIX=${ODLNEXUSPROXY:-https://nexus.opendaylight.org}
-
 if [ ${BUNDLEURL} == 'last' ]; then
-    NEXUSPATH="${NEXUSURL_PREFIX}/content/repositories/opendaylight.snapshot/org/opendaylight/integration/distribution-${DISTRIBUTION}"
+    NEXUSPATH="${NEXUSURL_PREFIX}/content/repositories/opendaylight.snapshot/org/opendaylight/integration/distribution-karaf"
     # Extract the BUNDLEVERSION from the pom.xml
-    BUNDLEVERSION=`xpath pom.xml '/project/version/text()' 2> /dev/null`
+    export BUNDLEVERSION=`xpath pom.xml '/project/version/text()' 2> /dev/null`
     echo "Bundle version is ${BUNDLEVERSION}"
     # Acquire the timestamp information from maven-metadata.xml
     wget ${NEXUSPATH}/${BUNDLEVERSION}/maven-metadata.xml
     TIMESTAMP=`xpath maven-metadata.xml "//snapshotVersion[extension='zip'][1]/value/text()" 2>/dev/null`
     echo "Nexus timestamp is ${TIMESTAMP}"
-    BUNDLEFOLDER="distribution-${DISTRIBUTION}-${BUNDLEVERSION}"
-    BUNDLE="distribution-${DISTRIBUTION}-${TIMESTAMP}.zip"
-    BUNDLEURL="${NEXUSPATH}/${BUNDLEVERSION}/${BUNDLE}"
+    export BUNDLEFOLDER="distribution-karaf-${BUNDLEVERSION}"
+    export BUNDLE="distribution-karaf-${TIMESTAMP}.zip"
+    export ACTUALBUNDLEURL="${NEXUSPATH}/${BUNDLEVERSION}/${BUNDLE}"
 else
-    BUNDLE="${BUNDLEURL##*/}"
-    BUNDLEVERSION="$(basename $(dirname $BUNDLEURL))"
-    BUNDLEFOLDER="distribution-${DISTRIBUTION}-${BUNDLEVERSION}"
+    export ACTUALBUNDLEURL="${BUNDLEURL}"
+    export BUNDLE="${BUNDLEURL##*/}"
+    export BUNDLEVERSION="$(basename $(dirname $BUNDLEURL))"
+    export BUNDLEFOLDER="distribution-karaf-${BUNDLEVERSION}"
 fi
 
-echo "Distribution bundle URL is ${BUNDLEURL}"
+echo "Distribution bundle URL is ${ACTUALBUNDLEURL}"
 echo "Distribution bundle is ${BUNDLE}"
+echo "Distribution bundle version is ${BUNDLEVERSION}"
 echo "Distribution folder is ${BUNDLEFOLDER}"
+echo "Nexus prefix is ${NEXUSURL_PREFIX}"
+
+if [ -f ${WORKSPACE}/test/csit/scriptplans/${TESTPLAN} ]; then
+    echo "scriptplan exists!!!"
+    echo "Changing the scriptplan path..."
+    cat ${WORKSPACE}/test/csit/scriptplans/${TESTPLAN} | sed "s:integration:${WORKSPACE}:" > scriptplan.txt
+    cat scriptplan.txt
+    for line in $( egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' scriptplan.txt ); do
+        echo "Executing ${line}..."
+        source ${line}
+    done
+fi
 
 cat > ${WORKSPACE}/controller-script.sh <<EOF
-echo "Downloading the distribution..."
+
+echo "Changing to /tmp"
 cd /tmp
-wget --no-verbose '${BUNDLEURL}'
+
+echo "Downloading the distribution..."
+wget --no-verbose '${ACTUALBUNDLEURL}'
 
 echo "Extracting the new controller..."
 unzip -q ${BUNDLE}
 
 echo "Configuring the startup features..."
-cd ${BUNDLEFOLDER}/etc
-CFG=org.apache.karaf.features.cfg
-cp \${CFG} \${CFG}.bak
-cat \${CFG}.bak | sed "s/^featuresBoot=.*/featuresBoot=config,standard,region,package,kar,ssh,management,${CONTROLLERFEATURES}/" > \${CFG}.1
-cat \${CFG}.1 | sed "s%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features%" > \${CFG}
-cat \${CFG}
+FEATURESCONF=/tmp/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg
+sed -ie "s/featuresBoot=.*/featuresBoot=config,standard,region,package,kar,ssh,management,${ACTUALFEATURES}/g" \${FEATURESCONF}
+sed -ie "s%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features%g" \${FEATURESCONF}
+cat \${FEATURESCONF}
 
 echo "Configuring the log..."
-LOG=org.ops4j.pax.logging.cfg
-cp \${LOG} \${LOG}.bak
-cat \${LOG}.bak | sed 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=20MB/' > \${LOG}
-cat \${LOG}
+LOGCONF=/tmp/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg
+sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=20MB/g' \${LOGCONF}
+cat \${LOGCONF}
 
 echo "Configure max memory..."
-MEM=setenv
-cd ../bin
-cp \${MEM} \${MEM}.bak
-cat \${MEM}.bak | sed 's/JAVA_MAX_MEM="2048m"/JAVA_MAX_MEM="${CONTROLLERMEM}"/' > \${MEM}
-cat \${MEM}
+MEMCONF=/tmp/${BUNDLEFOLDER}/bin/setenv
+sed -ie 's/JAVA_MAX_MEM="2048m"/JAVA_MAX_MEM="${CONTROLLERMEM}"/g' \${MEMCONF}
+cat \${MEMCONF}
 
 echo "Starting controller..."
-./start &
+/tmp/${BUNDLEFOLDER}/bin/start
 
 echo "Waiting for controller to come up..."
 COUNT="0"
@@ -74,8 +85,7 @@ while true; do
     elif (( "\$COUNT" > "600" )); then
         echo Timeout Controller DOWN
         echo "Dumping Karaf log..."
-        cd ../data/log
-        cat karaf.log
+        cat /tmp/${BUNDLEFOLDER}/data/log/karaf.log
         exit 1
     else
         COUNT=\$(( \${COUNT} + 5 ))
@@ -88,7 +98,7 @@ echo "Cool down for 1 min :)..."
 sleep 60
 
 echo "Checking OSGi bundles..."
-sshpass -p karaf ./client -u karaf 'bundle:list'
+sshpass -p karaf /tmp/${BUNDLEFOLDER}/bin/client -u karaf 'bundle:list'
 
 EOF
 
@@ -102,7 +112,9 @@ cat testplan.txt
 SUITES=$( egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' ' )
 
 echo "Starting Robot test suites ${SUITES} ..."
-pybot -N ${TESTPLAN} -c critical -e exclude -v BUNDLEFOLDER:${BUNDLEFOLDER} -v WORKSPACE:/tmp -v CONTROLLER:${CONTROLLER0} -v MININET:${MININET0} -v MININET_USER:${USER} -v USER_HOME:${HOME} -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} ${TESTOPTIONS} ${SUITES}
+pybot -N ${TESTPLAN} -c critical -e exclude -v BUNDLEFOLDER:${BUNDLEFOLDER} -v WORKSPACE:/tmp \
+-v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} -v CONTROLLER:${CONTROLLER0} \
+-v MININET:${MININET0} -v MININET_USER:${USER} -v USER_HOME:${HOME} ${TESTOPTIONS} ${SUITES} || true
 
 echo "Fetching Karaf log"
 scp ${CONTROLLER0}:/tmp/${BUNDLEFOLDER}/data/log/karaf.log .
index 4b04c867e530144898aa88f2be4fef9772a15d79..6fcab672f5c820736f3f5f626f53f164db9b415e 100644 (file)
 echo "#################################################"
-echo "##   include-raw-integration-deploy-controller ##"
+echo "##       Install Distribution in Cluster       ##"
 echo "#################################################"
 
-set -x
+CONTROLLERMEM="2048m"
 
+if [ ${CONTROLLERSCOPE} == 'all' ]; then
+    ACTUALFEATURES="odl-integration-compatible-with-all,${CONTROLLERFEATURES}"
+    CONTROLLERMEM="3072m"
+else
+    ACTUALFEATURES="${CONTROLLERFEATURES}"
+fi
 
 cat > ${WORKSPACE}/deploy-controller-script.sh <<EOF
-echo "Downloading the distribution from ${ACTUALBUNDLEURL}"
+
+echo "Changing to /tmp"
 cd /tmp
+
+echo "Downloading the distribution from ${ACTUALBUNDLEURL}"
 wget --no-verbose  ${ACTUALBUNDLEURL}
 
 echo "Extracting the new controller..."
 unzip -q ${BUNDLE}
 
 echo "Configuring the startup features..."
-cd ${BUNDLEFOLDER}/etc
-CFG=org.apache.karaf.features.cfg
-cp \${CFG} \${CFG}.bak
-cat \${CFG}.bak | sed "s/^featuresBoot=.*/featuresBoot=config,standard,region,package,kar,ssh,management,${CONTROLLERFEAT}/" > \${CFG}.1
-cat \${CFG}.1 | sed "s%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features%" > \${CFG}
-cat \${CFG}
+FEATURESCONF=/tmp/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg
+sed -ie "s/featuresBoot=.*/featuresBoot=config,standard,region,package,kar,ssh,management,${ACTUALFEATURES}/g" \${FEATURESCONF}
+sed -ie "s%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features%g" \${FEATURESCONF}
+cat \${FEATURESCONF}
 
 echo "Configuring the log..."
-LOG=org.ops4j.pax.logging.cfg
-cp \${LOG} \${LOG}.bak
-cat \${LOG}.bak | sed 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=20MB/' > \${LOG}
-cat \${LOG}
+LOGCONF=/tmp/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg
+sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=20MB/g' \${LOGCONF}
+cat \${LOGCONF}
 
 echo "Configure max memory..."
-MEM=setenv
-cd ../bin
-cp \${MEM} \${MEM}.bak
-cat \${MEM}.bak | sed 's/JAVA_MAX_MEM="2048m"/JAVA_MAX_MEM="${CONTROLLERMEM}"/' > \${MEM}
-cat \${MEM}
-
-echo "Starting deploy controller..."
-./start
-
-EOF
-
-cat > ${WORKSPACE}/deploy-sanitytest-controller-script.sh <<EOF
-set -x
-
-echo "Waiting for controller to come up..."
-cd /tmp
-cd ${BUNDLEFOLDER}/bin
-
-COUNT="0"
-
-
-while true; do
-    RESP="\$( curl --user admin:admin -sL -w "%{http_code} %{url_effective}\\n" http://localhost:8181/restconf/modules -o /dev/null )"
-    echo \$RESP
-    if [[ \$RESP == *"200"* ]]; then
-        echo Controller is UP
-        break
-    elif (( "\$COUNT" > "600" )); then
-        echo Timeout Controller DOWN
-
-        cd /tmp/${BUNDLEFOLDER}/data/
-        cat karaf.log
-        exit 1
-    else
-        COUNT=\$(( \${COUNT} + 5 ))
-        sleep 5
-        echo waiting \$COUNT secs...
-    fi
-done
-
-
-cd /tmp/${BUNDLEFOLDER}/bin/
-
-echo "Checking OSGi bundles..."
-sshpass -p karaf ./client -u karaf 'bundle:list'
-
-pkill java
-
-set +x
+MEMCONF=/tmp/${BUNDLEFOLDER}/bin/setenv
+sed -ie 's/JAVA_MAX_MEM="2048m"/JAVA_MAX_MEM="${CONTROLLERMEM}"/g' \${MEMCONF}
+cat \${MEMCONF}
 
 EOF
 
-
-set +x
-
-
-
-
-###############################################################
-##  Define a function to run controller-script on controller  #
-###############################################################
-
-function runcontrollerscript
-{
-  local CONTROLLERIP=$1
-  echo "running controller $CONTROLLERIP"
-  scp ${WORKSPACE}/deploy-controller-script.sh $CONTROLLERIP:/tmp
-  ssh $CONTROLLERIP 'bash /tmp/deploy-controller-script.sh'
-}
-
-function sanitytestcontroller
-{
-  local CONTROLLERIP=$1
-  echo "sanity testing controller $CONTROLLERIP"
-  scp ${WORKSPACE}/deploy-sanitytest-controller-script.sh $CONTROLLERIP:/tmp
-  ssh $CONTROLLERIP 'bash /tmp/deploy-sanitytest-controller-script.sh'
-}
-
-echo "##################################"
-echo "##  Loop through controller IPs  #"
-echo "##################################"
-
-declare CONTROLLERIPS=($(cat slave_addresses.txt | grep CONTROLLER | awk -F = '{print $2}'))
-
-for  i in "${CONTROLLERIPS[@]}"
+CONTROLLERIPS=(${CONTROLLER0} ${CONTROLLER1} ${CONTROLLER2})
+for i in "${!CONTROLLERIPS[@]}"
 do
-   echo "IP address is: $i"
-   runcontrollerscript $i
+    echo "Installing distribution in member-$i with IP address ${CONTROLLERIPS[$i]}"
+    scp ${WORKSPACE}/deploy-controller-script.sh ${CONTROLLERIPS[$i]}:/tmp
+    ssh ${CONTROLLERIPS[$i]} 'bash /tmp/deploy-controller-script.sh'
 done
 
-for  i in "${CONTROLLERIPS[@]}"
-do
-   echo "IP address is: $i"
-   sanitytestcontroller $i
-done
-
-echo "###################################################"
-echo "## END include-raw-integration-deploy-controller ##"
-echo "###################################################"
-
 # vim: ts=4 sw=4 sts=4 et ft=sh :
 
index 6cf3f5133119a26146e6dcb9bed6dbe5ed1f9e8c..fb07c17d8443577694d81906d704518824fbaa5d 100644 (file)
@@ -1,24 +1,11 @@
 echo "#################################################"
-echo "## include-raw-integration-get-bundle_vars.txt ##"
+echo "##       Inject Global Variables               ##"
 echo "#################################################"
-set -x
-# Create a script to run controller inside a dynamic jenkins slave
-CONTROLLERMEM="2048m"
-DISTRIBUTION="karaf"
-
-
-
-if [ ${CONTROLLERSCOPE} == 'all' ]; then
-    CONTROLLERFEAT="odl-integration-compatible-with-all,${CONTROLLERFEATURES}"
-    CONTROLLERMEM="3072m"
-else
-    CONTROLLERFEAT="${CONTROLLERFEATURES}"
-fi
 
 NEXUSURL_PREFIX=${ODLNEXUSPROXY:-https://nexus.opendaylight.org}
 
 if [ ${BUNDLEURL} == 'last' ]; then
-    NEXUSPATH="${NEXUSURL_PREFIX}/content/repositories/opendaylight.snapshot/org/opendaylight/integration/distribution-${DISTRIBUTION}"
+    NEXUSPATH="${NEXUSURL_PREFIX}/content/repositories/opendaylight.snapshot/org/opendaylight/integration/distribution-karaf"
     # Extract the BUNDLEVERSION from the pom.xml
     BUNDLEVERSION=`xpath pom.xml '/project/version/text()' 2> /dev/null`
     echo "Bundle version is ${BUNDLEVERSION}"
@@ -27,39 +14,29 @@ if [ ${BUNDLEURL} == 'last' ]; then
     less maven-metadata.xml
     TIMESTAMP=`xpath maven-metadata.xml "//snapshotVersion[extension='zip'][1]/value/text()" 2>/dev/null`
     echo "Nexus timestamp is ${TIMESTAMP}"
-    BUNDLEFOLDER="distribution-${DISTRIBUTION}-${BUNDLEVERSION}"
-    BUNDLE="distribution-${DISTRIBUTION}-${TIMESTAMP}.zip"
-    BUNDLEURL="${NEXUSPATH}/${BUNDLEVERSION}/${BUNDLE}"
+    BUNDLEFOLDER="distribution-karaf-${BUNDLEVERSION}"
+    BUNDLE="distribution-karaf-${TIMESTAMP}.zip"
+    ACTUALBUNDLEURL="${NEXUSPATH}/${BUNDLEVERSION}/${BUNDLE}"
 else
+    ACTUALBUNDLEURL="${BUNDLEURL}"
     BUNDLE="${BUNDLEURL##*/}"
     BUNDLEVERSION="$(basename $(dirname $BUNDLEURL))"
-    BUNDLEFOLDER="distribution-${DISTRIBUTION}-${BUNDLEVERSION}"
+    BUNDLEFOLDER="distribution-karaf-${BUNDLEVERSION}"
 fi
 
-echo "Distribution bundle URL is ${BUNDLEURL}"
+echo "Distribution bundle URL is ${ACTUALBUNDLEURL}"
 echo "Distribution bundle is ${BUNDLE}"
+echo "Distribution bundle version is ${BUNDLEVERSION}"
 echo "Distribution folder is ${BUNDLEFOLDER}"
-
-
-# write the BUNDLE values into a HERE doc to later
-#  export to jenkins
+echo "Nexus prefix is ${NEXUSURL_PREFIX}"
 
 cat > ${WORKSPACE}/bundle_vars.txt <<EOF
-CONTROLLERFEAT=${CONTROLLERFEAT}
-CONTROLLERMEM=${CONTROLLERMEM}
-DISTRIBUTION=${DISTRIBUTION}
-TIMESTAMP=${TIMESTAMP}
-NEXUSURL_PREFIX=${NEXUSURL_PREFIX}
-NEXUSPATH=${NEXUSPATH}
+ACTUALBUNDLEURL=${ACTUALBUNDLEURL}
+BUNDLE=${BUNDLE}
 BUNDLEVERSION=${BUNDLEVERSION}
 BUNDLEFOLDER=${BUNDLEFOLDER}
-BUNDLE=${BUNDLE}
-ACTUALBUNDLEURL=${BUNDLEURL}
+NEXUSURL_PREFIX=${NEXUSURL_PREFIX}
 EOF
-set +x
-ls
-echo "#################################################"
-echo "## include-raw-integration-get-bundle_vars.txt ##"
-echo "#################################################"
 
+# vim: ts=4 sw=4 sts=4 et ft=sh :
 
index 257fb5c90645d8d240f847c4341cca8d459be7a7..6059b84a746ae9a13750c350ebe56a40d3ce8d6f 100644 (file)
@@ -1,65 +1,26 @@
-echo "#########################################################"
-echo "##  include-raw-integration-start-cluster-run-test.sh  ##"
-echo "#########################################################"
-# Expects $BUNDLEFOLDER to be set earlier in Jenkins job.
-set -x
+echo "#################################################"
+echo "##         Verify Cluster is UP                ##"
+echo "#################################################"
 
-  if [ -z ${BUNDLEFOLDER} ] || [ -f ${BUNDLEFOLDER} ]; then
-    echo "Location of ODL BUNDLEFOLDER:$BUNDLEFOLDER is not defined"
-    exit 1
-  fi
-
-# populate $(CONTROLLERIPS)
-
-  declare CONTROLLERIPS=($(cat slave_addresses.txt | grep CONTROLLER | awk -F = '{print $2}'))
-  declare -p CONTROLLERIPS
-
-# Creates a script to run controller inside a dynamic jenkins slave
-
-cat > ${WORKSPACE}/run-startandtest-controller-script.sh <<EOF
-set -x
-cd /tmp
-cd ${BUNDLEFOLDER}
-echo "BUNDLE: $BUNDLEFOLDER"
-echo "Checking status of controller..."
-    bash bin/status
-    bash bin/start &
-set +x
-EOF
-
-
-
-cat > ${WORKSPACE}/run-verify-controller-isup-script.sh <<EOF
-set -x
-cd /tmp
-cd ${BUNDLEFOLDER}
-echo "BUNDLE: $BUNDLEFOLDER"
-echo "Checking status of controller..."
- bash bin/status
- echo "Waiting for controller to come up..."
- COUNT="0"
+cat > ${WORKSPACE}/verify-cluster-is-up.sh <<EOF
 
+CONTROLLERID="member-\$1"
+CONTROLLERIP=\$2
 
+echo "Waiting for controller to come up..."
+COUNT="0"
 while true; do
     RESP="\$( curl --user admin:admin -sL -w "%{http_code} %{url_effective}\\n" http://localhost:8181/restconf/modules -o /dev/null )"
     echo \$RESP
-    if [[ \$RESP == *"200"* ]]; then
+    SHARD="\$( curl --user admin:admin -sL -w "%{http_code} %{url_effective}\\n" http://localhost:8181/jolokia/read/org.opendaylight.controller:Category=Shards,name=\$CONTROLLERID-shard-inventory-config,type=DistributedConfigDatastore)"
+    echo \$SHARD
+    if ([[ \$RESP == *"200"* ]] && [[ \$SHARD  == *'"status":200'* ]]); then
         echo Controller is UP
-    SHARD="\$( curl --user admin:admin -sL -w "%{http_code} %{url_effective}\\n" http://localhost:8181/jolokia/read/org.opendaylight.controller:Category=Shards,name=member-0-shard-inventory-config,type=DistributedConfigDatastore)"
-      echo \$SHARD
-      if [[ \$SHARD  == *'"status":200'* ]]
-       then
         break
-      fi
-      break
-
     elif (( "\$COUNT" > "600" )); then
         echo Timeout Controller DOWN
         echo "Dumping Karaf log..."
-        ls
-        pwd
-        cd data/log
-        cat karaf.log
+        cat /tmp/${BUNDLEFOLDER}/data/log/karaf.log
         exit 1
     else
         COUNT=\$(( \${COUNT} + 5 ))
@@ -68,34 +29,17 @@ while true; do
     fi
 done
 
-cd /tmp/${BUNDLEFOLDER}/bin/
-
 echo "Checking OSGi bundles..."
-sshpass -p karaf ./client -u karaf 'bundle:list'
+sshpass -p karaf /tmp/${BUNDLEFOLDER}/bin/client -u karaf 'bundle:list'
 
 EOF
 
-
-for  i in "${!CONTROLLERIPS[@]}"
+CONTROLLERIPS=(${CONTROLLER0} ${CONTROLLER1} ${CONTROLLER2})
+for i in "${!CONTROLLERIPS[@]}"
 do
- echo "Copying HERE docs to ${CONTROLLERIPS[$i]} which is node $i "
- scp ${WORKSPACE}/run-startandtest-controller-script.sh \
-${CONTROLLERIPS[$i]}:/tmp
-
- scp ${WORKSPACE}/run-verify-controller-isup-script.sh \
-${CONTROLLERIPS[$i]}:/tmp
-done
-
-for  i in "${!CONTROLLERIPS[@]}"
-do
- echo "Starting ${CONTROLLERIPS[$i]} on node $i "
- ssh ${CONTROLLERIPS[$i]} "bash /tmp/run-startandtest-controller-script.sh $i"&
-done
-
-for  i in "${!CONTROLLERIPS[@]}"
-do
- echo "Running sanity tests on ${CONTROLLERIPS[$i]} on node $i "
- ssh ${CONTROLLERIPS[$i]} "bash /tmp/run-verify-controller-isup-script.sh $i"
+    echo “Verifying member-$i with IP address ${CONTROLLERIPS[$i]} is UP”
+    scp ${WORKSPACE}/verify-cluster-is-up.sh ${CONTROLLERIPS[$i]}:/tmp
+    ssh ${CONTROLLERIPS[$i]} "bash /tmp/verify-cluster-is-up.sh $i ${CONTROLLERIPS[$i]}"
 done
 
 echo "Cool down for 1 min :)..."
@@ -108,30 +52,14 @@ cat testplan.txt
 SUITES=$( egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' ' )
 
 echo "Starting Robot test suites ${SUITES} ..."
-
-
 pybot -N ${TESTPLAN} -c critical -e exclude -v BUNDLEFOLDER:${BUNDLEFOLDER} -v WORKSPACE:/tmp \
 -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} -v CONTROLLER:${CONTROLLER0} -v CONTROLLER1:${CONTROLLER1} -v CONTROLLER2:${CONTROLLER2} \
--v MININET:${MININET0} -v MININET_USER:${USER} -v USER_HOME:${HOME} ${TESTOPTIONS} ${SUITES}
-
+-v MININET:${MININET0} -v MININET_USER:${USER} -v USER_HOME:${HOME} ${TESTOPTIONS} ${SUITES} || true
 
-#
-echo "######  Fetching controller0-karaf.log ############"
-scp $CONTROLLER0:/tmp/$BUNDLEFOLDER/data/log/karaf.log \
-controller0-karaf.log
-# cat karaf.log
-#
-echo "######  Fetching controller1-karaf.log ############"
-scp $CONTROLLER1:/tmp/$BUNDLEFOLDER/data/log/karaf.log \
-controller1-karaf.log
-# cat controller1-karaf.log
+echo "Fetching Karaf log"
+scp $CONTROLLER0:/tmp/$BUNDLEFOLDER/data/log/karaf.log controller0-karaf.log
+scp $CONTROLLER1:/tmp/$BUNDLEFOLDER/data/log/karaf.log controller1-karaf.log
+scp $CONTROLLER2:/tmp/$BUNDLEFOLDER/data/log/karaf.log controller2-karaf.log
 
-echo "######  Fetching controller2-karaf.log ############"
-scp $CONTROLLER2:/tmp/$BUNDLEFOLDER/data/log/karaf.log \
-controller2-karaf.log
-# cat controller2-karaf.log
+# vim: ts=4 sw=4 sts=4 et ft=sh :
 
-## vim: ts=4 sw=4 sts=4 et ft=sh :
-echo "############################################################"
-echo "## END include-raw-integration-start-cluster-run-test.sh  ##"
-echo "############################################################"
index eb03b5f755250c8539f2373b074537f1058edc8f..e2527eb5ef39d78f0e7d311a4a35bff446438728 100644 (file)
@@ -17,6 +17,8 @@
             branch: 'stable/helium'
 
     install:
+        - only:
+            scope: 'only'
         - all:
             scope: 'all'
 
similarity index 87%
rename from jjb/integration/integration-csit-basic-master.yaml
rename to jjb/integration/integration-csit-basic.yaml
index e72533d0918f8aa24d7ed14541a9cb1f3b2c606b..a424ba33f54eb4bb53dd7b961eee4decb87d5899 100644 (file)
@@ -1,5 +1,5 @@
 - project:
-    name: integration-csit-basic-master
+    name: integration-csit-basic
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-3node-cds-{functionality}-{install}-{stream}'
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable-lithium'
 
     install:
+        - only:
+            scope: 'only'
         - all:
             scope: 'all'
 
index 758d950a4fbb6e03a681aac2f4379b24f515fd8b..9fd9e403e72fa797a7315d9e00fc11276db8da0a 100644 (file)
@@ -1,6 +1,6 @@
 
 - project:
-    name: integration
+    name: integration-jobs
     jobs:
         - 'integration-csit-verify-{stream}'
         - 'integration-distribution-verify-{stream}'
     stream:
         - master:
             branch: 'master'
-            csit-list: 'aaa-csit-1node-cds-authn-only-{stream},aaa-csit-1node-cds-authn-all-{stream},openflowplugin-csit-1node-cds-flow-services-only-{stream},openflowplugin-csit-1node-cds-flow-services-all-{stream},l2switch-csit-1node-cds-switch-only-{stream},l2switch-csit-1node-cds-switch-all-{stream},vtn-csit-1node-cds-manager-only-{stream},vtn-csit-1node-cds-manager-all-{stream},lispflowmapping-csit-1node-cds-all-only-{stream},lispflowmapping-csit-1node-cds-all-all-{stream}'
+            csit-list: 'controller-csit-1node-cds-netconf-only-{stream},controller-csit-1node-cds-netconf-all-{stream},aaa-csit-1node-cds-authn-only-{stream},aaa-csit-1node-cds-authn-all-{stream},openflowplugin-csit-1node-cds-flow-services-only-{stream},openflowplugin-csit-1node-cds-flow-services-all-{stream},openflowplugin-csit-1node-cds-scalability-only-{stream},openflowplugin-csit-1node-cds-scalability-all-{stream},openflowplugin-csit-1node-cds-cbench-performance-only-{stream},openflowplugin-csit-1node-cds-config-performance-only-{stream},l2switch-csit-1node-cds-switch-only-{stream},l2switch-csit-1node-cds-switch-all-{stream},l2switch-csit-1node-cds-scalability-only-{stream},l2switch-csit-1node-cds-scalability-all-{stream},vtn-csit-1node-cds-manager-only-{stream},vtn-csit-1node-cds-manager-all-{stream},lispflowmapping-csit-1node-cds-all-only-{stream},lispflowmapping-csit-1node-cds-all-all-{stream}'
+
+        - stable-lithium:
+            branch: 'stable/lithium'
+            csit-list: 'controller-csit-1node-cds-netconf-only-{stream},controller-csit-1node-cds-netconf-all-{stream},aaa-csit-1node-cds-authn-only-{stream},aaa-csit-1node-cds-authn-all-{stream},openflowplugin-csit-1node-cds-flow-services-only-{stream},openflowplugin-csit-1node-cds-flow-services-all-{stream},openflowplugin-csit-1node-cds-scalability-only-{stream},openflowplugin-csit-1node-cds-scalability-all-{stream},openflowplugin-csit-1node-cds-cbench-performance-only-{stream},openflowplugin-csit-1node-cds-config-performance-only-{stream},l2switch-csit-1node-cds-switch-only-{stream},l2switch-csit-1node-cds-switch-all-{stream},l2switch-csit-1node-cds-scalability-only-{stream},l2switch-csit-1node-cds-scalability-all-{stream},vtn-csit-1node-cds-manager-only-{stream},vtn-csit-1node-cds-manager-all-{stream},lispflowmapping-csit-1node-cds-all-only-{stream},lispflowmapping-csit-1node-cds-all-all-{stream}'
 
         - stable-helium:
             branch: 'stable/helium'
-            csit-list: 'controller-csit-1node-imds-nsf-only-{stream},controller-csit-1node-imds-nsf-all-{stream},aaa-csit-1node-imds-authn-only-{stream},aaa-csit-1node-imds-authn-all-{stream},openflowplugin-csit-1node-imds-flow-services-only-{stream},openflowplugin-csit-1node-imds-flow-services-all-{stream},l2switch-csit-1node-imds-switch-only-{stream},l2switch-csit-1node-imds-switch-all-{stream},vtn-csit-1node-imds-manager-only-{stream},vtn-csit-1node-imds-manager-all-{stream},lispflowmapping-csit-1node-imds-all-only-{stream},lispflowmapping-csit-1node-imds-all-all-{stream}'
+            csit-list: 'controller-csit-1node-imds-nsf-only-{stream},controller-csit-1node-imds-nsf-all-{stream},controller-csit-1node-imds-netconf-only-{stream},controller-csit-1node-imds-netconf-all-{stream},aaa-csit-1node-imds-authn-only-{stream},aaa-csit-1node-imds-authn-all-{stream},openflowplugin-csit-1node-imds-flow-services-only-{stream},openflowplugin-csit-1node-imds-flow-services-all-{stream},l2switch-csit-1node-imds-switch-only-{stream},l2switch-csit-1node-imds-switch-all-{stream},vtn-csit-1node-imds-manager-only-{stream},vtn-csit-1node-imds-manager-all-{stream},lispflowmapping-csit-1node-imds-all-only-{stream},lispflowmapping-csit-1node-imds-all-all-{stream}'
 
     jdk: 'openjdk7'
 
         - integration-bundleurl:
             bundleurl: 'last'
 
+    triggers:
+        - timed: 'H H * * *'
+
     builders:
         - trigger-builds:
             - project: '{csit-list}'
index 2918a15504fc02e52fad8bf62cf7a774f3682a27..4f499768fdaa1a497b7698672d23cfe61bd7ae24 100644 (file)
@@ -8,6 +8,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable-lithium'
 
     project: 'integration'
     jdk: 'openjdk7'
index 2fc2607411053e51f57e1d040e2febc783a06e18..7c8cd4f1ab444498c4d45100d92a5e1317ee909b 100644 (file)
@@ -1,56 +1,3 @@
-- job-template:
-    name: '{project}-distribution-{stream}'
-
-    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: 'integration'
-
-    scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
-
-    wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-
-    triggers:
-        - reverse:
-            jobs: '{project}-merge-{stream}'
-            result: 'success'
-
-    prebuilders:
-        - wipe-org-opendaylight-repo
-
-    maven:
-        maven-name: '{mvn32}'
-        root-pom: 'pom.xml'
-        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
-        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-        settings: '{integration-settings}'
-        global-settings: '{odl-global-settings}'
-
-    publishers:
-        - email-notification:
-            email-prefix: '[{project}]'
-        - maven-deploy:
-            id: ''
-            unique-version: true
-            deploy-unstable: false
-
 - job-template:
     name: '{project}-csit-verify-{functionality}-{stream}'
 
diff --git a/jjb/iotdm/iotdm-csit-basic.yaml b/jjb/iotdm/iotdm-csit-basic.yaml
new file mode 100644 (file)
index 0000000..d72e8f2
--- /dev/null
@@ -0,0 +1,33 @@
+- project:
+    name: iotdm-csit-basic
+    jobs:
+        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-{functionality}-{stream}'
+
+    # The project name
+    project: 'iotdm'
+
+    # The functionality under test
+    functionality: 'basic'
+
+    # Project branches
+    stream:
+        - master:
+            branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
+
+    install:
+        - only:
+            scope: 'only'
+        - all:
+            scope: 'all'
+
+    # Features to install
+    install-features: 'odl-iotdm-onem2m'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'iotdm-distribution-{stream}'
index 76d6ab9dbf72da191d16e14e892eb51a81249872..4bfdf75fa38f806ae519590e49ad24dbc7a2523a 100644 (file)
@@ -1,4 +1,6 @@
 BRANCHES:
 - master:
     jdks: openjdk7,openjdk8
+- stable/lithium:
+    jdks: openjdk7,openjdk8
 DEPENDENCIES: controller,yangtools,odlparent,aaa
index b11b48f3c796514d7babb5d185944b17b591ae31..61727351089be1737bb3ed7a9dc1f6ad60aa177e 100644 (file)
@@ -9,6 +9,7 @@
         - 'iotdm-verify-{stream}'
         - 'iotdm-merge-{stream}'
         - 'iotdm-daily-{stream}'
+        - 'iotdm-distribution-{stream}'
         - 'iotdm-integration-{stream}'
         - 'iotdm-sonar'
         - 'iotdm-clm'
             jdks:
                 - openjdk7
                 - openjdk8
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
 
     project: 'iotdm'
 
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[iotdm]'
         - maven-deploy:
             email-prefix: '[iotdm]'
         - jacoco-report
 
+- job-template:
+    name: 'iotdm-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'iotdm-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
new file mode 100644 (file)
index 0000000..d051cbb
--- /dev/null
@@ -0,0 +1,36 @@
+- project:
+    name: l2switch-csit-host-scalability-daily
+    jobs:
+        - '{project}-csit-periodic-1node-cds-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'l2switch'
+
+    # The functionality under test
+    functionality: 'host-scalability-daily'
+
+    # Project branches
+    stream:
+        - master:
+            branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-l2switch-all,odl-l2switch-switch-rest'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (daily)
+    schedule: 'H H * * *'
+
+    # Plot Info
+    01-plot-title: 'Max number of Hosts'
+    01-plot-yaxis: 'Network Hosts'
+    01-plot-group: 'Inventory Host Scalability'
+    01-plot-data-file: 'hosts.csv'
similarity index 89%
rename from jjb/l2switch/l2switch-csit-scalability-master.yaml
rename to jjb/l2switch/l2switch-csit-scalability.yaml
index d58bb630a94edc4e26c7f875ecefe0bc2458739c..6319e6d4ef037ecb3f5fefddd76e9dd279a91a73 100644 (file)
@@ -1,5 +1,5 @@
 - project:
-    name: l2switch-csit-scalability-master
+    name: l2switch-csit-scalability
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:
similarity index 89%
rename from jjb/l2switch/l2switch-csit-switch-master.yaml
rename to jjb/l2switch/l2switch-csit-switch.yaml
index 8de156ee3bdfcd59393c47c1bbefec4771002b10..0b162eedaeb2ce617291bd52f157383862554bd2 100644 (file)
@@ -1,5 +1,5 @@
 - project:
-    name: l2switch-csit-switch-master
+    name: l2switch-csit-switch
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:
diff --git a/jjb/l2switch/l2switch-distribution.yaml b/jjb/l2switch/l2switch-distribution.yaml
deleted file mode 100644 (file)
index 4fb15e9..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-- project:
-    name: l2switch-distribution
-    jobs:
-        - '{project}-distribution-{stream}'
-
-    # The project name
-    project: 'l2switch'
-
-    # The project branches
-    stream:
-        - master:
-            branch: 'master'
-        - stable-helium:
-            branch: 'stable/helium'
-
-    jdk: 'openjdk7'
-
index 543261242e0199d7f570235b6db89c358c7bb9d1..bd6e3532988dd63feef0a6e234f0a038fbeae2f1 100644 (file)
@@ -9,6 +9,7 @@
         - 'l2switch-verify-{stream}'
         - 'l2switch-merge-{stream}'
         - 'l2switch-daily-{stream}'
+        - 'l2switch-distribution-{stream}'
         - 'l2switch-integration-{stream}'
         - 'l2switch-sonar'
         - 'l2switch-clm'
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[l2switch]'
         - maven-deploy:
             email-prefix: '[l2switch]'
         - jacoco-report
 
+- job-template:
+    name: 'l2switch-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'l2switch-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
diff --git a/jjb/lacp/lacp-csit-lacp-master.yaml b/jjb/lacp/lacp-csit-lacp-master.yaml
new file mode 100644 (file)
index 0000000..206004c
--- /dev/null
@@ -0,0 +1,32 @@
+- project:
+    name: lacp-csit-lacp-master
+    jobs:
+        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-{functionality}-{stream}'
+
+    # The project name
+    project: 'lacp'
+
+    # The functionality under test
+    functionality: 'lacp'
+
+    # Project branches
+    stream:
+        - master:
+            branch: 'master'
+
+    install:
+        - only:
+            scope: 'only'
+        - all:
+            scope: 'all'
+
+    # Features to install
+    install-features: 'odl-lacp-ui'
+
+    # Robot custom options
+    robot-options: ' '
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},lacp-distribution-{stream}'
+
index 406d5c2423f543b7e84c2d4796753a214b6eba15..f8717b1ede9f9433a17db077881ef0d2c98a0378 100644 (file)
@@ -1,6 +1,8 @@
 BRANCHES:
 - master:
     jdks: openjdk7
+- stable/lithium:
+    jdks: openjdk7
 MVN_GOALS: clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
 MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m
 DEPENDENCIES: yangtools,controller,openflowjava,openflowplugin,odlparent
index cb5cf228ba299c052925fd69d6537cda931ca223..cd5bcee4401b94167f2a5798ddab3b67c6e0b076 100644 (file)
@@ -9,6 +9,7 @@
         - 'lacp-verify-{stream}'
         - 'lacp-merge-{stream}'
         - 'lacp-daily-{stream}'
+        - 'lacp-distribution-{stream}'
         - 'lacp-integration-{stream}'
         - 'lacp-sonar'
         - 'lacp-clm'
             jdk: openjdk7
             jdks:
                 - openjdk7
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'lacp'
 
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[lacp]'
         - maven-deploy:
             email-prefix: '[lacp]'
         - jacoco-report
 
+- job-template:
+    name: 'lacp-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'lacp-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
similarity index 89%
rename from jjb/lispflowmapping/lispflowmapping-csit-all-master.yaml
rename to jjb/lispflowmapping/lispflowmapping-csit-all.yaml
index 535a8126a3612865953f976da5e8741c22d48f1e..11545965b2ddea84bc76d82273652aaf6c2348c1 100644 (file)
@@ -1,5 +1,5 @@
 - project:
-    name: lispflowmapping-csit-all-master
+    name: lispflowmapping-csit-all
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:
diff --git a/jjb/lispflowmapping/lispflowmapping-distribution.yaml b/jjb/lispflowmapping/lispflowmapping-distribution.yaml
deleted file mode 100644 (file)
index 7e963a3..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-- project:
-    name: lispflowmapping-distribution
-    jobs:
-        - '{project}-distribution-{stream}'
-
-    # The project name
-    project: 'lispflowmapping'
-
-    # The project branches
-    stream:
-        - master:
-            branch: 'master'
-        - stable-helium:
-            branch: 'stable/helium'
-
-    jdk: 'openjdk7'
-
index 949310abae218554a4b0016794f90eb442516101..7eefb3514efb796485acf98c25b7e584bed6f39b 100644 (file)
@@ -9,6 +9,7 @@
         - 'lispflowmapping-verify-{stream}'
         - 'lispflowmapping-merge-{stream}'
         - 'lispflowmapping-daily-{stream}'
+        - 'lispflowmapping-distribution-{stream}'
         - 'lispflowmapping-integration-{stream}'
         - 'lispflowmapping-sonar'
         - 'lispflowmapping-clm'
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[lispflowmapping]'
         - maven-deploy:
             email-prefix: '[lispflowmapping]'
         - jacoco-report
 
+- job-template:
+    name: 'lispflowmapping-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'lispflowmapping-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
index a991382c90cae0ac74d770af343588cafa8ab28b..266ef28894404509a76fb149cf394183acaa4a71 100644 (file)
@@ -2,3 +2,5 @@ DEPENDENCIES: odlparent
 BRANCHES:
 - master:
     jdks: openjdk7,openjdk8
+- stable/lithium:
+    jdks: openjdk7,openjdk8
index e87ab82953038c51a1bfec6ef2dc6f9b44475949..70557e54dd31153d5bed740218db5493adcdaa6e 100644 (file)
@@ -9,6 +9,7 @@
         - 'neutron-verify-{stream}'
         - 'neutron-merge-{stream}'
         - 'neutron-daily-{stream}'
+        - 'neutron-distribution-{stream}'
         - 'neutron-integration-{stream}'
         - 'neutron-sonar'
         - 'neutron-clm'
             jdks:
                 - openjdk7
                 - openjdk8
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
 
     project: 'neutron'
 
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[neutron]'
         - maven-deploy:
             email-prefix: '[neutron]'
         - jacoco-report
 
+- job-template:
+    name: 'neutron-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'neutron-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
index 68a71d9307a688792faf64830121514cb3573cd1..9458cbcacd4c1e8217aa883b0e2ad2136151c8bc 100644 (file)
@@ -1,4 +1,6 @@
 BRANCHES:
 - master:
     jdks: openjdk7
-DEPENDENCIES: odlparent
+- stable/lithium:
+    jdks: openjdk7
+DEPENDENCIES: controller,odlparent,vtn,yangtools,groupbasedpolicy
index 860623ae108087a8f29aa95bf346cba73d951ddf..1a557cd744009b462a2f30269e42134b01497c24 100644 (file)
@@ -9,6 +9,7 @@
         - 'nic-verify-{stream}'
         - 'nic-merge-{stream}'
         - 'nic-daily-{stream}'
+        - 'nic-distribution-{stream}'
         - 'nic-integration-{stream}'
         - 'nic-sonar'
         - 'nic-clm'
             jdk: openjdk7
             jdks:
                 - openjdk7
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'nic'
 
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[nic]'
         - maven-deploy:
             email-prefix: '[nic]'
         - jacoco-report
 
+- job-template:
+    name: 'nic-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'nic-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
 
     triggers:
         - reverse:
-            jobs: 'odlparent-merge-{stream}'
+            jobs: 'controller-merge-{stream},odlparent-merge-{stream},vtn-merge-{stream},yangtools-merge-{stream},groupbasedpolicy-merge-{stream}'
             result: 'success'
 
     prebuilders:
 
     publishers:
         - email-notification:
-            email-prefix: '[nic] [odlparent]'
+            email-prefix: '[nic] [controller] [odlparent] [vtn] [yangtools] [groupbasedpolicy]'
         - jacoco-report
 
 - job-template:
index ea1e14ca0879fcdd0834cd22ecff7b7d7aee73db..4c41560560ae4e8d58136b53ae8620ced80d9f94 100644 (file)
@@ -9,6 +9,7 @@
         - 'odlparent-verify-{stream}'
         - 'odlparent-merge-{stream}'
         - 'odlparent-daily-{stream}'
+        - 'odlparent-distribution-{stream}'
         - 'odlparent-integration-{stream}'
         - 'odlparent-sonar'
         - 'odlparent-clm'
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[odlparent]'
         - maven-deploy:
             email-prefix: '[odlparent]'
         - jacoco-report
 
+- job-template:
+    name: 'odlparent-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'odlparent-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
diff --git a/jjb/openflowjava/openflowjava-distribution.yaml b/jjb/openflowjava/openflowjava-distribution.yaml
deleted file mode 100644 (file)
index e6428cb..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-- project:
-    name: openflowjava-distribution
-    jobs:
-        - '{project}-distribution-{stream}'
-
-    # The project name
-    project: 'openflowjava'
-
-    # The project branches
-    stream:
-        - master:
-            branch: 'master'
-        - stable-helium:
-            branch: 'stable/helium'
-
-    jdk: 'openjdk7'
-
index c649795c9387d66839191da753d577733f2481c8..69f2ee0d442123221e91de5468f1e63c575f614c 100644 (file)
@@ -9,6 +9,7 @@
         - 'openflowjava-verify-{stream}'
         - 'openflowjava-merge-{stream}'
         - 'openflowjava-daily-{stream}'
+        - 'openflowjava-distribution-{stream}'
         - 'openflowjava-integration-{stream}'
         - 'openflowjava-sonar'
         - 'openflowjava-clm'
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[openflowjava]'
         - maven-deploy:
             email-prefix: '[openflowjava]'
         - jacoco-report
 
+- job-template:
+    name: 'openflowjava-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'openflowjava-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
similarity index 89%
rename from jjb/openflowplugin/openflowplugin-csit-cbench-daily-master.yaml
rename to jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
index b44a1f45d3ee956c2156e4096e3a58bbbcd934d4..af4f6ceb50129085e50e0a0cf2c0c54802d137ea 100644 (file)
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-cbench-daily-master
+    name: openflowplugin-csit-cbench-daily
     jobs:
         - '{project}-csit-periodic-1node-cds-{functionality}-{install}-{stream}'
 
@@ -13,6 +13,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:
similarity index 90%
rename from jjb/openflowplugin/openflowplugin-csit-cbench-performance-master.yaml
rename to jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml
index d9afacbf63cef0598c8173ed046100be728a5fcd..f8ad74192869134d0eea2114704d3d9a4222d6ac 100644 (file)
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-cbench-performance-master
+    name: openflowplugin-csit-cbench-performance
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
 
@@ -13,6 +13,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:
similarity index 88%
rename from jjb/openflowplugin/openflowplugin-csit-config-performance-master.yaml
rename to jjb/openflowplugin/openflowplugin-csit-config-performance.yaml
index 97629e639ff3ce311258e4925a62a1d7dd0fff68..2b0284ab07b08d4d8b054fc091ebf445923d5df3 100644 (file)
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-config-performance-master
+    name: openflowplugin-csit-config-performance
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
 
@@ -13,6 +13,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:
diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-more-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-more-lithium-redesign.yaml
new file mode 100644 (file)
index 0000000..cf65bde
--- /dev/null
@@ -0,0 +1,28 @@
+- project:
+    name: openflowplugin-csit-flow-services-more-lithium-redesign
+    jobs:
+        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'flow-services-more-lithium-redesign'
+
+    # Project branches
+    stream:
+        - master:
+            branch: 'master'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui-li'
+
+    # Robot custom options
+    robot-options: '-e adsal'
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-more.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-more.yaml
new file mode 100644 (file)
index 0000000..5395c55
--- /dev/null
@@ -0,0 +1,32 @@
+- project:
+    name: openflowplugin-csit-flow-services-more
+    jobs:
+        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-{functionality}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'flow-services-more'
+
+    # Project branches
+    stream:
+        - master:
+            branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-adsal-compatibility,odl-nsf-all'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
+
similarity index 88%
rename from jjb/openflowplugin/openflowplugin-csit-flow-services-master.yaml
rename to jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index 0701f1424a7630b01c17476b9e958299b9c9c7a9..9f2539ee8e5ffd501a0a3d6f465c9c8c5d67b0c4 100644 (file)
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-flow-services-master
+    name: openflowplugin-csit-flow-services
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:
similarity index 87%
rename from jjb/openflowplugin/openflowplugin-csit-scalability-daily-master.yaml
rename to jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml
index 9ba223c3c2d40db5e39297c5e1ade186ce6250df..bc8d2de8a0c4d78be600d9a42b63800ba987bf10 100644 (file)
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-scalability-daily-master
+    name: openflowplugin-csit-scalability-daily
     jobs:
         - '{project}-csit-periodic-1node-cds-{functionality}-{install}-{stream}'
 
@@ -13,6 +13,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:
similarity index 88%
rename from jjb/openflowplugin/openflowplugin-csit-scalability-master.yaml
rename to jjb/openflowplugin/openflowplugin-csit-scalability.yaml
index d28c8aa6865599d05919b14da56ec54a72b75bcc..664e6fe217e6d53143e506acaa66c36d77c0189c 100644 (file)
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-scalability-master
+    name: openflowplugin-csit-scalability
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:
diff --git a/jjb/openflowplugin/openflowplugin-csit-statistics-basic-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-statistics-basic-lithium-redesign.yaml
new file mode 100644 (file)
index 0000000..19ac188
--- /dev/null
@@ -0,0 +1,29 @@
+- project:
+    name: openflowplugin-csit-statistics-basic-lithium-redesign
+    jobs:
+        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'statistics-basic-lithium-redesign'
+
+    # Project branches
+    stream:
+        - master:
+            branch: 'master'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui-li'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: ''
+
diff --git a/jjb/openflowplugin/openflowplugin-distribution.yaml b/jjb/openflowplugin/openflowplugin-distribution.yaml
deleted file mode 100644 (file)
index 5785ec6..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-- project:
-    name: openflowplugin-distribution
-    jobs:
-        - '{project}-distribution-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The project branches
-    stream:
-        - master:
-            branch: 'master'
-        - stable-helium:
-            branch: 'stable/helium'
-
-    jdk: 'openjdk7'
-
index 4c257825ba38f4753331833f1a0a69169ebc2ad1..bc075d8270b2225cd760ab421d779b8a9d132edd 100644 (file)
@@ -3,6 +3,8 @@ BRANCHES:
     jdks: openjdk7,openjdk8
 - stable/helium:
     jdks: openjdk7
+- stable/lithium:
+    jdks: openjdk7,openjdk8
 MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install javadoc:aggregate
 #MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m
 DEPENDENCIES: yangtools,controller,openflowjava
index 527610dfb0018d568c16195e1fc4d6bbb7e5865c..6cc87e4e15d54689cb9fa38e664290dad44480b3 100644 (file)
@@ -9,6 +9,7 @@
         - 'openflowplugin-verify-{stream}'
         - 'openflowplugin-merge-{stream}'
         - 'openflowplugin-daily-{stream}'
+        - 'openflowplugin-distribution-{stream}'
         - 'openflowplugin-integration-{stream}'
         - 'openflowplugin-sonar'
         - 'openflowplugin-clm'
             jdk: openjdk7
             jdks:
                 - openjdk7
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
 
     project: 'openflowplugin'
 
             email-prefix: '[openflowplugin]'
         - jacoco-report
 
+- job-template:
+    name: 'openflowplugin-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'openflowplugin-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
diff --git a/jjb/ovsdb/ovsdb-distribution.yaml b/jjb/ovsdb/ovsdb-distribution.yaml
deleted file mode 100644 (file)
index 2a0ffa2..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-- project:
-    name: ovsdb-distribution
-    jobs:
-        - '{project}-distribution-{stream}'
-
-    # The project name
-    project: 'ovsdb'
-
-    # The project branches
-    stream:
-        - master:
-            branch: 'master'
-        - stable-helium:
-            branch: 'stable/helium'
-
-    jdk: 'openjdk7'
-
index 8b9abc7108f11cf9cdb10595e0062c5809aefac3..1d1f2e05ee04f0bd0ce09d8b78335456f39e3a41 100644 (file)
@@ -1,2 +1,9 @@
+BRANCHES:
+- master:
+    jdks: openjdk7
+- stable/helium:
+    jdks: openjdk7
+- stable/lithium:
+    jdks: openjdk7
 DEPENDENCIES: odlparent,controller,yangtools,openflowplugin,neutron
-JOB_TEMPLATES: verify,merge,daily,integration
\ No newline at end of file
+JOB_TEMPLATES: verify,merge,daily,distribution,integration
index 49f6be0bfebb68c09d7f5e7136e94fd8ed4196d2..304f52c9d1aa98fc0e611bfb6cb06d5d7c090698 100644 (file)
@@ -9,6 +9,7 @@
         - 'ovsdb-verify-{stream}'
         - 'ovsdb-merge-{stream}'
         - 'ovsdb-daily-{stream}'
+        - 'ovsdb-distribution-{stream}'
         - 'ovsdb-integration-{stream}'
         - 'ovsdb-clm'
 
             jdk: openjdk7
             jdks:
                 - openjdk7
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'ovsdb'
 
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[ovsdb]'
         - maven-deploy:
             email-prefix: '[ovsdb]'
         - jacoco-report
 
+- job-template:
+    name: 'ovsdb-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'ovsdb-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
index dc50acd7ce18c031d977fa5c8c10d3cb4bd40cd2..acc9d69890bec5d8be6ed2de1fa1c76f5f5a9b7f 100644 (file)
@@ -1 +1,8 @@
-DEPENDENCIES: controller,yangtools
\ No newline at end of file
+BRANCHES:
+- master:
+    jdks: openjdk7
+- stable/helium:
+    jdks: openjdk7
+- stable/lithium:
+    jdks: openjdk7
+DEPENDENCIES: controller,yangtools
index bbdae85521fa0c6d4467ff9bff6b17421f7e3435..c75c9470df0d732b38b284a818b016ba7ebdee76 100644 (file)
@@ -9,6 +9,7 @@
         - 'packetcable-verify-{stream}'
         - 'packetcable-merge-{stream}'
         - 'packetcable-daily-{stream}'
+        - 'packetcable-distribution-{stream}'
         - 'packetcable-integration-{stream}'
         - 'packetcable-sonar'
         - 'packetcable-clm'
             jdk: openjdk7
             jdks:
                 - openjdk7
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'packetcable'
 
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[packetcable]'
         - maven-deploy:
             email-prefix: '[packetcable]'
         - jacoco-report
 
+- job-template:
+    name: 'packetcable-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'packetcable-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
index 9cc2b132b91bb4b4e898327e1b70549b09c146c0..7863b0b64628e474c1a4211838eaaa19ea733492 100644 (file)
@@ -9,6 +9,7 @@
         - 'persistence-verify-{stream}'
         - 'persistence-merge-{stream}'
         - 'persistence-daily-{stream}'
+        - 'persistence-distribution-{stream}'
         - 'persistence-integration-{stream}'
         - 'persistence-sonar'
         - 'persistence-clm'
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[persistence]'
         - maven-deploy:
             email-prefix: '[persistence]'
         - jacoco-report
 
+- job-template:
+    name: 'persistence-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'persistence-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
index 32cc814e57492e5e50b8a209a563e417db65d248..cd70ad612d86bc3e9f49fb35eb11f37cf22d82a1 100644 (file)
@@ -1,4 +1,6 @@
 BRANCHES:
 - master:
     jdks: openjdk7
+- stable/lithium:
+    jdks: openjdk7
 DEPENDENCIES: odlparent,controller,yangtools,groupbasedpolicy
index 4693ec45c91c1f127e1834615308a7801d5451f5..844a52653548cf8c7c8400d48f8564246f505456 100644 (file)
@@ -9,6 +9,7 @@
         - 'reservation-verify-{stream}'
         - 'reservation-merge-{stream}'
         - 'reservation-daily-{stream}'
+        - 'reservation-distribution-{stream}'
         - 'reservation-integration-{stream}'
         - 'reservation-sonar'
         - 'reservation-clm'
             jdk: openjdk7
             jdks:
                 - openjdk7
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'reservation'
 
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[reservation]'
         - maven-deploy:
             email-prefix: '[reservation]'
         - jacoco-report
 
+- job-template:
+    name: 'reservation-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'reservation-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
index 31e54de3135a3324512e77503de0623c3ff310a4..ae43e06b11077b076e4ae9770a68395b1c704a88 100644 (file)
@@ -9,6 +9,7 @@
         - 'sdninterfaceapp-verify-{stream}'
         - 'sdninterfaceapp-merge-{stream}'
         - 'sdninterfaceapp-daily-{stream}'
+        - 'sdninterfaceapp-distribution-{stream}'
         - 'sdninterfaceapp-integration-{stream}'
         - 'sdninterfaceapp-sonar'
         - 'sdninterfaceapp-clm'
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[sdninterfaceapp]'
         - maven-deploy:
             email-prefix: '[sdninterfaceapp]'
         - jacoco-report
 
+- job-template:
+    name: 'sdninterfaceapp-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'sdninterfaceapp-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
index 233383f576d95af038bedce25cb6943656c34595..a1b5f4c1a5da704cab1ab86032bcd91dc0db8b8d 100644 (file)
@@ -1,2 +1,9 @@
+BRANCHES:
+- master:
+    jdks: openjdk7
+- stable/helium:
+    jdks: openjdk7
+- stable/lithium:
+    jdks: openjdk7
 MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true
 DEPENDENCIES: odlparent,yangtools,controller,openflowplugin,ovsdb,lispflowmapping
index eb983a610b2c8f8b8d3ce6c7649e847fa9b17664..fec34a1a796691780f750e2c3b7a4dbf46a898bd 100644 (file)
@@ -9,6 +9,7 @@
         - 'sfc-verify-{stream}'
         - 'sfc-merge-{stream}'
         - 'sfc-daily-{stream}'
+        - 'sfc-distribution-{stream}'
         - 'sfc-integration-{stream}'
         - 'sfc-sonar'
         - 'sfc-clm'
             jdk: openjdk7
             jdks:
                 - openjdk7
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'sfc'
 
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[sfc]'
         - maven-deploy:
             email-prefix: '[sfc]'
         - jacoco-report
 
+- job-template:
+    name: 'sfc-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'sfc-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
index 5946ac333ec6d4887ec70aab5ea47ab2cfe36240..6202ff5987a72f2894147922cb59869ac8704f69 100644 (file)
@@ -9,6 +9,7 @@
         - 'snbi-verify-{stream}'
         - 'snbi-merge-{stream}'
         - 'snbi-daily-{stream}'
+        - 'snbi-distribution-{stream}'
         - 'snbi-integration-{stream}'
         - 'snbi-sonar'
         - 'snbi-clm'
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[snbi]'
         - maven-deploy:
             email-prefix: '[snbi]'
         - jacoco-report
 
+- job-template:
+    name: 'snbi-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'snbi-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
similarity index 89%
rename from jjb/snmp/snmp-csit-basic-master.yaml
rename to jjb/snmp/snmp-csit-basic.yaml
index 55af9c38cd92ee0e887d27d1b0e2b1fffc8eb2c7..d43e3a311da1b04f3aaa51cf9384075a17d4a223 100644 (file)
@@ -1,5 +1,5 @@
 - project:
-    name: snmp-csit-basic-master
+    name: snmp-csit-basic
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:
diff --git a/jjb/snmp/snmp-distribution.yaml b/jjb/snmp/snmp-distribution.yaml
deleted file mode 100644 (file)
index b6f87d7..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-- project:
-    name: snmp-distribution
-    jobs:
-        - '{project}-distribution-{stream}'
-
-    # The project name
-    project: 'snmp'
-
-    # The project branches
-    stream:
-        - master:
-            branch: 'master'
-
-    jdk: 'openjdk7'
-
index d69376fd31790726d32f9677dcbae284ea60b66c..b80afba5d18f018b4d3d6978988b6b3e6963c71f 100644 (file)
@@ -9,6 +9,7 @@
         - 'snmp-verify-{stream}'
         - 'snmp-merge-{stream}'
         - 'snmp-daily-{stream}'
+        - 'snmp-distribution-{stream}'
         - 'snmp-integration-{stream}'
         - 'snmp-sonar'
         - 'snmp-clm'
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[snmp]'
         - maven-deploy:
             email-prefix: '[snmp]'
         - jacoco-report
 
+- job-template:
+    name: 'snmp-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'snmp-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
index 55f4493e1837898dde603f8209ad34c80fabdacd..c4c115a32a00f3fa80d32ef748ac85e16d7637d5 100644 (file)
@@ -1 +1,8 @@
+BRANCHES:
+- master:
+    jdks: openjdk7
+- stable/helium:
+    jdks: openjdk7
+- stable/lithium:
+    jdks: openjdk7
 DEPENDENCIES: odlparent,controller,yangtools
index 3fbeb2623edae718391afd321294594b321794e1..3217d05d5753955f86cb9e6e9adfb388df39f760 100644 (file)
@@ -9,6 +9,7 @@
         - 'snmp4sdn-verify-{stream}'
         - 'snmp4sdn-merge-{stream}'
         - 'snmp4sdn-daily-{stream}'
+        - 'snmp4sdn-distribution-{stream}'
         - 'snmp4sdn-integration-{stream}'
         - 'snmp4sdn-sonar'
         - 'snmp4sdn-clm'
             jdk: openjdk7
             jdks:
                 - openjdk7
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'snmp4sdn'
 
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[snmp4sdn]'
         - maven-deploy:
             email-prefix: '[snmp4sdn]'
         - jacoco-report
 
+- job-template:
+    name: 'snmp4sdn-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'snmp4sdn-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
index 7777dd89e7f66f9939da6b215ed23367831adfa0..c25c04fd10b30a1042be9fb88dfe81c2210fb2f6 100644 (file)
@@ -9,6 +9,7 @@
         - 'sxp-verify-{stream}'
         - 'sxp-merge-{stream}'
         - 'sxp-daily-{stream}'
+        - 'sxp-distribution-{stream}'
         - 'sxp-integration-{stream}'
         - 'sxp-sonar'
         - 'sxp-clm'
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[sxp]'
         - maven-deploy:
             email-prefix: '[sxp]'
         - jacoco-report
 
+- job-template:
+    name: 'sxp-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'sxp-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
diff --git a/jjb/tcpmd5/tcpmd5-distribution.yaml b/jjb/tcpmd5/tcpmd5-distribution.yaml
deleted file mode 100644 (file)
index d98b313..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-- project:
-    name: tcpmd5-distribution
-    jobs:
-        - '{project}-distribution-{stream}'
-
-    # The project name
-    project: 'tcpmd5'
-
-    # The project branches
-    stream:
-        - master:
-            branch: 'master'
-        - stable-helium:
-            branch: 'stable/helium'
-
-    jdk: 'openjdk7'
-
index f9e019fbe18ae595fb9724f4debd3f1918b560dd..a0f47fad1311a56ae2f3b66b118296b54b8e03a1 100644 (file)
@@ -9,6 +9,7 @@
         - 'tcpmd5-verify-{stream}'
         - 'tcpmd5-merge-{stream}'
         - 'tcpmd5-daily-{stream}'
+        - 'tcpmd5-distribution-{stream}'
         - 'tcpmd5-integration-{stream}'
         - 'tcpmd5-sonar'
         - 'tcpmd5-clm'
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[tcpmd5]'
         - maven-deploy:
             email-prefix: '[tcpmd5]'
         - jacoco-report
 
+- job-template:
+    name: 'tcpmd5-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'tcpmd5-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
index 7f90b1abe508c5ee4f672fc35b0735b08ee52a75..dee644a1169369cee141137d37b9fe8ede2c75e1 100644 (file)
@@ -9,6 +9,7 @@
         - 'toolkit-verify-{stream}'
         - 'toolkit-merge-{stream}'
         - 'toolkit-daily-{stream}'
+        - 'toolkit-distribution-{stream}'
         - 'toolkit-integration-{stream}'
         - 'toolkit-sonar'
         - 'toolkit-clm'
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[toolkit]'
         - maven-deploy:
             email-prefix: '[toolkit]'
         - jacoco-report
 
+- job-template:
+    name: 'toolkit-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'toolkit-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
index 261ec465d90826b8d7c7bfe7def59708a7d68ea6..5222de64a5a7521369619db2ac9d07ef5e2b3c85 100644 (file)
@@ -9,6 +9,7 @@
         - 'topoprocessing-verify-{stream}'
         - 'topoprocessing-merge-{stream}'
         - 'topoprocessing-daily-{stream}'
+        - 'topoprocessing-distribution-{stream}'
         - 'topoprocessing-integration-{stream}'
         - 'topoprocessing-sonar'
         - 'topoprocessing-clm'
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[topoprocessing]'
         - maven-deploy:
             email-prefix: '[topoprocessing]'
         - jacoco-report
 
+- job-template:
+    name: 'topoprocessing-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'topoprocessing-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
diff --git a/jjb/tsdr/tsdr-csit-tsdr-h2-master.yaml b/jjb/tsdr/tsdr-csit-tsdr-h2-master.yaml
new file mode 100644 (file)
index 0000000..0f7db08
--- /dev/null
@@ -0,0 +1,32 @@
+- project:
+    name: tsdr-csit-tsdr-h2
+    jobs:
+        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-{functionality}-{stream}'
+
+    # The project name
+    project: 'tsdr'
+
+    # The functionality under test to verify
+    functionality: 'h2-datastore'
+
+    # Project branches
+    stream:
+        - master:
+            branch: 'master'
+
+    install:
+        - only:
+            scope: 'only'
+        - all:
+            scope: 'all'
+
+    # Features to install
+    install-features: 'odl-restconf,odl-tsdr-all'
+
+    # Robot custom options
+    robot-options: ' '
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},tsdr-distribution-{stream}'
+
diff --git a/jjb/tsdr/tsdr-csit-tsdr.yaml b/jjb/tsdr/tsdr-csit-tsdr.yaml
new file mode 100644 (file)
index 0000000..93f2f3b
--- /dev/null
@@ -0,0 +1,34 @@
+- project:
+    name: tsdr-csit-tsdr
+    jobs:
+        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-{functionality}-{stream}'
+
+    # The project name
+    project: 'tsdr'
+
+    # The functionality under test to verify
+    functionality: 'hbase-datastore'
+
+    # Project branches
+    stream:
+        - master:
+            branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
+
+    install:
+        - only:
+            scope: 'only'
+        - all:
+            scope: 'all'
+
+    # Features to install
+    install-features: 'odl-restconf,odl-tsdr-hbase'
+
+    # Robot custom options
+    robot-options: ' '
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},tsdr-distribution-{stream}'
+
index c31267c8bcc1bb90ed4363108fc61692f939186b..ca41d539926e1750067612345148dd0f791dc702 100644 (file)
@@ -1,5 +1,7 @@
 BRANCHES:
 - master:
     jdks: openjdk7
+- stable/lithium:
+    jdks: openjdk7
 MVN_GOALS: clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
 MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m
index f8f779dd1354fd357127d9d54c370d8b605b5c4d..ae977f04c1cde1b31036b0dfe29b6c0bbaa259c2 100644 (file)
@@ -9,6 +9,7 @@
         - 'tsdr-verify-{stream}'
         - 'tsdr-merge-{stream}'
         - 'tsdr-daily-{stream}'
+        - 'tsdr-distribution-{stream}'
         - 'tsdr-integration-{stream}'
         - 'tsdr-sonar'
         - 'tsdr-clm'
             jdk: openjdk7
             jdks:
                 - openjdk7
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'tsdr'
 
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[tsdr]'
         - maven-deploy:
             email-prefix: '[tsdr]'
         - jacoco-report
 
+- job-template:
+    name: 'tsdr-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'tsdr-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
diff --git a/jjb/ttp/ttp.cfg b/jjb/ttp/ttp.cfg
new file mode 100644 (file)
index 0000000..c40071e
--- /dev/null
@@ -0,0 +1,7 @@
+BRANCHES:
+- master:
+    jdks: openjdk7
+- stable/helium:
+    jdks: openjdk7
+- stable/lithium:
+    jdks: openjdk7
index 6bc196830a4feca6c2ba51845a9e4a404386d5b4..fe01bff7392712e1f83f56386d36d5a863f80497 100644 (file)
@@ -9,6 +9,7 @@
         - 'ttp-verify-{stream}'
         - 'ttp-merge-{stream}'
         - 'ttp-daily-{stream}'
+        - 'ttp-distribution-{stream}'
         - 'ttp-integration-{stream}'
         - 'ttp-sonar'
         - 'ttp-clm'
             jdk: openjdk7
             jdks:
                 - openjdk7
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'ttp'
 
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[ttp]'
         - maven-deploy:
             email-prefix: '[ttp]'
         - jacoco-report
 
+- job-template:
+    name: 'ttp-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'ttp-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
similarity index 89%
rename from jjb/usc/usc-csit-channel-master.yaml
rename to jjb/usc/usc-csit-channel.yaml
index 9ceeeabc2cdb859059237f0f0baf6b54043d83fd..89b907b50dc84836c027f52dd2561d6299acad69 100644 (file)
@@ -1,5 +1,5 @@
 - project:
-    name: usc-csit-channel-master
+    name: usc-csit-channel
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:
diff --git a/jjb/usc/usc-distribution.yaml b/jjb/usc/usc-distribution.yaml
deleted file mode 100644 (file)
index 867c525..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-- project:
-    name: usc-distribution
-    jobs:
-        - '{project}-distribution-{stream}'
-
-    # The project name
-    project: 'usc'
-
-    # The project branches
-    stream:
-        - master:
-            branch: 'master'
-
-    jdk: 'openjdk7'
-
index ba37d734850188746dbf012f3e1e8c87569c9ada..1f570c101d1d3800569454f6ad8494135fc39118 100644 (file)
@@ -1,4 +1,6 @@
 BRANCHES:
 - master:
     jdks: openjdk7
-DEPENDENCIES: controller,yangtools,odlparent
\ No newline at end of file
+- stable/lithium:
+    jdks: openjdk7
+DEPENDENCIES: controller,yangtools,odlparent
index fc9c6d6c3e9e0321ca7cc4a1599871e3d0062a8e..8ce69774b085b6876e9c441f84e65ce4228f81e6 100644 (file)
@@ -9,6 +9,7 @@
         - 'usc-verify-{stream}'
         - 'usc-merge-{stream}'
         - 'usc-daily-{stream}'
+        - 'usc-distribution-{stream}'
         - 'usc-integration-{stream}'
         - 'usc-sonar'
         - 'usc-clm'
             jdk: openjdk7
             jdks:
                 - openjdk7
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'usc'
 
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[usc]'
         - maven-deploy:
             email-prefix: '[usc]'
         - jacoco-report
 
+- job-template:
+    name: 'usc-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'usc-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
diff --git a/jjb/vpnservice/vpnservice-csit-vpnservice.yaml b/jjb/vpnservice/vpnservice-csit-vpnservice.yaml
new file mode 100644 (file)
index 0000000..db226cd
--- /dev/null
@@ -0,0 +1,34 @@
+- project:
+    name: vpnservice-csit-vpnservice
+    jobs:
+        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-{functionality}-{stream}'
+
+    # The project name
+    project: 'vpnservice'
+
+    # The functionality under test
+    functionality: 'vpnservice'
+
+    # Project branches
+    stream:
+        - master:
+            branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
+
+    install:
+        - only:
+            scope: 'only'
+        - all:
+            scope: 'all'
+
+    # Features to install
+    install-features: 'odl-vpnservice-core'
+
+    # Robot custom options
+    robot-options: ' '
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},vpnservice-distribution-{stream}'
+
index 95e3361651886b0fb962ce950d77c12de783e387..087f8b39a8a188ed879a3193f2a5d2bd0060fdd2 100644 (file)
@@ -1,4 +1,6 @@
 BRANCHES:
 - master:
     jdks: openjdk7
-DEPENDENCIES: controller,yangtools,odlparent,openflowplugin
\ No newline at end of file
+- stable/lithium:
+    jdks: openjdk7
+DEPENDENCIES: controller,yangtools,odlparent,openflowplugin
index d94f810c0155eaa75d35653d1b9316dde5012eb9..5cbc0cb6984c4d776d6e158fcce805329afa0623 100644 (file)
@@ -9,6 +9,7 @@
         - 'vpnservice-verify-{stream}'
         - 'vpnservice-merge-{stream}'
         - 'vpnservice-daily-{stream}'
+        - 'vpnservice-distribution-{stream}'
         - 'vpnservice-integration-{stream}'
         - 'vpnservice-sonar'
         - 'vpnservice-clm'
             jdk: openjdk7
             jdks:
                 - openjdk7
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'vpnservice'
 
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[vpnservice]'
         - maven-deploy:
             email-prefix: '[vpnservice]'
         - jacoco-report
 
+- job-template:
+    name: 'vpnservice-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'vpnservice-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
similarity index 82%
rename from jjb/vtn/vtn-csit-manager-master.yaml
rename to jjb/vtn/vtn-csit-manager.yaml
index df47e0a3590d33167f954203911d936884e855dd..b12b79106c2a3fb608d665a6f403fbba462c651d 100644 (file)
@@ -1,5 +1,5 @@
 - project:
-    name: vtn-csit-manager-master
+    name: vtn-csit-manager
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:
@@ -22,7 +24,7 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-adsal-compatibility,odl-vtn-manager-all'
+    install-features: 'odl-vtn-manager-rest,odl-vtn-manager-neutron'
 
     # Robot custom options
     robot-options: ''
diff --git a/jjb/vtn/vtn-distribution.yaml b/jjb/vtn/vtn-distribution.yaml
deleted file mode 100644 (file)
index b62c657..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-- project:
-    name: vtn-distribution
-    jobs:
-        - '{project}-distribution-{stream}'
-
-    # The project name
-    project: 'vtn'
-
-    # The project branches
-    stream:
-        - master:
-            branch: 'master'
-        - stable-helium:
-            branch: 'stable/helium'
-
-    jdk: 'openjdk7'
-
index 0553a31e89619a4f400c6202c2662a8579ead54b..8a0d6cffce96de4cd5442510d634f8b344e17d68 100644 (file)
@@ -1,3 +1,10 @@
+BRANCHES:
+- master:
+    jdks: openjdk7
+- stable/helium:
+    jdks: openjdk7
+- stable/lithium:
+    jdks: openjdk7
 DEPENDENCIES: odlparent,controller,yangtools,openflowplugin,ovsdb,neutron
 MVN_GOALS: clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2 -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
 ARCHIVE_ARTIFACTS: manager/dist/*/target/*.zip, coordinator/dist/target/*.bz2, manager/northbound/target/site/wsdocs/**, manager/api/target/*-javadoc.jar, manager/api/target/apidocs/**
index 35b83963e10d2a0dbeda3eaf6406bcfd09392109..93668083270456d2ff2893cdb77c7f9f63001417 100644 (file)
@@ -9,6 +9,7 @@
         - 'vtn-verify-{stream}'
         - 'vtn-merge-{stream}'
         - 'vtn-daily-{stream}'
+        - 'vtn-distribution-{stream}'
         - 'vtn-integration-{stream}'
         - 'vtn-sonar'
         - 'vtn-clm'
             jdk: openjdk7
             jdks:
                 - openjdk7
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'vtn'
 
             email-prefix: '[vtn]'
         - jacoco-report
 
+- job-template:
+    name: 'vtn-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'vtn-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
diff --git a/jjb/yangtools/yangtools-distribution.yaml b/jjb/yangtools/yangtools-distribution.yaml
deleted file mode 100644 (file)
index 0ae4732..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-- project:
-    name: yangtools-distribution
-    jobs:
-        - '{project}-distribution-{stream}'
-
-    # The project name
-    project: 'yangtools'
-
-    # The project branches
-    stream:
-        - master:
-            branch: 'master'
-        - stable-helium:
-            branch: 'stable/helium'
-
-    jdk: 'openjdk7'
-
index 040eb01dd8a7403122e6673c3b410365e78cc17e..9a228665574aa5d603788e0d3d39a36a8d0cb01f 100644 (file)
@@ -6,4 +6,4 @@ BRANCHES:
 - stable/lithium:
     jdks: openjdk7,openjdk8
 DEPENDENCIES: odlparent
-JOB_TEMPLATES: merge,daily,integration,sonar
+JOB_TEMPLATES: merge,daily,distribution,integration,sonar
index 5c83ff5821d4aa553ee693a0565a6d254c88aee4..3f4869f66fedbfe4885f519cab5de907453b0429 100644 (file)
@@ -8,6 +8,7 @@
     jobs:
         - 'yangtools-merge-{stream}'
         - 'yangtools-daily-{stream}'
+        - 'yangtools-distribution-{stream}'
         - 'yangtools-integration-{stream}'
         - 'yangtools-sonar'
         - 'yangtools-clm'
         - findbugs
 
     publishers:
-        
         - email-notification:
             email-prefix: '[yangtools]'
         - maven-deploy:
             email-prefix: '[yangtools]'
         - jacoco-report
 
+- job-template:
+    name: 'yangtools-distribution-{stream}'
+
+    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: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'yangtools-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
index 94ee546f3552c18aa8125cb3d0f07b0f7e7d7289..f5608d198109bf6178391377fd75d50b22eb6952 100644 (file)
@@ -48,7 +48,7 @@ if os.path.isfile(project_conf):
 if cfg.get('JOB_TEMPLATES'):
     templates = cfg.get('JOB_TEMPLATES')
 else:
-    templates = "verify,merge,daily,integration,sonar"
+    templates = "verify,merge,daily,distribution,integration,sonar"
 templates += ",clm"  # ensure we always create a clm job for all projects
 
 ###################
@@ -194,5 +194,8 @@ with open(project_file, "w") as outfile:
                     line = re.sub("EMAIL_PREFIX", email_prefix, line)
                     line = re.sub("SONAR_BRANCH", sonar_branch, line)
                     line = re.sub("ARCHIVE_ARTIFACTS", archive_artifacts, line)
+                    # The previous command may have created superfluous lines.
+                    # If a line has no non-whitespace, it has to be '\n' only.
+                    line = re.sub(r'^\s+\n', "", line)
                 outfile.write(line)
         outfile.write("\n")
index a5155fe9b9842e52dd03c0313441c6aa3a846786..db5f639028e17b56ce86af889f91a1749003da48 100644 (file)
@@ -3,38 +3,15 @@
 # vim: sw=4 ts=4 sts=4 et tw=72 :
 
 yum clean all
-# Add the ODL yum repo (not needed for java nodes, but useful for
-# potential later layers)
-yum install -q -y https://nexus.opendaylight.org/content/repositories/opendaylight-yum-epel-6-x86_64/rpm/opendaylight-release/0.1.0-1.el6.noarch/opendaylight-release-0.1.0-1.el6.noarch.rpm
 
 # Make sure the system is fully up to date
 yum update -q -y
 
-# Add in git (needed for most everything) and XML-XPath as it is useful
-# for doing CLI based CML parsing of POM files
-yum install -q -y git perl-XML-XPath
-
-# install all available openjdk-devel sets
-yum install -q -y 'java-*-openjdk-devel'
-
-# we currently use Java7 (aka java-1.7.0-openjdk) as our standard make
-# sure that this is the java that alternatives is pointing to, dynamic
-# spin-up scripts can switch to any of the current JREs installed if
-# needed
-alternatives --set java /usr/lib/jvm/jre-1.7.0-openjdk.x86_64/bin/java
-alternatives --set java_sdk_openjdk /usr/lib/jvm/java-1.7.0-openjdk.x86_64
-
-# To handle the prompt style that is expected all over the environment
-# with how use use robotframework we need to make sure that it is
-# consistent for any of the users that are created during dynamic spin
-# ups
-echo 'PS1="[\u@\h \W]> "' >> /etc/skel/.bashrc
-
 # The following packages are not needed by all projects, but they are
 # needed by enough to make them useful everywhere
 yum install -q -y @development perl-{Digest-SHA,ExtUtils-MakeMaker} \
     ant {boost,gtest,json-c,libcurl,libxml2,libvirt,openssl}-devel \
-    {readline,unixODBC}-devel
+    {readline,unixODBC}-devel yum-utils
 
 # tcpmd5 is wanting to do 32bit ARM cross-compilation and is specifically
 # requesting the following be installed (note the kernel headers are
@@ -46,5 +23,15 @@ yum install -q -y glibc-devel.i686 kernel-headers
 # an EL6 system some of these packages are not availalble (or at the
 # wrong version) in publically available repositories as such this
 # should only really be done on an EL7 (or F18+) system
-yum install -q -y {jansson,libevent,libevent2,libnl,libuuid}-devel \
-    python-{devel,virtualenv,setuptools}
+yum install -q -y {jansson,libevent,libnl,libuuid}-devel \
+    python-{devel,virtualenv,setuptools,pip}
+
+#The following is needed for the new code in vtn project.
+#these packages will enable C# compilation.
+rpm --import "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF"
+#Added the mono tools repository
+yum-config-manager -q -y --add-repo http://origin-download.mono-project.com/repo/centos6/
+#Install the nuget binary
+yum install -q -y http://origin-download.mono-project.com/repo/centos/n/nuget/nuget-2.8.3+md58+dhx1-0.noarch.rpm
+#install the mono toolchain
+yum -q -y install mono-complete
index 1ae6a2a33b47eaa019657b5eff5bdd8448744085..7cdb8125780cd46a14298e36c83b82784d896e91 100644 (file)
@@ -3,29 +3,8 @@
 # vim: sw=4 ts=4 sts=4 et tw=72 :
 
 yum clean all
-# Add the ODL yum repo (not needed for java nodes, but useful for
-# potential later layers)
-yum install -q -y https://nexus.opendaylight.org/content/repositories/opendaylight-yum-epel-6-x86_64/rpm/opendaylight-release/0.1.0-1.el6.noarch/opendaylight-release-0.1.0-1.el6.noarch.rpm
 
 # Make sure the system is fully up to date
 yum update -q -y
 
-# Add in git (needed for most everything) and XML-XPath as it is useful
-# for doing CLI based CML parsing of POM files
-yum install -q -y git perl-XML-XPath
 
-# install all available openjdk-devel sets
-yum install -q -y 'java-*-openjdk-devel'
-
-# we currently use Java7 (aka java-1.7.0-openjdk) as our standard make
-# sure that this is the java that alternatives is pointing to, dynamic
-# spin-up scripts can switch to any of the current JREs installed if
-# needed
-alternatives --set java /usr/lib/jvm/jre-1.7.0-openjdk.x86_64/bin/java
-alternatives --set java_sdk_openjdk /usr/lib/jvm/java-1.7.0-openjdk.x86_64
-
-# To handle the prompt style that is expected all over the environment
-# with how use use robotframework we need to make sure that it is
-# consistent for any of the users that are created during dynamic spin
-# ups
-echo 'PS1="[\u@\h \W]> "' >> /etc/skel/.bashrc
diff --git a/vagrant/basic-mininet-fedora-node/README.md b/vagrant/basic-mininet-fedora-node/README.md
new file mode 100644 (file)
index 0000000..16a6fe2
--- /dev/null
@@ -0,0 +1,23 @@
+basic-mininet-fedora-node can be used to take an already converted
+Rackspace native base image to a basic system with mininet and other
+test tools for use in the OpenDaylight build and testing environment
+
+Please see the rackspace-convert-base vagrant setup for creation of the
+needed base image.
+
+This vagrant expects (by default) a personal Rackspace image named
+
+'Fedora 21 - Vagrant ready'
+
+To spin up and utilize.
+
+$ RSIMAGE='${baseimagename}' vagrant up --provider=rackspace
+
+Will execute this vagrant against a differently named base image
+
+$ RSRESEAL=true vagrant up --provider=rackspace
+
+NOTE: resealing will cause the vagrant to run the resealing operation.
+This operation will intentionally destroy current SSH pubkeys installed
+on the system as well as reset log files and network configurations. You
+have been warned.
diff --git a/vagrant/basic-mininet-fedora-node/Vagrantfile b/vagrant/basic-mininet-fedora-node/Vagrantfile
new file mode 100644 (file)
index 0000000..f9476a8
--- /dev/null
@@ -0,0 +1,62 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby sw=2 ts=2 sts=2 et :
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  # root off of the rackspace provider dummy box
+  config.vm.box = "dummy"
+
+  # rackspace systems, even with cloud-init
+  # don't seem to have the cloud int user ${osname} (or similar)
+  # getting the ssh key for some reason, root does for sure
+  # so use that
+  config.ssh.username = 'root'
+
+  # Fedora and EL systems default to requiring tty for sudo
+  # This should have been disabled with the Vagrant ready
+  # base box conversion (see rackspace-convert-base vagrant)
+  # but just to be safe
+  config.ssh.pty = true
+
+  # make sure to set the following in your
+  # ~/.vagrant.d/boxes/dummy/0/rackspace/Vagrantfile
+  # rs.username
+  # rs.api_key
+  # rs.rackspace_region
+  #
+  # If you are not using an SSH token / smartcard also set this
+  # rs.key_name
+  # config.ssh.private_key_path -- set this outside the rackspace block
+  #         in your base box
+  config.vm.provider :rackspace do |rs|
+    # create these base builds always on the smallest system possible
+    rs.flavor = 'general1-1'
+
+    # allow for switching to ORD cloud but default to DFW
+    if (ENV['RSREGION'] == 'ord')
+      rs.rackspace_region = :ord
+    else
+      rs.rackspace_region = :dfw
+    end
+
+    # Default the Fedora 21 - Vagrant ready image unless overriden by a RSIMAGE
+    # environment variable
+    if ENV['RSIMAGE']
+      rs.image = ENV['RSIMAGE']
+    else
+      rs.image = 'Fedora 21 - Vagrant ready'
+    end
+  end
+
+  # run our bootstrapping for the ovsdb-devstack system
+  config.vm.provision 'shell', path: 'bootstrap.sh'
+
+  # set RSRESEAL to... anything if you want to snap an image of this box
+  # not setting the environment variable will cause the system to come
+  # up fully and not be in a resealable state
+  if ENV['RSRESEAL']
+    config.vm.provision 'shell', path: 'system_reseal.sh'
+  end
+end
diff --git a/vagrant/basic-mininet-fedora-node/bootstrap.sh b/vagrant/basic-mininet-fedora-node/bootstrap.sh
new file mode 100644 (file)
index 0000000..7da8761
--- /dev/null
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# vim: sw=4 ts=4 sts=4 et tw=72 :
+
+# update os
+yum clean all
+yum update -q -y
+
+# install openvswitch
+yum install -q -y openvswitch
+# make sure it's enabled on system start, no need to start it
+# during setup
+systemctl enable openvswitch
+
+# install mininet
+git clone git://github.com/mininet/mininet
+cd mininet
+git checkout -b 2.2.1 2.2.1
+cd ..
+mininet/util/install.sh -nf
+
diff --git a/vagrant/basic-mininet-fedora-node/system_reseal.sh b/vagrant/basic-mininet-fedora-node/system_reseal.sh
new file mode 100644 (file)
index 0000000..ba54ce2
--- /dev/null
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# clean-up from any prior cloud-init networking
+rm -rf /etc/sysconfig/network-scripts/{ifcfg,route}-eth*
+
+rm -rf /etc/Pegasus/*.cnf /etc/Pegasus/*.crt /etc/Pegasus/*.csr /etc/Pegasus/*.pem /etc/Pegasus/*.srl /root/anaconda-ks.cfg /root/anaconda-post.log /root/initial-setup-ks.cfg /root/install.log /root/install.log.syslog /var/cache/fontconfig/* /var/cache/gdm/* /var/cache/man/* /var/lib/AccountService/users/* /var/lib/fprint/* /var/lib/logrotate.status /var/log/*.log* /var/log/BackupPC/LOG /var/log/ConsoleKit/* /var/log/anaconda.syslog /var/log/anaconda/* /var/log/apache2/*_log /var/log/apache2/*_log-* /var/log/apt/* /var/log/aptitude* /var/log/audit/* /var/log/btmp* /var/log/ceph/*.log /var/log/chrony/*.log /var/log/cron* /var/log/cups/*_log /var/log/debug* /var/log/dmesg* /var/log/exim4/* /var/log/faillog* /var/log/gdm/* /var/log/glusterfs/*glusterd.vol.log /var/log/glusterfs/glusterfs.log /var/log/httpd/*log /var/log/installer/* /var/log/jetty/jetty-console.log /var/log/journal/* /var/log/lastlog* /var/log/libvirt/libvirtd.log /var/log/libvirt/lxc/*.log /var/log/libvirt/qemu/*.log /var/log/libvirt/uml/*.log /var/log/lightdm/* /var/log/mail/* /var/log/maillog* /var/log/messages* /var/log/ntp /var/log/ntpstats/* /var/log/ppp/connect-errors /var/log/rhsm/* /var/log/sa/* /var/log/secure* /var/log/setroubleshoot/*.log /var/log/spooler* /var/log/squid/*.log /var/log/syslog* /var/log/tallylog* /var/log/tuned/tuned.log /var/log/wtmp* /var/named/data/named.run
+
+rm -rf ~/.viminfo /etc/ssh/ssh*key*
+
+echo "********************************************"
+echo "*   PLEASE SNAPSHOT IMAGE AT THIS TIME     *"
+echo "********************************************"
index ad4983059ec337b78b997f93ee00340c9cf4f534..6842655e3e4eaaeb0c6c41b1159855cc61b6d651 100644 (file)
@@ -9,7 +9,10 @@ yum install -y -q unzip xz
 # install some needed internal networking configurations
 yum install -y dnsmasq puppet
 
-puppet module install lex-dnsmasq
+# install specific versions of puppet modules
+puppet module install puppetlabs-stdlib -v 4.5.1
+puppet module install puppetlabs-concat -v 1.2.0
+puppet module install lex-dnsmasq -v 2.6.1
 
 # script requires information about subdomain
 if [ -z "$1" ]; then
@@ -34,30 +37,6 @@ chattr +i /etc/resolv.conf
 # don't let cloud-init do funny things to our routing
 chattr +i /etc/sysconfig/network-scripts/route-eth0
 
-# create a docker bridge that doesn't trample our networks
-# but only if docker is installed
-DOCKER=`rpm -q docker-io`
-if [ "$?" == "0" ]; then
-    echo "---> Docker installed, configuring docker bridge"
-    # fully overwrite the default, otherwise we end up with the options
-    # split over two lines which will fail
-    # Default: OPTIONS=--selinux-enabled
-    echo 'OPTIONS=--selinux-enabled --bip=10.250.0.254/24' > /etc/sysconfig/docker
-#    cat <<EOL > /etc/sysconfig/network-scripts/ifcfg-docker0
-#DEVICE="docker0"
-#TYPE="Bridge"
-#ONBOOT="yes"
-#NM_CONTROLLED="no"
-#IPADDR=10.250.0.254
-#NETMASK=255.255.255.0
-#EOL
-
-#    # don't let cloud-init do funny things to our docker bridge
-#    chattr +i /etc/sysconfig/network-scripts/ifcfg-docker0
-    cat /etc/sysconfig/docker
-fi
-
-
 # setup the needed routing
 cat <<EOL >> /etc/rc.d/post-cloud-init
 #!/bin/bash
index 8079d7bc85e06b390b37b72ea60026b7fdbae762..15d47f68cd8bb3005c84358b545ff56bfba54835 100644 (file)
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# vim: ts=4 sw=4 sts=4 et :
+# vim: ts=4 sw=4 sts=4 et tw=72 :
 
 # Handle the occurance where SELINUX is actually disabled
 if [ `grep SELINUX=permissive /etc/selinux/config` ]; then
@@ -26,3 +26,36 @@ fi
 
 yum clean all -q
 yum update -y -q
+
+# add in components we need or want on systems
+yum install -y -q @base unzip xz puppet git perl-XML-XPath
+
+# All of our systems require Java (because of Jenkins)
+# Install all versions of the OpenJDK devel but force 1.7.0 to be the
+# default
+
+yum install -y -q 'java-*-openjdk-devel'
+alternatives --set java /usr/lib/jvm/jre-1.7.0-openjdk.x86_64/bin/java
+alternatives --set java_sdk_openjdk /usr/lib/jvm/java-1.7.0-openjdk.x86_64
+
+# To handle the prompt style that is expected all over the environment
+# with how use use robotframework we need to make sure that it is
+# consistent for any of the users that are created during dynamic spin
+# ups
+echo 'PS1="[\u@\h \W]> "' >> /etc/skel/.bashrc
+
+# Do any Distro specific installations here
+echo "Checking distribution"
+if [ `/usr/bin/facter operatingsystem` = "Fedora" ]; then
+    echo "---> Fedora found"
+    echo "No extra steps for Fedora"
+else
+    if [ `/usr/bin/facter operatingsystemrelease | /bin/cut -d '.' -f1` = "7" ]; then
+        echo "---> CentOS 7"
+        echo "No extra steps currently for CentOS 7"
+    else
+        echo "---> CentOS 6"
+        echo "Installing ODL YUM repo"
+        yum install -q -y https://nexus.opendaylight.org/content/repositories/opendaylight-yum-epel-6-x86_64/rpm/opendaylight-release/0.1.0-1.el6.noarch/opendaylight-release-0.1.0-1.el6.noarch.rpm
+    fi
+fi