diff options
| author |   meimei <meimei@huawei.com> | 2016-01-23 10:43:07 +0800 |
|---|---|---|
| committer | meimei <meimei@huawei.com> | 2016-01-25 11:00:45 +0800 |
| commit | 51f8b2dbaac66424e1c7cb67422e10f8cec9471c (patch) | |
| tree | 07b50170daab1a826655430d88d5fc30887f3016 | |
| parent | 4ab6aad6da36d74111bfe3b81d91b4668eeafdd9 (diff) | |
Create new fold in PPA-repo for Bramhputra
- enable the compass+opencontrail daily jobs
- set timeout of daily-ci-jobs and verify jobs
Change-Id: Ia300d3b0406b84e69892ac6fdf641f5b4399188f
Signed-off-by: meimei <meimei@huawei.com>
| -rw-r--r-- | jjb/compass4nfv/compass-build.sh | 4 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 19 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-project-jobs.yml | 9 |
3 files changed, 16 insertions, 16 deletions
diff --git a/jjb/compass4nfv/compass-build.sh b/jjb/compass4nfv/compass-build.sh index 85b3ab47d..d08c39c51 100644 --- a/jjb/compass4nfv/compass-build.sh +++ b/jjb/compass4nfv/compass-build.sh @@ -2,6 +2,7 @@ set -o errexit set -o nounset set -o pipefail +set -x # log info to console echo "Starting the build of $INSTALLER_TYPE. This could take some time..." @@ -14,6 +15,7 @@ echo # set OPNFV_ARTIFACT_VERSION export OPNFV_ARTIFACT_VERSION=$(date -u +"%Y-%m-%d_%H-%M-%S") +export PACKAGE_URL=$PPA_REPO # start the build if [ -d $PPA_CACHE ] @@ -38,4 +40,4 @@ ls -al $BUILD_DIRECTORY ) > $BUILD_DIRECTORY/opnfv.properties echo echo "--------------------------------------------------------" -echo "Done!"
\ No newline at end of file +echo "Done!" diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index f43ab59ec..99c40cbbe 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -44,9 +44,9 @@ - 'os-onos-nofeature-ha': disabled: false auto-trigger-name: 'compass-{scenario}-{pod}-trigger' -# - 'os-ocl-nofeature-ha': -# disabled: true -# auto-trigger-name: 'compass-{scenario}-{pod}-trigger' + - 'os-ocl-nofeature-ha': + disabled: false + auto-trigger-name: 'compass-{scenario}-{pod}-trigger' jobs: - 'compass-{scenario}-{pod}-daily-{stream}' @@ -77,6 +77,9 @@ wrappers: - build-name: name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' + - timeout: + timeout: 360 + fail: true parameters: - project-parameter: @@ -185,19 +188,9 @@ default: $WORKSPACE/build_output description: "Directory where the build artifact will be located upon the completion of the build." - string: - name: CACHE_DIRECTORY - default: $HOME/opnfv/cache/$PROJECT - description: "Directory where the cache to be used during the build is located." - - string: name: GS_URL default: '$GS_BASE{gs-pathname}' description: "URL to Google Storage." - - string: - name: PPA_REPO - default: "http://205.177.226.235:9999" - - string: - name: PPA_CACHE - default: "$WORKSPACE/work/repo/" - choice: name: COMPASS_OPENSTACK_VERSION choices: diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml index 0316e6f70..da054220b 100644 --- a/jjb/compass4nfv/compass-project-jobs.yml +++ b/jjb/compass4nfv/compass-project-jobs.yml @@ -47,6 +47,11 @@ concurrent: true + wrappers: + - timeout: + timeout: 120 + fail: true + properties: - throttle: enabled: true @@ -193,7 +198,7 @@ description: "Directory where the build artifact will be located upon the completion of the build." - string: name: CACHE_DIRECTORY - default: $HOME/opnfv/cache/$PROJECT + default: "$HOME/opnfv/cache/$PROJECT{gs-pathname}" description: "Directory where the cache to be used during the build is located." - string: name: GS_URL @@ -201,7 +206,7 @@ description: "URL to Google Storage." - string: name: PPA_REPO - default: "http://205.177.226.235:9999" + default: "http://205.177.226.237:9999{gs-pathname}" - string: name: PPA_CACHE default: "$WORKSPACE/work/repo/" |