Merge "Use lf-infra-parameters"

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 83653e4e54736ec55fac413d3e27d4e7c3d74933..eab728fb963216663446a94bc1303b555c80a972 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -149,12 +149,11 @@
           fi
 
 - publisher:
-    # include-raw-autorelease-notify-build-failure.sh searches console log for
-    # failures and emails the status to the release mailing list.
+    # Search console log for failures and email status to the release mailing list.
     name: opendaylight-infra-notify-status
     publishers:
       - postbuildscript:
           builders:
-            - shell: !include-raw: include-raw-autorelease-notify-build-failure.sh
-          script-only-if-succeeded: 'False'
-          script-only-if-failed: 'True'
+            - shell: !include-raw: notify-build-failure.sh
+          script-only-if-succeeded: false
+          script-only-if-failed: true

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 7d8b97fb5e71abf7ff201d5541f4aa67260b6ea4..6f1fe3be22e241b837ee046e0f613ca4f5eaa264 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -37,6 +37,3 @@
     archive-artifacts: >
         **/*.prop
         **/*.log
-        patches/**
-        patches.tar.gz
-        error.log.gz

diff --git a/jjb/autorelease/include-raw-autorelease-notify-build-failure.sh b/jjb/autorelease/notify-build-failure.sh
similarity index 97%
rename from jjb/autorelease/include-raw-autorelease-notify-build-failure.sh
rename to jjb/autorelease/notify-build-failure.sh
index ca31d529c5d3f0bd25894c74f52c4794d0dd29bd..61651964dab65afe94f41a36d38225761d1a52e6 100644 (file)
--- a/jjb/autorelease/include-raw-autorelease-notify-build-failure.sh
+++ b/jjb/autorelease/notify-build-failure.sh
@@ -8,16 +8,17 @@
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
+# This script parses the console log to discover which project has caused a
+# build failure and notify the project as appropriate.
 
 NEWLINE=$'\n'
 RELEASE_EMAIL="release@lists.opendaylight.org"
 ARCHIVES_DIR="$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER"
 CONSOLE_LOG="/tmp/autorelease-build.log"
 STREAM=${JOB_NAME#*-*e-}
-ERROR_LOG="$WORKSPACE/error.log.gz"
+ERROR_LOG="$WORKSPACE/archives/error.log.gz"
 
-# get console logs
-wget --no-verbose -O "$CONSOLE_LOG" "${BUILD_URL}consoleText"
+wget -nv -O "$CONSOLE_LOG" "${BUILD_URL}consoleText"
 
 # TODO: This section is still required since some of the projects use
 # description. Remove this section when the reactor info is more consistant.

diff --git a/jjb/autorelease/prepare-release.sh b/jjb/autorelease/prepare-release.sh
index 661dcd7fa2ab820a534506cd6010700bff6a2a40..0b025ec9b6cd1a4d4b395323364249a736e24ddc 100644 (file)
--- a/jjb/autorelease/prepare-release.sh
+++ b/jjb/autorelease/prepare-release.sh
@@ -23,7 +23,8 @@ RELEASE_TAG="${RELEASE_TAG:-${STREAM^}}"
 RELEASE_TAG="${RELEASE_TAG^}"
 
 # Directory to put git format-patches
-PATCH_DIR="$WORKSPACE/patches"
+PATCH_DIR="$WORKSPACE/archives/patches"
+mkdir -p "$PATCH_DIR"
 
 echo "$RELEASE_TAG"
 # Remove this case statement when Carbon is no longer supported.
@@ -40,7 +41,6 @@ esac
 git submodule foreach "git commit -am \"Release $RELEASE_TAG\" || true"
 git commit -am "Release $RELEASE_TAG"
 
-mkdir patches
 # TODO: Fix this workaround so that scripts will ensure that taglist.log exists and archived.
 mv taglist.log "$PATCH_DIR" || true
 modules=$(xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -m '//x:modules' -v '//x:module' pom.xml)
@@ -51,5 +51,5 @@ for module in $modules; do
     popd
 done
 
-tar cvzf patches.tar.gz -C "$WORKSPACE" patches
+tar cvzf "$PATCH_DIR/patches.tar.gz" -C "$WORKSPACE/archives" patches
 rm "$PATCH_DIR"/*.bundle

diff --git a/packer/provision/java-builder.sh b/packer/provision/java-builder.sh
index 775d2279a194b9788b6765b8931ab512262ec301..089c915057fe801eeea19c508ed294ed3ebd683d 100644 (file)
--- a/packer/provision/java-builder.sh
+++ b/packer/provision/java-builder.sh
@@ -63,3 +63,16 @@ wget -nv https://releases.hashicorp.com/packer/0.12.2/packer_0.12.2_linux_amd64.
 unzip packer_0.12.2_linux_amd64.zip -d /usr/local/bin/
 # rename packer to avoid conflict with binary in cracklib
 mv /usr/local/bin/packer /usr/local/bin/packer.io
+
+# Check out quagga , compile and install for router functionalities
+echo "Installing the Quagga..."
+mkdir -p /tmp/build_quagga
+cd /tmp/build_quagga
+git clone https://github.com/6WIND/zrpcd.git
+cd zrpcd
+git checkout 20170731
+chmod a+x /tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh
+/tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh -d -b -t
+
+# Removing the build_quagga folder
+rm -rf /tmp/build_quagga/

diff --git a/packer/provision/mininet-ovs-2.5.sh b/packer/provision/mininet-ovs-2.5.sh
index 4afb693411b92e81bfed2e27cd01cbd0dcb5d81e..5e7274335d156302acdb4c634ff6ff1575648a24 100644 (file)
--- a/packer/provision/mininet-ovs-2.5.sh
+++ b/packer/provision/mininet-ovs-2.5.sh
@@ -44,3 +44,16 @@ apt-get install vlan
 
 # Install netaddr package which is needed by some custom mininet topologies
 apt-get install python-netaddr
+
+# Check out quagga , compile and install for router functionalities
+echo "Installing the Quagga..."
+mkdir -p /tmp/build_quagga
+cd /tmp/build_quagga
+git clone https://github.com/6WIND/zrpcd.git
+cd zrpcd
+git checkout 20170731
+chmod a+x /tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh
+/tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh -d -b -t
+
+# Removing the build_quagga folder
+rm -rf /tmp/build_quagga/