Merge "Switch linter jobs to ubuntu 18.04 minion by default"

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index f4d101e..f5f3a1d 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -56,7 +56,7 @@
     name: '{project-name}-{stream}-{subproject}-lint'
     project-type: freestyle
     description: 'Job intended for running linters with Tox and Coala'
-    build-node: ubuntu1604-builder-2c-1g
+    build-node: ubuntu1804-builder-4c-4g
     node: '{build-node}'
 
     parameters:

diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml
index f93a1fa..7d0eb5d 100644 (file)
--- a/jjb/testsuite/testsuite.yaml
+++ b/jjb/testsuite/testsuite.yaml
@@ -63,8 +63,7 @@
     project-name: 'testsuite'
     python-version: python3
     jobs:
-      - '{project-name}-{stream}-{subproject}-lint':
-          build-node: ubuntu1804-builder-4c-4g
+      - '{project-name}-{stream}-{subproject}-lint'
     subproject:
       - 'yaml':
           tox-dir: '.'