Fix descriptions for oscore and 2way jobs
Change-Id: I3c16e9b0331de71a6e23aad029c2bf6238669d27
diff --git a/jenkins/client/job/git-mirrors/2way.yml b/jenkins/client/job/git-mirrors/2way.yml
index ba17f9f..0546d94 100644
--- a/jenkins/client/job/git-mirrors/2way.yml
+++ b/jenkins/client/job/git-mirrors/2way.yml
@@ -1,7 +1,7 @@
parameters:
_param:
jenkins_pollscm_spec: "H/60 * * * *"
- job_description: <br>Syncronizes code projects with GitHub.<br>
+ job_description_2way: <br>Syncronizes code projects with GitHub.<br>
jenkins:
client:
job_template:
@@ -21,7 +21,7 @@
target: Mirantis/mcp-offline-model
branches: "master"
template:
- description: ${_param:job_description}
+ description: ${_param:job_description_2way}
discard:
build:
keep_num: 10
diff --git a/jenkins/client/job/oscore/init.yml b/jenkins/client/job/oscore/init.yml
index 4df13c4..2f45ef8 100644
--- a/jenkins/client/job/oscore/init.yml
+++ b/jenkins/client/job/oscore/init.yml
@@ -5,7 +5,7 @@
- system.jenkins.client.job.oscore.salt_virtual_models
parameters:
_param:
- job_description: <br>Deploy and test OpenStack.<br>
+ job_description_oscore: <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 c8908e7..eb565a2 100644
--- a/jenkins/client/job/oscore/qa.yml
+++ b/jenkins/client/job/oscore/qa.yml
@@ -5,7 +5,7 @@
oscore-build-docker-image:
name: "{{job_prefix}}-{{oscore-qa-project}}-build-docker-image"
template:
- description: ${_param:job_description}
+ description: ${_param:job_description_oscore}
discard:
build:
keep_num: 25
@@ -50,7 +50,7 @@
oscore-docker-image-systest-template:
name: "{{job_prefix}}-{{oscore-qa-project}}-image-systest-{{model}}"
template:
- description: ${_param:job_description}
+ description: ${_param:job_description_oscore}
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 82b51ee..911c1ce 100644
--- a/jenkins/client/job/oscore/salt_virtual_models.yml
+++ b/jenkins/client/job/oscore/salt_virtual_models.yml
@@ -4,7 +4,7 @@
job:
oscore-test_virtual_model:
concurrent: true
- description: ${_param:job_description}
+ description: ${_param:job_description_oscore}
discard:
build:
keep_num: 30
@@ -97,7 +97,7 @@
type: workflow-scm
oscore-test_virtual_models:
concurrent: true
- description: ${_param:job_description}
+ description: ${_param:job_description_oscore}
discard:
build:
keep_num: 30
diff --git a/jenkins/client/job/oscore/security_tests.yml b/jenkins/client/job/oscore/security_tests.yml
index d564574..8c6e39d 100644
--- a/jenkins/client/job/oscore/security_tests.yml
+++ b/jenkins/client/job/oscore/security_tests.yml
@@ -5,7 +5,7 @@
bandit-scanner-template-downstream:
name: "{{job_prefix}}-bandit-downstream-{{project}}"
template:
- description: ${_param:job_description}
+ description: ${_param:job_description_oscore}
discard:
build:
keep_num: 30
@@ -95,7 +95,7 @@
bandit-scanner-template-upstream:
name: "{{job_prefix}}-bandit-upstream-{{project}}"
template:
- description: ${_param:job_description}
+ description: ${_param:job_description_oscore}
discard:
build:
keep_num: 30
diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
index 122f793..fe9d33c 100644
--- a/jenkins/client/job/oscore/tests.yml
+++ b/jenkins/client/job/oscore/tests.yml
@@ -5,7 +5,7 @@
test-openstack-component-formula:
name: "{{job_prefix}}-formula-systest-{{model}}-{{openstack_version}}"
template:
- description: ${_param:job_description}
+ description: ${_param:job_description_oscore}
discard:
build:
keep_num: 30
@@ -147,7 +147,7 @@
test-openstack-component-periodic:
name: "{{job_prefix}}-{{milestone}}-{{model}}-{{openstack_version}}-{{formula_pkg_revision}}"
template:
- description: ${_param:job_description}
+ description: ${_param:job_description_oscore}
discard:
build:
keep_num: 30
@@ -286,7 +286,7 @@
test-runner-template:
name: "{{job_prefix}}-{{test_type}}-runner"
template:
- description: ${_param:job_description}
+ description: ${_param:job_description_oscore}
discard:
build:
keep_num: 30
@@ -381,7 +381,7 @@
results-checker-template:
name: "{{job_prefix}}-{{test_type}}-results-checker"
template:
- description: ${_param:job_description}
+ description: ${_param:job_description_oscore}
discard:
build:
keep_num: 30
@@ -454,7 +454,7 @@
deploy-kvm-virtual-template:
name: "{{job_prefix}}-deploy-kvm-VMs"
template:
- description: ${_param:job_description}
+ description: ${_param:job_description_oscore}
discard:
build:
keep_num: 30
@@ -536,7 +536,7 @@
oscore-oscc-ci-template:
name: "{{job_prefix}}-oscc-ci"
template:
- description: ${_param:job_description}
+ description: ${_param:job_description_oscore}
discard:
build:
keep_num: 30
@@ -601,7 +601,7 @@
build-salt-formula-refspec-template:
name: "{{job_prefix}}-build-salt-formula-refspec"
template:
- description: ${_param:job_description}
+ description: ${_param:job_description_oscore}
discard:
build:
keep_num: 30
@@ -671,7 +671,7 @@
test-salt-formula-refspec-template:
name: "{{job_prefix}}-test-salt-formula-refspec"
template:
- description: ${_param:job_description}
+ description: ${_param:job_description_oscore}
discard:
build:
keep_num: 30
@@ -764,7 +764,7 @@
test-deploy-virtual-model-change-template:
name: "{{job_prefix}}-deploy-virtual-model-change-{{job_suffix}}"
template:
- description: ${_param:job_description}
+ description: ${_param:job_description_oscore}
discard:
build:
keep_num: 30
diff --git a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
index cccd01a..a2b000a 100644
--- a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
+++ b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
@@ -1,7 +1,7 @@
parameters:
_param:
jenkins_pollscm_spec: "H/60 * * * *"
- job_description: <br>Syncronizes code projects with GitHub.<br>
+ job_description_2way: <br>Syncronizes code projects with GitHub.<br>
jenkins:
client:
job_template:
@@ -369,7 +369,7 @@
branches: ${_param:salt_formulas_branches}
notification_recipients: ${_param:salt_formulas_notification_recipients}
template:
- description: ${_param:job_description}
+ description: ${_param:job_description_2way}
discard:
build:
keep_num: 10
@@ -415,7 +415,7 @@
default: "{{notification_recipients}}"
job:
git-mirror-2way-salt-formulas-scripts:
- description: ${_param:job_description}
+ description: ${_param:job_description_2way}
discard:
build:
keep_num: 10
@@ -449,7 +449,7 @@
type: string
default: "master"
git-mirror-2way-salt-formulas-cookiecutter:
- description: ${_param:job_description}
+ description: ${_param:job_description_2way}
discard:
build:
keep_num: 10