Merge "Change TEST_TESMPEST_* to TEST_*"
diff --git a/jenkins/client/job/oscore/qa.yml b/jenkins/client/job/oscore/qa.yml
index a8d4fae..258baa7 100644
--- a/jenkins/client/job/oscore/qa.yml
+++ b/jenkins/client/job/oscore/qa.yml
@@ -168,10 +168,18 @@
type: string
description: Tempest configuration file path inside container
default: "{{tempest_conf}}"
+ TEST_CONF:
+ type: string
+ description: Tempest configuration file path inside container
+ default: "{{test_conf}}"
TEST_TEMPEST_TARGET:
type: string
description: Node to run tests
default: "{{tempest_target}}"
+ TEST_TARGET:
+ type: string
+ description: Node to run tests
+ default: "{{test_target}}"
TEST_MODEL:
type: string
description: Environment salt model
diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
index eb3a325..8cedaf8 100644
--- a/jenkins/client/job/oscore/tests.yml
+++ b/jenkins/client/job/oscore/tests.yml
@@ -103,14 +103,26 @@
type: string
description: Tempest configuration file path inside container
default: "{{tempest_conf}}"
+ TEST_CONF:
+ type: string
+ description: Tempest configuration file path inside container
+ default: "{{test_conf}}"
TEST_TEMPEST_TARGET:
type: string
description: Node to run tests
default: "{{tempest_target}}"
+ TEST_TARGET:
+ type: string
+ description: Node to run tests
+ default: "{{test_target}}"
TEST_TEMPEST_PATTERN:
type: string
description: Run tests matched to pattern only
default: "tempest"
+ TEST_PATTERN:
+ type: string
+ description: Run tests matched to pattern only
+ default: "tempest"
TEST_MODEL:
type: string
description: Environment salt model
@@ -253,14 +265,26 @@
type: string
description: Tempest configuration file path inside container
default: "{{tempest_conf}}"
+ TEST_CONF:
+ type: string
+ description: Tempest configuration file path inside container
+ default: "{{test_conf}}"
TEST_TEMPEST_TARGET:
type: string
description: Node to run tests
default: "{{tempest_target}}"
+ TEST_TARGET:
+ type: string
+ description: Node to run tests
+ default: "{{test_target}}"
TEST_TEMPEST_PATTERN:
type: string
description: Run tests matched to pattern only
default: "tempest --concurrency 2"
+ TEST_PATTERN:
+ type: string
+ description: Run tests matched to pattern only
+ default: "tempest --concurrency 2"
TEST_MODEL:
type: string
description: Environment salt model
@@ -326,10 +350,17 @@
TEST_TEMPEST_TARGET:
type: string
description: Salt target to run tests
+ TEST_TARGET:
+ type: string
+ description: Salt target to run tests
TEST_TEMPEST_IMAGE:
type: string
description: Url to tempest docker image
default: 'docker-prod-local.artifactory.mirantis.com/mirantis/oscore/rally-tempest'
+ TEST_IMAGE:
+ type: string
+ description: Url to tempest docker image
+ default: 'docker-prod-local.artifactory.mirantis.com/mirantis/oscore/rally-tempest'
LOCAL_TEMPEST_IMAGE:
type: string
description: Path to local docker image
@@ -337,17 +368,31 @@
TEST_TEMPEST_PATTERN:
type: string
description: Run tests matched to pattern only
+ TEST_PATTERN:
+ type: string
+ description: Run tests matched to pattern only
TEST_TEMPEST_SET:
type: string
description: Run tests matched by tempest set only
+ TEST_SET:
+ type: string
+ description: Run tests matched by tempest set only
TEST_TEMPEST_CONCURRENCY:
type: string
description: How much test threads to run
default: "2"
+ TEST_CONCURRENCY:
+ type: string
+ description: How much test threads to run
+ default: "2"
TEST_TEMPEST_CONF:
type: string
description: Tempest configuration file path inside container
default: "mcp.conf"
+ TEST_CONF:
+ type: string
+ description: Tempest configuration file path inside container
+ default: "mcp.conf"
TEST_MODEL:
type: string
description: Environment salt model
@@ -406,6 +451,9 @@
TEST_TEMPEST_TARGET:
type: string
description: Node to run tests
+ TEST_TARGET:
+ type: string
+ description: Node to run tests
TEST_MILESTONE:
type: string
description: Product milestone