Merge "Updating list of csit jobs to verify distribution"

diff --git a/jenkins-scripts/builder.sh b/jenkins-scripts/builder.sh
index e2f5f13535cdc5bf6dae49d76ff39873d2a6f59e..038e81d83588d087927e8bfec0fd24b52d3d5c68 100755 (executable)
--- a/jenkins-scripts/builder.sh
+++ b/jenkins-scripts/builder.sh
@@ -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://download.mono-project.com/repo/centos6
+#Install the nuget binary
+yum install -q -y http://download.mono-project.com/repo/centos/RPMS/noarch/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/jjb/iotdm/iotdm-csit-basic-master.yaml b/jjb/iotdm/iotdm-csit-basic-master.yaml
new file mode 100644 (file)
index 0000000..a38788d
--- /dev/null
+++ b/jjb/iotdm/iotdm-csit-basic-master.yaml
@@ -0,0 +1,31 @@
+- project:
+    name: iotdm-csit-basic-master
+    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'
+
+    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}'
\ No newline at end of file

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

diff --git a/jjb/openflowplugin/openflowplugin.cfg b/jjb/openflowplugin/openflowplugin.cfg
index 4c257825ba38f4753331833f1a0a69169ebc2ad1..bc075d8270b2225cd760ab421d779b8a9d132edd 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.cfg
+++ b/jjb/openflowplugin/openflowplugin.cfg
@@ -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

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 275033cc2f4838cc172ee09d13326cb7934cdc84..2bd0fe166a578f07a513c1782e0d777143b73b69 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -28,6 +28,12 @@
             jdk: openjdk7
             jdks:
                 - openjdk7
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
 
     project: 'openflowplugin'
 

diff --git a/jjb/vtn/vtn.cfg b/jjb/vtn/vtn.cfg
index 0553a31e89619a4f400c6202c2662a8579ead54b..8a0d6cffce96de4cd5442510d634f8b344e17d68 100644 (file)
--- a/jjb/vtn/vtn.cfg
+++ b/jjb/vtn/vtn.cfg
@@ -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/**

diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml
index 3333b2956e189508a3742f2adb0441d2b42b4ece..7ce129b52206e26ed5d1c8325df2615f5c3ab6fc 100644 (file)
--- a/jjb/vtn/vtn.yaml
+++ b/jjb/vtn/vtn.yaml
@@ -27,6 +27,11 @@
             jdk: openjdk7
             jdks:
                 - openjdk7
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'vtn'