From 9c391d3fed613acf03f36e21a137cdc8f5926db0 Mon Sep 17 00:00:00 2001 From: "Pasch, Frederik" Date: Wed, 3 Jul 2024 10:51:28 +0200 Subject: [PATCH 1/6] move gazebo --- .../scenario_execution_gazebo}/MANIFEST.in | 0 .../scenario_execution_gazebo}/README.md | 0 .../scenario_execution_gazebo}/package.xml | 0 .../resource/scenario_execution_gazebo | 0 .../scenario_execution_gazebo/__init__.py | 0 .../scenario_execution_gazebo/actions/__init__.py | 0 .../scenario_execution_gazebo/actions/gazebo_actor_exists.py | 0 .../scenario_execution_gazebo/actions/gazebo_delete_actor.py | 0 .../actions/gazebo_relative_spawn_actor.py | 0 .../scenario_execution_gazebo/actions/gazebo_spawn_actor.py | 0 .../scenario_execution_gazebo/actions/gazebo_wait_for_sim.py | 0 .../scenario_execution_gazebo/actions/utils.py | 0 .../scenario_execution_gazebo/get_osc_library.py | 0 .../scenario_execution_gazebo/lib_osc/gazebo.osc | 0 .../scenario_execution_gazebo}/setup.cfg | 0 .../scenario_execution_gazebo}/setup.py | 0 simulation/gazebo/test_scenario_execution_gazebo/setup.cfg | 4 ---- .../scenario_execution_execution_gazebo_test}/README.md | 0 .../scenario_execution_execution_gazebo_test}/models/box.sdf | 0 .../models/box.sdf.xacro | 0 .../models/walking_human.sdf | 0 .../scenario_execution_execution_gazebo_test}/package.xml | 0 .../resource/scenario_execution_gazebo_test | 0 .../resource/test_scenario_execution_gazebo | 0 .../scenarios/test_relative_spawn.osc | 0 .../scenarios/test_spawn_exists_delete.osc | 0 .../scenarios/test_spawn_xacro_with_parameters.osc | 0 test/scenario_execution_execution_gazebo_test/setup.cfg | 4 ++++ .../scenario_execution_execution_gazebo_test}/setup.py | 2 +- 29 files changed, 5 insertions(+), 5 deletions(-) rename {scenario_execution_gazebo => libs/scenario_execution_gazebo}/MANIFEST.in (100%) rename {scenario_execution_gazebo => libs/scenario_execution_gazebo}/README.md (100%) rename {scenario_execution_gazebo => libs/scenario_execution_gazebo}/package.xml (100%) rename {scenario_execution_gazebo => libs/scenario_execution_gazebo}/resource/scenario_execution_gazebo (100%) rename {scenario_execution_gazebo => libs/scenario_execution_gazebo}/scenario_execution_gazebo/__init__.py (100%) rename {scenario_execution_gazebo => libs/scenario_execution_gazebo}/scenario_execution_gazebo/actions/__init__.py (100%) rename {scenario_execution_gazebo => libs/scenario_execution_gazebo}/scenario_execution_gazebo/actions/gazebo_actor_exists.py (100%) rename {scenario_execution_gazebo => libs/scenario_execution_gazebo}/scenario_execution_gazebo/actions/gazebo_delete_actor.py (100%) rename {scenario_execution_gazebo => libs/scenario_execution_gazebo}/scenario_execution_gazebo/actions/gazebo_relative_spawn_actor.py (100%) rename {scenario_execution_gazebo => libs/scenario_execution_gazebo}/scenario_execution_gazebo/actions/gazebo_spawn_actor.py (100%) rename {scenario_execution_gazebo => libs/scenario_execution_gazebo}/scenario_execution_gazebo/actions/gazebo_wait_for_sim.py (100%) rename {scenario_execution_gazebo => libs/scenario_execution_gazebo}/scenario_execution_gazebo/actions/utils.py (100%) rename {scenario_execution_gazebo => libs/scenario_execution_gazebo}/scenario_execution_gazebo/get_osc_library.py (100%) rename {scenario_execution_gazebo => libs/scenario_execution_gazebo}/scenario_execution_gazebo/lib_osc/gazebo.osc (100%) rename {scenario_execution_gazebo => libs/scenario_execution_gazebo}/setup.cfg (100%) rename {scenario_execution_gazebo => libs/scenario_execution_gazebo}/setup.py (100%) delete mode 100644 simulation/gazebo/test_scenario_execution_gazebo/setup.cfg rename {simulation/gazebo/test_scenario_execution_gazebo => test/scenario_execution_execution_gazebo_test}/README.md (100%) rename {simulation/gazebo/test_scenario_execution_gazebo => test/scenario_execution_execution_gazebo_test}/models/box.sdf (100%) rename {simulation/gazebo/test_scenario_execution_gazebo => test/scenario_execution_execution_gazebo_test}/models/box.sdf.xacro (100%) rename {simulation/gazebo/test_scenario_execution_gazebo => test/scenario_execution_execution_gazebo_test}/models/walking_human.sdf (100%) rename {simulation/gazebo/test_scenario_execution_gazebo => test/scenario_execution_execution_gazebo_test}/package.xml (100%) rename simulation/gazebo/test_scenario_execution_gazebo/resource/test_scenario_execution_gazebo => test/scenario_execution_execution_gazebo_test/resource/scenario_execution_gazebo_test (100%) create mode 100644 test/scenario_execution_execution_gazebo_test/resource/test_scenario_execution_gazebo rename {simulation/gazebo/test_scenario_execution_gazebo => test/scenario_execution_execution_gazebo_test}/scenarios/test_relative_spawn.osc (100%) rename {simulation/gazebo/test_scenario_execution_gazebo => test/scenario_execution_execution_gazebo_test}/scenarios/test_spawn_exists_delete.osc (100%) rename {simulation/gazebo/test_scenario_execution_gazebo => test/scenario_execution_execution_gazebo_test}/scenarios/test_spawn_xacro_with_parameters.osc (100%) create mode 100644 test/scenario_execution_execution_gazebo_test/setup.cfg rename {simulation/gazebo/test_scenario_execution_gazebo => test/scenario_execution_execution_gazebo_test}/setup.py (96%) diff --git a/scenario_execution_gazebo/MANIFEST.in b/libs/scenario_execution_gazebo/MANIFEST.in similarity index 100% rename from scenario_execution_gazebo/MANIFEST.in rename to libs/scenario_execution_gazebo/MANIFEST.in diff --git a/scenario_execution_gazebo/README.md b/libs/scenario_execution_gazebo/README.md similarity index 100% rename from scenario_execution_gazebo/README.md rename to libs/scenario_execution_gazebo/README.md diff --git a/scenario_execution_gazebo/package.xml b/libs/scenario_execution_gazebo/package.xml similarity index 100% rename from scenario_execution_gazebo/package.xml rename to libs/scenario_execution_gazebo/package.xml diff --git a/scenario_execution_gazebo/resource/scenario_execution_gazebo b/libs/scenario_execution_gazebo/resource/scenario_execution_gazebo similarity index 100% rename from scenario_execution_gazebo/resource/scenario_execution_gazebo rename to libs/scenario_execution_gazebo/resource/scenario_execution_gazebo diff --git a/scenario_execution_gazebo/scenario_execution_gazebo/__init__.py b/libs/scenario_execution_gazebo/scenario_execution_gazebo/__init__.py similarity index 100% rename from scenario_execution_gazebo/scenario_execution_gazebo/__init__.py rename to libs/scenario_execution_gazebo/scenario_execution_gazebo/__init__.py diff --git a/scenario_execution_gazebo/scenario_execution_gazebo/actions/__init__.py b/libs/scenario_execution_gazebo/scenario_execution_gazebo/actions/__init__.py similarity index 100% rename from scenario_execution_gazebo/scenario_execution_gazebo/actions/__init__.py rename to libs/scenario_execution_gazebo/scenario_execution_gazebo/actions/__init__.py diff --git a/scenario_execution_gazebo/scenario_execution_gazebo/actions/gazebo_actor_exists.py b/libs/scenario_execution_gazebo/scenario_execution_gazebo/actions/gazebo_actor_exists.py similarity index 100% rename from scenario_execution_gazebo/scenario_execution_gazebo/actions/gazebo_actor_exists.py rename to libs/scenario_execution_gazebo/scenario_execution_gazebo/actions/gazebo_actor_exists.py diff --git a/scenario_execution_gazebo/scenario_execution_gazebo/actions/gazebo_delete_actor.py b/libs/scenario_execution_gazebo/scenario_execution_gazebo/actions/gazebo_delete_actor.py similarity index 100% rename from scenario_execution_gazebo/scenario_execution_gazebo/actions/gazebo_delete_actor.py rename to libs/scenario_execution_gazebo/scenario_execution_gazebo/actions/gazebo_delete_actor.py diff --git a/scenario_execution_gazebo/scenario_execution_gazebo/actions/gazebo_relative_spawn_actor.py b/libs/scenario_execution_gazebo/scenario_execution_gazebo/actions/gazebo_relative_spawn_actor.py similarity index 100% rename from scenario_execution_gazebo/scenario_execution_gazebo/actions/gazebo_relative_spawn_actor.py rename to libs/scenario_execution_gazebo/scenario_execution_gazebo/actions/gazebo_relative_spawn_actor.py diff --git a/scenario_execution_gazebo/scenario_execution_gazebo/actions/gazebo_spawn_actor.py b/libs/scenario_execution_gazebo/scenario_execution_gazebo/actions/gazebo_spawn_actor.py similarity index 100% rename from scenario_execution_gazebo/scenario_execution_gazebo/actions/gazebo_spawn_actor.py rename to libs/scenario_execution_gazebo/scenario_execution_gazebo/actions/gazebo_spawn_actor.py diff --git a/scenario_execution_gazebo/scenario_execution_gazebo/actions/gazebo_wait_for_sim.py b/libs/scenario_execution_gazebo/scenario_execution_gazebo/actions/gazebo_wait_for_sim.py similarity index 100% rename from scenario_execution_gazebo/scenario_execution_gazebo/actions/gazebo_wait_for_sim.py rename to libs/scenario_execution_gazebo/scenario_execution_gazebo/actions/gazebo_wait_for_sim.py diff --git a/scenario_execution_gazebo/scenario_execution_gazebo/actions/utils.py b/libs/scenario_execution_gazebo/scenario_execution_gazebo/actions/utils.py similarity index 100% rename from scenario_execution_gazebo/scenario_execution_gazebo/actions/utils.py rename to libs/scenario_execution_gazebo/scenario_execution_gazebo/actions/utils.py diff --git a/scenario_execution_gazebo/scenario_execution_gazebo/get_osc_library.py b/libs/scenario_execution_gazebo/scenario_execution_gazebo/get_osc_library.py similarity index 100% rename from scenario_execution_gazebo/scenario_execution_gazebo/get_osc_library.py rename to libs/scenario_execution_gazebo/scenario_execution_gazebo/get_osc_library.py diff --git a/scenario_execution_gazebo/scenario_execution_gazebo/lib_osc/gazebo.osc b/libs/scenario_execution_gazebo/scenario_execution_gazebo/lib_osc/gazebo.osc similarity index 100% rename from scenario_execution_gazebo/scenario_execution_gazebo/lib_osc/gazebo.osc rename to libs/scenario_execution_gazebo/scenario_execution_gazebo/lib_osc/gazebo.osc diff --git a/scenario_execution_gazebo/setup.cfg b/libs/scenario_execution_gazebo/setup.cfg similarity index 100% rename from scenario_execution_gazebo/setup.cfg rename to libs/scenario_execution_gazebo/setup.cfg diff --git a/scenario_execution_gazebo/setup.py b/libs/scenario_execution_gazebo/setup.py similarity index 100% rename from scenario_execution_gazebo/setup.py rename to libs/scenario_execution_gazebo/setup.py diff --git a/simulation/gazebo/test_scenario_execution_gazebo/setup.cfg b/simulation/gazebo/test_scenario_execution_gazebo/setup.cfg deleted file mode 100644 index ab842df0..00000000 --- a/simulation/gazebo/test_scenario_execution_gazebo/setup.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[develop] -script_dir=$base/lib/test_scenario_execution_gazebo -[install] -install_scripts=$base/lib/test_scenario_execution_gazebo diff --git a/simulation/gazebo/test_scenario_execution_gazebo/README.md b/test/scenario_execution_execution_gazebo_test/README.md similarity index 100% rename from simulation/gazebo/test_scenario_execution_gazebo/README.md rename to test/scenario_execution_execution_gazebo_test/README.md diff --git a/simulation/gazebo/test_scenario_execution_gazebo/models/box.sdf b/test/scenario_execution_execution_gazebo_test/models/box.sdf similarity index 100% rename from simulation/gazebo/test_scenario_execution_gazebo/models/box.sdf rename to test/scenario_execution_execution_gazebo_test/models/box.sdf diff --git a/simulation/gazebo/test_scenario_execution_gazebo/models/box.sdf.xacro b/test/scenario_execution_execution_gazebo_test/models/box.sdf.xacro similarity index 100% rename from simulation/gazebo/test_scenario_execution_gazebo/models/box.sdf.xacro rename to test/scenario_execution_execution_gazebo_test/models/box.sdf.xacro diff --git a/simulation/gazebo/test_scenario_execution_gazebo/models/walking_human.sdf b/test/scenario_execution_execution_gazebo_test/models/walking_human.sdf similarity index 100% rename from simulation/gazebo/test_scenario_execution_gazebo/models/walking_human.sdf rename to test/scenario_execution_execution_gazebo_test/models/walking_human.sdf diff --git a/simulation/gazebo/test_scenario_execution_gazebo/package.xml b/test/scenario_execution_execution_gazebo_test/package.xml similarity index 100% rename from simulation/gazebo/test_scenario_execution_gazebo/package.xml rename to test/scenario_execution_execution_gazebo_test/package.xml diff --git a/simulation/gazebo/test_scenario_execution_gazebo/resource/test_scenario_execution_gazebo b/test/scenario_execution_execution_gazebo_test/resource/scenario_execution_gazebo_test similarity index 100% rename from simulation/gazebo/test_scenario_execution_gazebo/resource/test_scenario_execution_gazebo rename to test/scenario_execution_execution_gazebo_test/resource/scenario_execution_gazebo_test diff --git a/test/scenario_execution_execution_gazebo_test/resource/test_scenario_execution_gazebo b/test/scenario_execution_execution_gazebo_test/resource/test_scenario_execution_gazebo new file mode 100644 index 00000000..e69de29b diff --git a/simulation/gazebo/test_scenario_execution_gazebo/scenarios/test_relative_spawn.osc b/test/scenario_execution_execution_gazebo_test/scenarios/test_relative_spawn.osc similarity index 100% rename from simulation/gazebo/test_scenario_execution_gazebo/scenarios/test_relative_spawn.osc rename to test/scenario_execution_execution_gazebo_test/scenarios/test_relative_spawn.osc diff --git a/simulation/gazebo/test_scenario_execution_gazebo/scenarios/test_spawn_exists_delete.osc b/test/scenario_execution_execution_gazebo_test/scenarios/test_spawn_exists_delete.osc similarity index 100% rename from simulation/gazebo/test_scenario_execution_gazebo/scenarios/test_spawn_exists_delete.osc rename to test/scenario_execution_execution_gazebo_test/scenarios/test_spawn_exists_delete.osc diff --git a/simulation/gazebo/test_scenario_execution_gazebo/scenarios/test_spawn_xacro_with_parameters.osc b/test/scenario_execution_execution_gazebo_test/scenarios/test_spawn_xacro_with_parameters.osc similarity index 100% rename from simulation/gazebo/test_scenario_execution_gazebo/scenarios/test_spawn_xacro_with_parameters.osc rename to test/scenario_execution_execution_gazebo_test/scenarios/test_spawn_xacro_with_parameters.osc diff --git a/test/scenario_execution_execution_gazebo_test/setup.cfg b/test/scenario_execution_execution_gazebo_test/setup.cfg new file mode 100644 index 00000000..f367a429 --- /dev/null +++ b/test/scenario_execution_execution_gazebo_test/setup.cfg @@ -0,0 +1,4 @@ +[develop] +script_dir=$base/lib/scenario_execution_gazebo_test +[install] +install_scripts=$base/lib/scenario_execution_gazebo_test diff --git a/simulation/gazebo/test_scenario_execution_gazebo/setup.py b/test/scenario_execution_execution_gazebo_test/setup.py similarity index 96% rename from simulation/gazebo/test_scenario_execution_gazebo/setup.py rename to test/scenario_execution_execution_gazebo_test/setup.py index 8484cf76..7808b003 100644 --- a/simulation/gazebo/test_scenario_execution_gazebo/setup.py +++ b/test/scenario_execution_execution_gazebo_test/setup.py @@ -19,7 +19,7 @@ import os from setuptools import find_namespace_packages, setup -PACKAGE_NAME = 'test_scenario_execution_gazebo' +PACKAGE_NAME = 'scenario_execution_gazebo_test' setup( name=PACKAGE_NAME, From a70c3ae08ed35db8dd6a324e3ec775cb40c2538a Mon Sep 17 00:00:00 2001 From: "Pasch, Frederik" Date: Wed, 3 Jul 2024 10:53:06 +0200 Subject: [PATCH 2/6] move gazebo --- .github/workflows/test_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml index 25bed459..5cdf6587 100644 --- a/.github/workflows/test_build.yml +++ b/.github/workflows/test_build.yml @@ -364,7 +364,7 @@ jobs: export ROS_DOMAIN_ID=2 export IGN_PARTITION=${HOSTNAME}:${GITHUB_RUN_ID} # shellcheck disable=SC1083 - scenario_batch_execution -i simulation/gazebo/test_scenario_execution_gazebo/scenarios/ -o test_scenario_execution_gazebo -- ros2 launch tb4_sim_scenario sim_nav_scenario_launch.py scenario:={SCENARIO} output_dir:={OUTPUT_DIR} + scenario_batch_execution -i test/scenario_execution_gazebo_test/scenarios/ -o test_scenario_execution_gazebo -- ros2 launch tb4_sim_scenario sim_nav_scenario_launch.py scenario:={SCENARIO} output_dir:={OUTPUT_DIR} - name: Upload result uses: actions/upload-artifact@ef09cdac3e2d3e60d8ccadda691f4f1cec5035cb if: always() From 964da3c6d6896421677344577eca56deee033a81 Mon Sep 17 00:00:00 2001 From: "Pasch, Frederik" Date: Wed, 3 Jul 2024 11:01:04 +0200 Subject: [PATCH 3/6] licenses --- libs/scenario_execution_gazebo/package.xml | 2 +- test/scenario_execution_execution_gazebo_test/package.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/scenario_execution_gazebo/package.xml b/libs/scenario_execution_gazebo/package.xml index 13f788a5..a14434e1 100644 --- a/libs/scenario_execution_gazebo/package.xml +++ b/libs/scenario_execution_gazebo/package.xml @@ -6,7 +6,7 @@ Scenario Execution library for Gazebo Intel Labs Intel Labs - Apache-2.0 + Apache-2.0 scenario_execution_ros diff --git a/test/scenario_execution_execution_gazebo_test/package.xml b/test/scenario_execution_execution_gazebo_test/package.xml index d1354a3e..a4a103aa 100644 --- a/test/scenario_execution_execution_gazebo_test/package.xml +++ b/test/scenario_execution_execution_gazebo_test/package.xml @@ -6,7 +6,7 @@ Tests for Scenario Execution library for Gazebo Intel Labs Intel Labs - Apache-2.0 + Apache-2.0 rclpy scenario_execution_gazebo From 66555689ff11076dabdd711c564135f3ff209cef Mon Sep 17 00:00:00 2001 From: "Pasch, Frederik" Date: Wed, 3 Jul 2024 11:02:42 +0200 Subject: [PATCH 4/6] licenses --- .../README.md | 0 .../models/box.sdf | 0 .../models/box.sdf.xacro | 0 .../models/walking_human.sdf | 0 .../package.xml | 0 .../resource/scenario_execution_gazebo_test | 0 .../resource/test_scenario_execution_gazebo | 0 .../scenarios/test_relative_spawn.osc | 0 .../scenarios/test_spawn_exists_delete.osc | 0 .../scenarios/test_spawn_xacro_with_parameters.osc | 0 .../setup.cfg | 0 .../setup.py | 0 12 files changed, 0 insertions(+), 0 deletions(-) rename test/{scenario_execution_execution_gazebo_test => scenario_execution_gazebo_test}/README.md (100%) rename test/{scenario_execution_execution_gazebo_test => scenario_execution_gazebo_test}/models/box.sdf (100%) rename test/{scenario_execution_execution_gazebo_test => scenario_execution_gazebo_test}/models/box.sdf.xacro (100%) rename test/{scenario_execution_execution_gazebo_test => scenario_execution_gazebo_test}/models/walking_human.sdf (100%) rename test/{scenario_execution_execution_gazebo_test => scenario_execution_gazebo_test}/package.xml (100%) rename test/{scenario_execution_execution_gazebo_test => scenario_execution_gazebo_test}/resource/scenario_execution_gazebo_test (100%) rename test/{scenario_execution_execution_gazebo_test => scenario_execution_gazebo_test}/resource/test_scenario_execution_gazebo (100%) rename test/{scenario_execution_execution_gazebo_test => scenario_execution_gazebo_test}/scenarios/test_relative_spawn.osc (100%) rename test/{scenario_execution_execution_gazebo_test => scenario_execution_gazebo_test}/scenarios/test_spawn_exists_delete.osc (100%) rename test/{scenario_execution_execution_gazebo_test => scenario_execution_gazebo_test}/scenarios/test_spawn_xacro_with_parameters.osc (100%) rename test/{scenario_execution_execution_gazebo_test => scenario_execution_gazebo_test}/setup.cfg (100%) rename test/{scenario_execution_execution_gazebo_test => scenario_execution_gazebo_test}/setup.py (100%) diff --git a/test/scenario_execution_execution_gazebo_test/README.md b/test/scenario_execution_gazebo_test/README.md similarity index 100% rename from test/scenario_execution_execution_gazebo_test/README.md rename to test/scenario_execution_gazebo_test/README.md diff --git a/test/scenario_execution_execution_gazebo_test/models/box.sdf b/test/scenario_execution_gazebo_test/models/box.sdf similarity index 100% rename from test/scenario_execution_execution_gazebo_test/models/box.sdf rename to test/scenario_execution_gazebo_test/models/box.sdf diff --git a/test/scenario_execution_execution_gazebo_test/models/box.sdf.xacro b/test/scenario_execution_gazebo_test/models/box.sdf.xacro similarity index 100% rename from test/scenario_execution_execution_gazebo_test/models/box.sdf.xacro rename to test/scenario_execution_gazebo_test/models/box.sdf.xacro diff --git a/test/scenario_execution_execution_gazebo_test/models/walking_human.sdf b/test/scenario_execution_gazebo_test/models/walking_human.sdf similarity index 100% rename from test/scenario_execution_execution_gazebo_test/models/walking_human.sdf rename to test/scenario_execution_gazebo_test/models/walking_human.sdf diff --git a/test/scenario_execution_execution_gazebo_test/package.xml b/test/scenario_execution_gazebo_test/package.xml similarity index 100% rename from test/scenario_execution_execution_gazebo_test/package.xml rename to test/scenario_execution_gazebo_test/package.xml diff --git a/test/scenario_execution_execution_gazebo_test/resource/scenario_execution_gazebo_test b/test/scenario_execution_gazebo_test/resource/scenario_execution_gazebo_test similarity index 100% rename from test/scenario_execution_execution_gazebo_test/resource/scenario_execution_gazebo_test rename to test/scenario_execution_gazebo_test/resource/scenario_execution_gazebo_test diff --git a/test/scenario_execution_execution_gazebo_test/resource/test_scenario_execution_gazebo b/test/scenario_execution_gazebo_test/resource/test_scenario_execution_gazebo similarity index 100% rename from test/scenario_execution_execution_gazebo_test/resource/test_scenario_execution_gazebo rename to test/scenario_execution_gazebo_test/resource/test_scenario_execution_gazebo diff --git a/test/scenario_execution_execution_gazebo_test/scenarios/test_relative_spawn.osc b/test/scenario_execution_gazebo_test/scenarios/test_relative_spawn.osc similarity index 100% rename from test/scenario_execution_execution_gazebo_test/scenarios/test_relative_spawn.osc rename to test/scenario_execution_gazebo_test/scenarios/test_relative_spawn.osc diff --git a/test/scenario_execution_execution_gazebo_test/scenarios/test_spawn_exists_delete.osc b/test/scenario_execution_gazebo_test/scenarios/test_spawn_exists_delete.osc similarity index 100% rename from test/scenario_execution_execution_gazebo_test/scenarios/test_spawn_exists_delete.osc rename to test/scenario_execution_gazebo_test/scenarios/test_spawn_exists_delete.osc diff --git a/test/scenario_execution_execution_gazebo_test/scenarios/test_spawn_xacro_with_parameters.osc b/test/scenario_execution_gazebo_test/scenarios/test_spawn_xacro_with_parameters.osc similarity index 100% rename from test/scenario_execution_execution_gazebo_test/scenarios/test_spawn_xacro_with_parameters.osc rename to test/scenario_execution_gazebo_test/scenarios/test_spawn_xacro_with_parameters.osc diff --git a/test/scenario_execution_execution_gazebo_test/setup.cfg b/test/scenario_execution_gazebo_test/setup.cfg similarity index 100% rename from test/scenario_execution_execution_gazebo_test/setup.cfg rename to test/scenario_execution_gazebo_test/setup.cfg diff --git a/test/scenario_execution_execution_gazebo_test/setup.py b/test/scenario_execution_gazebo_test/setup.py similarity index 100% rename from test/scenario_execution_execution_gazebo_test/setup.py rename to test/scenario_execution_gazebo_test/setup.py From 0cdf4842a6a38df684596015e1958dd6b13958b1 Mon Sep 17 00:00:00 2001 From: "Pasch, Frederik" Date: Wed, 3 Jul 2024 11:15:09 +0200 Subject: [PATCH 5/6] test fixes --- docs/libraries.rst | 2 +- test/scenario_execution_gazebo_test/README.md | 2 +- test/scenario_execution_gazebo_test/package.xml | 2 +- .../scenarios/test_relative_spawn.osc | 2 +- .../scenarios/test_spawn_exists_delete.osc | 2 +- .../scenarios/test_spawn_xacro_with_parameters.osc | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/libraries.rst b/docs/libraries.rst index 0f3e37b9..1d9a61aa 100644 --- a/docs/libraries.rst +++ b/docs/libraries.rst @@ -63,7 +63,7 @@ Spawn an actor within simulation. - ``file://``: Local path to model file - ``model://``: Path relative to available model search paths - - ``://``: Path relative to an available package (e.g. :repo_link:`simulation/gazebo/test_scenario_execution_gazebo/scenarios/test_spawn_exists_delete.osc`) + - ``://``: Path relative to an available package (e.g. :repo_link:`simulation/gazebo/scenario_execution_gazebo_test/scenarios/test_spawn_exists_delete.osc`) - ``https:://fuel``: Model from `fuel.gazebosim.org `__ (e.g. ``https://fuel.gazebosim.org/1.0/OpenRobotics/models/Beer``) If the file ending is ``.xacro`` the model is forwarded to `xacro `__ before getting spawned. diff --git a/test/scenario_execution_gazebo_test/README.md b/test/scenario_execution_gazebo_test/README.md index deb5cf41..ff56880f 100644 --- a/test/scenario_execution_gazebo_test/README.md +++ b/test/scenario_execution_gazebo_test/README.md @@ -1,3 +1,3 @@ # Tests of Scenario Execution Library for Gazebo -The `test_scenario_execution_gazebo` package provides test scenarios to test `scenario_execution_gazebo` within the `tb4_sim_scenario` setup. +The `scenario_execution_gazebo_test` package provides test scenarios to test `scenario_execution_gazebo` within the `tb4_sim_scenario` setup. diff --git a/test/scenario_execution_gazebo_test/package.xml b/test/scenario_execution_gazebo_test/package.xml index a4a103aa..472bd82c 100644 --- a/test/scenario_execution_gazebo_test/package.xml +++ b/test/scenario_execution_gazebo_test/package.xml @@ -1,7 +1,7 @@ - test_scenario_execution_gazebo + scenario_execution_gazebo_test 1.1.0 Tests for Scenario Execution library for Gazebo Intel Labs diff --git a/test/scenario_execution_gazebo_test/scenarios/test_relative_spawn.osc b/test/scenario_execution_gazebo_test/scenarios/test_relative_spawn.osc index 8faeaaa8..60c4bd32 100644 --- a/test/scenario_execution_gazebo_test/scenarios/test_relative_spawn.osc +++ b/test/scenario_execution_gazebo_test/scenarios/test_relative_spawn.osc @@ -17,7 +17,7 @@ scenario test_relative_spawn: robot_frame_id: 'turtlebot4_base_link_gt') test_obstacle.relative_spawn( distance: 1.5m, - model: 'test_scenario_execution_gazebo://models/box.sdf', + model: 'scenario_execution_gazebo_test://models/box.sdf', world_name: 'maze') emit end time_out: serial: diff --git a/test/scenario_execution_gazebo_test/scenarios/test_spawn_exists_delete.osc b/test/scenario_execution_gazebo_test/scenarios/test_spawn_exists_delete.osc index 2af48e4b..d6abcb04 100644 --- a/test/scenario_execution_gazebo_test/scenarios/test_spawn_exists_delete.osc +++ b/test/scenario_execution_gazebo_test/scenarios/test_spawn_exists_delete.osc @@ -8,7 +8,7 @@ scenario test_spawn_and_exists: test_obstacle.spawn( spawn_pose: pose_3d(position: position_3d(x: -3m, y: 0m, z: 1m)), world_name: 'maze', - model: 'test_scenario_execution_gazebo://models/box.sdf') + model: 'scenario_execution_gazebo_test://models/box.sdf') test_case: serial: wait elapsed(5s) test: actor_exists( diff --git a/test/scenario_execution_gazebo_test/scenarios/test_spawn_xacro_with_parameters.osc b/test/scenario_execution_gazebo_test/scenarios/test_spawn_xacro_with_parameters.osc index 7b76dcd7..62f53cc9 100644 --- a/test/scenario_execution_gazebo_test/scenarios/test_spawn_xacro_with_parameters.osc +++ b/test/scenario_execution_gazebo_test/scenarios/test_spawn_xacro_with_parameters.osc @@ -9,7 +9,7 @@ scenario test_spawn_xacro_with_parameters: spawn_pose: pose_3d(position: position_3d(x: -3m, z: 2m)), world_name: 'maze', xacro_arguments: 'box_width_length:=1 1,box_height:=4', - model: 'test_scenario_execution_gazebo://models/box.sdf.xacro') + model: 'scenario_execution_gazebo_test://models/box.sdf.xacro') test_case: serial: test: actor_exists( entity_name: 'test_obstacle', From fd73f56a2411cf7ee997f601d1a6cbb6b25f7e80 Mon Sep 17 00:00:00 2001 From: "Pasch, Frederik" Date: Wed, 3 Jul 2024 11:15:58 +0200 Subject: [PATCH 6/6] test fixes --- docs/libraries.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/libraries.rst b/docs/libraries.rst index 1d9a61aa..1b6afd68 100644 --- a/docs/libraries.rst +++ b/docs/libraries.rst @@ -63,7 +63,7 @@ Spawn an actor within simulation. - ``file://``: Local path to model file - ``model://``: Path relative to available model search paths - - ``://``: Path relative to an available package (e.g. :repo_link:`simulation/gazebo/scenario_execution_gazebo_test/scenarios/test_spawn_exists_delete.osc`) + - ``://``: Path relative to an available package (e.g. :repo_link:`test/scenario_execution_gazebo_test/scenarios/test_spawn_exists_delete.osc`) - ``https:://fuel``: Model from `fuel.gazebosim.org `__ (e.g. ``https://fuel.gazebosim.org/1.0/OpenRobotics/models/Beer``) If the file ending is ``.xacro`` the model is forwarded to `xacro `__ before getting spawned.