Tag linter and docker-compose integration jobs with id

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

diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index e9be0e2..5111c4d 100644 (file)
--- 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'
 
@@ -51,17 +49,58 @@
     golangver: 'golang112'
     mvn-settings: 'integration-settings'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-2c-1g
     jobs:
-      - '{project-name}-{stream}-verify-golang':
-          script: '{build_script}'
-    path: 'test/security/k8s'
-    pattern: '{path}/**'
+      - '{project-name}-{stream}-{subproject}-verify-golang'
+    subproject:
+      - 'test-security-k8s':
+          path: 'test/security/k8s'
+          pattern: '{path}/**'
+          build-node: ubuntu1804-builder-4c-4g
+          script: |
+              #!/bin/bash
+              set -ex # Fail build if any setup step fails
+              cd $WORKSPACE/{path}
+              make test
+      - 'test-security-sslendpoints':
+          path: 'test/security/sslendpoints'
+          pattern: '{path}/**'
+          build-node: ubuntu1804-docker-8c-8g
+          script: |
+              #!/bin/bash
+              set -ex # Fail build if any setup step fails
+              cd $WORKSPACE/{path}
+              rm -rf $WORKSPACE/{path}/bin
+              make docker-build
+              make test
+              make clean
+    stream:
+      - 'master':
+          branch: 'master'
+
+- project:
+    name: integration-linters
+    project: 'integration'
+    project-name: 'integration'
+    python-version: python3
+    jobs:
+      - integration-linters
+    subproject:
+      - 'yaml':
+          tox-dir: '.'
+          tox-envs: 'yaml'
+          pattern: '**/*.yaml'
+      - 'yml':
+          tox-dir: '.'
+          tox-envs: 'yaml'
+          pattern: '**/*.yml'
+      - 'json':
+          tox-dir: '.'
+          tox-envs: 'json'
+          pattern: '**/*.json'
+      - 'python':
+          tox-dir: '.'
+          tox-envs: 'py'
+          pattern: '**/*.py'
     stream:
       - 'master':
           branch: 'master'
-    build_script: |
-        #!/bin/bash
-        set -ex # Fail build if any setup step fails
-        cd {path}
-        make test