Merge "Temp. disable debmirror caching" into release/2019.2.0
diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index 60d2bb9..a7b5a8e 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -65,7 +65,7 @@
name: openldap:1.1.8
- registry: ${_param:mcp_docker_registry}/mirantis/external/library
target_registry: ${_param:local_docker_client_registry_target_registry}/mirantis/external/library
- name: postgresql:9.6.10
+ name: postgres:9.6.10
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:local_docker_client_registry_target_registry}/mirantis/cicd
name: phpldapadmin:${_param:apt_mk_version}
diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index 3003ebb..eed3084 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -1,7 +1,6 @@
parameters:
_param:
jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
- cvp_sanity_default_repo: "https://github.com/Mirantis/cvp-sanity-checks"
jenkins:
client:
view:
@@ -214,7 +213,7 @@
default: "salt"
TESTS_REPO:
type: string
- default: "${_param:cvp_sanity_default_repo}"
+ default: ""
description: Url for cvp-sanity-checks
TESTS_SETTINGS:
type: string
@@ -222,7 +221,7 @@
description: e.g. skipped_nodes=nal01.local.com,ntw01.local.com
TESTS_SET:
type: string
- default: "cvp_checks/tests/"
+ default: "cvp-sanity/cvp_checks/tests"
description: "Leave as is for full run or add a filename, e.g. _default_path_/test_mtu.py"
PROXY:
type: string
@@ -484,7 +483,7 @@
default: "salt"
TESTS_REPO:
type: string
- default: "https://github.com/Mirantis/cvp-spt"
+ default: ""
description: Url for cvp-spt repository
TESTS_SETTINGS:
type: string
@@ -492,7 +491,7 @@
description: "Additional environment variables to export, e.g. image_name, networks, HW_NODES"
TESTS_SET:
type: string
- default: "cvp_spt/tests/"
+ default: "cvp-spt/cvp_spt/tests"
description: "Leave as is for full run or add a filename, e.g. _default_path_/test_glance.py"
PROXY:
type: string