Add mso-config to docker image build

Change-Id: I85641f340474490adb5c532b23ab726e5b153cf6
Signed-off-by: Anaël Closson <ac2550@intl.att.com>

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 370f616..ca18d03 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -330,6 +330,12 @@
           branch: '{extra-branch}'
           checkout-dir: '{extra-checkout-dir}'
 
+      - git-extra-project:
+          refspec: 'refs/heads/{extra-branch-2}'
+          project: '{extra-project-2}'
+          branch: '{extra-branch-2}'
+          checkout-dir: '{extra-checkout-dir-2}'
+
     wrappers:
       - ecomp-infra-wrappers:
           build-timeout: '{build-timeout}'

diff --git a/jjb/mso/mso.yaml b/jjb/mso/mso.yaml
index 0496a5d..bbeb8e4 100644 (file)
--- a/jjb/mso/mso.yaml
+++ b/jjb/mso/mso.yaml
@@ -8,9 +8,13 @@
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-java-daily'
       - '{project-name}-{stream}-docker-java-daily':
-          extra-project: '/mso/chef-repo'
+          extra-project: 'mso/chef-repo'
           extra-branch: 'master'
-          extra-checkout-dir: './packages/docker/src/main/docker/docker-files/chef-repo'
+          extra-checkout-dir: './packages/docker/src/main/docker/docker-files/chef-config/chef-repos'
+          extra-project-2: 'mso/mso-config'
+          extra-branch-2: 'master'
+          extra-checkout-dir-2: './packages/docker/src/main/docker/docker-files/chef-config/mso-config'
+
           docker-pom: './packages/docker/src/main/docker/docker-files/chef-repo/pom.xml'
           profile-name: 'docker'