commit 9a6cb8e8d8790ba089a6671887b0cc83d2b73f97
author mcp-jenkins <mcp-jenkins@mirantis.com> Thu Nov 08 16:35:20 2018 +0000
committer Gerrit Code Review <mail@domain.com> Thu Nov 08 16:35:20 2018 +0000
tree d9c378bb92f6837574c566ab9c817bef8b41d60f
parent b30dc1c4a931a86ad260df241fff60be7807e78f
parent aafc2982d491e80c62787783ddaae09a47f86300

Merge "Split ES retention jobs for logs and notifications"

defaults/docker_images.yml

diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index 8d13c63..a7b4c19 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -17,3 +17,4 @@
     docker_image_gerrit: "${_param:mcp_docker_registry}/mirantis/cicd/gerrit:${_param:apt_mk_version}"
     # mysql:5.6
     docker_image_mysql: "${_param:mcp_docker_registry}/mirantis/cicd/mysql:${_param:apt_mk_version}"
+    docker_image_jenkins_slave: ${_param:mcp_docker_registry}/mirantis/cicd/jnlp-slave:${_param:apt_mk_version}

docker/swarm/stack/jenkins/slave.yml

diff --git a/docker/swarm/stack/jenkins/slave.yml b/docker/swarm/stack/jenkins/slave.yml
index f3cd90c..1585058 100644
--- a/docker/swarm/stack/jenkins/slave.yml
+++ b/docker/swarm/stack/jenkins/slave.yml
@@ -2,7 +2,6 @@
 - system.docker
 parameters:
   _param:
-    docker_image_jenkins_slave: mirantis/jnlp-slave
     jenkins_master_host: ${_param:control_vip_address}
     jenkins_master_port: 8081
     jenkins_secret: "7c40abc1a7df2d26dd6b2e4421af17218df75a16fcbd5e3aa6017d9f47eaeabe"