From 656b04c681fc9f9f4fc69982bb8f58ac500e7f94 Mon Sep 17 00:00:00 2001 From: Lisa Revel Date: Sat, 18 Feb 2017 21:55:17 +0000 Subject: Updated JJB for APOD CDAP Change-Id: I3002a5ee8c6da26a6f1b6bc70ae242a6e4f5bffe Signed-off-by: Lisa Revel --- jjb/dcae/apod-cdap.yaml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'jjb/dcae/apod-cdap.yaml') diff --git a/jjb/dcae/apod-cdap.yaml b/jjb/dcae/apod-cdap.yaml index 6dbccca2b..2a2d65fa8 100644 --- a/jjb/dcae/apod-cdap.yaml +++ b/jjb/dcae/apod-cdap.yaml @@ -3,18 +3,6 @@ - project: name: dcae-apod-cdap project-name: 'dcae-apod-cdap' - jobs: - - '{project-name}-{stream}-two-scm-verify-script' - - - # script: build script to execute - # extra-project: extra gerrit project to checkout - # extra-refspec: refspec for the extra project - # extra-branch: branch to checkout for the extra project - # checkout-dir: directory to checkout the extra project to - # DO NOT SET THIS TO anything that translates to - # $WORKSPACE as it will destroy the initial - # project checkout project: 'dcae/apod/cdap' stream: @@ -23,10 +11,22 @@ mvn-settings: 'dcae-apod-cdap-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-basebuild-4c-4g + build-node: ubuntu1604-docker-8c-8g + mvn-goals: '--version' + mvn-goals-versioning: '--version' extra-project: 'dcae/apod/buildtools' extra-branch: 'master' extra-refspec: 'refs/heads/{branch}' checkout-dir: 'dcae-apod-buildtools' - script: - !include-raw-escape: 'include-raw-apod-cdap.sh' + jobs: + - '{project-name}-{stream}-daily-release-2scm-mvn-script': + maven-deploy-properties: | + deployAtEnd=true + script: + !include-raw-escape: 'script-apod-cdap-daily-release.sh' + - '{project-name}-{stream}-verify-2scm-mvn-script': + script: + !include-raw-escape: 'script-apod-cdap-verify.sh' + - '{project-name}-{stream}-merge-2scm-mvn-script': + script: + !include-raw-escape: 'script-apod-cdap-merge.sh' -- cgit 1.2.3-korg