diff options
Diffstat (limited to 'jjb/opnfv')
| -rw-r--r-- | jjb/opnfv/opnfv-docker.sh | 2 | ||||
| -rw-r--r-- | jjb/opnfv/opnfv-docker.yml | 54 | ||||
| -rw-r--r-- | jjb/opnfv/opnfv-docs.yml | 6 | ||||
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 13 |
4 files changed, 73 insertions, 2 deletions
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/jjb/opnfv/opnfv-docs.yml b/jjb/opnfv/opnfv-docs.yml index 743657334..0ac8aa7e0 100644 --- a/jjb/opnfv/opnfv-docs.yml +++ b/jjb/opnfv/opnfv-docs.yml @@ -14,11 +14,13 @@ stream: - master: branch: '{stream}' + doc-version: '' gs-pathname: '' disabled: false - colorado: branch: 'stable/{stream}' - gs-pathname: '/{stream}' + doc-version: '2.0' + gs-pathname: '/{stream}/{doc-version}' disabled: false ######################## @@ -82,7 +84,7 @@ - string: name: GS_URL default: '$GS_BASE{gs-pathname}' - description: "Directory where the build artifact will be located upon the completion of the build." + description: "Directory where the build artifact will be located upon the completion of the build." scm: - gerrit-trigger-scm: diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index b2f17c1e7..ff24e9e6d 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -436,6 +436,19 @@ default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - parameter: + name: 'huawei-pod5-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - huawei-pod5 + default-slaves: + - huawei-pod5 + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT +- parameter: name: 'zte-pod1-defaults' parameters: - node: |