diff options
| -rwxr-xr-x | jjb/apex/apex-build.sh | 7 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml | 8 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml.j2 | 8 |
3 files changed, 14 insertions, 9 deletions
diff --git a/jjb/apex/apex-build.sh b/jjb/apex/apex-build.sh index aabd20e30..0c58a3ca9 100755 --- a/jjb/apex/apex-build.sh +++ b/jjb/apex/apex-build.sh @@ -12,7 +12,12 @@ echo if echo $ARTIFACT_VERSION | grep "dev" 1> /dev/null; then GERRIT_PATCHSET_NUMBER=$(echo $GERRIT_REFSPEC | grep -Eo '[0-9]+$') export OPNFV_ARTIFACT_VERSION="dev${GERRIT_CHANGE_NUMBER}_${GERRIT_PATCHSET_NUMBER}" - export BUILD_ARGS="-r $OPNFV_ARTIFACT_VERSION -c $CACHE_DIRECTORY" + if [ "$BRANCH" == 'master' ]; then + # build rpm + export BUILD_ARGS="-r $OPNFV_ARTIFACT_VERSION -c $CACHE_DIRECTORY --rpms" + else + export BUILD_ARGS="-r $OPNFV_ARTIFACT_VERSION -c $CACHE_DIRECTORY" + fi elif echo $BUILD_TAG | grep "csit" 1> /dev/null; then export OPNFV_ARTIFACT_VERSION=csit${BUILD_NUMBER} export BUILD_ARGS="-r $OPNFV_ARTIFACT_VERSION -c $CACHE_DIRECTORY" diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index 51b783ecd..4e8e7cf40 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -8,7 +8,7 @@ - 'apex-virtual-{stream}' - 'apex-deploy-{platform}-{stream}' - 'apex-daily-{stream}' - - 'apex-csit-promote-daily-{stream}' + - 'apex-csit-promote-daily-{stream}-{os_version}' - 'apex-fdio-promote-daily-{stream}' - 'apex-{scenario}-baremetal-{scenario_stream}' - 'apex-testsuite-{scenario}-baremetal-{scenario_stream}' @@ -762,7 +762,7 @@ # CSIT promote - job-template: - name: 'apex-csit-promote-daily-{stream}' + name: 'apex-csit-promote-daily-{stream}-{os_version}' # Job template for promoting CSIT Snapshots # @@ -804,7 +804,7 @@ - name: 'apex-deploy-virtual-{stream}' current-parameters: false predefined-parameters: | - DEPLOY_SCENARIO=os-odl-{os_version}_upstream-noha + DEPLOY_SCENARIO=os-odl-{os_version}-noha OPNFV_CLEAN=yes GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC @@ -822,7 +822,7 @@ - name: 'functest-apex-virtual-suite-{stream}' current-parameters: false predefined-parameters: | - DEPLOY_SCENARIO=os-odl-{os_version}_upstream-noha + DEPLOY_SCENARIO=os-odl-{os_version}-noha FUNCTEST_SUITE_NAME=tempest_smoke_serial GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2 index 4620bbc7e..5230e7a2c 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -8,7 +8,7 @@ - 'apex-virtual-{stream}' - 'apex-deploy-{platform}-{stream}' - 'apex-daily-{stream}' - - 'apex-csit-promote-daily-{stream}' + - 'apex-csit-promote-daily-{stream}-{os_version}' - 'apex-fdio-promote-daily-{stream}' - 'apex-{scenario}-baremetal-{scenario_stream}' - 'apex-testsuite-{scenario}-baremetal-{scenario_stream}' @@ -642,7 +642,7 @@ # CSIT promote - job-template: - name: 'apex-csit-promote-daily-{stream}' + name: 'apex-csit-promote-daily-{stream}-{os_version}' # Job template for promoting CSIT Snapshots # @@ -684,7 +684,7 @@ - name: 'apex-deploy-virtual-{stream}' current-parameters: false predefined-parameters: | - DEPLOY_SCENARIO=os-odl-{os_version}_upstream-noha + DEPLOY_SCENARIO=os-odl-{os_version}-noha OPNFV_CLEAN=yes GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC @@ -702,7 +702,7 @@ - name: 'functest-apex-virtual-suite-{stream}' current-parameters: false predefined-parameters: | - DEPLOY_SCENARIO=os-odl-{os_version}_upstream-noha + DEPLOY_SCENARIO=os-odl-{os_version}-noha FUNCTEST_SUITE_NAME=tempest_smoke_serial GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC |