Merge "Upgrade arm nodes"
diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 0adfae7..0cf19bc 100644
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -43,3 +43,56 @@
publishers:
- lf-infra-publish
+
+- job-template:
+ # Job template for running linters against specific file formats
+ #
+ # Required Variables:
+ # python-version: Python version to deploy in venv
+ # tox-env: Tox environments to run
+ # tox-dir: Directory containing the project's tox.ini
+ # pattern: List of file patterns to scan
+
+ name: '{project-name}-{stream}-{subproject}-lint'
+ project-type: freestyle
+ description: 'Job intended for running linters with Tox and Coala'
+ node: ubuntu1604-builder-2c-1g
+
+ parameters:
+ - lf-infra-parameters:
+ project: '{project}'
+ stream: '{stream}'
+ branch: '{branch}'
+ - lf-infra-tox-parameters:
+ tox-dir: '{tox-dir}'
+ tox-envs: '{tox-envs}'
+
+ properties:
+ - infra-properties:
+ build-days-to-keep: '{build-days-to-keep}'
+
+ scm:
+ - gerrit-trigger-scm:
+ refspec: '$GERRIT_REFSPEC'
+ choosing-strategy: 'gerrit'
+ submodule-recursive: '{submodule-recursive}'
+
+ wrappers:
+ - infra-wrappers:
+ build-timeout: '{build-timeout}'
+
+ triggers:
+ - gerrit-trigger-patch-submitted:
+ server: '{server-name}'
+ project: '{project}'
+ branch: '{branch}'
+ files: '{pattern}'
+
+ builders:
+ - lf-infra-tox-install:
+ python-version: '{python-version}'
+ - lf-infra-tox-run:
+ parallel: 'false'
+
+ publishers:
+ - lf-infra-publish
diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index eba9b17..8d4d52e 100644
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -36,11 +36,9 @@
name: integration-verify-vagrantfile
project-name: 'integration'
project: 'integration'
-
stream:
- 'master':
branch: 'master'
-
jobs:
- '{project-name}-{stream}-verify-vagrantfile'
@@ -86,3 +84,23 @@
jobs:
- gerrit-docker-verify
- gerrit-docker-merge
+
+- project:
+ name: integration-linters
+ project: 'integration'
+ project-name: 'integration'
+ python-version: python3
+ jobs:
+ - '{project-name}-{stream}-{subproject}-lint'
+ subproject:
+ - 'yaml':
+ tox-dir: '.'
+ tox-envs: 'yaml'
+ pattern: '**/*.yaml|**/*.yml'
+ - 'json':
+ tox-dir: '.'
+ tox-envs: 'json'
+ pattern: '**/*.json'
+ stream:
+ - 'master':
+ branch: 'master'
diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index 1923c76..da2407d 100644
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -14,6 +14,7 @@
docker-pom: 'pom.xml'
mvn-profile: 'docker'
mvn-params: "-P docker"
+ java-opts: 'Xss2048k'
- gerrit-maven-stage:
sign-artifacts: true
build-node: centos7-builder-4c-4g