[CVP] Several fixes for cvp job descriptions
-use release/{mcp_version} branch of cvp-configuration in
all related cvp jobs
-replace hardcode for xrally image path (depends on
https://gerrit.mcp.mirantis.com/#/c/46001/)
-add quotes where needed
-replace https path with http for salt api for several jobs
-add cvp view
Related-PROD: PROD-31703
Related-PROD: PROD-32081
Change-Id: I176b0fcfc10287dd35bf23fe86be7509076a9512
diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index 09b5b55..ec79239 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -6,6 +6,11 @@
enabled: true
type: ListView
include_regex: "validate.*"
+ CVP:
+ cvp:
+ enabled: true
+ type: ListView
+ include_regex: "cvp.*"
job:
validate_openstack:
type: workflow-scm
@@ -196,12 +201,12 @@
param:
IMAGE:
type: string
- default: ${_param:docker_image_cvp_sanity_checks}
+ 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
default: "${_param:jenkins_salt_api_url}"
- description: Full Salt API address [e.g. https://10.10.10.2:6969]
+ description: Full Salt API address [e.g. https://10.10.10.2:8969]
SALT_MASTER_CREDENTIALS:
type: string
default: "salt"
@@ -238,15 +243,15 @@
description: Path to skip list in container
SALT_MASTER_URL:
type: string
- default: "${_param:jenkins_salt_api_url}"
- description: Full Salt API address [e.g. https://10.10.10.2:6969]
+ default: "http://${_param:salt_master_host}:6969"
+ description: Full Salt API address [e.g. http://10.10.10.2:6969]
SALT_MASTER_CREDENTIALS:
type: string
default: "salt"
description: Credentials to the Salt API
TEST_IMAGE:
type: string
- default: "xrally/xrally-openstack:0.11.2"
+ default: "${_param:docker_image_cvp_xrally}"
description: Docker image to use for running Rally/Tempest
TARGET_NODE:
type: string
@@ -273,7 +278,7 @@
description: URL to Tempest repo (local or remote) or path to tempest folder in container
TOOLS_REPO:
type: string
- default: "https://github.com/Mirantis/cvp-configuration -b 2019.2.0"
+ default: "https://github.com/Mirantis/cvp-configuration -b release/${_param:mcp_version}"
description: URL of repo where testing tools, scenarios, configs are located.
cvp-ha:
type: workflow-scm
@@ -294,8 +299,8 @@
param:
SALT_MASTER_URL:
type: string
- default: "${_param:jenkins_salt_api_url}"
- description: Full Salt API address [e.g. https://10.10.10.2:6969]
+ default: "http://${_param:salt_master_host}:6969"
+ description: Full Salt API address [e.g. http://10.10.10.2:6969]
SALT_MASTER_CREDENTIALS:
type: string
default: "salt"
@@ -306,7 +311,7 @@
description: Node where container with tempest will be run
TEST_IMAGE:
type: string
- default: "xrally/xrally-openstack:0.11.2"
+ default: "${_param:docker_image_cvp_xrally}"
description: Docker image to use for running Rally/Tempest
TARGET_NODES:
type: string
@@ -342,7 +347,7 @@
description: Can be repo url (local or remote) or path to folder (inside container) with Tempest
TOOLS_REPO:
type: string
- default: "https://github.com/Mirantis/cvp-configuration -b 2019.2.0"
+ default: "https://github.com/Mirantis/cvp-configuration -b release/${_param:mcp_version}"
description: URL of repo where testing tools, scenarios, configs are located.
cvp-tempest:
type: workflow-scm
@@ -367,8 +372,8 @@
description: Prepare resources for Tempest
SALT_MASTER_URL:
type: string
- default: "${_param:jenkins_salt_api_url}"
- description: SALT_MASTER_URL
+ default: "http://${_param:salt_master_host}:6969"
+ description: Full Salt API address [e.g. http://10.10.10.2:6969]
TEMPEST_TEST_PATTERN:
type: string
default: "set=smoke"
@@ -416,12 +421,12 @@
description: Path to scenario file in container
TEST_IMAGE:
type: string
- default: "xrally/xrally-openstack:0.11.2"
+ default: "${_param:docker_image_cvp_xrally}"
description: Docker image to use for running Rally/Tempest
SALT_MASTER_URL:
type: string
- default: "${_param:jenkins_salt_api_url}"
- description: Full Salt API address [e.g. https://10.10.10.2:6969]
+ default: "http://${_param:salt_master_host}:6969"
+ description: Full Salt API address [e.g. http://10.10.10.2:6969]
SALT_MASTER_CREDENTIALS:
type: string
default: "salt"
@@ -432,7 +437,7 @@
description: Node where docker container with Rally will be run
TOOLS_REPO:
type: string
- default: "https://github.com/Mirantis/cvp-configuration -b 2019.2.0"
+ default: "https://github.com/Mirantis/cvp-configuration -b release/${_param:mcp_version}"
description: URL of repo where testing tools, scenarios, configs are located.
PROXY:
type: string
@@ -457,12 +462,12 @@
param:
IMAGE:
type: string
- default: ${_param:docker_image_cvp_sanity_checks}
+ 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
default: "${_param:jenkins_salt_api_url}"
- description: Full Salt API address [e.g. https://10.10.10.2:6969]
+ description: Full Salt API address [e.g. https://10.10.10.2:8969]
SALT_MASTER_CREDENTIALS:
type: string
default: "salt"
@@ -491,12 +496,12 @@
param:
IMAGE:
type: string
- default: ${_param:docker_image_cvp_sanity_checks}
+ 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
default: "${_param:jenkins_salt_api_url}"
- description: Full Salt API address [e.g. https://10.10.10.2:6969]
+ description: Full Salt API address [e.g. https://10.10.10.2:8969]
SALT_MASTER_CREDENTIALS:
type: string
default: "salt"