diff options
| author |   Lisa Revel <lr0306@att.com> | 2017-03-16 15:35:09 +0000 |
|---|---|---|
| committer | Lisa Revel <lr0306@att.com> | 2017-03-16 15:35:09 +0000 |
| commit | 5dc72285a11f783acd6d9ea3d063f93d3e0b6eb1 (patch) | |
| tree | cd64a8d9179f5b3c91e95afcbef5955264c691d4 | |
| parent | e5bf649806b53e9a764c4a19d5f9429afeab374c (diff) | |
Fix merge and extra branch
Change-Id: I3c9c215a8688345534bdec0adc51699dac93679c
Signed-off-by: Lisa Revel <lr0306@att.com>
| -rw-r--r-- | jjb/dcae/apod-analytics.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/jjb/dcae/apod-analytics.yaml b/jjb/dcae/apod-analytics.yaml index 6ee9bd5ca..54491eecc 100644 --- a/jjb/dcae/apod-analytics.yaml +++ b/jjb/dcae/apod-analytics.yaml @@ -18,7 +18,7 @@ archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g extra-project: 'dcae/apod/buildtools' - extra-branch: 'master' + extra-branch: '{branch}' extra-refspec: 'refs/heads/{branch}' checkout-dir: 'dcae-apod-buildtools' @@ -39,6 +39,6 @@ './dcae-apod-buildtools/scripts/script-apod-analytics-verify.sh' - '{project-name}-{stream}-merge-2scm-mvn-script': mvn-goals: 'clean deploy' - script: + script: | /bin/bash \ './dcae-apod-buildtools/scripts/script-apod-analytics-merge.sh' |