From: Lott, Christopher (cl778h) <cl778h@att.com>
Date: Thu, 5 Mar 2020 15:26:09 +0000 (-0500)
Subject: Drop junit option in pytest and remove pom.xml
X-Git-Tag: 2.1.4~1
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=1e502ffd2ef7f41f4bb06104c78203f2cb3aadac;p=ric-plt%2Fa1.git

Drop junit option in pytest and remove pom.xml

These are not needed by the new tox-sonarqube analysis job, the config
is now in the JJB configuration.

Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>
Change-Id: I2a87d0cc3bd9adbd7690b8c35797020bde9a78ef
---

diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index 35e7913..0000000
--- a/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<!--<![CDATA[
-========================LICENSE_START=================================
-O-RAN-SC
-%%
-Copyright (C) 2019 AT&T Intellectual Property and Nokia
-%%
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-========================LICENSE_END===================================
-]]>-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0   http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.o-ran-sc.ric-plt.a1</groupId>
-  <artifactId>a1mediator</artifactId>
-  <version>0</version>
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <sonar.sources>.</sonar.sources>
-    <sonar.junit.reportsPath>xunit-results.xml</sonar.junit.reportsPath>
-    <sonar.python.coverage.reportPaths>coverage.xml</sonar.python.coverage.reportPaths>
-    <sonar.python.xunit.reportPath>xunit-results.xml</sonar.python.xunit.reportPath>
-    <sonar.language>py</sonar.language>
-    <sonar.pluginname>python</sonar.pluginname>
-    <sonar.inclusions>a1/*.py</sonar.inclusions>
-    <sonar.exclusions>tests/*,setup.py</sonar.exclusions>
-  </properties>
-</project>
diff --git a/tox.ini b/tox.ini
index 9606882..2e6ad9e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -32,7 +32,7 @@ setenv =
 # Note, before this will work, for the first time on that machine, run ./install_deps.sh
 commands =
 # sometimes the -s flag is helpful; add -s after pytest; which streams the logs as they come in, rather than saving them all for the end of tests
-    pytest --junitxml xunit-results.xml --cov a1 --cov-report xml --cov-report term-missing --cov-report html --cov-fail-under=70
+    pytest --cov a1 --cov-report xml --cov-report term-missing --cov-report html --cov-fail-under=70
     coverage xml -i
 
 [testenv:flake8]