Merge "Update features for Argon release"

2 files changed, 17 insertions, 3 deletions

diff --git a/sdnr/wt/data-provider/setup/pom.xml b/sdnr/wt/data-provider/setup/pom.xml
index c0d8afe72..c75b31a1b 100644
--- a/sdnr/wt/data-provider/setup/pom.xml
+++ b/sdnr/wt/data-provider/setup/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.5.4</version>
+        <version>2.6.0</version>
         <relativePath/>
     </parent>
 
@@ -102,6 +102,20 @@
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
     </dependencies>
+    <!-- Tests require MariaDB4j , which does not currently support ARM64 -->
+    <profiles>
+        <profile>
+            <id>disable-test-on-ARM64</id>
+            <activation>
+                <os>
+                    <arch>aarch64</arch>
+                </os>
+            </activation>
+            <properties>
+                <skipTests>true</skipTests>
+            </properties>
+        </profile>
+    </profiles>
     <build>
         <plugins>
             <plugin>
diff --git a/sdnr/wt/data-provider/setup/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/MariaDBTestBase.java b/sdnr/wt/data-provider/setup/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/MariaDBTestBase.java
index 2845613cb..671d6225a 100644
--- a/sdnr/wt/data-provider/setup/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/MariaDBTestBase.java
+++ b/sdnr/wt/data-provider/setup/src/test/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/MariaDBTestBase.java
@@ -90,7 +90,7 @@ public class MariaDBTestBase {
         SqlDBConfig config = new SqlDBConfig(new ConfigurationFileRepresentation(TESTPROPFILE));
         config.setControllerId("test123");
         this.db = null;
-        this.dbProvider = new SqlDBDataProvider(config, false);
+        this.dbProvider = new SqlDBDataProvider(config, false, "");
         //testCreateTable(this.dbProvider.getDBService());
     }
 
@@ -104,7 +104,7 @@ public class MariaDBTestBase {
         //start db server
         this.db = startDatabase(port);
         //create db with name sdnrdb
-        this.dbProvider = new SqlDBDataProvider(config, false);
+        this.dbProvider = new SqlDBDataProvider(config, false, "");
         //testCreateTable(this.dbProvider.getDBService());
     }