Implement 'Update Service by importing Tosca Model'-story

[sdc.git] / integration-tests / pom.xml

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 735673d..801e215 100644 (file)
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -1117,6 +1117,7 @@ limitations under the License.
                             <name>${docker.namespace}/sdc-integration-tests-init</name>
                             <alias>integration-tests-init</alias>
                             <build>
+                                <skip>${it.test-model.disabled}</skip>
                                 <cleanup>try</cleanup>
                                 <dockerFileDir>${project.basedir}/integration-tests-init</dockerFileDir>
                                 <tags>
@@ -1195,12 +1196,9 @@ limitations under the License.
                 <configuration>
                     <forkCount>1</forkCount>
                     <reuseForks>true</reuseForks>
-                    <systemProperties>
-                        <property>
-                            <name>testng.dtd.http</name>
-                            <value>true</value>
-                        </property>
-                    </systemProperties>
+                    <systemPropertyVariables>
+                        <testng.dtd.http>true</testng.dtd.http>
+                    </systemPropertyVariables>
                     <suiteXmlFiles>
                         <file>src/test/resources/ci/testSuites/backend/onapApiSanity.xml</file>
                         <file>src/test/resources/ci/testSuites/frontend/onapUiSanity.xml</file>
@@ -1259,12 +1257,9 @@ limitations under the License.
                         <configuration>
                             <forkCount>1</forkCount>
                             <reuseForks>true</reuseForks>
-                            <systemProperties>
-                                <property>
-                                    <name>testng.dtd.http</name>
-                                    <value>true</value>
-                                </property>
-                            </systemProperties>
+                            <systemPropertyVariables>
+                                <testng.dtd.http>true</testng.dtd.http>
+                            </systemPropertyVariables>
                             <suiteXmlFiles>
                                 <file>src/test/resources/ci/testSuites/backend/onapApiSanity.xml</file>
                                 <file>src/test/resources/ci/testSuites/frontend/onapUiSanity.xml</file>
@@ -1293,12 +1288,9 @@ limitations under the License.
                         <configuration>
                             <forkCount>1</forkCount>
                             <reuseForks>true</reuseForks>
-                            <systemProperties>
-                                <property>
-                                    <name>testng.dtd.http</name>
-                                    <value>true</value>
-                                </property>
-                            </systemProperties>
+                            <systemPropertyVariables>
+                                <testng.dtd.http>true</testng.dtd.http>
+                            </systemPropertyVariables>
                             <suiteXmlFiles>
                                 <file>src/test/resources/ci/testSuites/backend/onapApiSanity.xml</file>
                                 <file>src/test/resources/ci/testSuites/backend/helmValidatorTests.xml</file>
@@ -1325,12 +1317,9 @@ limitations under the License.
                         <configuration>
                             <forkCount>1</forkCount>
                             <reuseForks>true</reuseForks>
-                            <systemProperties>
-                                <property>
-                                    <name>testng.dtd.http</name>
-                                    <value>true</value>
-                                </property>
-                            </systemProperties>
+                            <systemPropertyVariables>
+                                <testng.dtd.http>true</testng.dtd.http>
+                            </systemPropertyVariables>
                             <suiteXmlFiles>
                                 <file>src/test/resources/ci/testSuites/frontend/onapUiSanity.xml</file>
                                 <file>src/test/resources/ci/testSuites/frontend/helmValidatorTests.xml</file>