commit c28e97434cb85c9947db07b0104a3ef9ad2e701a
author mcp-jenkins <mcp-jenkins@mirantis.com> Fri Feb 22 13:28:21 2019 +0000
committer Gerrit Code Review <mail@domain.com> Fri Feb 22 13:28:21 2019 +0000
tree b051a243c3c31d637030e0c1f87ed86e9f0a834e
parent 33afffc96260e8e4bc11ee438b6d8dd6741cb46d
parent e2bad8d6cc216395c79d4dfba923d423e21fd9e8

Merge "Set nova instance_build_timeout to 1h by default"

defaults/docker_images.yml

diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index 6dba818..8207c87 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -41,6 +41,8 @@
     # keycloak
     docker_image_keycloak_server: "${_param:mcp_docker_registry}/mirantis/external/jboss/keycloak:4.5.0.Final"
     docker_image_keycloak_proxy: "${_param:mcp_docker_registry}/mirantis/external/jboss/keycloak:3.4.2.Final"
+    # CVP
+    docker_image_cvp_sanity_checks: ${_param:mcp_docker_registry}/mirantis/cvp/cvp-sanity-checks:${_param:mcp_version}
     # aptly
     docker_image_aptly:
       base: "${_param:mcp_docker_registry}/mirantis/cicd/aptly:${_param:mcp_version}"

jenkins/client/job/validate.yml

diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index bde6f77..9f20fc9 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -198,7 +198,7 @@
           param:
             IMAGE:
               type: string
-              default: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-sanity-checks:${_param:mcp_version}"
+              default: ${_param:docker_image_cvp_sanity_checks}
               description: Docker image with tests and all pip dependecies to use for testing
             SALT_MASTER_URL:
               type: string
@@ -452,7 +452,7 @@
           param:
             IMAGE:
               type: string
-              default: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-sanity-checks:${_param:mcp_version}"
+              default: ${_param:docker_image_cvp_sanity_checks}
               description: Docker image with tests and all pip dependecies to use for testing
             SALT_MASTER_URL:
               type: string