From 9362a6c565d46890d397d889ef8d8630d54e48f8 Mon Sep 17 00:00:00 2001 From: Karl Schrab Date: Thu, 10 Oct 2024 17:52:07 +0200 Subject: [PATCH] ci: use SUMO 1.21.0 for testing --- Jenkinsfile | 2 +- README.md | 4 ++-- test/ci/ci-image-mvn-sumo/Dockerfile | 2 +- test/ci/ci-image-mvn-sumo/README.md | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f2553b398..9fc50778f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ kind: Pod spec: containers: - name: maven-sumo - image: eclipsemosaic/mosaic-ci:jdk17-sumo-1.20.0 + image: eclipsemosaic/mosaic-ci:jdk17-sumo-1.21.0 command: - cat tty: true diff --git a/README.md b/README.md index 5e1516830..1f57caf57 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,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.20.0`. +* [Eclipse SUMO](https://github.com/eclipse/sumo) is coupled directly using the TraCI interface. We recommend using the SUMO release `1.21.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). @@ -73,7 +73,7 @@ For a successful build you need the following software to be installed: * **Maven 3.1.x** or higher. * **Java 17**, or 21 - We recommend using the [Adoptium OpenJDK (aka Eclipse Temurin)](https://adoptium.net/?variant=openjdk17). -* **SUMO 1.20.0** - Older versions > 1.2.0 are most probably supported, but not tested. The environment variable `SUMO_HOME` should be configured properly. +* **SUMO 1.21.0** - Older versions > 1.2.0 are most probably supported, but not tested. The environment variable `SUMO_HOME` should be configured properly. ## Build diff --git a/test/ci/ci-image-mvn-sumo/Dockerfile b/test/ci/ci-image-mvn-sumo/Dockerfile index 3ab423666..c77cf0a79 100644 --- a/test/ci/ci-image-mvn-sumo/Dockerfile +++ b/test/ci/ci-image-mvn-sumo/Dockerfile @@ -9,6 +9,6 @@ WORKDIR /home/jenkins RUN apt-get update && \ apt-get install -y --allow-unauthenticated software-properties-common && \ # adjust this output string to bypass potential caches - echo "Installing SUMO 1.20.0" && \ + echo "Installing SUMO 1.21.0" && \ add-apt-repository ppa:sumo/stable && \ apt-get install -y sumo \ No newline at end of file diff --git a/test/ci/ci-image-mvn-sumo/README.md b/test/ci/ci-image-mvn-sumo/README.md index fec594112..5e4c1d40b 100644 --- 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:jdk17-sumo-1.20.0 +docker build . -t eclipsemosaic/mosaic-ci:jdk17-sumo-1.21.0 docker login -docker push eclipsemosaic/mosaic-ci:jdk17-sumo-1.20.0 +docker push eclipsemosaic/mosaic-ci:jdk17-sumo-1.21.0 ``` Afterwards, the image should be available here: https://hub.docker.com/r/eclipsemosaic/mosaic-ci/tags