diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-03-28 14:17:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-03-28 14:17:49 +0000 |
| commit | 9209de0961d4229ba535b20fe9385a9c7138c311 (patch) | |
| tree | 940e174b166c8d719d040464314cecc5ca31aa13 /jjb | |
| parent | 336feda2a00aca956de266225f7210ac73c2e4b6 (diff) | |
| parent | a6594716c24a58f48c968a41bc8dfe72e4bb2a63 (diff) | |
Merge "Apex: clean out extra args to deploy and update cleaning"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/apex/apex.yml | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index b304f2270..6f2f441af 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -15,7 +15,7 @@ branch: 'master' gs-pathname: '' block-stream: 'brahmaputra' - slave: 'opnfv-jump-1' + slave: 'intel-pod7' - brahmaputra: branch: 'stable/brahmaputra' gs-pathname: '/brahmaputra' @@ -167,7 +167,7 @@ - trigger-builds: - project: 'apex-deploy-{platform}-{scenario}-{stream}' predefined-parameters: - OPNFV_CLEAN='yes' + OPNFV_CLEAN=yes git-revision: false block: true - trigger-builds: @@ -229,8 +229,9 @@ - 'apex-build' - trigger-builds: - project: 'apex-deploy-virtual-os-odl_l2-nofeature-ha-{stream}' - predefined-parameters: + predefined-parameters: | BUILD_DIRECTORY=apex-build-{stream}/build_output + OPNFV_CLEAN=yes git-revision: false block: true - 'apex-upload-artifact' @@ -502,9 +503,11 @@ else export OPNFV_ARTIFACT_VERSION=${ARTIFACT_VERSION} fi + # clean for stable but doesn't matter for master + sudo opnfv-clean || echo "" # start the build cd $WORKSPACE/ci - ./build.sh -v $OPNFV_ARTIFACT_VERSION $BUILD_ARGS + ./build.sh $BUILD_ARGS RPM_VERSION=$(grep Version $BUILD_DIRECTORY/../build/opnfv-apex.spec | awk '{ print $2 }')-$(echo $OPNFV_ARTIFACT_VERSION | tr -d '_-') # list the contents of BUILD_OUTPUT directory ls -al $BUILD_DIRECTORY |