yamllint fixes, and updated pgaas.yaml

Change-Id: Iafd28d475d7f70ae2cb61a841984465115e47b75
Signed-off-by: lj1412 <lji@research.att.com>
diff --git a/jjb/dcae/pgaas.yaml b/jjb/dcae/pgaas.yaml
index 78643a8..33893cb 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'