Revert "Apex: fixes build directory passing for iso upload"

This reverts commit ec2e44c72271cb78a00bebd32ceb43487ad176b5.

Change-Id: I2f8db687df9cceaa50bf6a26de659ea70f70df45

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 4aff18b..de565ed 100644 (file)
--- 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=$WORKSPACE/../apex-build-danube/.build
+                    BUILD_DIRECTORY=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=$WORKSPACE/../apex-build-master/.build
+                    BUILD_DIRECTORY=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 14e3433..d739a70 100644 (file)
--- 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=$WORKSPACE/../apex-build-{{ stream }}/.build
+                    BUILD_DIRECTORY=apex-build-{{ stream }}/.build
                     GERRIT_BRANCH=$GERRIT_BRANCH
                     GERRIT_REFSPEC=
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER