Merge "Fixing branch of libparc and updating centos repositories."

4 files changed, 25 insertions, 16 deletions

diff --git a/jjb/cicn/build-package.sh b/jjb/cicn/build-package.sh
index 30b7e70e2..6a81ccb03 100644
--- a/jjb/cicn/build-package.sh
+++ b/jjb/cicn/build-package.sh
@@ -3,7 +3,8 @@
 set -euxo pipefail
 IFS=$'\n\t'
 
-apt_get=`which apt-get`
+APT_PATH=`which apt-get` || true
+apt_get=${APT_PATH:-"/usr/local/bin/apt-get"}
 
 # Parameters:
 # $1 = Distribution [trusty / CentOS]
@@ -83,14 +84,20 @@ update_fdio_repo() {
 
         elif [ "$DISTRIB_ID" == "CentOS" ]; then
             REPO_VPP_URL="${NEXUSPROXY}/content/repositories/fd.io.centos7/"
-                    sudo cat << EOF > fdio-master.repo
-[fdio-master]
+                    sudo cat << EOF > fdio.repo
+[fdio-vpp-master]
 name=fd.io master branch latest merge
-baseurl=${REPO_URL}
+baseurl=${REPO_VPP_URL}
+enabled=1
+gpgcheck=0
+
+[fdio-cicn-master]
+name=fd.io master branch latest merge
+baseurl=${REPO_CICN_URL}
 enabled=1
 gpgcheck=0
 EOF
-            sudo mv fdio-master.repo /etc/yum.repos.d/fdio-master.repo
+            sudo mv fdio.repo /etc/yum.repos.d/fdio.repo
         else
             echo "Distribution $DISTRIB_CODENAME is not supported"
         fi
diff --git a/jjb/cicn/cicn.yaml b/jjb/cicn/cicn.yaml
index e6ecccbbe..4b5c839d4 100644
--- a/jjb/cicn/cicn.yaml
+++ b/jjb/cicn/cicn.yaml
@@ -32,7 +32,7 @@
             repo-os-part: 'centos7'
     stream:
         - master:
-            branch: 'cframework/libparc'
+            branch: 'cframework/master'
             repo-stream-part: 'master'
     type:
         - short
@@ -273,7 +273,7 @@
                 - include-raw-cicn-maven-push.sh
     publishers:
         - archive:
-            artifacts: 'build/*.rpm,build/*.deb'
+            artifacts: 'longbow/build/*.rpm,longbow/build/*.deb'
             allow-empty: 'true'
             fingerprint: false
             only-if-success: true
@@ -346,7 +346,7 @@
                 - include-raw-cicn-maven-push.sh
     publishers:
         - archive:
-            artifacts: 'build/*.rpm,build/*.deb'
+            artifacts: 'libparc/build/*.rpm,libparc/build/*.deb'
             allow-empty: 'true'
             fingerprint: false
             only-if-success: true
@@ -419,7 +419,7 @@
                 - include-raw-cicn-maven-push.sh
     publishers:
         - archive:
-            artifacts: 'build/*.rpm,build/*.deb'
+            artifacts: 'libccnx-common/build/*.rpm,libccnx-common/build/*.deb'
             allow-empty: 'true'
             fingerprint: false
             only-if-success: true
@@ -492,7 +492,7 @@
                 - include-raw-cicn-maven-push.sh
     publishers:
         - archive:
-            artifacts: 'build/*.rpm,build/*.deb'
+            artifacts: 'libccnx-transport-rta/build/*.rpm,libccnx-transport-rta/build/*.deb'
             allow-empty: 'true'
             fingerprint: false
             only-if-success: true
@@ -565,7 +565,7 @@
                 - include-raw-cicn-maven-push.sh
     publishers:
         - archive:
-            artifacts: 'build/*.rpm,build/*.deb'
+            artifacts: 'libccnx-portal/build/*.rpm,libccnx-portal/build/*.deb'
             allow-empty: 'true'
             fingerprint: false
             only-if-success: true
@@ -711,7 +711,7 @@
                 - include-raw-cicn-maven-push.sh
     publishers:
         - archive:
-            artifacts: 'build/*.rpm,build/*.deb'
+            artifacts: 'metis/build/*.rpm,metis/build/*.deb'
             allow-empty: 'true'
             fingerprint: false
             only-if-success: true
@@ -845,7 +845,7 @@
         - shell:
             !include-raw-escape:
                 - build-package.sh
-                - include-raw-cicn-http-server-build.sh
+                - include-raw-cicn-vpp-plugin-build.sh
         - provide-maven-settings:
             settings-file: 'cicn-settings'
             global-settings-file: 'global-settings'
@@ -855,7 +855,7 @@
                 - include-raw-cicn-maven-push.sh
     publishers:
         - archive:
-            artifacts: 'build/*.rpm,build/*.deb'
+            artifacts: 'cicn-plugin/build/*.rpm,cicn-plugin/build/*.deb'
             allow-empty: 'true'
             fingerprint: false
             only-if-success: true
diff --git a/jjb/cicn/include-raw-cicn-radio-emulators-build.sh b/jjb/cicn/include-raw-cicn-radio-emulators-build.sh
index 72c663a85..c5b762bd0 100644
--- a/jjb/cicn/include-raw-cicn-radio-emulators-build.sh
+++ b/jjb/cicn/include-raw-cicn-radio-emulators-build.sh
@@ -3,7 +3,8 @@
 set -euxo pipefail
 IFS=$'\n\t'
 
-apt_get=`which apt-get`
+APT_PATH=`which apt-get` || true
+apt_get=${APT_PATH:-"/usr/local/bin/apt-get"}
 
 PACKAGE_NAME="RADIO_EMULATOR"
 RADIO_EMULATOR_DEPS_UBUNTU="pkg-config libboost-all-dev libsqlite3-dev libopenmpi-dev libxml2-dev libwebsocketpp-dev"
diff --git a/jjb/cicn/include-raw-cicn-viper-build.sh b/jjb/cicn/include-raw-cicn-viper-build.sh
index 149b771d4..e636a14f4 100644
--- a/jjb/cicn/include-raw-cicn-viper-build.sh
+++ b/jjb/cicn/include-raw-cicn-viper-build.sh
@@ -3,7 +3,8 @@
 set -euxo pipefail
 IFS=$'\n\t'
 
-apt_get=`which apt-get`
+APT_PATH=`which apt-get` || true
+apt_get=${APT_PATH:-"/usr/local/bin/apt-get"}
 
 PACKAGE_NAME="VIPER"
 VIPER_DEPS_UBUNTU="zlib1g-dev git-core build-essential libxml2-dev libcurl4-openssl-dev \