Update OpFlex dependencies

* Switch to upstream OVS 2.6.0
* Update rapidjson and libuv dependencies

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

diff --git a/jjb/opflex/include-raw-openvswitch_tgz-build.sh b/jjb/opflex/include-raw-openvswitch_tgz-build.sh
index a0d2e1094ec7969095e4fcfc07c0330d6a068c67..ba8d7af5e30ecc0dfac59ce7c9b3e86baffc1233 100644 (file)
--- a/jjb/opflex/include-raw-openvswitch_tgz-build.sh
+++ b/jjb/opflex/include-raw-openvswitch_tgz-build.sh
@@ -11,9 +11,8 @@ mkdir -p "$DESTDIR"
 
 ./boot.sh
 ./configure --prefix="$ROOT" --enable-shared
-make -j8
+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 *

diff --git a/jjb/opflex/include-raw-opflex-dep_rpm-build.sh b/jjb/opflex/include-raw-opflex-dep_rpm-build.sh
deleted file mode 100644 (file)
index 63aa052..0000000
--- a/jjb/opflex/include-raw-opflex-dep_rpm-build.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -e
-set -x
-
-LIBUV_VERSION=1.5.0
-wget https://github.com/libuv/libuv/archive/v$LIBUV_VERSION.tar.gz
-mock --define="buildversion $BUILD_NUMBER" -r $MOCK_TARGET --resultdir target/srpm --buildsrpm --spec libuv.spec --sources v$LIBUV_VERSION.tar.gz
-
-RAPIDJSON_VERSION=1.0.2
-wget https://github.com/miloyip/rapidjson/archive/v$RAPIDJSON_VERSION.tar.gz
-mock --define="buildversion $BUILD_NUMBER" -r $TARGET --resultdir target/srpm --buildsrpm --spec rapidjson-devel.spec --sources v$RAPIDJSON_VERSION.tar.gz
-
-mockchain -m --define="buildversion $BUILD_NUMBER" -r $MOCK_TARGET -l target/rpm target/srpm/*.src.rpm
-find target/rpm/results -name "*.rpm" -exec mv {} . \;

diff --git a/jjb/opflex/include-raw-ovs_rpm-build.sh b/jjb/opflex/include-raw-ovs_rpm-build.sh
deleted file mode 100644 (file)
index 9dbe487..0000000
--- a/jjb/opflex/include-raw-ovs_rpm-build.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-# Build OVS RPMs
-
-set -e
-set -x
-
-TARGET=epel-7-x86_64
-BASEKERNEL=3.10.0-229.14.1.el7.x86_64
-BVDEFINE=--define="buildversion $BUILD_NUMBER"
-KMDEFINE=--define="kversion $BASEKERNEL"
-
-./boot.sh
-./configure
-make dist
-
-SOURCE_FILE=$(ls *.tar.gz)
-
-mock -r $TARGET --resultdir target/srpm --buildsrpm --spec rhel/openvswitch-gbp-rhel.spec --sources $SOURCE_FILE "$BVDEFINE" "$KMDEFINE"
-mock -r $TARGET --resultdir target/srpm --buildsrpm --spec rhel/openvswitch-gbp-kmod-rhel.spec --sources $SOURCE_FILE "$BVDEFINE" "$KMDEFINE"
-mockchain -r $TARGET -l target/rpm -m --nocheck -m "$BVDEFINE" -m "$KMDEFINE" target/srpm/*.src.rpm
-
-find target/rpm/results -name "*.rpm" -exec mv {} . \;

diff --git a/jjb/opflex/include-raw-rapidjson_tgz-build.sh b/jjb/opflex/include-raw-rapidjson_tgz-build.sh
index e173dc8d12828aa392a3ce0265e201541a5838e7..47b1fa0b374aabf5cb0290c1283d34c24344a9f8 100644 (file)
--- a/jjb/opflex/include-raw-rapidjson_tgz-build.sh
+++ b/jjb/opflex/include-raw-rapidjson_tgz-build.sh
@@ -13,7 +13,7 @@ mkdir -p "$DESTDIR/$ROOT/include"
 cp -R include/rapidjson "$DESTDIR/$ROOT/include"
 sed -e "s|@INCLUDE_INSTALL_DIR@|$ROOT/include|" \
     -e "s|@PROJECT_NAME@|RapidJSON|" \
-    -e "s|@LIB_VERSION_STRING@|1.0.1|" RapidJSON.pc.in > \
+    -e "s|@LIB_VERSION_STRING@|1.0.2|" RapidJSON.pc.in > \
     "$DESTDIR/$ROOT/lib/pkgconfig/RapidJSON.pc"
 
 pushd $DESTDIR

diff --git a/jjb/opflex/opflex-dependencies-rpm.yaml b/jjb/opflex/opflex-dependencies-rpm.yaml
deleted file mode 100644 (file)
index 866e46c..0000000
--- a/jjb/opflex/opflex-dependencies-rpm.yaml
+++ /dev/null
@@ -1,103 +0,0 @@
-- project:
-    name: opflex-dependencies-rpm
-    jobs:
-        - 'opflex-dep_rpm-{stream}'
-        - 'opflex-openvswitch_rpm-{stream}'
-
-    stream:
-        - carbon:
-            branch: 'master'
-            jdk: openjdk7
-        - boron:
-            branch: 'stable/boron'
-            jdk: openjdk7
-        - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-
-    project: 'opflex'
-
-- parameter:
-    name: mock-target-parameter
-    parameters:
-        - string:
-            name: MOCK_TARGET
-            default: 'epel-7-x86_64'
-            description: "Target architecture for mock RPM builds"
-
-- scm:
-    name: 'git-opflex-3rdparty'
-    scm:
-        - git:
-            url: https://github.com/noironetworks/3rdparty-rpm.git
-            branches:
-                - 'origin/master'
-            wipe-workspace: true
-
-- job-template:
-    name: 'opflex-dep_rpm-{stream}'
-
-    project-type: freestyle
-    node: centos7-java-builder-2c-8g
-    concurrent: true
-
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    scm:
-        - git-opflex-3rdparty
-
-    wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    parameters:
-        - mock-target-parameter
-
-    builders:
-        - shell:
-            !include-raw-escape:
-                - include-raw-opflex-dep_rpm-build.sh
-
-    publishers:
-        - email-notification:
-            email-prefix: '[opflex]'
-        - archive:
-            artifacts: '*.rpm'
-
-- job-template:
-    name: 'opflex-openvswitch_rpm-{stream}'
-
-    project-type: freestyle
-    node: centos7-java-builder-2c-8g
-    concurrent: true
-
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    scm:
-        - git-opflex-ovs
-
-    wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    parameters:
-        - mock-target-parameter
-
-    builders:
-        - shell:
-            !include-raw-escape:
-                - include-raw-ovs_rpm-build.sh
-
-    publishers:
-        - email-notification:
-            email-prefix: '[opflex]'
-        - archive:
-            artifacts: '*.rpm'

diff --git a/jjb/opflex/opflex-dependencies.yaml b/jjb/opflex/opflex-dependencies.yaml
index 41795f9a7db933cbe854380ee8170463fb20e6a1..5fb9da7e76ede2aae19237669c5989a1615e1793 100644 (file)
--- a/jjb/opflex/opflex-dependencies.yaml
+++ b/jjb/opflex/opflex-dependencies.yaml
@@ -24,7 +24,7 @@
         - git:
             url: https://github.com/libuv/libuv.git
             branches:
-                - 'refs/tags/v1.7.5'
+                - 'refs/tags/v1.8.0'
             wipe-workspace: true
 
 - scm:
@@ -33,16 +33,16 @@
         - git:
             url: https://github.com/miloyip/rapidjson.git
             branches:
-                - 'refs/tags/v1.0.1'
+                - 'refs/tags/v1.0.2'
             wipe-workspace: true
 
 - scm:
-    name: 'git-opflex-ovs'
+    name: 'git-ovs'
     scm:
         - git:
-            url: https://github.com/noironetworks/ovs.git
+            url: https://github.com/openvswitch/ovs.git
             branches:
-                - 'origin/noiro'
+                - 'refs/tags/v2.6.0'
             wipe-workspace: true
 
 - job-template:
@@ -121,7 +121,7 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     scm:
-        - git-opflex-ovs
+        - git-ovs
 
     wrappers:
         - opendaylight-infra-wrappers: