Update to use a combined pipelined job on OMEC CI
Change-Id: Id542149f9c9f4d24aa36e17b481f6d80c4f53056
diff --git a/jjb/omec-ci.yaml b/jjb/omec-ci.yaml
index 6deee82..e26be3a 100644
--- a/jjb/omec-ci.yaml
+++ b/jjb/omec-ci.yaml
@@ -3,6 +3,19 @@
# Uses github pull request builder to trigger and Jenkinsfiles from this repo
# https://github.com/omec-project/omec-project-ci
+# generic OMEC test-case jobs, shared by other projects and triggered within pipelines
+- project:
+ name: omec
+ executor_node: 'intel-102'
+
+ github_pr_auth_id: '64fe2b1a-b33a-4f13-8442-ad8360434003'
+ github_pr_org_list:
+ - 'omec-project'
+
+ jobs:
+ - 'omec-tc1'
+ - 'omec-tc2'
+
# for ngic-rtc
- project:
name: ngic-rtc
@@ -15,17 +28,10 @@
- 'omec-project'
jobs:
- - 'omec-ngic-rtc-test'
-
-- job-group:
- name: 'omec-ngic-rtc-test'
- jobs:
- - 'omec-pipeline':
+ - 'omec-combined':
+ pipeline-file: 'Jenkinsfile-omec-combined.groovy'
+ - 'omec-install':
pipeline-file: 'Jenkinsfile-omec-install-ngic-rtc-vnf.groovy'
- - 'omec-tc1':
- dependency-jobs: 'omec_ngic-rtc_pipeline'
- - 'omec-tc2':
- dependency-jobs: 'omec_ngic-rtc_tc1'
# for c3po
- project:
@@ -39,17 +45,10 @@
- 'omec-project'
jobs:
- - 'omec-c3po-test'
-
-- job-group:
- name: 'omec-c3po-test'
- jobs:
- - 'omec-pipeline':
+ - 'omec-combined':
+ pipeline-file: 'Jenkinsfile-omec-combined.groovy'
+ - 'omec-install':
pipeline-file: 'Jenkinsfile-omec-install-c3po-vnf.groovy'
- - 'omec-tc1':
- dependency-jobs: 'omec_c3po_pipeline'
- - 'omec-tc2':
- dependency-jobs: 'omec_c3po_tc1'
# for openmme
- project:
@@ -63,23 +62,15 @@
- 'omec-project'
jobs:
- - 'omec-openmme-test'
-
-- job-group:
- name: 'omec-openmme-test'
- jobs:
- - 'omec-pipeline':
+ - 'omec-combined':
+ pipeline-file: 'Jenkinsfile-omec-combined.groovy'
+ - 'omec-install':
pipeline-file: 'Jenkinsfile-omec-install-openmme-vnf.groovy'
- - 'omec-tc1':
- dependency-jobs: 'omec_openmme_pipeline'
- - 'omec-tc2':
- dependency-jobs: 'omec_openmme_tc1'
-# build/install pipeline job
-
+# Combined pipeline
- job-template:
- id: 'omec-pipeline'
- name: 'omec_{project}_pipeline'
+ id: 'omec-combined'
+ name: 'omec_{project}_combined'
project-type: pipeline
description: |
@@ -92,6 +83,10 @@
artifact-num-to-keep: '{artifact-num-to-keep}'
- github:
url: 'https://github.com/omec-project/{project}'
+ - build-blocker:
+ use-build-blocker: true
+ blocking-jobs:
+ - "omec-combined"
wrappers:
- lf-infra-wrappers:
@@ -124,11 +119,11 @@
branches:
- 'master'
-# tests
+# install jobs, run for each project
- job-template:
- id: 'omec-tc1'
- name: 'omec_{project}_tc1'
+ id: 'omec-install'
+ name: 'omec_{project}_install'
project-type: pipeline
description: |
@@ -158,10 +153,41 @@
default: '{project}'
description: 'Name of the project'
- triggers:
- - cord-infra-github-pr-trigger:
- github_pr_org_list: '{obj:github_pr_org_list}'
- github_pr_auth_id: '{github_pr_auth_id}'
+ concurrent: false
+
+ pipeline-scm:
+ script-path: '{pipeline-file}'
+ scm:
+ - git:
+ url: 'https://github.com/omec-project/omec-project-ci'
+ branches:
+ - 'master'
+
+# tests
+- job-template:
+ id: 'omec-tc1'
+ name: 'omec_tc1'
+ project-type: pipeline
+
+ description: |
+ <!-- Managed by Jenkins Job Builder -->
+ Created by {id} job-template from ci-management/jjb/omec-ci.yaml<br />
+
+ 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: '{build-timeout}'
+ jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+ parameters:
+ - string:
+ name: executorNode
+ default: '{executor_node}'
+ description: 'Name of the Jenkins executor node to run the job on'
concurrent: false
@@ -175,7 +201,7 @@
- job-template:
id: 'omec-tc2'
- name: 'omec_{project}_tc2'
+ name: 'omec_tc2'
project-type: pipeline
description: |
@@ -186,8 +212,6 @@
- cord-infra-properties:
build-days-to-keep: '{build-days-to-keep}'
artifact-num-to-keep: '{artifact-num-to-keep}'
- - github:
- url: 'https://github.com/omec-project/{project}'
wrappers:
- lf-infra-wrappers:
@@ -200,16 +224,6 @@
default: '{executor_node}'
description: 'Name of the Jenkins executor node to run the job on'
- - string:
- name: project
- default: '{project}'
- description: 'Name of the project'
-
- triggers:
- - cord-infra-github-pr-trigger:
- github_pr_org_list: '{obj:github_pr_org_list}'
- github_pr_auth_id: '{github_pr_auth_id}'
-
concurrent: false
pipeline-scm: