summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/global-templates-java.yaml6
-rw-r--r--jjb/mso/mso.yaml8
2 files changed, 12 insertions, 2 deletions
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 370f616ea..ca18d035d 100644
--- 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 0496a5d88..bbeb8e4c1 100644
--- 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'