Merge "Add mso-config to docker image build"
diff --git a/jjb/aai/aai-aai-config.yaml b/jjb/aai/aai-aai-config.yaml
deleted file mode 100644
index c477ad8..0000000
--- a/jjb/aai/aai-aai-config.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-- project:
- name: aai-aai-config
- project-name: 'aai-aai-config'
- jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
-
- project: 'aai/aai-config'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'aai-aai-config-settings'
- files: '**'
- archive-artifacts: ''
diff --git a/jjb/aai/aai-aai-data.yaml b/jjb/aai/aai-aai-data.yaml
deleted file mode 100644
index 5e5632d..0000000
--- a/jjb/aai/aai-aai-data.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-- project:
- name: aai-aai-data
- project-name: 'aai-aai-data'
- jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
-
- project: 'aai/aai-data'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'aai-aai-data-settings'
- files: '**'
- archive-artifacts: ''
diff --git a/jjb/ecompsdkos/ecompsdkos.yaml b/jjb/ecompsdkos/ecompsdkos.yaml
index 5e97cc1..6250127 100644
--- a/jjb/ecompsdkos/ecompsdkos.yaml
+++ b/jjb/ecompsdkos/ecompsdkos.yaml
@@ -2,10 +2,14 @@
- project:
name: ecompsdkos
project-name: 'ecompsdkos'
+ subproject:
+ - 'ecomp-sdk':
+ pom: 'ecomp-sdk/pom.xml'
+ pattern: 'ecomp-sdk/**'
+
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-java-daily'
+ - '{project-name}-{stream}-{subproject}-verify-java'
+ - '{project-name}-{stream}-{subproject}-merge-java'
project: 'ecompsdkos'
stream: