Merge "Move AAF build to Ubuntu 1804"

[ci-management.git] / jjb / integration / integration-templates-docker.yaml

diff --git a/jjb/integration/integration-templates-docker.yaml b/jjb/integration/integration-templates-docker.yaml
index c8041a2..0bf3097 100644 (file)
--- a/jjb/integration/integration-templates-docker.yaml
+++ b/jjb/integration/integration-templates-docker.yaml
@@ -2,7 +2,7 @@
 - job-template:
     name: '{project-name}-{stream}-{subproject}-docker-merge'
     project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
+    node: 'ubuntu1804-docker-8c-8g'
     docker-image-name: ''
 
     properties:
@@ -31,8 +31,6 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      # 12 AM UTC
-      - timed: 'H 12 * * *'
       - gerrit-trigger-patch-merged:
           server: '{server-name}'
           project: '{project}'
@@ -66,7 +64,7 @@
 - job-template:
     name: '{project-name}-{stream}-{subproject}-docker-verify'
     project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
+    node: 'ubuntu1804-docker-8c-8g'
     docker-image-name: ''
 
     properties:
@@ -86,8 +84,8 @@
 
     scm:
       - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
           submodule-recursive: '{submodule-recursive}'
 
     wrappers: