From: Thanh Ha (zxiiro) <thanh.ha@linuxfoundation.org>
Date: Mon, 17 Sep 2018 14:07:43 +0000 (+0000)
Subject: Merge "add diag_status to ha_proxy"
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=f3ea2b8fdb9c08ea7696048e4dc9811930758aba;hp=606623e2e1f9189b9b4999755bc4193b1806be8a;p=releng%2Fbuilder.git

Merge "add diag_status to ha_proxy"
---

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index e6bf110b6..5ade7e8ba 100644
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -122,7 +122,6 @@
     name: autorelease-generate-release-patches
     builders:
       - shell: !include-raw:
-          - ../global-jjb/shell/lftools-install.sh
           - prepare-release.sh
 
 - builder:
diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 5280e00a3..dc03923f2 100644
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -536,6 +536,7 @@
           forbidden-files: ''
 
     builders:
+      - lf-infra-pre-build
       - autorelease-checkout-gerrit-patch
       - autorelease-compare-projects
       - jacoco-nojava-workaround
diff --git a/jjb/autorelease/prepare-release.sh b/jjb/autorelease/prepare-release.sh
index d60364ee0..59c0a94ee 100644
--- a/jjb/autorelease/prepare-release.sh
+++ b/jjb/autorelease/prepare-release.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2015, 2017 The Linux Foundation and others.
diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 4e603fb23..76c36daae 100644
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -292,13 +292,11 @@
           openstack_system2_image: '{openstack_system_image_queens}'
 
 - project:
-    name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-fluorine
+    name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration
     jobs:
       - inttest-csit-openstack
 
     project: 'netvirt'
-    stream: 'fluorine'
-    branch: 'master'
     testplan: '{project}-{topology}-openstack.txt'
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'n-cpu,placement-api,tempest'
@@ -309,6 +307,14 @@
     os-ctl-cnt: 0
     os-cmp-cnt: 0
 
+    stream:
+      - neon:
+          branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
+      - oxygen:
+          branch: 'stable/oxygen'
+
     topology:
       - 1node:
           openstack_system2_count: 0
diff --git a/jjb/odl-openstack-check-image-protection.sh b/jjb/odl-openstack-check-image-protection.sh
index 77a669e0b..76a68e5bc 100644
--- a/jjb/odl-openstack-check-image-protection.sh
+++ b/jjb/odl-openstack-check-image-protection.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2017 The Linux Foundation and others.
@@ -17,9 +17,6 @@
 # by the cleanup old images job.
 echo "---> Check image protection"
 
-# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
-source "/tmp/v/openstack/bin/activate"
-
 declare -a yaml_images
 readarray -t yaml_images <<< "$(grep -r _system_image: --include \*.yaml \
     | awk -F": " -e '{print $3}' | sed "s:'::;s:'$::;/^$/d" | sort -u)"
diff --git a/jjb/odl-openstack-cleanup-old-images.sh b/jjb/odl-openstack-cleanup-old-images.sh
index 01e420dde..9cc82cd82 100644
--- a/jjb/odl-openstack-cleanup-old-images.sh
+++ b/jjb/odl-openstack-cleanup-old-images.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2017 - 2018 The Linux Foundation and others.
@@ -11,6 +11,4 @@
 # Removes openstack images older than 30 days in the cloud
 echo "---> Cleanup old images"
 
-# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
-source "/tmp/v/openstack/bin/activate"
 lftools openstack --os-cloud vex image cleanup --days=30
diff --git a/jjb/odl-openstack-cleanup-orphaned-nodes.sh b/jjb/odl-openstack-cleanup-orphaned-nodes.sh
index c3c6b35a2..df598b473 100644
--- a/jjb/odl-openstack-cleanup-orphaned-nodes.sh
+++ b/jjb/odl-openstack-cleanup-orphaned-nodes.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2017 - 2018 The Linux Foundation and others.
@@ -43,9 +43,6 @@ minion_in_jenkins() {
 # Fetch server list before fetching active minions to minimize race condition
 # where we might be trying to delete servers while jobs are trying to start
 
-# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
-source "/tmp/v/openstack/bin/activate"
-
 # We purposely need word splitting here to create the OS_SERVERS array.
 # shellcheck disable=SC2207
 mapfile -t OS_SERVERS < <(openstack server list -f value -c "Name" | grep -E 'prd|snd')
@@ -69,5 +66,3 @@ for server in "${OS_SERVERS[@]}"; do
             server remove --minutes 15 "$server"
     fi
 done
-
-deactivate
diff --git a/jjb/odl-openstack-cleanup-stale-nodes.sh b/jjb/odl-openstack-cleanup-stale-nodes.sh
index f9af3c8e1..25cf88c70 100644
--- a/jjb/odl-openstack-cleanup-stale-nodes.sh
+++ b/jjb/odl-openstack-cleanup-stale-nodes.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2017 - 2018 The Linux Foundation and others.
@@ -10,9 +10,6 @@
 ##############################################################################
 echo "---> Cleanup stale nodes"
 
-# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
-source "/tmp/v/openstack/bin/activate"
-
 # Todo: As a safe check we could obtain the list of active jobs from Jenkins and
 # compute the checksum from $JOB_NAME to check if any active nodes exist and
 # skip deleting those nodes. This step may not be required since there is already
diff --git a/jjb/odl-openstack-cleanup-stale-stacks.sh b/jjb/odl-openstack-cleanup-stale-stacks.sh
index 16559c9fe..6d5e553c1 100644
--- a/jjb/odl-openstack-cleanup-stale-stacks.sh
+++ b/jjb/odl-openstack-cleanup-stale-stacks.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2017 The Linux Foundation and others.
@@ -13,9 +13,6 @@
 # list of Jenkins instances to check for active builds.
 echo "---> Cleanup stale stacks"
 
-# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
-source "/tmp/v/openstack/bin/activate"
-
 stack_in_jenkins() {
     # Usage: check_stack_in_jenkins STACK_NAME JENKINS_URL [JENKINS_URL...]
     # Returns: 0 If stack is in Jenkins and 1 if stack is not in Jenkins.
diff --git a/jjb/odl-openstack-cleanup-stale-volumes.sh b/jjb/odl-openstack-cleanup-stale-volumes.sh
index 433aecf2c..3745eb253 100644
--- a/jjb/odl-openstack-cleanup-stale-volumes.sh
+++ b/jjb/odl-openstack-cleanup-stale-volumes.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2018 The Linux Foundation and others.
@@ -10,8 +10,6 @@
 ##############################################################################
 # Scans OpenStack for orphaned volumes
 
-# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
-source "/tmp/v/openstack/bin/activate"
 mapfile -t os_volumes < <(openstack volume list -f value -c ID --status Available)
 
 echo "---> Orphaned volumes"
@@ -23,5 +21,3 @@ else
         lftools openstack --os-cloud vex volume remove --minutes 15 "$volume"
     done
 fi
-
-deactivate
diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 7cbd88e5d..0768c5858 100644
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -166,7 +166,7 @@
       - timed: '0,30 * * * *'
 
     builders:
-      - odl-openstack-install
+      - lf-infra-pre-build
       # Servers
       - odl-openstack-cleanup-stale-stacks
       - odl-openstack-cleanup-stale-nodes
diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index d7f28aaf1..4b0776a5b 100644
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -86,7 +86,7 @@
       - gerrit-maven-sonar:
           mvn-params: >
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
-            -Dsonar.jacoco.reportPaths=$WORKSPACE/target/jacoco.exec
+            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
 
     project: 'yangtools'
     project-name: 'yangtools'