summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYun Huang <yun.huang@windriver.com>2018-03-18 15:36:59 +0800
committerYun Huang <yun.huang@windriver.com>2018-03-18 15:36:59 +0800
commiteb0fb51034382b1cdc85798c428b4f501c247eda (patch)
treeea64f2bef840907b7ac8de935a368795b8ea956a
parentce7349565ec25f0b0be99a558b927d45257cf1ae (diff)
Correct sonar script pathname
Change-Id: Idc527e0bea04556f78789042faf2d0fff7ccacf4 Issue-ID: MULTICLOUD-171 Signed-off-by: Yun Huang <yun.huang@windriver.com>
-rw-r--r--newton/pom.xml4
-rw-r--r--newton/tox.ini4
-rw-r--r--ocata/pom.xml2
-rw-r--r--windriver/pom.xml2
4 files changed, 6 insertions, 6 deletions
diff --git a/newton/pom.xml b/newton/pom.xml
index 4f16383f..1fda1076 100644
--- a/newton/pom.xml
+++ b/newton/pom.xml
@@ -36,7 +36,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<nexusproxy>https://nexus.onap.org</nexusproxy>
- <sonar.sources>.</sonar.sources>
+ <sonar.sources>.,../share</sonar.sources>
<sonar.junit.reportsPath>xunit-results.xml</sonar.junit.reportsPath>
<sonar.python.coverage.reportPath>coverage.xml</sonar.python.coverage.reportPath>
<sonar.language>py</sonar.language>
@@ -52,7 +52,7 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<configuration>
- <executable>${session.executionRootDirectory}/mvn-phase-script.sh</executable>
+ <executable>${project.basedir}/mvn-phase-script.sh</executable>
<environmentVariables>
<!-- make mvn properties as env for our script -->
<MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID>
diff --git a/newton/tox.ini b/newton/tox.ini
index e3334cf1..ec17886d 100644
--- a/newton/tox.ini
+++ b/newton/tox.ini
@@ -16,12 +16,12 @@ setenv =
deps = -r{toxinidir}/requirements.txt
commands =
coverage run --branch manage.py test newton
- coverage report --omit="./venv-tox/*,./.tox/*,*tests*,*__init__.py,*newton_base*,*common*" --fail-under=30
+ coverage report --omit="./venv-tox/*,./.tox/*,*tests*,*__init__.py" --fail-under=30
[testenv:pep8]
deps=flake8
commands=flake8
[testenv:cov]
-commands = coverage xml --omit="./venv-tox/*,./.tox/*,*tests*,*__init__.py,*newton_base*,*common*, *site-packages*"
+commands = coverage xml --omit="./venv-tox/*,./.tox/*,*tests*,*__init__.py, *site-packages*"
diff --git a/ocata/pom.xml b/ocata/pom.xml
index bf90f6e1..29032167 100644
--- a/ocata/pom.xml
+++ b/ocata/pom.xml
@@ -49,7 +49,7 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<configuration>
- <executable>${session.executionRootDirectory}/mvn-phase-script.sh</executable>
+ <executable>${project.basedir}/mvn-phase-script.sh</executable>
<environmentVariables>
<!-- make mvn properties as env for our script -->
<MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID>
diff --git a/windriver/pom.xml b/windriver/pom.xml
index 2c08bdad..0b216c59 100644
--- a/windriver/pom.xml
+++ b/windriver/pom.xml
@@ -49,7 +49,7 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<configuration>
- <executable>${session.executionRootDirectory}/mvn-phase-script.sh</executable>
+ <executable>${project.basedir}/mvn-phase-script.sh</executable>
<environmentVariables>
<!-- make mvn properties as env for our script -->
<MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID>