commit d74ecabe98f3e9f48b088f8036a5e9a547c5d96f
author Jakub Josef <jjosef@mirantis.com> Mon Oct 16 16:00:53 2017 +0000
committer Gerrit Code Review <gerrit2@7cd0c2eb159e> Mon Oct 16 16:00:54 2017 +0000
tree 857812af91847f8a0ccde2c4da8799ddf1e7c7e3
parent 4ddeb7edeac30286377b1659eb36ff69f9c1fc77
parent 7e7098069109e999b7da008198ae8f5afd22dad7

Merge "Update k8s conformance version."

jenkins/client/job/deploy/lab/deploy.yml

diff --git a/jenkins/client/job/deploy/lab/deploy.yml b/jenkins/client/job/deploy/lab/deploy.yml
index 75c3776..e64858a 100644
--- a/jenkins/client/job/deploy/lab/deploy.yml
+++ b/jenkins/client/job/deploy/lab/deploy.yml
@@ -143,7 +143,7 @@
                 default: "http://127.0.0.1:8080"
               TEST_K8S_CONFORMANCE_IMAGE:
                 type: string
-                default: "docker-dev-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.7.3-1_1503652362277"
+                default: "docker-dev-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.7.5-2_1504192939316"
 
               TEST_TEMPEST_IMAGE:
                 type: string

jenkins/client/job/deploy/rollout.yml

diff --git a/jenkins/client/job/deploy/rollout.yml b/jenkins/client/job/deploy/rollout.yml
index 4854845..93f5167 100644
--- a/jenkins/client/job/deploy/rollout.yml
+++ b/jenkins/client/job/deploy/rollout.yml
@@ -51,7 +51,7 @@
               default: "http://127.0.0.1:8080"
             TEST_K8S_CONFORMANCE_IMAGE:
               type: string
-              default: "docker-dev-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.7.3-1_1503652362277"
+              default: "docker-dev-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.7.5-2_1504192939316"
             TEST_TEMPEST_IMAGE:
               type: string
               description: "Tempest docker image"

jenkins/client/job/deploy/test.yml

diff --git a/jenkins/client/job/deploy/test.yml b/jenkins/client/job/deploy/test.yml
index b965a52..9b99ee5 100644
--- a/jenkins/client/job/deploy/test.yml
+++ b/jenkins/client/job/deploy/test.yml
@@ -31,7 +31,7 @@
               default: "http://127.0.0.1:8080"
             TEST_K8S_CONFORMANCE_IMAGE:
               type: string
-              default: "docker-dev-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.7.3-1_1503652362277"
+              default: "docker-dev-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.7.5-2_1504192939316"
 
             TEST_TEMPEST_IMAGE:
               type: string

jenkins/client/job/validate.yml

diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index 9ee63c1..bc7e847 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -57,7 +57,7 @@
               default: "http://127.0.0.1:8080"
             TEST_K8S_CONFORMANCE_IMAGE:
               type: string
-              default: "docker-dev-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.7.3-1_1503652362277"
+              default: "docker-dev-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.7.5-2_1504192939316"
             RUN_SPT_TESTS:
               type: boolean
               default: 'true'