OMEC: Change c3po trigger to work correctly with divided build process
Change-Id: I482cecbf7c2a0957813902c1b83eb5d0d4121e93
diff --git a/jjb/omec-ci.yaml b/jjb/omec-ci.yaml
index 50cc068..9c4ca0c 100644
--- a/jjb/omec-ci.yaml
+++ b/jjb/omec-ci.yaml
@@ -31,11 +31,12 @@
- 'omec-combined':
pipeline-file: 'Jenkinsfile-omec-combined.groovy'
- 'omec-install':
+ sub-project: '{name}'
pipeline-file: 'Jenkinsfile-omec-install-ngic-rtc-vnf.groovy'
-# for c3po-hss
+# for c3po
- project:
- name: c3po-hss
+ name: c3po
project: '{name}'
executor_node: 'intel-102'
@@ -48,24 +49,11 @@
- 'omec-combined':
pipeline-file: 'Jenkinsfile-omec-combined.groovy'
- 'omec-install':
- pipeline-file: 'Jenkinsfile-omec-install-c3po-hss-vnf.groovy'
-
-# for c3po-sgx
-- project:
- name: c3po-sgx
- project: '{name}'
-
- executor_node: 'intel-102'
-
- github_pr_auth_id: '64fe2b1a-b33a-4f13-8442-ad8360434003'
- github_pr_org_list:
- - 'omec-project'
-
- jobs:
- - 'omec-combined':
- pipeline-file: 'Jenkinsfile-omec-combined.groovy'
- - 'omec-install':
+ sub-project: 'c3po-sgx'
pipeline-file: 'Jenkinsfile-omec-install-c3po-sgx-vnf.groovy'
+ - 'omec-install':
+ sub-project: 'c3po-hss'
+ pipeline-file: 'Jenkinsfile-omec-install-c3po-hss-vnf.groovy'
# for openmme
- project:
@@ -82,6 +70,7 @@
- 'omec-combined':
pipeline-file: 'Jenkinsfile-omec-combined.groovy'
- 'omec-install':
+ sub-project: '{name}'
pipeline-file: 'Jenkinsfile-omec-install-openmme-vnf.groovy'
# Combined pipeline
@@ -140,7 +129,7 @@
# install jobs, run for each project
- job-template:
id: 'omec-install'
- name: 'omec_{project}_install'
+ name: 'omec_{sub-project}_install'
project-type: pipeline
description: |