X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration.yaml;h=35181c95ac8217852ff63fc3944b878675992d50;hb=1d8560eabf81b6d213353910630d69105f0da4d3;hp=03480eeb10065d4436af202718e8a8ad70268174;hpb=afcfa13660af9659c1d7ef060c0a7da5eab25a35;p=ci-management.git

diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index 03480eeb1..35181c95a 100644
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -6,46 +6,105 @@
       - project-view
 
 - project:
-    name: integration
-    project-name: 'integration'
+    name: integration-info
+    project-name: integration
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
-    project: 'integration'
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: integration
+    branch: master
+
+- project:
+    name: integration-verify-python
+    project-name: integration
+    project: integration
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
+    mvn-settings: 'integration-settings'
+    build-node: 'centos7-builder-4c-4g'
     subproject:
-      - 'version-manifest':
-          pom: 'version-manifest/pom.xml'
-          pattern: 'version-manifest/**'
+      - 'test-vcpe':
+          path: 'test/vcpe'
+          pattern: 'test/vcpe/**'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-python'
+
+- project:
+    name: integration-verify-vagrantfile
+    project-name: 'integration'
+    project: 'integration'
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+    jobs:
+      - '{project-name}-{stream}-verify-vagrantfile'
+
+- project:
+    name: integration-verify-golang
+    project-name: 'integration'
+    project: 'integration'
+    golangver: 'golang112'
     mvn-settings: 'integration-settings'
-    files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1604-builder-2c-1g
+    jobs:
+      - '{project-name}-{stream}-verify-golang':
+          script: '{build_script}'
+    path: 'test/security/k8s'
+    pattern: '{path}/**'
+    stream:
+      - 'master':
+          branch: 'master'
+    build_script: |
+        #!/bin/bash
+        set -ex # Fail build if any setup step fails
+        cd test/security/k8s
+        make test
 
 - project:
-    name: integration-clm
-    jobs:
-      - gerrit-maven-clm:
-          mvn-params: '-f version-manifest/pom.xml'
-    nexus-iq-namespace: 'onap-'
+    name: integration-netconf-pnp-simulator
     project: integration
-    project-name: 'integration'
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+    # Required by verifier
     mvn-settings: 'integration-settings'
+    project-name: 'integration-netconf-pnp-simulator'
+    gerrit_trigger_file_paths:
+      - compare-type: ANT
+        pattern: 'test/mocks/netconf-pnp-simulator/engine/**'
+    docker-name: 'onap/integration/simulators/netconf-pnp-simulator'
+    docker-root: test/mocks/netconf-pnp-simulator/engine
+    container-tag-method: yaml-file
+    build-node: centos7-docker-8c-8g
+    build-timeout: 20
+    jobs:
+      - gerrit-docker-verify
+      - gerrit-docker-merge
 
 - project:
-    name: integration-info
-    project-name: integration
+    name: integration-linters
+    project: 'integration'
+    project-name: 'integration'
+    python-version: python3
     jobs:
-      - gerrit-info-yaml-verify
-    project: integration
-    branch: master
+      - '{project-name}-{stream}-{subproject}-lint'
+    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'
+    stream:
+      - 'master':
+          branch: 'master'