Merge "[CVP] cvp jobs EXTRAM_PARAMS should have better description"
diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index ede66b1..467d79c 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -115,8 +115,10 @@
default: "salt"
EXTRA_PARAMS:
type: text
- default: "---"
- description: YAML context with additional parameters
+ default: |
+ envs:
+ - tests_set=''
+ description: "YAML context with additional parameters, e.g. skipped_nodes=nal01.local.com,ntw01.local.com or tests_set='tests/test_mtu.py'"
cvp-func:
type: workflow-scm
name: cvp-func
@@ -152,7 +154,7 @@
description: Credentials to the Salt API
TEST_IMAGE:
type: string
- default: "xrally/xrally-openstack:0.10.1"
+ default: "xrally/xrally-openstack:0.11.2"
description: Docker image to use for running Rally/Tempest
TARGET_NODE:
type: string
@@ -212,7 +214,7 @@
description: Node where container with tempest will be run
TEST_IMAGE:
type: string
- default: "xrally/xrally-openstack:0.10.1"
+ default: "xrally/xrally-openstack:0.11.2"
description: Docker image to use for running Rally/Tempest
TARGET_NODES:
type: string
@@ -324,7 +326,7 @@
description: Path to scenario file in container
TEST_IMAGE:
type: string
- default: "xrally/xrally-openstack:0.10.1"
+ default: "xrally/xrally-openstack:0.11.2"
description: Docker image to use for running Rally/Tempest
SALT_MASTER_URL:
type: string
@@ -410,8 +412,12 @@
default: "salt"
EXTRA_PARAMS:
type: text
- default: "---"
- description: YAML context with additional parameters
+ default: |
+ envs:
+ - tests_set=''
+ - image_name='Ubuntu'
+ - networks=10.101.0.0/24
+ description: 'YAML context with additional parameters. Additional params: HW_NODES, CMP_HOSTS, salt_timeout, skipped_nodes, nova_timeout, iperf_prep_string, IMAGE_SIZE_MB'
cvp-shaker:
type: workflow-scm
name: cvp-shaker