Merge changes I2f3a5e71,I20873217
* changes:
Add job to simply check syntax of cookiecutter
Add jobs to test and mirror customer's salt models
diff --git a/jenkins/client/job/salt-models/git-mirrors.yml b/jenkins/client/job/salt-models/git-mirrors.yml
index 7ee7b94..b5d2b2a 100644
--- a/jenkins/client/job/salt-models/git-mirrors.yml
+++ b/jenkins/client/job/salt-models/git-mirrors.yml
@@ -7,11 +7,26 @@
git_mirror_2way_salt_model:
name: git-mirror-2way-salt-model-{{name}}
param:
- name:
- - reclass-system
- - slovaktelekom
- - stacklight
- - statens
+ - name: reclass-system
+ branches: "master"
+ - name: slovaktelekom
+ branches: "master"
+ - name: stacklight
+ branches: "master"
+ - name: statens
+ branches: "master"
+ - name: aeg
+ branches: "master"
+ - name: att-cicd
+ branches: "master"
+ - name: mall
+ branches: "master"
+ - name: quickplay
+ branches: "master"
+ - name: ril-jamnagar
+ branches: "master,jlab,next"
+ - name: vf-cloudstore
+ branches: "master"
template:
type: workflow-scm
concurrent: false
@@ -50,4 +65,4 @@
default: "gerrit"
BRANCHES:
type: string
- default: "master"
+ default: "{{branches}}"
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index f548fd7..f19edfe 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -7,6 +7,12 @@
test_salt_model:
name: test-salt-model-{{name}}
jobs:
+ - name: aeg
+ extra_formulas: ""
+ - name: att-cicd
+ extra_formulas: ""
+ - name: mall
+ extra_formulas: ""
- name: mcp-baremetal-lab
extra_formulas: ""
- name: mcp-virtual-lab
@@ -15,10 +21,20 @@
extra_formulas: ""
- name: qa
extra_formulas: ""
+ - name: quickplay
+ extra_formulas: ""
+ - name: ril-jamnagar
+ extra_formulas: ""
+ - name: slovaktelekom
+ extra_formulas: ""
- name: stacklight
extra_formulas: ""
+ - name: statens
+ extra_formulas: ""
- name: training
extra_formulas: ""
+ - name: vf-cloudstore
+ extra_formulas: ""
template:
type: workflow-scm
scm:
@@ -103,9 +119,12 @@
type: string
default: master
test_salt_model_cookiecutter:
- name: test-salt-model-cookiecutter-{{cookiecutter_template}}
+ name: test-{{option}}-cookiecutter-{{cookiecutter_template}}
jobs:
- cookiecutter_template: cookiecutter-templates
+ option: salt-model
+ - cookiecutter_template: cookiecutter-templates
+ option: syntax
template:
type: workflow-scm
concurrent: true
@@ -142,3 +161,9 @@
RECLASS_MODEL_BRANCH:
type: string
default: master
+ TEST_OPTION:
+ type: string
+ default: "{{option}}"
+ PARALLEL_NODE_GROUP_SIZE:
+ type: string
+ default: "3"