commit f8b17b4fa350f40785d17c38f6848faa1057a4aa
author mcp-jenkins <mcp-jenkins@mirantis.com> Thu Nov 22 12:35:29 2018 +0000
committer Gerrit Code Review <mail@domain.com> Thu Nov 22 12:35:29 2018 +0000
tree 42a24255d296fff3b25b8d880d1256bd65eca178
parent 6e17f5c5a125de7ba65f438e21039fad7714112a
parent 54c9f7919c269d1713458fbccd83230d79138289

Merge "Enabling keepalived on proxy nodes"

defaults/docker_images.yml

diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index ca55601..7a818e0 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -17,7 +17,9 @@
     docker_image_gerrit: "${_param:mcp_docker_registry}/mirantis/cicd/gerrit:${_param:mcp_version}"
     # mysql:5.6
     docker_image_mysql: "${_param:mcp_docker_registry}/mirantis/cicd/mysql:${_param:mcp_version}"
-    docker_image_jenkins_slave: ${_param:mcp_docker_registry}/mirantis/cicd/jnlp-slave:${_param:mcp_version}
+    # jenkins:2.121.3
+    docker_image_jenkins: "${_param:mcp_docker_registry}/mirantis/cicd/jenkins:${_param:mcp_version}"
+    docker_image_jenkins_slave: "${_param:mcp_docker_registry}/mirantis/cicd/jnlp-slave:${_param:mcp_version}"
     # model-generator
     docker_image_operations_api: "${_param:mcp_docker_registry}/mirantis/model-generator/operations-api:${_param:mcp_version}"
     docker_image_operations_ui: "${_param:mcp_docker_registry}/mirantis/model-generator/operations-ui:${_param:mcp_version}"

docker/client/compose/service/jenkins.yml

diff --git a/docker/client/compose/service/jenkins.yml b/docker/client/compose/service/jenkins.yml
index 5054909..55aacdc 100644
--- a/docker/client/compose/service/jenkins.yml
+++ b/docker/client/compose/service/jenkins.yml
@@ -2,7 +2,6 @@
   - system.docker.client.compose
 parameters:
   _param:
-    docker_image_jenkins: mirantis/jenkins:2.100
     jenkins_master_extra_opts: ""
     jenkins_master_executors_num: 4
     jenkins_master_max_concurent_requests: 40

docker/swarm/stack/jenkins/master.yml

diff --git a/docker/swarm/stack/jenkins/master.yml b/docker/swarm/stack/jenkins/master.yml
index 890f8da..45c952f 100644
--- a/docker/swarm/stack/jenkins/master.yml
+++ b/docker/swarm/stack/jenkins/master.yml
@@ -2,7 +2,6 @@
 - system.docker
 parameters:
   _param:
-    docker_image_jenkins: mirantis/jenkins:2.100
     jenkins_master_extra_opts: ""
     jenkins_master_executors_num: 4
     jenkins_master_max_concurent_requests: 40