summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Venkatesh Kumar <vv770d@att.com>2022-05-25 15:40:05 -0400
committerVijay Venkatesh Kumar <vv770d@att.com>2022-05-31 19:22:54 +0000
commit3406e99107e26fe4be26025708f86ed6e16a44a5 (patch)
tree406357af9a04b621aa8816b926fdfccc52df39f9
parent95855b69835177954e185f171af2f0aea3b3d3f3 (diff)
[MOD/AAdapter] Include containername property
Container name specified in CI, new property added to be used by OGR tool for name consistency checks Change-Id: I3b1c599f6d5b09b7543be49205e677fc347fad06 Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com> Issue-ID: DCAEGEN2-3090 Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>
-rw-r--r--adapter/acumos/pom.xml33
-rw-r--r--adapter/acumos/tox.ini4
2 files changed, 19 insertions, 18 deletions
diff --git a/adapter/acumos/pom.xml b/adapter/acumos/pom.xml
index c160103..4b8dec8 100644
--- a/adapter/acumos/pom.xml
+++ b/adapter/acumos/pom.xml
@@ -3,7 +3,7 @@
============LICENSE_START=======================================================
org.onap.dcae
================================================================================
-Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+Copyright (c) 2019-2020,2022 AT&T Intellectual Property. All rights reserved.
Copyright (c) 2021 highstreet technologies GmbH. All rights reserved.
=============================================================================
Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,19 +20,20 @@ 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">
- <!-- This file is used only for Sonar scans -->
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.onap.dcaegen2.platform.adapter</groupId>
- <artifactId>dcaegen2-platform-adapter-acumos</artifactId>
- <version>1.0.7</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.language>py</sonar.language>
- <sonar.pluginname>python</sonar.pluginname>
- <sonar.inclusions>**/*.py</sonar.inclusions>
- <sonar.exclusions>**/tests/**,**/setup.py</sonar.exclusions>
- </properties>
+ <!-- This file is used only for Sonar scans -->
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.onap.dcaegen2.platform.adapter</groupId>
+ <artifactId>dcaegen2-platform-adapter-acumos</artifactId>
+ <version>1.0.7</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.language>py</sonar.language>
+ <sonar.pluginname>python</sonar.pluginname>
+ <sonar.inclusions>**/*.py</sonar.inclusions>
+ <sonar.exclusions>**/tests/**,**/setup.py</sonar.exclusions>
+ <containerName>org.onap.dcaegen2.platform.adapter.acumos</containerName>
+ </properties>
</project>
diff --git a/adapter/acumos/tox.ini b/adapter/acumos/tox.ini
index ea7a24e..c92b18a 100644
--- a/adapter/acumos/tox.ini
+++ b/adapter/acumos/tox.ini
@@ -1,7 +1,7 @@
# ============LICENSE_START====================================================
# org.onap.dcae
# =============================================================================
-# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2019,2022 AT&T Intellectual Property. All rights reserved.
# Copyright (c) 2021 highstreet technologies GmbH. All rights reserved.
# =============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,7 +31,7 @@ deps=
setenv =
PYTHONPATH={toxinidir}
commands=
- nodeenv -p
+ nodeenv --node=17.2.0 -p
npm install --global protobuf-jsonschema
pytest --verbose --junitxml xunit-results.xml --cov aoconversion --cov-report xml --cov-report html --cov-report term