Commit bc9a69a7 authored by Evgeny Kusmenko's avatar Evgeny Kusmenko

Merge branch 'e/e-infrastructure' into 'master'

E/e infrastructure

See merge request !29
parents 2d887778 c7cd427a
Pipeline #191502 failed with stages
in 5 minutes and 9 seconds
......@@ -65,9 +65,10 @@ branchJobLinux:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
script:
# clean up
- docker rmi montisim-server-builder
- docker rmi rpc-server
- docker rmi restful-server
# ignore error in case image not exists
- docker rmi montisim-server-builder || true
- docker rmi rpc-server || true
- docker rmi restful-server || true
# pull the latest RMIServer image
- docker pull registry.git.rwth-aachen.de/monticore/embeddedmontiarc/simulators/rmimodelserver:latest
- cd docker
......@@ -84,6 +85,11 @@ masterJobLinux:
before_script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
script:
# clean up
# ignore error in case image not exists
- docker rmi montisim-server-builder || true
- docker rmi rpc-server || true
- docker rmi restful-server || true
# pull the latest RMIServer image
- docker pull registry.git.rwth-aachen.de/monticore/embeddedmontiarc/simulators/rmimodelserver:latest
- cd docker
......
......@@ -287,6 +287,15 @@
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<configuration>
<runOrder>reversealphabetical</runOrder>
</configuration>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
......
......@@ -18,7 +18,7 @@ import java.io.FileNotFoundException;
import java.util.List;
import java.util.Properties;
public class SimulationServiceTest extends TestCase {
public class IntegrationTest extends TestCase {
/**
* This test will execute a complete simulation task using chargingstation.sim.
......@@ -32,7 +32,7 @@ public class SimulationServiceTest extends TestCase {
*/
@Test
public void testSimulation() throws Exception {
Logger logger = LoggerFactory.getLogger(SimulationServiceTest.class);
Logger logger = LoggerFactory.getLogger(IntegrationTest.class);
ScenarioModel scenario = ScenarioService.saveScenario(
new FileInputStream(getClass().getResource("/chargingstation.sim").getPath()),
"uploaded.sim"
......@@ -62,6 +62,7 @@ public class SimulationServiceTest extends TestCase {
// double finalBattery = frames.get(frames.size() - 1).getBattery();
// after charging, final battery percentage should be higher than initial
// assertTr ue(finalBattery > initialBattery);
}
@Test
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment