Add merge-pipeline-k8s job.
* Added job for merge k8s patches.
* Fixed vote for unstable k8s-pipeline job.
Change-Id: I7e4b8cde84bb35167a36788560b688972a8529b5
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml
index 645b80d..c872c64 100644
--- a/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml
+++ b/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml
@@ -35,10 +35,11 @@
comment:
- addedContains:
commentAddedCommentContains: '(recheck|reverify)'
+ gerrit-build-unstable-verified-value: 1
param:
KUBE_DOCKER_REGISTRY:
type: string
- default: 'docker-dev-virtual.docker.mirantis.net'
+ default: 'docker-dev-local.docker.mirantis.net'
description: 'Docker registry for binaries and images'
CALICO_DOCKER_REGISTRY:
type: string
@@ -46,16 +47,8 @@
description: 'Docker registry for published Calico images'
K8S_BASE_IMAGE:
type: string
- default: '{docker-prod-virtual}/mirantis/base-images/debian-base:20161223134732'
+ default: 'mirantis/base-images/debian-base:20161223134732'
description: 'Base Docker image to build k8s'
- DOCKER_IMAGE_UNIT:
- type: string
- default: '{docker-prod-virtual}/mirantis/k8s-tests-images/k8s-tests-unit:latest'
- desription: 'Docker image for k8s unit tests'
- DOCKER_IMAGE_INTEGRATION:
- type: string
- default: '{docker-prod-virtual}/mirantis/k8s-tests-images/k8s-tests-integration:latest'
- desription: 'Docker image for k8s integration tests'
CALICO_CNI_IMAGE_REPO:
type: string
default: 'calico/cni'