Merge "backups to gluster"
diff --git a/apache/server/site/barbican.yml b/apache/server/site/barbican.yml
new file mode 100644
index 0000000..78c9f02
--- /dev/null
+++ b/apache/server/site/barbican.yml
@@ -0,0 +1,50 @@
+parameters:
+ _param:
+ apache_barbican_ssl:
+ enabled: false
+ apache_barbican_api_address: 0.0.0.0
+ apache_barbican_api_host: ${linux:network:fqdn}
+ apache:
+ server:
+ enabled: true
+ site:
+ barbican:
+ enabled: false
+ available: true
+ type: wsgi
+ name: barbican
+ ssl: ${_param:apache_barbican_ssl}
+ wsgi:
+ daemon_process: barbican-api
+ processes: 3
+ threads: 10
+ user: barbican
+ group: barbican
+ display_name: '%{GROUP}'
+ script_alias: '/ /usr/bin/barbican-wsgi-api'
+ application_group: '%{GLOBAL}'
+ authorization: 'On'
+ host:
+ address: ${_param:apache_barbican_api_address}
+ name: ${_param:apache_barbican_api_host}
+ port: 9311
+ log:
+ custom:
+ format: >-
+ %v:%p %{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\"
+ error:
+ enabled: true
+ format: '%M'
+ barbican_admin:
+ enabled: false
+ available: true
+ type: wsgi
+ name: barbican_admin
+ ssl: ${_param:apache_barbican_ssl}
+ wsgi:
+ daemon_process: barbican-api-admin
+ processes: 3
+ threads: 10
+ user: barbican
+ group: barbican
+ display_name: '%{GROUP}'
diff --git a/jenkins/client/job/deploy/lab/component/aaa.yml b/jenkins/client/job/deploy/lab/component/aaa.yml
index 1c640d5..26a66fd 100644
--- a/jenkins/client/job/deploy/lab/component/aaa.yml
+++ b/jenkins/client/job/deploy/lab/component/aaa.yml
@@ -8,4 +8,4 @@
stack_type: heat
stack_install: core,aaa
stack_test: ""
- job_timer: ""
+ job_timer: "H H(0-6) * * *"
diff --git a/jenkins/client/job/deploy/lab/component/drivetrain.yml b/jenkins/client/job/deploy/lab/component/drivetrain.yml
index 945ac4a..6d05945 100644
--- a/jenkins/client/job/deploy/lab/component/drivetrain.yml
+++ b/jenkins/client/job/deploy/lab/component/drivetrain.yml
@@ -8,7 +8,7 @@
stack_type: heat
stack_install: core
stack_test: ""
- job_timer: ""
+ job_timer: "H H(0-6) * * *"
- stack_name: drivetrain_ha_clusters
stack_env: devcloud
stack_type: heat
diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
index 8cedaf8..63bd9b3 100644
--- a/jenkins/client/job/oscore/tests.yml
+++ b/jenkins/client/job/oscore/tests.yml
@@ -280,11 +280,11 @@
TEST_TEMPEST_PATTERN:
type: string
description: Run tests matched to pattern only
- default: "tempest --concurrency 2"
+ default: "{{test_pattern}}"
TEST_PATTERN:
type: string
description: Run tests matched to pattern only
- default: "tempest --concurrency 2"
+ default: "{{test_pattern}}"
TEST_MODEL:
type: string
description: Environment salt model
@@ -297,6 +297,10 @@
type: boolean
default: 'true'
description: Whether to fail build on test results
+ RUN_SMOKE:
+ type: boolean
+ default: "{{run_smoke}}"
+ description: Enabling of running smoke tests
test-runner-template:
name: "{{job_prefix}}-{{test_type}}-runner"
template:
@@ -332,6 +336,10 @@
type: string
description: Job for results processing
default: "{{proc_results_job}}"
+ TEST_TYPE:
+ type: string
+ description: Name of test type
+ default: "{{test_type}}"
SLAVE_NODE:
type: string
default: 'python'
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index c68e3d9..8744c0c 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -82,6 +82,28 @@
APT_REPOSITORY_GPG:
type: string
default: ""
+ test_customers_salt_models:
+ name: test-customers-salt-models
+ template:
+ type: workflow-scm
+ discard:
+ build:
+ keep_num: 50
+ artifact:
+ keep_num: 50
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
+ credentials: "gerrit"
+ script: test-customers-salt-models.groovy
+ concurrent: false
+ param:
+ CUSTOMERS:
+ type: string
+ description: "Comma separated list of customer model names"
+ default: "{{customers}}"
+
test_salt_model_customer:
name: test-salt-model-customer-{{name}}
template: