Merge "Update nodes"

diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index 2c2d89f..17b6083 100644 (file)
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -79,6 +79,7 @@
     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
     build-node: centos7-docker-8c-8g
     build-timeout: 20
     jobs:

diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml
index 4a8d9c9..f93a1fa 100644 (file)
--- a/jjb/testsuite/testsuite.yaml
+++ b/jjb/testsuite/testsuite.yaml
@@ -69,15 +69,19 @@
       - 'yaml':
           tox-dir: '.'
           tox-envs: 'yaml'
-          pattern: '**/*.yaml|**/*.yml'
+          pattern: '**/*.yaml'
+      - 'yml':
+          tox-dir: '.'
+          tox-envs: 'yaml'
+          pattern: '**/*.yml'
       - 'json':
           tox-dir: '.'
           tox-envs: 'json'
           pattern: '**/*.json'
-      - 'robot':
-          tox-dir: '.'
-          tox-envs: 'robot'
-          pattern: '**/*.robot'
+#      - 'robot':
+#          tox-dir: '.'
+#          tox-envs: 'robot'
+#          pattern: '**/*.robot'
     stream:
       - 'master':
           branch: 'master'

diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml
index a19dcd6..917ff29 100644 (file)
--- a/jjb/usecaseui/usecase-ui-server.yaml
+++ b/jjb/usecaseui/usecase-ui-server.yaml
@@ -18,6 +18,8 @@
       - '{project-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
           build-node: ubuntu1604-docker-8c-8g
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'

diff --git a/jjb/vvp/vvp-test-engine.yaml b/jjb/vvp/vvp-test-engine.yaml
index c746fbd..e3c571f 100644 (file)
--- a/jjb/vvp/vvp-test-engine.yaml
+++ b/jjb/vvp/vvp-test-engine.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: vvp-test-engine
+    name: vvp-test-engine-info
     project-name: 'vvp-test-engine'
     project: 'vvp/test-engine'
     mvn-settings: 'vvp-test-engine-settings'
@@ -8,3 +8,37 @@
     jobs:
       - gerrit-info-yaml-verify
     build-node: centos7-builder-2c-1g
+
+- project:
+    name: vvp-test-engine-sonar
+    jobs:
+      - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
+    cron: '@daily'
+    build-node: ubuntu1804-docker-8c-8g
+    project: 'vvp/test-engine'
+    project-name: 'vvp-test-engine'
+    branch: 'master'
+    mvn-settings: 'vvp-test-engine-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vvp-test-engine-verify
+    project-name: 'vvp-test-engine'
+    project: 'vvp/vvp-test-engine'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'vvp-test-engine-settings'
+    build-node: 'centos7-builder-4c-4g'
+    subproject:
+      - 'onap-client':
+          path: 'onap-client'
+          pattern: 'onap-client/**'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-python'