MODIFY some changes in pom for jenkins execution

Evolveum · Jul 25, 2018 · bc473f6 · bc473f6
1 parent 6b52ba8
commit bc473f6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml
@@ -111,7 +111,7 @@
                     <!--<noverify>true</noverify>-->
                     <!--<jvmArguments>"-Dcom.sun.management.jmxremote.port=20002","-Djava.rmi.server.hostname=0.0.0.0"</jvmArguments>-->
                     <!--<jmxPort>20002</jmxPort>-->
-                    <jvmArguments>"-Dmidpoint.schrodinger=true"</jvmArguments><!-- TODO question: CAN this argument be active by default, or should be there a different profile defined for this? -->
+                    <jvmArguments>-Dserver.port=8090 -Dmidpoint.schrodinger=true</jvmArguments><!-- TODO question: CAN this argument be active by default, or should be there a different profile defined for this? -->
                 </configuration>
                 <executions>
                     <execution>

diff --git a/testing/schrodingertest/pom.xml b/testing/schrodingertest/pom.xml
@@ -336,7 +336,10 @@
                                     <arg value="${project.starter.module}/pom.xml"/>
                                     <arg value="spring-boot:run"/>
                                 </exec>
-                                <sleep seconds="230" /><!--TODO CHANGE! (This should be rather the concern of the tests) : Needed so MP boots up, but the whole thing is quite hackish and depends on the environment (and almost the weather)-->
+                                <!--<sleep seconds="230" />&lt;!&ndash;TODO CHANGE! (This should be rather the concern of the tests) : Needed so MP boots up, but the whole thing is quite hackish and depends on the environment (and almost the weather)&ndash;&gt;-->
+                                <waitfor maxwait="400" maxwaitunit="second" checkevery="500" checkeveryunit="millisecond">
+                                    <http url="http://www.localhost:8080/midpoint"/>
+                                </waitfor>
                             </target>
                         </configuration>
                         <goals>

diff --git a/testing/schrodingertest/src/test/resources/configuration/schrodinger.properties b/testing/schrodingertest/src/test/resources/configuration/schrodinger.properties
@@ -1,8 +1,9 @@
 username=administrator
 password=5ecr3t
-base_url=http://localhost:8080/midpoint
+#base_url=http://localhost:8080/midpoint
+base_url=http://localhost:8090/midpoint
 webdriver=webdriver.chrome.driver
-webdriverLocation=/opt/chromedriver
-#webdriverLocation=C:\\Users\\matus\\chromedriver\\chromedriver.exe
+#webdriverLocation=/opt/chromedriver
+webdriverLocation=C:\\Users\\matus\\chromedriver\\chromedriver.exe
 # By default if no value is specified for headless start then the value is: false
 headlessStart=true