diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 48bfcdd7..ac54a69d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -148,7 +148,6 @@ jobs: run: | apt-get update apt-get -y install python3-coverage python3-pip python3-pytest python3-pytest-asyncio - pip3 install pytest==8.0.2 cd src/cda-telematics/telematic_system/telematic_historical_data_processing/rosbag2_processing_service/docker chmod 777 checkout.sh install.sh ./checkout.sh @@ -159,6 +158,7 @@ jobs: run: | cd $GITHUB_WORKSPACE/src/cda-telematics/telematic_system/telematic_historical_data_processing/rosbag2_processing_service source /ws/install/setup.bash + pip3 install pytest==8.0.2 python3 -m coverage run -m pytest python3 -m coverage xml --omit="/opt/*,/root/*,/tmp/*,/usr/*,/var/*,**/__init__.py" - name: Find coverage.xml diff --git a/telematic_system/docker-compose.cloud.servers.yml b/telematic_system/docker-compose.cloud.servers.yml index 22fbc4d2..0127981f 100644 --- a/telematic_system/docker-compose.cloud.servers.yml +++ b/telematic_system/docker-compose.cloud.servers.yml @@ -15,7 +15,7 @@ services: context: "./telematic_cloud_messaging" container_name: messaging_server #Todo: The cloud messaging service image has incorrect configuration. Please update the application.properties, and build it from source code. - image: usdotfhwastol/telematic_cloud_messaging:carma-system-4.7.2 + image: usdotfhwastol/telematic_cloud_messaging:carma-system-4.7.3 depends_on: - nats restart: always @@ -33,7 +33,7 @@ services: context: ./telematic_historical_data_processing dockerfile: Dockerfile network: host - image: usdotfhwastol/telematic_historical_data_processing:carma-system-4.7.2 + image: usdotfhwastol/telematic_historical_data_processing:carma-system-4.7.3 network_mode: host logging: options: diff --git a/telematic_system/docker-compose.local.yml b/telematic_system/docker-compose.local.yml index 3c5b95a9..0cc55288 100644 --- a/telematic_system/docker-compose.local.yml +++ b/telematic_system/docker-compose.local.yml @@ -51,7 +51,7 @@ services: grafana: build: context: "./telematic_apps/grafana" - image: usdotfhwastol/telematic_grafana:carma-system-4.7.2 + image: usdotfhwastol/telematic_grafana:carma-system-4.7.3 restart: always container_name: grafana logging: @@ -74,7 +74,7 @@ services: build: context: "./telematic_apps/web_app/server" dockerfile: "Dockerfile" - image: usdotfhwastol/telematic_web_server:carma-system-4.7.2 + image: usdotfhwastol/telematic_web_server:carma-system-4.7.3 restart: always container_name: web_server logging: @@ -95,7 +95,7 @@ services: web_client: build: context: "./telematic_apps/web_app/client" - image: usdotfhwastol/telematic_web_client:carma-system-4.7.2 + image: usdotfhwastol/telematic_web_client:carma-system-4.7.3 restart: always container_name: web_client logging: @@ -110,7 +110,7 @@ services: build: context: "./telematic_apps/apache2" dockerfile: "./local.Dockerfile" - image: usdotfhwastol/telematic_local_apache2:carma-system-4.7.2 + image: usdotfhwastol/telematic_local_apache2:carma-system-4.7.3 restart: always container_name: apache2 logging: @@ -135,7 +135,7 @@ services: build: context: "./telematic_cloud_messaging" container_name: messaging_server - image: usdotfhwastol/telematic_cloud_messaging:carma-system-4.7.2 + image: usdotfhwastol/telematic_cloud_messaging:carma-system-4.7.3 depends_on: - nats - mysqldb @@ -155,7 +155,7 @@ services: context: ./telematic_historical_data_processing dockerfile: Dockerfile network: host - image: usdotfhwastol/telematic_historical_data_processing:carma-system-4.7.2 + image: usdotfhwastol/telematic_historical_data_processing:carma-system-4.7.3 container_name: rosbag2_processing_service restart: always depends_on: diff --git a/telematic_system/docker-compose.units.yml b/telematic_system/docker-compose.units.yml index ed0865cb..1788e72f 100755 --- a/telematic_system/docker-compose.units.yml +++ b/telematic_system/docker-compose.units.yml @@ -4,7 +4,7 @@ services: build: context: ./telematic_units/carma_vehicle_bridge dockerfile: Dockerfile - image: usdotfhwastol/carma_vehicle_nats_bridge:carma-system-4.7.2 + image: usdotfhwastol/carma_vehicle_nats_bridge:carma-system-4.7.3 logging: options: max-size: "2g" @@ -32,7 +32,7 @@ services: build: context: ./telematic_units/carma_street_bridge dockerfile: Dockerfile - image: usdotfhwastol/carma_street_nats_bridge:carma-system-4.7.2 + image: usdotfhwastol/carma_street_nats_bridge:carma-system-4.7.3 logging: options: max-size: "2g" @@ -60,7 +60,7 @@ services: build: context: ./telematic_units/carma_cloud_bridge dockerfile: Dockerfile - image: usdotfhwastol/carma_cloud_nats_bridge:carma-system-4.7.2 + image: usdotfhwastol/carma_cloud_nats_bridge:carma-system-4.7.3 logging: options: max-size: "2g" diff --git a/telematic_system/docker-compose.webapp.yml b/telematic_system/docker-compose.webapp.yml index 9d17c9b2..a00b3706 100644 --- a/telematic_system/docker-compose.webapp.yml +++ b/telematic_system/docker-compose.webapp.yml @@ -5,7 +5,7 @@ services: context: "./telematic_apps/web_app/server" restart: always container_name: web_server - image: usdotfhwastol/telematic_web_server:carma-system-4.7.2 + image: usdotfhwastol/telematic_web_server:carma-system-4.7.3 logging: options: max-size: "10m" @@ -48,7 +48,7 @@ services: web_client: build: context: "./telematic_apps/web_app/client" - image: usdotfhwastol/telematic_web_client:carma-system-4.7.2 + image: usdotfhwastol/telematic_web_client:carma-system-4.7.3 restart: always container_name: web_client logging: @@ -65,7 +65,7 @@ services: build: context: "./telematic_apps/apache2" restart: always - image: usdotfhwastol/telematic_apache2:carma-system-4.7.2 + image: usdotfhwastol/telematic_apache2:carma-system-4.7.3 container_name: apache2 logging: options: @@ -88,7 +88,7 @@ services: grafana: build: context: "./telematic_apps/grafana" - image: usdotfhwastol/telematic_grafana:carma-system-4.7.2 + image: usdotfhwastol/telematic_grafana:carma-system-4.7.3 restart: always container_name: grafana logging: diff --git a/telematic_system/telematic_apps/web_app/client/src/components/topics/DefaultTopicSettings.js b/telematic_system/telematic_apps/web_app/client/src/components/topics/DefaultTopicSettings.js index 3dbc7270..dfe312ba 100644 --- a/telematic_system/telematic_apps/web_app/client/src/components/topics/DefaultTopicSettings.js +++ b/telematic_system/telematic_apps/web_app/client/src/components/topics/DefaultTopicSettings.js @@ -150,7 +150,7 @@ const DefaultTopicSettings = (props) => { Save - Save + Load {isSaved || isLoaded ? {msg} : {msg}}