feat(sumo): Enable compatibility with SUMO version 1.18.0 (#329)

* feat(sumo): update to sumo 1.18.0 * ci: updated docker image for sumo 1.18.0 in Jenkinsfile Signed-off-by: Moritz Schweppenhäuser <[email protected]>
eclipse · Jul 11, 2023 · 8a51dff · 8a51dff
1 parent f8e4b6f
commit 8a51dff
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -8,7 +8,7 @@ kind: Pod
 spec:
   containers:
   - name: maven-sumo
-    image: eclipsemosaic/mosaic-ci:jdk8-sumo-1.16.0
+    image: eclipsemosaic/mosaic-ci:jdk8-sumo-1.18.0
     command:
     - cat
     tty: true

diff --git a/README.md b/README.md
@@ -42,7 +42,7 @@ Additional simulators and assessment features are provided by [Fraunhofer FOKUS]
 
 ## Related repositories
 
-* [Eclipse SUMO](https://github.com/eclipse/sumo) is coupled directly using the TraCI interface. We recommend using the SUMO release `1.17.0`.
+* [Eclipse SUMO](https://github.com/eclipse/sumo) is coupled directly using the TraCI interface. We recommend using the SUMO release `1.18.0`.
 * The coupling to [ns-3](https://www.nsnam.org) is realized by a federate implementation which can be found [in our MOSAIC Addons repository](https://github.com/mosaic-addons/ns3-federate). 
   We currently support ns-3 version `3.36.1`. 
 * The coupling to [OMNeT++](https://omnetpp.org) is implemented in a very similar manner. The corresponding federate implementation can be found [in our MOSAIC Addons repository](https://github.com/mosaic-addons/omnetpp-federate). 
@@ -61,7 +61,7 @@ For a successful build you need the following software to be installed:
 
 * **Maven 3.1.x** or higher.
 * **Java 8, 11, or 17** - We recommend using the [Adoptium OpenJDK (aka Eclipse Temurin)](https://adoptium.net/?variant=openjdk8).
-* **SUMO 1.17.0** - Additionally, the environment variable `SUMO_HOME` should be configured properly.
+* **SUMO 1.18.0** - Additionally, the environment variable `SUMO_HOME` should be configured properly.
 
 ## Build
 

diff --git a/fed/mosaic-sumo/src/main/java/org/eclipse/mosaic/fed/sumo/bridge/SumoVersion.java b/fed/mosaic-sumo/src/main/java/org/eclipse/mosaic/fed/sumo/bridge/SumoVersion.java
@@ -41,8 +41,8 @@ public enum SumoVersion {
     SUMO_1_14_x("1.14.*", TraciVersion.API_20),
     SUMO_1_15_x("1.15.*", TraciVersion.API_20),
     SUMO_1_16_x("1.16.*", TraciVersion.API_20),
-
     SUMO_1_17_x("1.17.*", TraciVersion.API_20),
+    SUMO_1_18_x("1.18.*", TraciVersion.API_20),
 
     /**
      * the lowest version supported by this client.
@@ -52,7 +52,7 @@ public enum SumoVersion {
     /**
      * the highest version supported by this client.
      */
-    HIGHEST(SUMO_1_17_x.sumoVersion, SUMO_1_17_x.traciVersion);
+    HIGHEST(SUMO_1_18_x.sumoVersion, SUMO_1_18_x.traciVersion);
 
     private final String sumoVersion;
     private final TraciVersion traciVersion;

diff --git a/test/ci/ci-image-mvn-sumo/Dockerfile b/test/ci/ci-image-mvn-sumo/Dockerfile
@@ -8,7 +8,7 @@ WORKDIR /home/jenkins
 
 RUN apt-get update &&  \
     apt-get install -y --allow-unauthenticated software-properties-common && \
-    # adjust this output string to bypass potentiall caches
-    echo "Installing SUMO 1.16.0" && \
+    # adjust this output string to bypass potential caches
+    echo "Installing SUMO 1.18.0" && \
     add-apt-repository ppa:sumo/stable && \
     apt-get install -y sumo
diff --git a/test/ci/ci-image-mvn-sumo/README.md b/test/ci/ci-image-mvn-sumo/README.md
@@ -10,9 +10,9 @@ build and tag the docker image with the latest SUMO version. This image should b
 and available in the PPA.
 
 ```shell script
-docker build . -t eclipsemosaic/mosaic-ci:jdk8-sumo-1.17.0
+docker build . -t eclipsemosaic/mosaic-ci:jdk8-sumo-1.18.0
 docker login
-docker push eclipsemosaic/mosaic-ci:jdk8-sumo-1.17.0
+docker push eclipsemosaic/mosaic-ci:jdk8-sumo-1.18.0
 ```  
 
 Afterwards, the image should be available here: https://hub.docker.com/r/eclipsemosaic/mosaic-ci/tags