From: rameshiyer27 <ramesh.murugan.iyer@est.tech>
Date: Wed, 20 Mar 2024 12:38:11 +0000 (+0000)
Subject: Fix jenkins merge job failure in policy-docker
X-Git-Tag: 3.1.2~7
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=6f8a8fdf2815ab5354b15c3fa6c076c09cf62b27;p=policy%2Fdocker.git

Fix jenkins merge job failure in policy-docker

ACM regression tests are getting invoked in the maven build without
policy deployment available. The tests are skipped by default and enabled only
from the regression script.

Issue-ID: POLICY-4946
Change-Id: I476eed2aa015f349fdabb474281f49d62bfea058
Signed-off-by: rameshiyer27 <ramesh.murugan.iyer@est.tech>
---

diff --git a/csit/run-acm-regression.sh b/csit/run-acm-regression.sh
index 615e4a94..5f77d214 100755
--- a/csit/run-acm-regression.sh
+++ b/csit/run-acm-regression.sh
@@ -65,4 +65,4 @@ docker-compose -f docker-compose.yml up -d "policy-clamp-runtime-acm"
 cd ${REGRESSION_FOLDER}
 
 # Invoke the regression test cases
-mvn clean test
\ No newline at end of file
+mvn clean test -Dtests.skip=false
\ No newline at end of file
diff --git a/policy-regression-tests/policy-clamp-regression/pom.xml b/policy-regression-tests/policy-clamp-regression/pom.xml
index da13e157..850c748f 100644
--- a/policy-regression-tests/policy-clamp-regression/pom.xml
+++ b/policy-regression-tests/policy-clamp-regression/pom.xml
@@ -18,6 +18,7 @@
         <version.cucumber>7.15.0</version.cucumber>
         <version.rest-assured>5.4.0</version.rest-assured>
         <version.junit-platform>1.10.2</version.junit-platform>
+        <tests.skip>true</tests.skip>
     </properties>
 
     <dependencies>
@@ -74,4 +75,24 @@
 
     </dependencies>
 
+    <build>
+        <finalName>${project.artifactId}-${project.version}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>${tests.skip}</skipTests>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>