diff options
| author |   Tim Rozet <trozet@redhat.com> | 2015-12-15 16:26:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-12-15 16:26:14 +0000 |
| commit | 7baae6ff718e3f545074b9ae9e4f9a36b0a6ca1b (patch) | |
| tree | 2d566d779556c98a7e8e7e64e41c84eb3cb0a599 | |
| parent | 29b8e3440d04fbe3c448d0598f85e8c09c83e929 (diff) | |
| parent | 4024c6738783851044b1bab82d4d23d17582307a (diff) | |
Merge "removing flags from apex build, they are not used"
| -rw-r--r-- | jjb/apex/apex.yml | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 54329aa85..14c472b1e 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -14,8 +14,6 @@ - master: branch: 'master' gs-pathname: '' - flags: '' - disabled: false project: 'apex' @@ -27,7 +25,6 @@ parameters: - apex-parameter: gs-pathname: '{gs-pathname}' - flags: '{flags}' - project-parameter: project: '{project}' - gerrit-parameter: @@ -90,7 +87,6 @@ parameters: - apex-parameter: gs-pathname: '{gs-pathname}' - flags: '{flags}' - project-parameter: project: '{project}' - gerrit-parameter: @@ -144,7 +140,6 @@ project: '{project}' - apex-parameter: gs-pathname: '{gs-pathname}' - flags: '{flags}' - gerrit-parameter: branch: '{branch}' - string: @@ -187,7 +182,6 @@ project: '{project}' - apex-parameter: gs-pathname: '{gs-pathname}' - flags: '{flags}' builders: - 'apex-deploy-virtual' @@ -216,7 +210,6 @@ project: '{project}' - apex-parameter: gs-pathname: '{gs-pathname}' - flags: '{flags}' builders: - 'apex-workspace-cleanup' @@ -244,7 +237,6 @@ project: '{project}' - apex-parameter: gs-pathname: '{gs-pathname}' - flags: '{flags}' properties: - build-blocker: @@ -300,10 +292,6 @@ name: GS_URL default: artifacts.opnfv.org/$PROJECT/{gs-pathname} description: "URL to Google Storage." - - string: - name: FLAGS - default: '{flags}' - description: "Build Flags" ######################## # builder macros @@ -319,8 +307,6 @@ # log info to console echo "Starting the build of Apex using OpenStack Master packages. This will take some time..." echo "---------------------------------------------------------------------------------------" - echo "Build flags for this build are ${FLAGS}" - echo "---------------------------------------------------------------------------------------" echo # create the cache directory if it doesn't exist [[ -d $CACHE_DIRECTORY ]] || mkdir -p $CACHE_DIRECTORY @@ -328,7 +314,7 @@ export OPNFV_ARTIFACT_VERSION=$(date -u +"%Y-%m-%d_%H-%M-%S") # start the build cd $WORKSPACE/ci - ./build.sh $FLAGS -v $OPNFV_ARTIFACT_VERSION -c file://$CACHE_DIRECTORY $BUILD_DIRECTORY + ./build.sh -v $OPNFV_ARTIFACT_VERSION -c file://$CACHE_DIRECTORY $BUILD_DIRECTORY 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 |