Merge "Fix default acls of gerrit projects"
diff --git a/jenkins/client/job/oscore/qa.yml b/jenkins/client/job/oscore/qa.yml
index 258baa7..b7319b4 100644
--- a/jenkins/client/job/oscore/qa.yml
+++ b/jenkins/client/job/oscore/qa.yml
@@ -164,18 +164,10 @@
type: string
default: "3"
# test
- TEST_TEMPEST_CONF:
- 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
diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
index 8012d61..377ae0d 100644
--- a/jenkins/client/job/oscore/tests.yml
+++ b/jenkins/client/job/oscore/tests.yml
@@ -103,26 +103,14 @@
type: string
default: "3"
# test
- TEST_TEMPEST_CONF:
- 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
@@ -265,26 +253,14 @@
type: string
description: Product milestone
default: "{{milestone}}"
- TEST_TEMPEST_CONF:
- 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: "{{test_pattern}}"
TEST_PATTERN:
type: string
description: Run tests matched to pattern only
@@ -359,16 +335,9 @@
type: boolean
default: 'false'
description: Upload results to testrail or not
- 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: "{{test_image}}"
TEST_IMAGE:
type: string
description: Url to tempest docker image
@@ -377,30 +346,16 @@
type: string
description: Path to local docker image
default: ''
- 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
@@ -460,9 +415,6 @@
type: string
default: "{{testrail_credentials}}"
description: Credentials for results upload to testrail
- TEST_TEMPEST_TARGET:
- type: string
- description: Node to run tests
TEST_TARGET:
type: string
description: Node to run tests