Merge "Add descriptions for OSCORE jobs"
diff --git a/jenkins/client/job/oscore/init.yml b/jenkins/client/job/oscore/init.yml
index 4666ddd..4df13c4 100644
--- a/jenkins/client/job/oscore/init.yml
+++ b/jenkins/client/job/oscore/init.yml
@@ -4,6 +4,8 @@
- system.jenkins.client.job.oscore.qa
- system.jenkins.client.job.oscore.salt_virtual_models
parameters:
+ _param:
+ job_description: <br>Deploy and test OpenStack.<br>
jenkins:
client:
view:
diff --git a/jenkins/client/job/oscore/qa.yml b/jenkins/client/job/oscore/qa.yml
index b7319b4..c8908e7 100644
--- a/jenkins/client/job/oscore/qa.yml
+++ b/jenkins/client/job/oscore/qa.yml
@@ -5,6 +5,7 @@
oscore-build-docker-image:
name: "{{job_prefix}}-{{oscore-qa-project}}-build-docker-image"
template:
+ description: ${_param:job_description}
discard:
build:
keep_num: 25
@@ -49,6 +50,7 @@
oscore-docker-image-systest-template:
name: "{{job_prefix}}-{{oscore-qa-project}}-image-systest-{{model}}"
template:
+ description: ${_param:job_description}
discard:
build:
keep_num: 30
diff --git a/jenkins/client/job/oscore/salt_virtual_models.yml b/jenkins/client/job/oscore/salt_virtual_models.yml
index f8ee2f3..82b51ee 100644
--- a/jenkins/client/job/oscore/salt_virtual_models.yml
+++ b/jenkins/client/job/oscore/salt_virtual_models.yml
@@ -4,6 +4,7 @@
job:
oscore-test_virtual_model:
concurrent: true
+ description: ${_param:job_description}
discard:
build:
keep_num: 30
@@ -96,6 +97,7 @@
type: workflow-scm
oscore-test_virtual_models:
concurrent: true
+ description: ${_param:job_description}
discard:
build:
keep_num: 30
diff --git a/jenkins/client/job/oscore/security_tests.yml b/jenkins/client/job/oscore/security_tests.yml
index 36b5441..d564574 100644
--- a/jenkins/client/job/oscore/security_tests.yml
+++ b/jenkins/client/job/oscore/security_tests.yml
@@ -5,6 +5,7 @@
bandit-scanner-template-downstream:
name: "{{job_prefix}}-bandit-downstream-{{project}}"
template:
+ description: ${_param:job_description}
discard:
build:
keep_num: 30
@@ -94,6 +95,7 @@
bandit-scanner-template-upstream:
name: "{{job_prefix}}-bandit-upstream-{{project}}"
template:
+ description: ${_param:job_description}
discard:
build:
keep_num: 30
diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
index 377ae0d..122f793 100644
--- a/jenkins/client/job/oscore/tests.yml
+++ b/jenkins/client/job/oscore/tests.yml
@@ -5,6 +5,7 @@
test-openstack-component-formula:
name: "{{job_prefix}}-formula-systest-{{model}}-{{openstack_version}}"
template:
+ description: ${_param:job_description}
discard:
build:
keep_num: 30
@@ -146,6 +147,7 @@
test-openstack-component-periodic:
name: "{{job_prefix}}-{{milestone}}-{{model}}-{{openstack_version}}-{{formula_pkg_revision}}"
template:
+ description: ${_param:job_description}
discard:
build:
keep_num: 30
@@ -284,6 +286,7 @@
test-runner-template:
name: "{{job_prefix}}-{{test_type}}-runner"
template:
+ description: ${_param:job_description}
discard:
build:
keep_num: 30
@@ -378,6 +381,7 @@
results-checker-template:
name: "{{job_prefix}}-{{test_type}}-results-checker"
template:
+ description: ${_param:job_description}
discard:
build:
keep_num: 30
@@ -450,6 +454,7 @@
deploy-kvm-virtual-template:
name: "{{job_prefix}}-deploy-kvm-VMs"
template:
+ description: ${_param:job_description}
discard:
build:
keep_num: 30
@@ -531,6 +536,7 @@
oscore-oscc-ci-template:
name: "{{job_prefix}}-oscc-ci"
template:
+ description: ${_param:job_description}
discard:
build:
keep_num: 30
@@ -595,6 +601,7 @@
build-salt-formula-refspec-template:
name: "{{job_prefix}}-build-salt-formula-refspec"
template:
+ description: ${_param:job_description}
discard:
build:
keep_num: 30
@@ -664,6 +671,7 @@
test-salt-formula-refspec-template:
name: "{{job_prefix}}-test-salt-formula-refspec"
template:
+ description: ${_param:job_description}
discard:
build:
keep_num: 30
@@ -756,6 +764,7 @@
test-deploy-virtual-model-change-template:
name: "{{job_prefix}}-deploy-virtual-model-change-{{job_suffix}}"
template:
+ description: ${_param:job_description}
discard:
build:
keep_num: 30