Merge "Add doc linters"

diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index 0aab36f..ffd5a2d 100644 (file)
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: dmaap-datarouter
+    name: dmaap-datarouter-java11
     project-name: 'dmaap-datarouter'
     jobs:
       - '{project-name}-{stream}-verify-java'
@@ -11,11 +11,29 @@
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
-
     project: 'dmaap/datarouter'
     stream:
       - 'master':
           branch: 'master'
+    mvn-settings: 'dmaap-datarouter-settings'
+    files: '**'
+    archive-artifacts: ''
+    java-version: openjdk11
+
+
+- project:
+    name: dmaap-datarouter-java8
+    project-name: 'dmaap-datarouter'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          mvn-goals: 'clean package -P docker docker:build docker:push'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+    project: 'dmaap/datarouter'
+    stream:
       - 'frankfurt':
           branch: 'frankfurt'
       - 'elalto':
@@ -23,7 +41,7 @@
     mvn-settings: 'dmaap-datarouter-settings'
     files: '**'
     archive-artifacts: ''
-    java-version: openjdk11
+    java-version: openjdk8
 
 - project:
     name: dmaap-datarouter-sonar

diff --git a/jjb/integration/integration-docker-compose.yaml b/jjb/integration/integration-docker-compose.yaml
index 852d5a1..1e07eb9 100644 (file)
--- a/jjb/integration/integration-docker-compose.yaml
+++ b/jjb/integration/integration-docker-compose.yaml
@@ -44,3 +44,11 @@
             cd $DOCKER_ROOT
             ./prepare-images.sh
             ./docker-compose-setup.sh
+      - 'prov-mns-provider':
+          pattern: 'test/mocks/prov-mns-provider/**'
+          docker_root: 'test/mocks/prov-mns-provider'
+          script: |
+            #!/bin/bash
+            cd $DOCKER_ROOT
+            docker build . -t prov-mns-provider
+            docker-compose up -d

diff --git a/jjb/integration/simulators/integration-pnf-simulator.yaml b/jjb/integration/simulators/integration-pnf-simulator.yaml
index 09875f8..df000a1 100644 (file)
--- a/jjb/integration/simulators/integration-pnf-simulator.yaml
+++ b/jjb/integration/simulators/integration-pnf-simulator.yaml
@@ -1,7 +1,7 @@
 ---
 - project:
       name: integration-simulators-pnf-simulator
-      project-name: 'integration-simulators-pnf-simulator'
+      project-name: integration-pnf-simulator
       stream:
           -   'master':
                   branch: 'master'
@@ -43,8 +43,8 @@
       sonar-mvn-goal: '{sonar_mvn_goal}'
       cron: '@daily'
       build-node: ubuntu1804-docker-8c-8g
-      project: 'integration/simulators/pnf-simulator'
-      project-name: 'integration-simulators-pnf-simulator'
+      project: integration/simulators/pnf-simulator
+      project-name: integration-pnf-simulator
       branch: 'master'
       mvn-settings: 'integration-simulators-pnf-simulator-settings'
       mvn-goals: 'clean install'
@@ -53,7 +53,7 @@
 
 - project:
       name: integration-simulators-pnf-simulator-info
-      project-name: integration-simulators-pnf-simulator
+      project-name: integration-pnf-simulator
       jobs:
           - gerrit-info-yaml-verify
       build-node: centos7-builder-2c-1g
@@ -63,7 +63,7 @@
 - project:
       name: integration-simulators-pnf-simulator-linters
       project: integration/simulators/pnf-simulator
-      project-name: integration-simulators-pnf-simulator
+      project-name: integration-pnf-simulator
       python-version: python3
       jobs:
           - integration-linters
@@ -80,6 +80,10 @@
                 tox-dir: '.'
                 tox-envs: 'json'
                 pattern: '**/*.json'
+          - 'python':
+                tox-dir: '.'
+                tox-envs: 'py'
+                pattern: '**/*.py'
       stream:
           - 'master':
                 branch: 'master'