From d0704845441a27098d806f61bd190cb8f1499818 Mon Sep 17 00:00:00 2001 From: lj1412 Date: Sat, 18 Feb 2017 21:46:11 +0000 Subject: yamllint fixes, and updated pgaas.yaml Change-Id: Iafd28d475d7f70ae2cb61a841984465115e47b75 Signed-off-by: lj1412 --- jjb/dcae/pgaas.yaml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'jjb/dcae/pgaas.yaml') diff --git a/jjb/dcae/pgaas.yaml b/jjb/dcae/pgaas.yaml index 78643a82a..33893cb9f 100644 --- a/jjb/dcae/pgaas.yaml +++ b/jjb/dcae/pgaas.yaml @@ -3,7 +3,6 @@ - project: name: dcae-pgaas project-name: 'dcae-pgaas' - stream: 'master' project: 'dcae/pgaas' stream: - 'master': @@ -11,19 +10,22 @@ mvn-settings: 'dcae-pgaas-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/buildtools' + extra-refspec: 'refs/heads/{branch}' + extra-branch: 'master' + checkout-dir: 'buildtools' jobs: - - '{project-name}-{stream}-daily-release-scm-mvn-script': + - '{project-name}-{stream}-daily-release-2scm-mvn-script': maven-deploy-properties: | deployAtEnd=true script: - !include-raw-escape: 'script-pgaas-daily-release.sh' - - '{project-name}-{stream}-merge-scm-mvn-script': + !include-raw-escape: 'script-pgaas-daily-release.sh' + - '{project-name}-{stream}-merge-2scm-mvn-script': script: - !include-raw-escape: 'script-pgaas-merge.sh' - - '{project-name}-{stream}-verify-scm-mvn-script': + !include-raw-escape: 'script-pgaas-merge.sh' + - '{project-name}-{stream}-verify-2scm-mvn-script': script: - !include-raw-escape: 'script-pgaas-verify.sh' - + !include-raw-escape: 'script-pgaas-verify.sh' -- cgit 1.2.3-korg