Merge "Job dependency, rename jobs with underscores, updated api-test"
diff --git a/jjb/api-test.yaml b/jjb/api-test.yaml
new file mode 100644
index 0000000..f024b31
--- /dev/null
+++ b/jjb/api-test.yaml
@@ -0,0 +1,39 @@
+---
+# CORD API tests using cord-tester
+
+- job-template:
+ id: api-test
+ name: 'verify_{project}_api-test'
+ description: |
+ <!-- Managed by Jenkins Job Builder -->
+ Created by api-test job-template from ci-management/jjb/api-test.yaml
+
+ triggers:
+ - cord-infra-gerrit-trigger-patchset:
+ gerrit-server-name: '{gerrit-server-name}'
+ project-regexp: '^{project}$'
+ branch-regexp: '{branch-regexp}'
+ dependency-jobs: '{dependency-jobs}'
+
+ properties:
+ - cord-infra-properties:
+ build-days-to-keep: '{build-days-to-keep}'
+ artifact-num-to-keep: '{artifact-num-to-keep}'
+
+ wrappers:
+ - lf-infra-wrappers:
+ build-timeout: '60'
+ jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+ node: 'ubuntu16.04-basebuild-4c-8g'
+ project-type: pipeline
+ concurrent: true
+
+ # Run the master branch Jenkinsfile from cord-tester against all other revisions
+ pipeline-scm:
+ script-path: 'Jenkinsfile/verify-api-test-JenkinsFile'
+ scm:
+ - git:
+ url: '{gerrit-server-url}/cord-tester'
+ branches:
+ - 'master'
diff --git a/jjb/lint.yaml b/jjb/lint.yaml
index ae448c0..e08f8e6 100644
--- a/jjb/lint.yaml
+++ b/jjb/lint.yaml
@@ -1,11 +1,14 @@
---
# CORD lint and static code validation job templates
-# These are invoked by the per-git-repo jobs stored in jjb/validate/
+# These are invoked by the per-git-repo jobs stored in verify/
# Verify that there is valid license/copyright on files
- job-template:
id: verify-licensed
- name: 'verify-{project}-licensed'
+ name: 'verify_{project}_licensed'
+ description: |
+ <!-- Managed by Jenkins Job Builder -->
+ Created by verify-licensed job-template from ci-management/jjb/lint.yaml
triggers:
- cord-infra-gerrit-trigger-patchset:
@@ -44,7 +47,10 @@
# run `ansible-lint` to validate ansible playbooks/roles
- job-template:
id: verify-ansible-lint
- name: 'verify-{project}-ansible-lint'
+ name: 'verify_{project}_ansible-lint'
+ description: |
+ <!-- Managed by Jenkins Job Builder -->
+ Created by verify-ansible-lint job-template from ci-management/jjb/lint.yaml
triggers:
- cord-infra-gerrit-trigger-patchset:
@@ -83,7 +89,10 @@
# run `helm lint --strict` to validate helm charts
- job-template:
id: verify-helm-lint
- name: 'verify-{project}-helm-lint'
+ name: 'verify_{project}_helm-lint'
+ description: |
+ <!-- Managed by Jenkins Job Builder -->
+ Created by verify-helm-lint job-template from ci-management/jjb/lint.yaml
triggers:
- cord-infra-gerrit-trigger-patchset:
diff --git a/jjb/verify/cord.yaml b/jjb/verify/cord.yaml
index 59ae2e0..601f3b0 100644
--- a/jjb/verify/cord.yaml
+++ b/jjb/verify/cord.yaml
@@ -13,5 +13,8 @@
name: 'verify-cord-jobs'
jobs:
- 'verify-licensed'
- - 'verify-ansible-lint'
+ - 'verify-ansible-lint':
+ dependency-jobs: 'verify_cord_licensed'
+ - 'api-test':
+ dependency-jobs: 'verify_cord_licensed, verify_cord_ansible-lint'
diff --git a/jjb/verify/helm-charts.yaml b/jjb/verify/helm-charts.yaml
index 73c7b5b..7eaa8bf 100644
--- a/jjb/verify/helm-charts.yaml
+++ b/jjb/verify/helm-charts.yaml
@@ -13,5 +13,6 @@
name: 'verify-helm-charts-jobs'
jobs:
- 'verify-licensed'
- - 'verify-helm-lint'
+ - 'verify-helm-lint':
+ dependency-jobs: 'verify_helm-charts_licensed'
diff --git a/jjb/verify/maas.yaml b/jjb/verify/maas.yaml
index 936e635..f9c029c 100644
--- a/jjb/verify/maas.yaml
+++ b/jjb/verify/maas.yaml
@@ -13,5 +13,6 @@
name: 'verify-maas-jobs'
jobs:
- 'verify-licensed'
- - 'verify-ansible-lint'
+ - 'verify-ansible-lint':
+ dependency-jobs: 'verify_maas_licensed'
diff --git a/jjb/verify/platform-install.yaml b/jjb/verify/platform-install.yaml
index 0a1e376..c04db63 100644
--- a/jjb/verify/platform-install.yaml
+++ b/jjb/verify/platform-install.yaml
@@ -13,5 +13,8 @@
name: 'verify-platform-install-jobs'
jobs:
- 'verify-licensed'
- - 'verify-ansible-lint'
+ - 'verify-ansible-lint':
+ dependency-jobs: 'verify_platform-install_licensed'
+ - 'api-test':
+ dependency-jobs: 'verify_platform-install_licensed, verify_platform-install_ansible-lint'