Merge "Maven-merge-master fails for BBS-ep component"

diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index b4a116a..17dd0b4 100644 (file)
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -49,7 +49,7 @@
     branch: 'master'
     mvn-settings: 'ccsdk-features-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
+    mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
     maven-version: "mvn35"
 
 - project:
@@ -65,6 +65,7 @@
       - 'frankfurt':
           branch: 'frankfurt'
     mvn-settings: 'ccsdk-features-settings'
+    mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
     maven-version: "mvn35"
     build-node: ubuntu1804-builder-4c-4g
 
@@ -86,5 +87,6 @@
     mvn-settings: 'ccsdk-features-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true
+    mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
     project: ccsdk/features
     branch: master

diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml
index cf6c430..3920653 100644 (file)
--- a/jjb/integration/integration-docker.yaml
+++ b/jjb/integration/integration-docker.yaml
@@ -32,7 +32,13 @@
     docker-name: 'onap/integration/simulators/netconf-pnp-simulator'
     docker-root: test/mocks/netconf-pnp-simulator/engine
     container-tag-method: yaml-file
-    post_docker_build_script: !include-raw-escape: ../global-jjb/shell/tox-run.sh
+    post_docker_build_script: |
+        #!/bin/bash
+        set -eux
+        cd "$DOCKER_ROOT"
+        # To simplify the references inside tox.ini and tests/settings.py
+        docker tag "$CONTAINER_PUSH_REGISTRY/$DOCKER_NAME:$DOCKER_IMAGE_TAG" netconf-pnp-simulator:latest
+        tox
     build-node: centos7-docker-8c-8g
     build-timeout: 20
     jobs:

diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index 5111c4d..5b211d7 100644 (file)
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -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/simulators/integration-pnf-simulator.yaml b/jjb/integration/simulators/integration-pnf-simulator.yaml
index 0fbecb7..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