diff options
| -rw-r--r-- | jjb/armband/armband-ci-jobs.yml | 20 | ||||
| -rw-r--r-- | jjb/bottlenecks/bottlenecks-project-jobs.yml | 30 | ||||
| -rw-r--r-- | jjb/opnfv/opnfv-docker.sh | 2 | ||||
| -rw-r--r-- | jjb/opnfv/opnfv-docker.yml | 54 | ||||
| -rwxr-xr-x | utils/calculate_version.sh | 2 |
5 files changed, 93 insertions, 15 deletions
diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml index 25987328d..f6b48656a 100644 --- a/jjb/armband/armband-ci-jobs.yml +++ b/jjb/armband/armband-ci-jobs.yml @@ -228,46 +228,46 @@ - trigger: name: 'fuel-os-odl_l2-nofeature-ha-armband-baremetal-master-trigger' triggers: - - timed: '0 3,15 * * 1' + - timed: '0 0 * * 1' - trigger: name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-master-trigger' triggers: - - timed: '0 3,15 * * 2' + - timed: '0 0 * * 2' - trigger: name: 'fuel-os-odl_l3-nofeature-ha-armband-baremetal-master-trigger' triggers: - - timed: '0 3,15 * * 3' + - timed: '0 0 * * 3' - trigger: name: 'fuel-os-odl_l2-bgpvpn-ha-armband-baremetal-master-trigger' triggers: - - timed: '0 3,15 * * 4' + - timed: '0 0 * * 4' - trigger: name: 'fuel-os-odl_l2-nofeature-noha-armband-baremetal-master-trigger' triggers: - - timed: '0 3,15 * * 5' + - timed: '0 0 * * 5' #---------------------------------------------------------------------- # Enea Armband CI Baremetal Triggers running against colorado branch #---------------------------------------------------------------------- - trigger: name: 'fuel-os-odl_l2-nofeature-ha-armband-baremetal-colorado-trigger' triggers: - - timed: '0 4,16 * * 1' + - timed: '0 4 * * *' - trigger: name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-colorado-trigger' triggers: - - timed: '0 4,16 * * 2' + - timed: '0 8 * * *' - trigger: name: 'fuel-os-odl_l3-nofeature-ha-armband-baremetal-colorado-trigger' triggers: - - timed: '0 4,16 * * 3' + - timed: '0 12 * * *' - trigger: name: 'fuel-os-odl_l2-bgpvpn-ha-armband-baremetal-colorado-trigger' triggers: - - timed: '0 4,16 * * 4' + - timed: '0 16 * * *' - trigger: name: 'fuel-os-odl_l2-nofeature-noha-armband-baremetal-colorado-trigger' triggers: - - timed: '0 4,16 * * 5' + - timed: '0 20 * * *' #--------------------------------------------------------------- # Enea Armband CI Virtual Triggers running against master branch #--------------------------------------------------------------- diff --git a/jjb/bottlenecks/bottlenecks-project-jobs.yml b/jjb/bottlenecks/bottlenecks-project-jobs.yml index fffc22def..51782a255 100644 --- a/jjb/bottlenecks/bottlenecks-project-jobs.yml +++ b/jjb/bottlenecks/bottlenecks-project-jobs.yml @@ -71,9 +71,7 @@ - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' builders: - - shell: | - echo "bottlenecks: verify job" - #TO DO: this should be changed when the unittest ready + - bottlenecks-unit-tests - job-template: name: 'bottlenecks-merge-{stream}' @@ -107,8 +105,7 @@ branch-pattern: '**/{branch}' builders: - - shell: | - echo "bottlenecks: merge" + - bottlenecks-unit-tests - job-template: name: 'bottlenecks-{suite}-upload-artifacts-{stream}' @@ -195,3 +192,26 @@ echo "Bottlenecks: cleanup cache used for storage downloaded packages" /bin/rm -rf $CACHE_DIR + +- builder: + name: bottlenecks-unit-tests + builders: + - shell: | + #!/bin/bash + set -o errexit + set -o pipefail + + echo "Running unit tests..." + cd $WORKSPACE + virtualenv $WORKSPACE/bottlenecks_venv + source $WORKSPACE/bottlenecks_venv/bin/activate + + # install python packages + easy_install -U setuptools + easy_install -U pip + pip install -r requirements.txt + + # unit tests + /bin/bash $WORKSPACE/tests.sh + + deactivate diff --git a/jjb/opnfv/opnfv-docker.sh b/jjb/opnfv/opnfv-docker.sh index 07198c608..c5edf7cc3 100644 --- a/jjb/opnfv/opnfv-docker.sh +++ b/jjb/opnfv/opnfv-docker.sh @@ -71,6 +71,8 @@ if [[ "$DOCKER_REPO_NAME" == "opnfv/bottlenecks" ]]; then cd $WORKSPACE/ci/docker elif [[ "$DOCKER_REPO_NAME" == "opnfv/cperf" ]]; then cd $WORKSPACE/docker +elif [[ "$DOCKER_REPO_NAME" == "opnfv/dovetail" ]]; then + cd $WORKSPACE/docker elif [[ "$DOCKER_REPO_NAME" == "opnfv/functest" ]]; then cd $WORKSPACE/docker elif [[ "$DOCKER_REPO_NAME" == "opnfv/qtip" ]]; then diff --git a/jjb/opnfv/opnfv-docker.yml b/jjb/opnfv/opnfv-docker.yml index 4250eef64..f313b3b92 100644 --- a/jjb/opnfv/opnfv-docker.yml +++ b/jjb/opnfv/opnfv-docker.yml @@ -16,6 +16,9 @@ jobs: - '{project}-docker-build-push-{stream}' - 'yardstick-docker-build-push-{stream}' + #dovetail not sync with release, an independent job + #only master by now, will adjust accordingly in future + - 'dovetail-docker-build-push-{dovetailstream}' stream: - master: @@ -24,6 +27,10 @@ - colorado: branch: 'stable/{stream}' disabled: false + dovetailstream: + - master: + branch: '{dovetailstream}' + disabled: false ######################## # job templates @@ -113,3 +120,50 @@ triggers: - pollscm: cron: "*/30 * * * *" + +- job-template: + name: 'dovetail-docker-build-push-{dovetailstream}' + + disabled: '{obj:disabled}' + + parameters: + - project-parameter: + project: 'dovetail' + - 'opnfv-build-ubuntu-defaults' + - string: + name: PUSH_IMAGE + default: "true" + description: "To enable/disable pushing the image to Dockerhub." + #BASE_VERSION parameter is used for version control + #by now, only master branch is used, this parameter takes no effect + #once branch control settled, should be adjusted togather with + #opnfv-docker.sh and caculate_version.sh + - string: + name: BASE_VERSION + default: "1.0" + description: "Base version to be used." + - string: + name: DOCKER_REPO_NAME + default: "opnfv/dovetail" + description: "Dockerhub repo to be pushed to." + - string: + name: UPDATE_LATEST_STABLE + default: "false" + description: "This will update the latest_stable image only." + - string: + name: STABLE_TAG + description: "If above option is true, this is the tag to be pulled." + + scm: + - git-scm: + credentials-id: '{ssh-credentials}' + refspec: '' + branch: '{branch}' + + builders: + - shell: + !include-raw-escape: ./opnfv-docker.sh + + triggers: + - pollscm: + cron: "*/30 * * * *" diff --git a/utils/calculate_version.sh b/utils/calculate_version.sh index 608a3bd73..cf929dd5e 100755 --- a/utils/calculate_version.sh +++ b/utils/calculate_version.sh @@ -35,11 +35,13 @@ function docker_version() { fi tag_json=$(curl $url_tag 2>/dev/null | python -mjson.tool | grep ${BASE_VERSION} | head -1) #e.g. tag_json= "name": "brahmaputra.0.2", + #special case, for dovetail, not sync with release, tag_json name not headed with arno, etc if [ "${tag_json}" == "" ]; then echo ${BASE_VERSION}.0 else tag=$(echo $tag_json | awk '{print $2}' | sed 's/\,//' | sed 's/\"//g') #e.g.: tag=brahmaputra.0.2 + #special case, for dovetail, not sync with release tag_current_version=$(echo $tag | sed 's/.*\.//') tag_new_version=$(($tag_current_version+1)) #e.g.: tag=brahmaputra.0.3 |