diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-12-12 03:42:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-12-12 03:42:35 +0000 |
| commit | eb455611516ee52bb5b5ecb9383334d237862967 (patch) | |
| tree | 85ade15718db0c1493a590f4734829c3f9217039 | |
| parent | 023455ae688a605362967821b1e2655bc5ddeadd (diff) | |
| parent | 45889ba21ea3967d2e336235cba39ed419c94d08 (diff) | |
Merge "Apex: Fixes build paths"
| -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 |