Merge "Add apache metadata to horizon classes"
diff --git a/jenkins/client/job/debian/packages/salt-multi.yml b/jenkins/client/job/debian/packages/salt-multi.yml
index e185b60..b58b801 100644
--- a/jenkins/client/job/debian/packages/salt-multi.yml
+++ b/jenkins/client/job/debian/packages/salt-multi.yml
@@ -63,7 +63,7 @@
upload_source_package: true
dist: xenial
- name: swift
- upload_source_package: true
+ upload_source_package: false
dist: xenial
template:
discard:
diff --git a/jenkins/client/job/deploy/update/upgrade_mcp_release.yml b/jenkins/client/job/deploy/update/upgrade_mcp_release.yml
index 5968245..18f5646 100644
--- a/jenkins/client/job/deploy/update/upgrade_mcp_release.yml
+++ b/jenkins/client/job/deploy/update/upgrade_mcp_release.yml
@@ -47,4 +47,8 @@
UPDATE_LOCAL_REPOS:
type: boolean
default: 'false'
- description: "Use only when local repositories are present."
\ No newline at end of file
+ description: "Use only when local repositories are present."
+ PIPELINE_TIMEOUT:
+ type: string
+ default: '12'
+ description: "Sets pipeline timeout in hours. Defaults to '12' if left empty."
\ No newline at end of file
diff --git a/jenkins/client/job/oscore/salt_virtual_models.yml b/jenkins/client/job/oscore/salt_virtual_models.yml
index f315b3d..49ef6df 100644
--- a/jenkins/client/job/oscore/salt_virtual_models.yml
+++ b/jenkins/client/job/oscore/salt_virtual_models.yml
@@ -109,6 +109,30 @@
type: boolean
description: Whether to use container with rally
default: "false"
+ TEST_PASS_THRESHOLD:
+ type: string
+ description: Tests pass rate to consider build successful
+ default: "96"
+ FAIL_ON_TESTS:
+ type: boolean
+ default: 'true'
+ description: Whether to fail build on test results
+ TEST_PATTERN:
+ type: string
+ description: Run tests matched to pattern only
+ default: ''
+ TEST_MILESTONE:
+ type: string
+ description: Product milestone
+ default: 'MCP1.1'
+ TESTRAIL:
+ type: boolean
+ description: Whether to upload results to testrail or not
+ default: "false"
+ OPENSTACK_VERSION:
+ type: string
+ description: Version of openstack to test
+ default: ""
scm:
script: test-virtual-model-pipeline.groovy
type: git
diff --git a/jenkins/client/job/salt-models/generate.yml b/jenkins/client/job/salt-models/generate.yml
index 39af9b8..73f815d 100644
--- a/jenkins/client/job/salt-models/generate.yml
+++ b/jenkins/client/job/salt-models/generate.yml
@@ -32,8 +32,8 @@
type: string
TEST_MODEL:
type: boolean
- default: false
+ default: true
RECLASS_VERSION:
type: string
default: 'v1.5.4'
- description: "Version (branch) of Reclass we will use"
+ description: "Version (branch) of Reclass we will use.pip+git package"
diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index a020a73..112cb3d 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -206,12 +206,12 @@
description: e.g. skipped_nodes=nal01.local.com,ntw01.local.com
TESTS_SET:
type: string
- default: "cvp-sanity-check/cvp_checks/tests/"
- description: Leave empty for full run or choose a file, e.g. test_mtu.py
+ default: "cvp-sanity-checks/cvp_checks/tests/"
+ description: "Leave as is for full run or add a filename, e.g. _default_path_/test_mtu.py"
PROXY:
type: string
default: ""
- description: Proxy address to clone repo and install python requirements
+ description: "Proxy address to use to access the Internet. For offline mode, use \"offline\" value."
cvp-func:
type: workflow-scm
name: cvp-func
@@ -246,7 +246,7 @@
description: Credentials to the Salt API
TEST_IMAGE:
type: string
- default: "xrally/xrally-openstack:0.9.1"
+ default: "xrally/xrally-openstack:0.9.2"
description: Docker image to use for running Rally/Tempest
TARGET_NODE:
type: string
@@ -255,7 +255,7 @@
PROXY:
type: string
default: ""
- description: Proxy address to clone repo and install python requirements
+ description: "Proxy address to use to access the Internet. For offline mode, use \"offline\" value."
TEMPEST_TEST_PATTERN:
type: string
default: "set=smoke"
@@ -309,7 +309,7 @@
description: Node where container with tempest will be run
TEST_IMAGE:
type: string
- default: "xrally/xrally-openstack:0.9.1"
+ default: "xrally/xrally-openstack:0.9.2"
description: Docker image to use for running Rally/Tempest
TARGET_NODES:
type: string
@@ -330,7 +330,7 @@
PROXY:
type: string
default: ""
- description: Proxy address to clone repo and install python requirements
+ description: "Proxy address to use to access the Internet. For offline mode, use \"offline\" value."
TEMPEST_TEST_PATTERN:
type: string
default: "set=smoke"
@@ -373,7 +373,7 @@
description: Path to scenario file in container
TEST_IMAGE:
type: string
- default: "xrally/xrally-openstack:0.9.1"
+ default: "xrally/xrally-openstack:0.9.2"
description: Docker image to use for running Rally/Tempest
SALT_MASTER_URL:
type: string
@@ -390,9 +390,11 @@
TOOLS_REPO:
type: string
default: "https://github.com/Mirantis/cvp-configuration"
+ description: URL of repo where testing tools, scenarios, configs are located.
PROXY:
type: string
default: ""
+ description: "Proxy address to use to access the Internet. For offline mode, use \"offline\" value."
cvp-stacklight:
type: workflow-scm
name: cvp-stacklight
@@ -419,7 +421,7 @@
default: "salt"
TESTS_REPO:
type: string
- default: "https://github.com/legan4ik/stacklight-pytest"
+ default: "https://github.com/Mirantis/stacklight-pytest -b cvp_stacklight"
description: Url for cvp-stacklight-tests
TESTS_SETTINGS:
type: string
@@ -428,11 +430,11 @@
TESTS_SET:
type: string
default: "stacklight-pytest/stacklight_tests/tests/prometheus/"
- description: "Leave empty for full run or choose a file, e.g. test_dashboards.py"
+ description: "Leave as is for full run or add a filename, e.g. _default_path_/test_dashboards.py"
PROXY:
type: string
default: ""
- description: Proxy address to clone repo and install python requirements
+ description: "Proxy address to use to access the Internet. For offline mode, use \"offline\" value."
cvp-spt:
type: workflow-scm
name: cvp-spt
@@ -468,8 +470,8 @@
TESTS_SET:
type: string
default: "cvp-spt/cvp_spt/tests/"
- description: "Leave empty for full run or choose a file, e.g. test_glance.py"
+ description: "Leave as is for full run or add a filename, e.g. _default_path_/test_glance.py"
PROXY:
type: string
default: ""
- description: Proxy address to clone repo and install python requirements
+ description: "Proxy address to use to access the Internet. For offline mode, use \"offline\" value."
diff --git a/linux/system/banner.yml b/linux/system/banner.yml
index 173a044..55b417f 100644
--- a/linux/system/banner.yml
+++ b/linux/system/banner.yml
@@ -8,9 +8,9 @@
contents: |
=================================== WARNING ====================================
You have accessed a computer managed by ${_param:banner_company_name}.
- You are required to have authorisation from ${_param:banner_company_name}
+ You are required to have authorization from ${_param:banner_company_name}
before you proceed and you are strictly limited to use set out within that
- authorisation. Unauthorised access to or misuse of this system is prohibited
+ authorization. Unauthorized access to or misuse of this system is prohibited
and constitutes an offence under the Computer Misuse Act 1990.
If you disclose any information obtained through this system without authority
${_param:banner_company_name} may take legal action against you.
diff --git a/linux/system/motd/static.yml b/linux/system/motd/static.yml
index c0e23c0..831a84e 100644
--- a/linux/system/motd/static.yml
+++ b/linux/system/motd/static.yml
@@ -6,9 +6,9 @@
motd: |
=================================== WARNING ====================================
You have accessed a computer managed by ${_param:motd_company_name}.
- You are required to have authorisation from ${_param:motd_company_name}
+ You are required to have authorization from ${_param:motd_company_name}
before you proceed and you are strictly limited to use set out within that
- authorisation. Unauthorised access to or misuse of this system is prohibited
+ authorization. Unauthorized access to or misuse of this system is prohibited
and constitutes an offence under the Computer Misuse Act 1990.
If you disclose any information obtained through this system without
authority ${_param:motd_company_name} may take legal action against you.
diff --git a/salt/master/formula/pkg/openstack.yml b/salt/master/formula/pkg/openstack.yml
index 31b8980..4717682 100644
--- a/salt/master/formula/pkg/openstack.yml
+++ b/salt/master/formula/pkg/openstack.yml
@@ -103,6 +103,3 @@
supervisor:
source: pkg
name: salt-formula-supervisor
- swift:
- source: pkg
- name: salt-formula-swift