From: Lisa Revel Date: Thu, 16 Mar 2017 15:35:09 +0000 (+0000) Subject: Fix merge and extra branch X-Git-Tag: 1.0.0-Amsterdam~563 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=5dc72285a11f783acd6d9ea3d063f93d3e0b6eb1;p=ci-management.git Fix merge and extra branch Change-Id: I3c9c215a8688345534bdec0adc51699dac93679c Signed-off-by: Lisa Revel --- 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'