Test all

.gitlab-ci.yml

@@ -35,26 +35,26 @@ masterJobWindowsRestful:
   only:
   - master
 
-#branchJobWindowsRpc:
-#  stage: windows
-#  script:
-#  - cd rpc
-#  - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B  clean install --settings ..\settings.xml
-#  tags:
-#  - Windows10
-#  except:
-#  - master
-#
-#branchJobWindowsRestful:
-#  stage: windows
-#  script:
-#    - cd restful
-#    # TODO: we have to skip tests for now, because most tests require a running instance of zookeeper
-#    - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B  clean install --settings ..\settings.xml -DskipTests
-#  tags:
-#    - Windows10
-#  except:
-#    - master
+branchJobWindowsRpc:
+  stage: windows
+  script:
+  - cd rpc
+  - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B  clean install --settings ..\settings.xml
+  tags:
+  - Windows10
+  except:
+  - master
+
+branchJobWindowsRestful:
+  stage: windows
+  script:
+    - cd restful
+    # TODO: we have to skip tests for now, because most tests require a running instance of zookeeper
+    - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B  clean install --settings ..\settings.xml -DskipTests
+  tags:
+    - Windows10
+  except:
+    - master
 
 # run tests
 branchJobLinux:

docker/run_test.sh

@@ -65,20 +65,14 @@ docker run \
     rpc-server:latest
 
 
-docker logs --tail 20 autopilot
-docker logs --tail 100 rpc-server
-
 cd ${CURR_DIR}
 #docker build -t server-test-runner -f ./docker/TestDockerfile .
 docker run \
     --rm --network="simulation-network" \
     -e "ZOO_SERVERS=zookeeper" \
-    montisim-server-builder sh -c "cd restful && mvn test -Dtest=SimulationServiceTest -s ../settings.xml" \
+    montisim-server-builder sh -c "cd restful && mvn test -s ../settings.xml" \
     2>&1 | tee result.txt
 
-docker stop autopilot
-docker logs --tail 20 autopilot
-docker logs rpc-server
 
 dockerCleanUp
 
@@ -87,4 +81,3 @@ tail -10 result.txt | grep "BUILD SUCCESS"
 code=$?
 echo $code
 exit $code
-