Merge "Define vhost_socket_dir in neutron section"
diff --git a/jenkins/client/job/docker/opencontrail.yml b/jenkins/client/job/docker/opencontrail.yml
index b5a6c93..53a76e0 100644
--- a/jenkins/client/job/docker/opencontrail.yml
+++ b/jenkins/client/job/docker/opencontrail.yml
@@ -29,29 +29,23 @@
- updated: {}
comment:
- addedContains:
- commentAddedCommentContains: '(buildcontainer)'
+ commentAddedCommentContains: '(buildcontainer|test|recheck|verify|)'
param:
IMAGE_GIT_URL:
type: string
- default: "${_param:jenkins_gerrit_url}/mk/docker-opencontrail-{{version}}"
+ default: "${_param:jenkins_gerrit_url}/mk/docker-opencontrail"
OC_VERSION:
type: string
default: "{{version}}"
IMAGE_CREDENTIALS_ID:
type: string
default: "gerrit"
- IMAGE_TAGS:
+ APT_KEY:
type: string
- default: "latest"
- REGISTRY_URL:
+ default: "${_param:jenkins_aptly_url}/public.gpg"
+ APT_REPO_URL:
type: string
- default: ""
+ default: "${_param:jenkins_aptly_url}/xenial/ nightly"
REGISTRY_CREDENTIALS_ID:
type: string
default: "dockerhub"
- DOCKER_GIT_TAG:
- type: boolean
- default: "true"
- EXTRA_REPO_URL:
- type: string
- default: "${_param:jenkins_aptly_url}"