commit 7ec4eb1431f76a7b442de2f98689ceec4e0d4b40
author mcp-jenkins <mcp-jenkins@mirantis.com> Tue Jan 14 14:34:42 2020 +0000
committer Gerrit Code Review <mail@domain.com> Tue Jan 14 14:34:42 2020 +0000
tree 5c1f7286ff85d234e06aeccbfa5f47e87c39b3d6
parent 683ad15800e92c63abb2c05a60f8ac3a56d31f2e
parent cb9ff8400bdf20a4b4d1ececc75b3934edc204fb

Merge "Add kdziekonski user to stacklight team" into release/proposed/2019.2.0

defaults/docker_images.yml

diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index d35d8fe..2464d3b 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -18,7 +18,7 @@
     docker_image_mysql: "${_param:mcp_docker_registry}/mirantis/cicd/mysql:2019.2.6"
     # jenkins:2.150.3
     docker_image_jenkins: "${_param:mcp_docker_registry}/mirantis/cicd/jenkins:2019.2.5"
-    docker_image_jenkins_jnlp_slave: "${_param:mcp_docker_registry}/mirantis/cicd/jnlp-slave:2019.2.6"
+    docker_image_jenkins_jnlp_slave: "${_param:mcp_docker_registry}/mirantis/cicd/jnlp-slave:2019.2.8"
     # TODO: fix tag
     docker_image_jenkins_ssh_slave: "${_param:mcp_docker_registry}/mirantis/cicd/ssh-slave:2019.2.5"
     # model-generator

jenkins/client/approved_scripts.yml

diff --git a/jenkins/client/approved_scripts.yml b/jenkins/client/approved_scripts.yml
index f425a3f..6491f5c 100644
--- a/jenkins/client/approved_scripts.yml
+++ b/jenkins/client/approved_scripts.yml
@@ -150,6 +150,7 @@
         - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods iterator java.lang.Object[]
         - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods leftShift java.lang.StringBuffer java.lang.Object
         - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods minus java.lang.String java.lang.Object
+        - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods minus java.util.List java.lang.Iterable
         - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods minus java.util.List java.util.Collection
         - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods multiply java.lang.String java.lang.Number
         - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods plus java.util.List java.lang.Iterable