Restore older OpFlex build streams and further fixes to carbon build

* Set up templating variables to allow changing dependencies only for
  new release streams without disrupting old ones.
* OVS library header fixup for carbon build

Change-Id: Iae3fdffcd1cfda68419e4e4a9cc3129505ee2ee8
Signed-off-by: Rob Adams <readams@readams.net>

diff --git a/jjb/opflex/include-raw-libuv_tgz-build.sh b/jjb/opflex/deps-inc-v1/include-raw-libuv_tgz-build.sh
similarity index 100%
rename from jjb/opflex/include-raw-libuv_tgz-build.sh
rename to jjb/opflex/deps-inc-v1/include-raw-libuv_tgz-build.sh

diff --git a/jjb/opflex/include-raw-openvswitch_tgz-build.sh b/jjb/opflex/deps-inc-v1/include-raw-openvswitch_tgz-build.sh
similarity index 72%
rename from jjb/opflex/include-raw-openvswitch_tgz-build.sh
rename to jjb/opflex/deps-inc-v1/include-raw-openvswitch_tgz-build.sh
index ba8d7af5e30ecc0dfac59ce7c9b3e86baffc1233..d939f6eaa809bd8275cc8c2a7610fa9d0ea06370 100644 (file)
--- a/jjb/opflex/include-raw-openvswitch_tgz-build.sh
+++ b/jjb/opflex/deps-inc-v1/include-raw-openvswitch_tgz-build.sh
@@ -13,6 +13,8 @@ mkdir -p "$DESTDIR"
 ./configure --prefix="$ROOT" --enable-shared
 make -j4
 DESTDIR=`pwd`/$DESTDIR make install
+find lib ofproto -name "*.h" -exec cp --parents -t "$DESTDIR/$ROOT/include/openvswitch/" {} \;
 
 pushd $DESTDIR
 tar -czf openvswitch.tgz *
+popd

diff --git a/jjb/opflex/include-raw-rapidjson_tgz-build.sh b/jjb/opflex/deps-inc-v1/include-raw-rapidjson_tgz-build.sh
similarity index 100%
rename from jjb/opflex/include-raw-rapidjson_tgz-build.sh
rename to jjb/opflex/deps-inc-v1/include-raw-rapidjson_tgz-build.sh

diff --git a/jjb/opflex/deps-inc-v2/include-raw-openvswitch_tgz-build.sh b/jjb/opflex/deps-inc-v2/include-raw-openvswitch_tgz-build.sh
new file mode 100644 (file)
index 0000000..182fec2
--- /dev/null
+++ b/jjb/opflex/deps-inc-v2/include-raw-openvswitch_tgz-build.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+# Build script for openvswitch
+
+set -e
+set -x
+
+ROOT=/tmp/opflex-prefix
+DESTDIR=install-root
+
+mkdir -p "$DESTDIR"
+
+./boot.sh
+./configure --prefix="$ROOT" --enable-shared
+make -j4
+DESTDIR=`pwd`/$DESTDIR make install
+
+# OVS headers get installed to weird and inconsistent locations.  Try
+# to clean things up
+mkdir -p $DESTDIR/$ROOT/include/openvswitch/openvswitch
+mv $DESTDIR/$ROOT/include/openvswitch/*.h $DESTDIR/$ROOT/include/openvswitch/openvswitch
+mv $DESTDIR/$ROOT/include/openflow $DESTDIR/$ROOT/include/openvswitch
+cp -t "$DESTDIR/$ROOT/include/openvswitch/" include/*.h
+find lib -name "*.h" -exec cp --parents -t "$DESTDIR/$ROOT/include/openvswitch/" {} \;
+
+pushd $DESTDIR
+tar -czf openvswitch.tgz *
+popd
+

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index f9c5f6367138857b84cdc27a11badf537e77e121..9f3d699a5c8a97232f4b992d579cae46c745f2f7 100644 (file)
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -11,13 +11,13 @@
     stream:
         - carbon:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
         - boron:
             branch: 'stable/boron'
-            jdk: openjdk7
+            jdk: openjdk8
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: openjdk7
+            jdk: openjdk8
 
     project: 'opflex'
     archive-artifacts: '**/*.tar.gz'

diff --git a/jjb/opflex/opflex-dependencies.yaml b/jjb/opflex/opflex-dependencies.yaml
index 5fb9da7e76ede2aae19237669c5989a1615e1793..6f68a9434528fae392031f7202fc0922d21dc203 100644 (file)
--- a/jjb/opflex/opflex-dependencies.yaml
+++ b/jjb/opflex/opflex-dependencies.yaml
@@ -8,18 +8,42 @@
     stream:
         - carbon:
             branch: 'master'
-            jdk: openjdk7
+            libuv-build: v1
+            libuv-scm: v2
+            rapidjson-build: v1
+            rapidjson-scm: v2
+            openvswitch-build: v2
+            openvswitch-scm: v2
         - boron:
             branch: 'stable/boron'
-            jdk: openjdk7
+            libuv-build: v1
+            libuv-scm: v1
+            rapidjson-build: v1
+            rapidjson-scm: v1
+            openvswitch-build: v1
+            openvswitch-scm: v1
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: openjdk7
+            libuv-build: v1
+            libuv-scm: v1
+            rapidjson-build: v1
+            rapidjson-scm: v1
+            openvswitch-build: v1
+            openvswitch-scm: v1
 
     project: 'opflex'
 
 - scm:
-    name: 'git-opflex-libuv'
+    name: 'git-opflex-libuv-v1'
+    scm:
+        - git:
+            url: https://github.com/libuv/libuv.git
+            branches:
+                - 'refs/tags/v1.7.5'
+            wipe-workspace: true
+
+- scm:
+    name: 'git-opflex-libuv-v2'
     scm:
         - git:
             url: https://github.com/libuv/libuv.git
@@ -28,7 +52,16 @@
             wipe-workspace: true
 
 - scm:
-    name: 'git-opflex-rapidjson'
+    name: 'git-opflex-rapidjson-v1'
+    scm:
+        - git:
+            url: https://github.com/miloyip/rapidjson.git
+            branches:
+                - 'refs/tags/v1.0.1'
+            wipe-workspace: true
+
+- scm:
+    name: 'git-opflex-rapidjson-v2'
     scm:
         - git:
             url: https://github.com/miloyip/rapidjson.git
@@ -37,7 +70,16 @@
             wipe-workspace: true
 
 - scm:
-    name: 'git-ovs'
+    name: 'git-opflex-ovs-v1'
+    scm:
+        - git:
+            url: https://github.com/noironetworks/ovs.git
+            branches:
+                - 'origin/noiro'
+            wipe-workspace: true
+
+- scm:
+    name: 'git-opflex-ovs-v2'
     scm:
         - git:
             url: https://github.com/openvswitch/ovs.git
@@ -45,6 +87,13 @@
                 - 'refs/tags/v2.6.0'
             wipe-workspace: true
 
+- builder:
+    name: 'builder-opflex-libuv-v1'
+    builders:
+        - shell:
+            !include-raw-escape:
+                - deps-inc-v1/include-raw-libuv_tgz-build.sh
+
 - job-template:
     name: 'opflex-libuv_tgz-{stream}'
 
@@ -59,16 +108,14 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     scm:
-        - git-opflex-libuv
+        - git-opflex-libuv-{libuv-scm}
 
     wrappers:
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
 
     builders:
-        - shell:
-            !include-raw-escape:
-                - include-raw-libuv_tgz-build.sh
+        - builder-opflex-libuv-{libuv-build}
 
     publishers:
         - email-notification:
@@ -76,6 +123,13 @@
         - archive:
             artifacts: 'install-root/*.tgz'
 
+- builder:
+    name: 'builder-opflex-rapidjson-v1'
+    builders:
+        - shell:
+            !include-raw-escape:
+                - deps-inc-v1/include-raw-rapidjson_tgz-build.sh
+
 - job-template:
     name: 'opflex-rapidjson_tgz-{stream}'
 
@@ -90,16 +144,14 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     scm:
-        - git-opflex-rapidjson
+        - git-opflex-rapidjson-{rapidjson-scm}
 
     wrappers:
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
 
     builders:
-        - shell:
-            !include-raw-escape:
-                - include-raw-rapidjson_tgz-build.sh
+        - builder-opflex-rapidjson-{rapidjson-build}
 
     publishers:
         - email-notification:
@@ -107,6 +159,20 @@
         - archive:
             artifacts: 'install-root/*.tgz'
 
+- builder:
+    name: 'builder-opflex-openvswitch-v1'
+    builders:
+        - shell:
+            !include-raw:
+                - deps-inc-v1/include-raw-openvswitch_tgz-build.sh
+
+- builder:
+    name: 'builder-opflex-openvswitch-v2'
+    builders:
+        - shell:
+            !include-raw:
+                - deps-inc-v2/include-raw-openvswitch_tgz-build.sh
+
 - job-template:
     name: 'opflex-openvswitch_tgz-{stream}'
 
@@ -121,16 +187,14 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     scm:
-        - git-ovs
+        - git-opflex-ovs-{openvswitch-scm}
 
     wrappers:
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
 
     builders:
-        - shell:
-            !include-raw-escape:
-                - include-raw-openvswitch_tgz-build.sh
+        - builder-opflex-openvswitch-{openvswitch-build}
 
     publishers:
         - email-notification: