From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Mon, 15 May 2017 16:21:13 +0000 (+0000)
Subject: Merge "Disable building 6wind/quagga binaries"
X-Git-Tag: release/carbon~48
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=882681991948b4e88f448e89987d684c23f53bec;hp=6e8439da86536587a1fa1798a7bc0697ae2f08fe;p=releng%2Fbuilder.git

Merge "Disable building 6wind/quagga binaries"
---

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index f88c21a50..7b6b0e204 100644
--- 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 cae8e5988..284fdef09 100644
--- 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
index 000000000..e5af46885
--- /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/integration/include-raw-integration-install-robotframework.sh b/jjb/integration/include-raw-integration-install-robotframework.sh
index 6ad635cdc..be6b965f3 100644
--- a/jjb/integration/include-raw-integration-install-robotframework.sh
+++ b/jjb/integration/include-raw-integration-install-robotframework.sh
@@ -52,6 +52,9 @@ pip install --upgrade tornado jsonpointer
 # Module for TemplatedRequests.robot library
 pip install --upgrade jmespath
 
+# Module for backup-restore support library
+pip install jsonpatch
+
 # Print installed versions.
 pip freeze
 
diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml
index b69daa0f9..63ae08f99 100644
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@ -34,8 +34,7 @@
       - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      # TODO uncomment this line when IoTDM added to Carbon
-      # - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
index 6502bc4e9..dfdeebce7 100644
--- 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 f45a61a8b..7fe94b942 100644
--- 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 47747815e..f77e4ab82 100644
--- 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