Merge "Upgrade builder to Ubuntu 18.04 for docker-verify jobs"
diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml
index 1066057..1d105d7 100644
--- a/jjb/integration/integration-docker.yaml
+++ b/jjb/integration/integration-docker.yaml
@@ -22,4 +22,3 @@
mvn-settings: 'integration-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/integration/integration-templates-docker.yaml b/jjb/integration/integration-templates-docker.yaml
index a01e82f..0bf3097 100644
--- 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:
@@ -64,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: