diff options
author | Tim Rozet <trozet@redhat.com> | 2016-12-11 22:40:53 -0500 |
---|---|---|
committer | Tim Rozet <trozet@redhat.com> | 2016-12-11 22:40:53 -0500 |
commit | 45889ba21ea3967d2e336235cba39ed419c94d08 (patch) | |
tree | 1c255d4660b8968cf92fcc404d80a72cd04e7cc3 | |
parent | 0cd71faff9baccc6448d8b4019ec8a5f8d8382df (diff) |
Apex: Fixes build paths
Change-Id: I42eceade9d24a237c2a0f725db9e39de53c5be8a
Signed-off-by: Tim Rozet <trozet@redhat.com>
-rwxr-xr-x | jjb/apex/apex-build.sh | 2 | ||||
-rw-r--r-- | jjb/apex/apex.yml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/jjb/apex/apex-build.sh b/jjb/apex/apex-build.sh index e3e3f6194..ee1dfb5d3 100755 --- a/jjb/apex/apex-build.sh +++ b/jjb/apex/apex-build.sh @@ -23,7 +23,7 @@ fi # start the build cd $WORKSPACE/ci ./build.sh $BUILD_ARGS -RPM_VERSION=$(grep Version: $BUILD_DIRECTORY/rpm_specs/opnfv-apex.spec | awk '{ print $2 }')-$(echo $OPNFV_ARTIFACT_VERSION | tr -d '_-') +RPM_VERSION=$(grep Version: $WORKSPACE/build/rpm_specs/opnfv-apex.spec | awk '{ print $2 }')-$(echo $OPNFV_ARTIFACT_VERSION | tr -d '_-') # list the contents of BUILD_OUTPUT directory echo "Build Directory is ${BUILD_DIRECTORY}" echo "Build Directory Contents:" diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index b3de969f8..9befaba83 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -362,7 +362,7 @@ - trigger-builds: - project: 'apex-deploy-virtual-os-nosdn-nofeature-noha-{stream}' predefined-parameters: | - BUILD_DIRECTORY=apex-build-{stream}/build + BUILD_DIRECTORY=apex-build-{stream}/.build OPNFV_CLEAN=yes git-revision: false same-node: true @@ -606,7 +606,7 @@ description: "Artifact version type" - string: name: BUILD_DIRECTORY - default: $WORKSPACE/build + default: $WORKSPACE/.build description: "Directory where the build artifact will be located upon the completion of the build." - string: name: CACHE_DIRECTORY |