Move gazebo library

.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()

docs/libraries.rst

@@ -63,7 +63,7 @@ Spawn an actor within simulation.
 
     - ``file://<path-to-model>``: Local path to model file
     - ``model://<path-to-model>``: Path relative to available model search paths
-    - ``<package-name>://<path-to-model>``: Path relative to an available package (e.g. :repo_link:`simulation/gazebo/test_scenario_execution_gazebo/scenarios/test_spawn_exists_delete.osc`)
+    - ``<package-name>://<path-to-model>``: 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 <https://app.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 <https://wiki.ros.org/xacro>`__ before getting spawned.

scenario_execution_gazebo/package.xml → libs/scenario_execution_gazebo/package.xml

@@ -6,7 +6,7 @@
   <description>Scenario Execution library for Gazebo</description>
   <author email="[email protected]">Intel Labs</author>
   <maintainer email="[email protected]">Intel Labs</maintainer>
-  <license file="../LICENSE">Apache-2.0</license>
+  <license file="../../LICENSE">Apache-2.0</license>
 
   <depend>scenario_execution_ros</depend>
 

simulation/gazebo/test_scenario_execution_gazebo/README.md → 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.

simulation/gazebo/test_scenario_execution_gazebo/package.xml → test/scenario_execution_gazebo_test/package.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
-  <name>test_scenario_execution_gazebo</name>
+  <name>scenario_execution_gazebo_test</name>
   <version>1.1.0</version>
   <description>Tests for Scenario Execution library for Gazebo</description>
   <author email="[email protected]">Intel Labs</author>
   <maintainer email="[email protected]">Intel Labs</maintainer>
-  <license file="../../../LICENSE">Apache-2.0</license>
+  <license file="../../LICENSE">Apache-2.0</license>
 
   <exec_depend>rclpy</exec_depend>
   <exec_depend>scenario_execution_gazebo</exec_depend>

simulation/gazebo/test_scenario_execution_gazebo/scenarios/test_relative_spawn.osc → 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:

simulation/gazebo/test_scenario_execution_gazebo/scenarios/test_spawn_exists_delete.osc → 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(

simulation/gazebo/test_scenario_execution_gazebo/scenarios/test_spawn_xacro_with_parameters.osc → 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',

test/scenario_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

simulation/gazebo/test_scenario_execution_gazebo/setup.py → test/scenario_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,