Reverse build trigger for cicn packages

Change-Id: I101d8b93308426fd9fe738cc98b8830b3419f98c
Signed-off-by: Mauro Sardara <msardara+fdio@cisco.com>

diff --git a/jjb/cicn/build-package.sh b/jjb/cicn/build-package.sh
index d2d944b..289e9d8 100644 (file)
--- a/jjb/cicn/build-package.sh
+++ b/jjb/cicn/build-package.sh
@@ -66,8 +66,19 @@ build_package() {
 
     # Figure out what system we are running on
     if [ -f /etc/lsb-release ];then
+
+        BUILD_TOOLS="build-essential cmake"
+        LIBSSL_LIBEVENT="libevent-dev libssl-dev"
+        LONGBOW_DEPS=""
+        LIBPARC_DEPS="longbow $LIBSSL_LIBEVENT"
+        LIBCCNX_COMMON_DEPS="$LIBPARC_DEPS libparc"
+        LIBCCNX_TRANSPORT_RTA_DEPS="$LIBCCNX_COMMON_DEPS libccnx-common"
+        LIBCCNX_PORTAL_DEPS="$LIBCCNX_TRANSPORT_RTA_DEPS libccnx-transport-rta"
+        LIBICNET_DEPS="$LIBCCNX_PORTAL_DEPS libboost-system-dev"
+        METIS_DEPS="$LIBCCNX_TRANSPORT_RTA_DEPS libccnx-transport-rta"
+        HTTP_SERVER_DEPS="$LIBICNET_DEPS libicnet libboost-regex-dev libboost-filesystem-dev"
+
         . /etc/lsb-release
-        source ./ubuntu-dependencies
         DEB=ON
         RPM=OFF
 
@@ -76,7 +87,19 @@ build_package() {
         fi
 
     elif [ -f /etc/redhat-release ];then
-        source ./centos-dependencies
+
+        BUILD_TOOLS_GROUP="'Development Tools'"
+        BUILD_TOOLS_SINGLE="cmake"
+        LIBSSL_LIBEVENT="libevent-devel openssl-devel"
+        LONGBOW_DEPS=""
+        LIBPARC_DEPS="longbow $LIBSSL_LIBEVENT"
+        LIBCCNX_COMMON_DEPS="$LIBPARC_DEPS libparc"
+        LIBCCNX_TRANSPORT_RTA_DEPS="$LIBCCNX_COMMON_DEPS libccnx-common"
+        LIBCCNX_PORTAL_DEPS="$LIBCCNX_TRANSPORT_RTA_DEPS libccnx-transport-rta"
+        LIBICNET_DEPS="$LIBCCNX_PORTAL_DEPS boost-devel"
+        METIS_DEPS="$LIBCCNX_TRANSPORT_RTA_DEPS libccnx-transport-rta"
+        HTTP_SERVER_DEPS="$LIBICNET_DEPS libicnet boost-devel"
+
         sudo yum install -y redhat-lsb
         DISTRIB_ID=`lsb_release -si`
         DISTRIB_RELEASE=`lsb_release -sr`

diff --git a/jjb/cicn/centos-dependencies b/jjb/cicn/centos-dependencies
deleted file mode 100644 (file)
index 7c2a41e..0000000
--- a/jjb/cicn/centos-dependencies
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-IFS=$'\n\t'
-
-BUILD_TOOLS_GROUP="'Development Tools'"
-BUILD_TOOLS_SINGLE="cmake"
-LIBSSL_LIBEVENT="libevent-devel openssl-devel"
-LONGBOW_DEPS=""
-LIBPARC_DEPS="longbow $LIBSSL_LIBEVENT"
-LIBCCNX_COMMON_DEPS="$LIBPARC_DEPS libparc"
-LIBCCNX_TRANSPORT_RTA_DEPS="$LIBCCNX_COMMON_DEPS libccnx-common"
-LIBCCNX_PORTAL_DEPS="$LIBCCNX_TRANSPORT_RTA_DEPS libccnx-transport-rta"
-LIBICNET_DEPS="$LIBCCNX_PORTAL_DEPS boost-devel"
-METIS_DEPS="$LIBCCNX_TRANSPORT_RTA_DEPS libccnx-transport-rta"
-HTTP_SERVER_DEPS="$LIBICNET_DEPS libicnet boost-devel"
\ No newline at end of file

diff --git a/jjb/cicn/cicn.yaml b/jjb/cicn/cicn.yaml
index 2d355a0..99b5f43 100644 (file)
--- a/jjb/cicn/cicn.yaml
+++ b/jjb/cicn/cicn.yaml
@@ -209,6 +209,7 @@
             global-settings-type: cfp
         - shell:
             !include-raw-escape:
+                - build-package.sh
                 - include-raw-cicn-longbow-build.sh
         - provide-maven-settings:
             settings-file: 'cicn-longbow-settings'
@@ -267,6 +268,9 @@
         - gerrit-trigger-patch-merged:
             name: '{project}'
             branch: '{branch}'
+        - reverse:
+            jobs: 'cicn-longbow-merge-{stream}-{os}'
+            result: 'failure'
 
     builders:
         - maven-target:
@@ -278,6 +282,7 @@
             global-settings-type: cfp
         - shell:
             !include-raw-escape:
+                - build-package.sh
                 - include-raw-cicn-libparc-build.sh
         - provide-maven-settings:
             settings-file: 'cicn-libparc-settings'
@@ -336,6 +341,9 @@
         - gerrit-trigger-patch-merged:
             name: '{project}'
             branch: '{branch}'
+        - reverse:
+            jobs: 'cicn-longbow-merge-{stream}-{os}, cicn-libparc-merge-{stream}-{os}'
+            result: 'failure'
 
     builders:
         - maven-target:
@@ -347,6 +355,7 @@
             global-settings-type: cfp
         - shell:
             !include-raw-escape:
+                - build-package.sh
                 - include-raw-cicn-libccnx-common-build.sh
         - provide-maven-settings:
             settings-file: 'cicn-libccnx-common-settings'
@@ -405,6 +414,9 @@
         - gerrit-trigger-patch-merged:
             name: '{project}'
             branch: '{branch}'
+        - reverse:
+            jobs: 'cicn-longbow-merge-{stream}-{os}, cicn-libparc-merge-{stream}-{os}, cicn-libccnx-common-merge-{stream}-{os}'
+            result: 'failure'
 
     builders:
         - maven-target:
@@ -416,6 +428,7 @@
             global-settings-type: cfp
         - shell:
             !include-raw-escape:
+                - build-package.sh
                 - include-raw-cicn-libccnx-transport-rta-build.sh
         - provide-maven-settings:
             settings-file: 'cicn-libccnx-transport-rta-settings'
@@ -474,6 +487,9 @@
         - gerrit-trigger-patch-merged:
             name: '{project}'
             branch: '{branch}'
+        - reverse:
+            jobs: 'cicn-longbow-merge-{stream}-{os}, cicn-libparc-merge-{stream}-{os}, cicn-libccnx-common-merge-{stream}-{os}, cicn-libccnx-transport-rta-merge-{stream}-{os}'
+            result: 'failure'
 
     builders:
         - maven-target:
@@ -485,6 +501,7 @@
             global-settings-type: cfp
         - shell:
             !include-raw-escape:
+                - build-package.sh
                 - include-raw-cicn-libccnx-portal-build.sh
         - provide-maven-settings:
             settings-file: 'cicn-libccnx-portal-settings'
@@ -543,6 +560,9 @@
         - gerrit-trigger-patch-merged:
             name: '{project}'
             branch: '{branch}'
+        - reverse:
+            jobs: 'cicn-longbow-merge-{stream}-{os}, cicn-libparc-merge-{stream}-{os}, cicn-libccnx-common-merge-{stream}-{os}, cicn-libccnx-transport-rta-merge-{stream}-{os}, cicn-libccnx-portal-merge-{stream}-{os}'
+            result: 'failure'
 
     builders:
         - maven-target:
@@ -554,6 +574,7 @@
             global-settings-type: cfp
         - shell:
             !include-raw-escape:
+                - build-package.sh
                 - include-raw-cicn-libicnet-build.sh
         - provide-maven-settings:
             settings-file: 'cicn-libicnet-settings'
@@ -612,6 +633,9 @@
         - gerrit-trigger-patch-merged:
             name: '{project}'
             branch: '{branch}'
+        - reverse:
+            jobs: 'cicn-longbow-merge-{stream}-{os}, cicn-libparc-merge-{stream}-{os}, cicn-libccnx-common-merge-{stream}-{os}, cicn-libccnx-transport-rta-merge-{stream}-{os}, cicn-libccnx-portal-merge-{stream}-{os}'
+            result: 'failure'
 
     builders:
         - maven-target:
@@ -623,6 +647,7 @@
             global-settings-type: cfp
         - shell:
             !include-raw-escape:
+                - build-package.sh
                 - include-raw-cicn-metis-build.sh
         - provide-maven-settings:
             settings-file: 'cicn-metis-settings'
@@ -681,6 +706,9 @@
         - gerrit-trigger-patch-merged:
             name: '{project}'
             branch: '{branch}'
+        - reverse:
+            jobs: 'cicn-libicnet-merge-{stream}-{os}'
+            result: 'failure'
 
     builders:
         - maven-target:
@@ -692,6 +720,7 @@
             global-settings-type: cfp
         - shell:
             !include-raw-escape:
+                - build-package.sh
                 - include-raw-cicn-http-server-build.sh
         - provide-maven-settings:
             settings-file: 'cicn-http-server-settings'

diff --git a/jjb/cicn/include-raw-cicn-libccnx-transport-rta-build.sh b/jjb/cicn/include-raw-cicn-libccnx-transport-rta-build.sh
index 7c7cfef..7786eba 100644 (file)
--- a/jjb/cicn/include-raw-cicn-libccnx-transport-rta-build.sh
+++ b/jjb/cicn/include-raw-cicn-libccnx-transport-rta-build.sh
@@ -5,7 +5,7 @@ IFS=$'\n\t'
 
 source ./build-package.sh
 
-LIBCCNX_TRANSPORT_RTA="LIBCCNX_TRANSPORT_RTA"
-LIBCCNX_TRANSPORT_RTA_DEPS="LIBCCNX_TRANSPORT_RTA_DEPS"
+PACKAGE_NAME="LIBCCNX_TRANSPORT_RTA"
+PACKAGE_DEPS="LIBCCNX_TRANSPORT_RTA_DEPS"
 cd libccnx-transport-rta
 build_package $PACKAGE_NAME $PACKAGE_DEPS
\ No newline at end of file

diff --git a/jjb/cicn/ubuntu-dependencies b/jjb/cicn/ubuntu-dependencies
deleted file mode 100644 (file)
index cb349ac..0000000
--- a/jjb/cicn/ubuntu-dependencies
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-IFS=$'\n\t'
-
-BUILD_TOOLS="build-essential cmake"
-LIBSSL_LIBEVENT="libevent-dev libssl-dev"
-LONGBOW_DEPS=""
-LIBPARC_DEPS="longbow $LIBSSL_LIBEVENT"
-LIBCCNX_COMMON_DEPS="$LIBPARC_DEPS libparc"
-LIBCCNX_TRANSPORT_RTA_DEPS="$LIBCCNX_COMMON_DEPS libccnx-common"
-LIBCCNX_PORTAL_DEPS="$LIBCCNX_TRANSPORT_RTA_DEPS libccnx-transport-rta"
-LIBICNET_DEPS="$LIBCCNX_PORTAL_DEPS libboost-system-dev"
-METIS_DEPS="$LIBCCNX_TRANSPORT_RTA_DEPS libccnx-transport-rta"
-HTTP_SERVER_DEPS="$LIBICNET_DEPS libicnet libboost-regex-dev libboost-filesystem-dev"
\ No newline at end of file