From: Tim Rozet <trozet@redhat.com>
Date: Sat, 16 Jan 2016 02:47:14 +0000 (-0500)
Subject: apex: fixes BUILD_DIRECTORY with verify
X-Git-Tag: brahmaputra.1.0~189
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=7742b508964e524bfc1a162bbc5cc31187e495c8;p=releng.git

apex: fixes BUILD_DIRECTORY with verify

Change-Id: I41a0ff693403fe3262cd5d8262b27b79ce050977
Signed-off-by: Tim Rozet <trozet@redhat.com>
---

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 8e2f51152..22817dd1a 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -321,8 +321,6 @@
             block: true
         - trigger-builds:
           - project: 'apex-deploy-baremetal-os-odl_l2-nofeature-ha-{stream}'
-            predefined-parameters:
-              DEPLOY_SCENARIO="os-odl_l2-nofeature-ha"
             git-revision: true
             block: true
         - trigger-builds:
@@ -482,6 +480,11 @@
                 # specific artifact from artifacts.opnfv.org
                 RPM_INSTALL_PATH=$GS_URL/$ARTIFACT_NAME
             else
+                if [[ $BUILD_DIRECTORY == *verify* ]]; then
+                  BUILD_DIRECTORY=$WORKSPACE/../$BUILD_DIRECTORY
+                  echo "BUILD DIRECTORY modified to $BUILD_DIRECTORY"
+                fi
+
                 if [[ -f ${BUILD_DIRECTORY}/../opnfv.properties ]]; then
                     # if opnfv.properties exists then use the
                     # local build. Source the file so we get local OPNFV vars