Merge "netconf-pnp-simulator: fix tox execution working dir"

diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml
index 2cec134..ea7bcaf 100644 (file)
--- a/jjb/demo/demo.yaml
+++ b/jjb/demo/demo.yaml
@@ -61,7 +61,7 @@
     project-name: 'demo'
     python-version: python3
     jobs:
-      - '{project-name}-{stream}-{subproject}-lint'
+      - integration-linters
     subproject:
       - 'yaml':
           tox-dir: '.'

diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index 7034453..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,16 +11,37 @@
           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':
           branch: 'elalto'
     mvn-settings: 'dmaap-datarouter-settings'
     files: '**'
     archive-artifacts: ''
+    java-version: openjdk8
 
 - project:
     name: dmaap-datarouter-sonar
@@ -39,6 +60,7 @@
     mvn-settings: 'dmaap-datarouter-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
 
 - project:
     name: dmaap-datarouter-clm
@@ -49,6 +71,7 @@
     project-name: 'dmaap-datarouter'
     branch: 'master'
     mvn-settings: 'dmaap-datarouter-settings'
+    java-version: openjdk11
 
 - project:
     name: dmaap-datarouter-info

diff --git a/jjb/integration/integration-docker-compose.yaml b/jjb/integration/integration-docker-compose.yaml
index 3d1e8a2..1e07eb9 100644 (file)
--- a/jjb/integration/integration-docker-compose.yaml
+++ b/jjb/integration/integration-docker-compose.yaml
@@ -7,7 +7,7 @@
       - 'master':
           branch: 'master'
     jobs:
-      - '{project-name}-{stream}-{subproject}-docker-compose-verify'
+      - integration-docker-compose-verify
     subproject:
       - 'netconf-pnp-simulator':
           pattern: 'test/mocks/netconf-pnp-simulator/modules/**'
@@ -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/integration-templates-docker.yaml b/jjb/integration/integration-templates-docker.yaml
index ac383fb..e434d0a 100644 (file)
--- a/jjb/integration/integration-templates-docker.yaml
+++ b/jjb/integration/integration-templates-docker.yaml
@@ -126,6 +126,7 @@
 
 - job-template:
     name: '{project-name}-{stream}-{subproject}-docker-compose-verify'
+    id: integration-docker-compose-verify
     project-type: freestyle
     description: 'This job validates Docker Compose based projects'
     node: 'ubuntu1804-docker-8c-8g'

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 7d9ffed..61d09d7 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -54,6 +54,7 @@
     #     pattern:        List of file patterns to scan
 
     name: '{project-name}-{stream}-{subproject}-lint'
+    id: integration-linters
     project-type: freestyle
     description: 'Job intended for running linters with Tox and Coala'
     build-node: ubuntu1804-builder-4c-4g

diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index 6e36576..5b211d7 100644 (file)
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -83,7 +83,7 @@
     project-name: 'integration'
     python-version: python3
     jobs:
-      - '{project-name}-{stream}-{subproject}-lint'
+      - integration-linters
     subproject:
       - 'yaml':
           tox-dir: '.'
@@ -101,6 +101,14 @@
           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'

diff --git a/jjb/integration/netconf-pnp-simulator-verify.sh b/jjb/integration/netconf-pnp-simulator-verify.sh
index 6fb7b82..28e8ae3 100644 (file)
--- a/jjb/integration/netconf-pnp-simulator-verify.sh
+++ b/jjb/integration/netconf-pnp-simulator-verify.sh
@@ -22,7 +22,7 @@ echo "---> netconf-pnp-simulator-verify.sh"
 set -e # Exit with zero only if all commands succeed
 
 DOCKER_COMPOSE_LOG="/tmp/docker-compose.log"
-DOCKER_COMPOSE_LOG_MSG=( "INFO  [supervisor] success:" "entered RUNNING state" )
+DOCKER_COMPOSE_LOG_MSG=( "success:" "entered RUNNING state" )
 DOCKER_COMPOSE_SLEEP_INTERVAL=60
 
 if [ -z ${NETCONF_SIM_SERVICE_NAME} ];

diff --git a/jjb/integration/simulators/integration-dc-simulator.yaml b/jjb/integration/simulators/integration-dc-simulator.yaml
index 7d807dc..5b07413 100644 (file)
--- a/jjb/integration/simulators/integration-dc-simulator.yaml
+++ b/jjb/integration/simulators/integration-dc-simulator.yaml
@@ -14,7 +14,7 @@
     project-name: integration-simulators-dc-simulator
     python-version: python3
     jobs:
-      - '{project-name}-{stream}-{subproject}-lint'
+      - integration-linters
     subproject:
       - 'yaml':
           tox-dir: '.'

diff --git a/jjb/integration/simulators/integration-pnf-simulator.yaml b/jjb/integration/simulators/integration-pnf-simulator.yaml
index 664a0fa..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,10 +63,10 @@
 - 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:
-          - '{project-name}-{stream}-{subproject}-lint'
+          - integration-linters
       subproject:
           - 'yaml':
                 tox-dir: '.'
@@ -80,6 +80,10 @@
                 tox-dir: '.'
                 tox-envs: 'json'
                 pattern: '**/*.json'
+          - 'python':
+                tox-dir: '.'
+                tox-envs: 'py'
+                pattern: '**/*.py'
       stream:
           - 'master':
                 branch: 'master'

diff --git a/jjb/integration/simulators/integration-ran-simulator.yaml b/jjb/integration/simulators/integration-ran-simulator.yaml
index 584d93f..895854a 100644 (file)
--- a/jjb/integration/simulators/integration-ran-simulator.yaml
+++ b/jjb/integration/simulators/integration-ran-simulator.yaml
@@ -14,7 +14,7 @@
     project-name: integration-simulators-ran-simulator
     python-version: python3
     jobs:
-      - '{project-name}-{stream}-{subproject}-lint'
+      - integration-linters
     subproject:
       - 'yaml':
           tox-dir: '.'

diff --git a/jjb/integration/usecases/integration-usecases-bbs.yaml b/jjb/integration/usecases/integration-usecases-bbs.yaml
index fbf56a4..ce2743e 100644 (file)
--- a/jjb/integration/usecases/integration-usecases-bbs.yaml
+++ b/jjb/integration/usecases/integration-usecases-bbs.yaml
@@ -14,7 +14,7 @@
     project-name: integration-usecases-bbs
     python-version: python3
     jobs:
-      - '{project-name}-{stream}-{subproject}-lint'
+      - integration-linters
     subproject:
       - 'yaml':
           tox-dir: '.'

diff --git a/jjb/integration/usecases/integration-usecases-mdons.yaml b/jjb/integration/usecases/integration-usecases-mdons.yaml
index 7f4d692..475b271 100644 (file)
--- a/jjb/integration/usecases/integration-usecases-mdons.yaml
+++ b/jjb/integration/usecases/integration-usecases-mdons.yaml
@@ -14,7 +14,7 @@
     project-name: integration-usecases-mdons
     python-version: python3
     jobs:
-      - '{project-name}-{stream}-{subproject}-lint'
+      - integration-linters
     subproject:
       - 'yaml':
           tox-dir: '.'

diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml
index 7d0eb5d..58bab20 100644 (file)
--- a/jjb/testsuite/testsuite.yaml
+++ b/jjb/testsuite/testsuite.yaml
@@ -63,7 +63,7 @@
     project-name: 'testsuite'
     python-version: python3
     jobs:
-      - '{project-name}-{stream}-{subproject}-lint'
+      - integration-linters
     subproject:
       - 'yaml':
           tox-dir: '.'