summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorMatthewLi <matthew.lijun@huawei.com>2016-09-20 01:20:12 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-09-20 01:20:12 +0000
commit82d58651bbf7a2bd5ee0a74bf767be71c27a8eef (patch)
tree60465f327e01402f1ef20e1c33aa871ed048a720 /jjb
parent6b8494be837ba49e870aac1972f76d7facbbc304 (diff)
parent62fb1ae22a2783f9803c863d0a7991c8949e2e27 (diff)
Merge "dovetail docker job added"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/opnfv/opnfv-docker.sh2
-rw-r--r--jjb/opnfv/opnfv-docker.yml54
2 files changed, 56 insertions, 0 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 * * * *"