From 48aa31fa0d645e86cdf4de1fc767970d99eeb7e6 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Mon, 22 May 2017 15:08:24 -0400 Subject: [PATCH] Apex: fix iso verify build dir to absolute path Change-Id: I0c85806e5fa04a890a130d8106d96c7fb812e691 Signed-off-by: Tim Rozet --- jjb/apex/apex-iso-verify.sh | 2 -- jjb/apex/apex.yml | 4 ++-- jjb/apex/apex.yml.j2 | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/jjb/apex/apex-iso-verify.sh b/jjb/apex/apex-iso-verify.sh index 5378a903b..f102421f3 100755 --- a/jjb/apex/apex-iso-verify.sh +++ b/jjb/apex/apex-iso-verify.sh @@ -8,8 +8,6 @@ echo "Starting the Apex iso verify." echo "--------------------------------------------------------" echo -BUILD_DIRECTORY=$WORKSPACE/../$BUILD_DIRECTORY - source $BUILD_DIRECTORY/../opnfv.properties if ! rpm -q virt-install > /dev/null; then diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index de565ed66..4aff18b1b 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -678,7 +678,7 @@ - name: 'apex-verify-iso-danube' current-parameters: false predefined-parameters: | - BUILD_DIRECTORY=apex-build-danube/.build + BUILD_DIRECTORY=$WORKSPACE/../apex-build-danube/.build GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC= GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER @@ -1009,7 +1009,7 @@ - name: 'apex-verify-iso-master' current-parameters: false predefined-parameters: | - BUILD_DIRECTORY=apex-build-master/.build + BUILD_DIRECTORY=$WORKSPACE/../apex-build-master/.build GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC= GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2 index d739a7068..14e34336c 100644 --- a/jjb/apex/apex.yml.j2 +++ b/jjb/apex/apex.yml.j2 @@ -678,7 +678,7 @@ - name: 'apex-verify-iso-{{ stream }}' current-parameters: false predefined-parameters: | - BUILD_DIRECTORY=apex-build-{{ stream }}/.build + BUILD_DIRECTORY=$WORKSPACE/../apex-build-{{ stream }}/.build GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC= GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER -- 2.16.6