Merge "Include sysstat package on xtrabackup nodes by default"
diff --git a/jenkins/client/approved_scripts.yml b/jenkins/client/approved_scripts.yml
index 43bc5e2..90273a2 100644
--- a/jenkins/client/approved_scripts.yml
+++ b/jenkins/client/approved_scripts.yml
@@ -141,6 +141,7 @@
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods getAt java.lang.String int
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods getAt java.util.Collection java.lang.String
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods getAt java.util.List groovy.lang.Range
+ - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods getAt java.util.regex.Matcher java.util.Collection
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods getBytes java.io.File
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods getText java.io.InputStream
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods hasProperty java.lang.Object java.lang.String
diff --git a/jenkins/client/job/deploy/update/virt_snapshot.yml b/jenkins/client/job/deploy/update/virt_snapshot.yml
index 22c8880..feada8a 100644
--- a/jenkins/client/job/deploy/update/virt_snapshot.yml
+++ b/jenkins/client/job/deploy/update/virt_snapshot.yml
@@ -55,7 +55,7 @@
type: string
default: "snapshot1"
description: "Snapshot name"
- PATH:
+ LIBVIRT_IMAGES_PATH:
type: string
default: "/var/lib/libvirt/images"
description: "Path where snapshot image and dumpxml are being put"
diff --git a/kubernetes/pool/images/drivetrain.yml b/kubernetes/pool/images/drivetrain.yml
index 94f5302..c62a31c 100644
--- a/kubernetes/pool/images/drivetrain.yml
+++ b/kubernetes/pool/images/drivetrain.yml
@@ -7,4 +7,10 @@
- ${_param:docker_image_jenkins}
- ${_param:docker_image_openldap}
- ${_param:docker_image_phpldapadmin}
- - ${_param:docker_image_mysql}
\ No newline at end of file
+ - ${_param:docker_image_mysql}
+ - ${_param:kubernetes_calico_kube_controllers_image}
+ - ${_param:kubernetes_coredns_image}
+ - ${_param:kubernetes_helm_tiller_image}
+ - ${_param:kubernetes_ingressnginx_controller_image}
+ - ${_param:kubernetes_metallb_controller_image}
+ - ${_param:kubernetes_metallb_speaker_image}