X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration.yaml;h=cb8286d8a58f5ac95447f0f82512b1038a3177d6;hb=ffc3ac818c92944c9b956633550a461457d10d36;hp=453dc752ab94ed0bf90a39bb913ac54a2cc734c1;hpb=4447925e2200d4cf8a0556c2b23af0c5e3c270ea;p=ci-management.git

diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index 453dc752a..cb8286d8a 100644
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -10,7 +10,7 @@
     project-name: integration
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: integration
     branch: master
 
@@ -21,14 +21,15 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
     mvn-settings: 'integration-settings'
-    build-node: 'centos7-builder-4c-4g'
+    build-node: 'ubuntu1804-builder-4c-4g'
     subproject:
       - 'test-vcpe':
           path: 'test/vcpe'
           pattern: 'test/vcpe/**'
+      - 'ran-nssmf-simulator':
+          path: 'test/mocks/ran-nssmf-simulator'
+          pattern: 'test/mocks/ran-nssmf-simulator/**'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
 
@@ -36,11 +37,9 @@
     name: integration-verify-vagrantfile
     project-name: 'integration'
     project: 'integration'
-
     stream:
       - 'master':
           branch: 'master'
-
     jobs:
       - '{project-name}-{stream}-verify-vagrantfile'
 
@@ -48,20 +47,69 @@
     name: integration-verify-golang
     project-name: 'integration'
     project: 'integration'
-    golangver: 'golang112'
+    golangver: 'golang114'
     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'
+      - 'rst':
+          tox-dir: '.'
+          tox-envs: 'rst'
+          pattern: '**/*.rst'
+      - 'md':
+          tox-dir: '.'
+          tox-envs: 'md'
+          pattern: '**/*.md'
     stream:
       - 'master':
           branch: 'master'
-    build_script: |
-        #!/bin/bash
-        set -ex # Fail build if any setup step fails
-        cd test/security/k8s
-        make test