Merge "Enable autorelease verify job for IoTDM"

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index f88c21a5013e60f22059c985d10f3db2eadadf82..7b6b0e2046808b4d59cc9ad561530ef71a782453 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -138,6 +138,10 @@
           if [ "$GERRIT_BRANCH" != "stable/beryllium" ]; then
               cd $WORKSPACE/scripts/release_notes_management
               java -jar target/autonotes.jar
+              if [ -f  "$WORKSPACE/scripts/release_notes_management/projects/release-notes.rst" ]; then
+                  mkdir -p $WORKSPACE/archives
+                  cp -vf "$WORKSPACE/scripts/release_notes_management/projects/release-notes.rst" "$WORKSPACE/archives"
+              fi
           fi
 
 - publisher:
@@ -157,10 +161,6 @@
     publishers:
       - postbuildscript:
           builders:
-            - shell: |
-                mkdir -p archives/
-                cp /var/log/sa/* $_
-                # convert sar data to ascii format
-                sar -A -f /var/log/sa/sa$(date +%d) > archives/sar$(date +%d)
+            - shell: !include-raw: include-raw-autorelease-collect-sar.sh
           script-only-if-succeeded: false
           script-only-if-failed: false

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index cae8e5988fd9a7c1e0f51481b7e442385a2246c8..284fdef09c0635d96479e9cabca753b4b42bd26c 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -57,7 +57,7 @@
 
     wrappers:
       - opendaylight-infra-wrappers:
-          build-timeout: '1440'
+          build-timeout: '900'
 
     triggers:
       - timed: '{cron}'
@@ -216,7 +216,5 @@
 
     publishers:
       - opendaylight-infra-sysstats
-      - archive:
-          artifacts: 'scripts/release_notes_management/projects/release-notes.rst, /var/log/sa/*'
       - opendaylight-infra-shiplogs:
           maven-version: 'mvn33'

diff --git a/jjb/autorelease/include-raw-autorelease-collect-sar.sh b/jjb/autorelease/include-raw-autorelease-collect-sar.sh
new file mode 100644 (file)
index 0000000..e5af468
--- /dev/null
+++ b/jjb/autorelease/include-raw-autorelease-collect-sar.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+# @License EPL-1.0 <http://spdx.org/licenses/EPL-1.0>
+##############################################################################
+# Copyright (c) 2017 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+
+mkdir -p archives/sar
+cp /var/log/sa/* $_
+# convert sar data to ascii format
+while IFS="" read -r s
+do
+    [ -f "$s" ] && sar -A -f "$s" > archives/sar/sar${s//[!0-9]/}
+done < <(find /var/log/sa -name "sa[0-9]*")

diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
index 6502bc4e9bf87ad300cee6cb1febbec2d4928951..dfdeebce7c3b6618b46ff89618e5344b6d6d2985 100644 (file)
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -6,8 +6,7 @@
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      # TODO uncomment the below line once lacp is added back to Carbon
-      # - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index f45a61a8be9389c5b63eea48f7460e60be162363..7fe94b94292015b18d36a1ca91d3c30afecbfed3 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -120,6 +120,14 @@
       - opendaylight-infra-properties:
           build-days-to-keep: 7
 
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+
     wrappers:
       - opendaylight-infra-wrappers:
           build-timeout: '{build-timeout}'

diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml
index 47747815ee5f2efbedbbbb37ac67de71090f1b1b..f77e4ab8298fc741b8c3eda324c3baefee6364b9 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -6,7 +6,8 @@
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
+      # remove nitrogen validate job until SNMP4SDN is back in nitrogen
+      # - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen

diff --git a/packer/provision/mininet-ovs-2.5.sh b/packer/provision/mininet-ovs-2.5.sh
index 90258f4e42b644b0f0c1c9ca52cd9ac6a668dc3a..55efc9970af866df8349ada2af99617be6302fb1 100644 (file)
--- a/packer/provision/mininet-ovs-2.5.sh
+++ b/packer/provision/mininet-ovs-2.5.sh
@@ -54,7 +54,6 @@ mkdir -p /tmp/build_quagga
 cd /tmp/build_quagga
 git clone https://github.com/6WIND/zrpcd.git
 cd zrpcd
-git checkout 20170418
 chmod a+x /tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh
 /tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh -d -b -t -v 2