Merge "fix the build for Frankfurt and elalto maintainence"

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

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 0cf19bc..622d523 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -8,7 +8,7 @@
     name: '{project-name}-{stream}-verify-vagrantfile'
     project-type: freestyle
     description: 'Job intended for validating vagrantfiles'
-    node: ubuntu1604-builder-2c-1g
+    node: ubuntu1804-builder-4c-4g
 
     parameters:
       - lf-infra-parameters:
@@ -44,7 +44,7 @@
     publishers:
       - lf-infra-publish
 
-- job-template:
+- job-template: &tox_verify_boilerplate
     # Job template for running linters against specific file formats
     #
     # Required Variables:
@@ -54,9 +54,11 @@
     #     pattern:        List of file patterns to scan
 
     name: '{project-name}-{stream}-{subproject}-lint'
+    id: integration-linters
     project-type: freestyle
     description: 'Job intended for running linters with Tox and Coala'
-    node: ubuntu1604-builder-2c-1g
+    build-node: ubuntu1804-builder-4c-4g
+    node: '{build-node}'
 
     parameters:
       - lf-infra-parameters:
@@ -96,3 +98,9 @@
 
     publishers:
       - lf-infra-publish
+
+- job-template:
+    <<: *tox_verify_boilerplate
+    name: '{project-name}-{stream}-{subproject}-tox-verify'
+    id: integration-tox-verify
+    description: 'Job intended for running tox'