Merge "Fix for sonar job"

diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml
index 9a53e71..0e630c1 100644 (file)
--- a/jjb/aai/aai-search-data-service.yaml
+++ b/jjb/aai/aai-search-data-service.yaml
@@ -16,7 +16,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          mvn-params: 'docker:build -B -Dmaven.test.skip=true'
+          mvn-params: '-Pdocker -B -Dmaven.test.skip=true'
           build-node: ubuntu1604-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
@@ -38,7 +38,7 @@
     project-name: 'aai-search-data-service-searchguard'
     jobs:
       - gerrit-maven-docker-stage:
-          mvn-params: 'docker:build -B -Dmaven.test.skip=true'
+          mvn-params: '-Pdocker -B -Dmaven.test.skip=true'
           build-node: ubuntu1604-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'

diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index faf8b8a..2b7d045 100644 (file)
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -16,6 +16,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'policy-common-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml
index 5445a71..2f82d77 100644 (file)
--- a/jjb/policy/policy-parent.yaml
+++ b/jjb/policy/policy-parent.yaml
@@ -16,6 +16,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'policy-parent-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/testsuite/testsuite-python-testing-utils.yaml b/jjb/testsuite/testsuite-python-testing-utils.yaml
index 5cd6815..7bca18f 100644 (file)
--- a/jjb/testsuite/testsuite-python-testing-utils.yaml
+++ b/jjb/testsuite/testsuite-python-testing-utils.yaml
@@ -9,8 +9,8 @@
     project: 'testsuite/python-testing-utils'
     subproject:
       - 'robotframework-onap':
-          tox-dir: robotframework-onap/
-          tox-envs: ''
+          tox-dir: './robotframework-onap/'
+          tox-envs: 'py27'
     stream:
       - 'master':
           branch: 'master'