diff options
| author |   Andrew Grimberg <agrimberg@linuxfoundation.org> | 2017-02-10 17:47:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@openecomp.org> | 2017-02-10 17:47:10 +0000 |
| commit | 4b4d18b7be4f8457d2539f560a7606d4ffa8504c (patch) | |
| tree | 6991376a1a9b99cc8af0b3abdb97410d4b389c94 | |
| parent | 494a344c0b63112e69838c1cc8e9849a1f4591b6 (diff) | |
| parent | 4232ff5069735e3406f50eb95399bf4adf4b47f0 (diff) | |
Merge "Add mso-config to docker image build"
| -rw-r--r-- | jjb/global-templates-java.yaml | 6 | ||||
| -rw-r--r-- | jjb/mso/mso.yaml | 8 |
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' |