X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-templates.yaml;h=c70712dbdca2f00c129c8096c281c6405d729808;hb=0e9584e187edb624e37bb3f1845df100bf8b5a1d;hp=7d9ffed2101b1140a0eead634ad0c40489acd5aa;hpb=3e2712d71bbddadf3a4fd4e1a3cf128c809bad81;p=ci-management.git

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 7d9ffed21..c70712dbd 100644
--- 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: ubuntu1804-builder-4c-4g
+    node: ubuntu2004-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,10 @@
     #     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'
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: ubuntu2004-builder-4c-4g
     node: '{build-node}'
 
     parameters:
@@ -97,3 +98,39 @@
 
     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'
+
+- job-template:
+    <<: *tox_verify_boilerplate
+    name: '{project-name}-{stream}-{subproject}-terraform-verify'
+    terraform-version: 0.13.2
+    terragrunt-version: 0.24.1
+    python-version: python3
+    id: integration-terraform-verify
+    description: 'Job intended for validating terraform modules'
+
+    parameters:
+      - lf-infra-parameters:
+          project: '{project}'
+          stream: '{stream}'
+          branch: '{branch}'
+      - lf-infra-tox-parameters:
+          tox-dir: '{tox-dir}'
+          tox-envs: '{tox-envs}'
+      - integration-terraform-version:
+          terraform-version: '{terraform-version}'
+      - integration-terragrunt-version:
+          terragrunt-version: '{terragrunt-version}'
+
+    builders:
+      - integration-install-terraform
+      - integration-install-terragrunt
+      - lf-infra-tox-install:
+          python-version: '{python-version}'
+      - lf-infra-tox-run:
+          parallel: 'false'