Additional updates to the final repo locations and names for the RobotVacuumSample and the ROS2 Gem

Signed-off-by: Steve Pham <[email protected]>

Docker/Dockerfile

@@ -23,13 +23,13 @@ ARG IMAGE_TYPE=simulation  # Default to 'simulation'
 ARG O3DE_REPO=https://github.com/o3de/o3de.git
 ARG O3DE_BRANCH=development
 
-ARG ROS2_GEM_REPO=https://github.com/RobotecAI/o3de-ros2-gem.git
+ARG ROS2_GEM_REPO=https://github.com/o3de/o3de-extras.git
 ARG ROS2_GEM_BRANCH=development
 
 ARG LOFT_GEM_REPO=https://github.com/o3de/loft-arch-vis-sample.git
 ARG LOFT_GEM_BRANCH=main
 
-ARG ROBOT_VAC_SAMPLE_REPO=https://github.com/RobotecAI/o3de-demo-project.git
+ARG ROBOT_VAC_SAMPLE_REPO=https://github.com/o3de/RobotVacuumSample.git
 ARG ROBOT_VAC_SAMPLE_BRANCH=main
 
 ENV WORKSPACE=/data/workspace
@@ -104,27 +104,27 @@ RUN if [ "${IMAGE_TYPE}" = "simulation" ]; then \
         $WORKSPACE/o3de/python/get_python.sh && \
         $WORKSPACE/o3de/scripts/o3de.sh register -ep $WORKSPACE/o3de && \
         git clone $ROS2_GEM_REPO && \
-        git -C $WORKSPACE/o3de-ros2-gem checkout $ROS2_GEM_BRANCH &&\
-        $WORKSPACE/o3de/scripts/o3de.sh register -gp $WORKSPACE/o3de-ros2-gem && \
+        git -C $WORKSPACE/o3de-extras checkout $ROS2_GEM_BRANCH &&\
+        $WORKSPACE/o3de/scripts/o3de.sh register -gp $WORKSPACE/o3de-extras/Gems/ROS2 && \
         git clone --recursive $LOFT_GEM_REPO && \
         git -C $WORKSPACE/loft-arch-vis-sample checkout $LOFT_GEM_BRANCH &&\
         git -C $WORKSPACE/loft-arch-vis-sample lfs install && \
         git -C $WORKSPACE/loft-arch-vis-sample lfs pull && \
         $WORKSPACE/o3de/scripts/o3de.sh register -gp $WORKSPACE/loft-arch-vis-sample/Gems/ArchVis/ && \
         git clone --recursive $ROBOT_VAC_SAMPLE_REPO && \
-        git -C $WORKSPACE/o3de-demo-project checkout $ROBOT_VAC_SAMPLE_BRANCH &&\
-        git -C $WORKSPACE/o3de-demo-project lfs install && \
-        git -C $WORKSPACE/o3de-demo-project lfs pull && \
-        $WORKSPACE/o3de/scripts/o3de.sh register -pp $WORKSPACE/o3de-demo-project/  && \
+        git -C $WORKSPACE/RobotVacuumSample checkout $ROBOT_VAC_SAMPLE_BRANCH &&\
+        git -C $WORKSPACE/RobotVacuumSample lfs install && \
+        git -C $WORKSPACE/RobotVacuumSample lfs pull && \
+        $WORKSPACE/o3de/scripts/o3de.sh register -pp $WORKSPACE/RobotVacuumSample/  && \
         . /opt/ros/${ROS_VERSION}/setup.sh && \
-        cmake -B $WORKSPACE/o3de-demo-project/build/linux -S $WORKSPACE/o3de-demo-project -G "Ninja Multi-Config" -DLY_STRIP_DEBUG_SYMBOLS=TRUE -DLY_DISABLE_TEST_MODULES=ON && \
-        cmake --build $WORKSPACE/o3de-demo-project/build/linux --config profile --target AssetProcessorBatch ROS2-Gem-Demo.GameLauncher RobotVacuumSample.Assets && \
+        cmake -B $WORKSPACE/RobotVacuumSample/build/linux -S $WORKSPACE/RobotVacuumSample -G "Ninja Multi-Config" -DLY_STRIP_DEBUG_SYMBOLS=TRUE -DLY_DISABLE_TEST_MODULES=ON && \
+        cmake --build $WORKSPACE/RobotVacuumSample/build/linux --config profile --target AssetProcessorBatch RobotVacuumSample.GameLauncher RobotVacuumSample.Assets && \
         $WORKSPACE/cleanup.bash; \
     elif [  "${IMAGE_TYPE}" = "navstack" ]; then \
         apt-get install -y --no-install-recommends ros-${ROS_DISTRO}-desktop && \
         cd $WORKSPACE && \
         git clone --recursive $ROBOT_VAC_SAMPLE_REPO && \
-        git -C $WORKSPACE/o3de-demo-project checkout $ROBOT_VAC_SAMPLE_BRANCH; \
+        git -C $WORKSPACE/RobotVacuumSample checkout $ROBOT_VAC_SAMPLE_BRANCH; \
     else \
         echo "Unsupported IMAGE_TYPE: ${IMAGE_TYPE}" && exit 1; \
     fi

Docker/LaunchNavStack.bash

@@ -10,7 +10,7 @@ unset LD_LIBRARY_PATH
 
 source /opt/ros/$ROS_DISTRO/setup.bash
 
-cd /data/workspace/o3de-demo-project/launch
+cd /data/workspace/RobotVacuumSample/launch
 
 ros2 launch navigation.launch.py
 

Docker/LaunchSimulation.bash

@@ -10,11 +10,11 @@ unset LD_LIBRARY_PATH
 
 source /opt/ros/$ROS_DISTRO/setup.bash
 
-export LD_LIBRARY_PATH=/data/workspace/o3de-demo-project/build/linux/bin/profile:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=/data/workspace/RobotVacuumSample/build/linux/bin/profile:$LD_LIBRARY_PATH
 
-if [ -d /data/workspace/o3de-demo-project/build/linux/bin/profile ]
+if [ -d /data/workspace/RobotVacuumSample/build/linux/bin/profile ]
 then
-    cd /data/workspace/o3de-demo-project/build/linux/bin/profile
+    cd /data/workspace/RobotVacuumSample/build/linux/bin/profile
     ./RobotVacuumSample.GameLauncher -bg_ConnectToAssetProcessor=0 > /data/workspace/simulation_launch.log 2>&1
 else
     echo "Simulation not installed on this image"

Docker/README.md

@@ -104,9 +104,9 @@ The Dockerscripts use the following arguments to determine the repository to pul
 | Argument              | Repository                       | Default     |
 |-----------------------|----------------------------------|-------------|
 | O3DE_REPO             | O3DE                             | https://github.com/o3de/o3de.git                   |
-| ROS2_GEM_REPO         | O3DE ROS2 Gem                    | https://github.com/RobotecAI/o3de-ros2-gem.git     |
+| ROS2_GEM_REPO         | O3DE ROS2 Gem                    | https://github.com/o3de/o3de-extras.git            |
 | LOFT_GEM_REPO         | Loft ArchVis Sample Scene        | https://github.com/o3de/loft-arch-vis-sample.git   |
-| ROBOT_VAC_SAMPLE_REPO | Loft Scene Simulation repository | https://github.com/RobotecAI/o3de-demo-project.git |
+| ROBOT_VAC_SAMPLE_REPO | Loft Scene Simulation repository | https://github.com/o3de/RobotVacuumSample          |
 
 In addition the repositories, the following arguments target the branch, commit, or tag to pull from their corresponding repository
 

Docker/cleanup.bash

@@ -8,7 +8,7 @@
 
 # Delete files that were only needed for the Client and AssetProcessing after a build of the code and assets are complete
 
-DELETE_LIST=(o3de-ros2-gem/ \
+DELETE_LIST=(o3de-extras/ \
              loft-arch-vis-sample/ \
              ~/.o3de/3rdParty/ \
              o3de/.git \
@@ -16,30 +16,30 @@ DELETE_LIST=(o3de-ros2-gem/ \
              o3de/python/downloaded_packages \
              o3de/Code \
              o3de/Gems \
-             o3de-demo-project/.git \
-             o3de-demo-project/Gem \
-             o3de-demo-project/Source \
-             o3de-demo-project/Levels \
-             o3de-demo-project/ReflectionProbes \
-             o3de-demo-project/build/linux/Azcg/ \
-             o3de-demo-project/build/linux/CMake \
-             o3de-demo-project/build/linux/CMakeFiles/ \
-             o3de-demo-project/build/linux/External/ \
-             o3de-demo-project/build/linux/Testing/ \
-             o3de-demo-project/build/linux/_deps/ \
-             o3de-demo-project/build/linux/cmake \
-             o3de-demo-project/build/linux/lib/ \
-             o3de-demo-project/build/linux/o3de/ \
-             o3de-demo-project/build/linux/packages/ \
-             o3de-demo-project/build/linux/runtime_dependencies/ \
-             o3de-demo-project/build/linux/bin/profile/*.Editor.so \
-             o3de-demo-project/build/linux/bin/profile/EditorPlugins \
-             o3de-demo-project/build/linux/bin/profile/Editor \
-             o3de-demo-project/build/linux/bin/profile/AssetProcessor \
-             o3de-demo-project/build/linux/bin/profile/AssetProcessorBatch \
-             o3de-demo-project/build/linux/bin/profile/MaterialEditor \
-             o3de-demo-project/build/linux/bin/profile/AssetBuilder \
-             o3de-demo-project/build/linux/bin/profile/MaterialCanvas )
+             RobotVacuumSample/.git \
+             RobotVacuumSample/Gem \
+             RobotVacuumSample/Source \
+             RobotVacuumSample/Levels \
+             RobotVacuumSample/ReflectionProbes \
+             RobotVacuumSample/build/linux/Azcg/ \
+             RobotVacuumSample/build/linux/CMake \
+             RobotVacuumSample/build/linux/CMakeFiles/ \
+             RobotVacuumSample/build/linux/External/ \
+             RobotVacuumSample/build/linux/Testing/ \
+             RobotVacuumSample/build/linux/_deps/ \
+             RobotVacuumSample/build/linux/cmake \
+             RobotVacuumSample/build/linux/lib/ \
+             RobotVacuumSample/build/linux/o3de/ \
+             RobotVacuumSample/build/linux/packages/ \
+             RobotVacuumSample/build/linux/runtime_dependencies/ \
+             RobotVacuumSample/build/linux/bin/profile/*.Editor.so \
+             RobotVacuumSample/build/linux/bin/profile/EditorPlugins \
+             RobotVacuumSample/build/linux/bin/profile/Editor \
+             RobotVacuumSample/build/linux/bin/profile/AssetProcessor \
+             RobotVacuumSample/build/linux/bin/profile/AssetProcessorBatch \
+             RobotVacuumSample/build/linux/bin/profile/MaterialEditor \
+             RobotVacuumSample/build/linux/bin/profile/AssetBuilder \
+             RobotVacuumSample/build/linux/bin/profile/MaterialCanvas )
 
 for i in ${DELETE_LIST[@]}
 do

README.md

@@ -17,8 +17,8 @@ Refer to the [O3DE System Requirements](https://www.o3de.org/docs/welcome-guide/
 This project has the following dependencies:
 
 - [O3DE](https://github.com/o3de/o3de)
-- [ROS2 Gem](https://github.com/RobotecAI/o3de-ros2-gem)
-  - ROS 2 (Galactic or Humble) itself is also required, see [Gem Requirements](https://github.com/RobotecAI/o3de-ros2-gem#requirements)  
+- [ROS2 Gem](https://github.com/o3de/o3de-extras/Gems/ROS2)
+  - ROS 2 (Galactic or Humble) itself is also required, see [Gem Requirements](https://github.com/o3de/o3de-extras/Gems/ROS2#requirements)  
 - [Loft Scene Sample](https://github.com/aws-lumberyard/loft-arch-vis-sample)
   - `development` branch (the default) should work.
 - [Robot Vacuum Sample Project](https://github.com/o3de/RobotVacuumSample)
@@ -53,8 +53,8 @@ $ cd $DEMO_BASE
 
 ```
 ~$ cd $DEMO_BASE
-~$ git clone https://github.com/RobotecAI/o3de-ros2-gem.git
-~$ $DEMO_BASE/o3de/scripts/o3de.sh register -gp $DEMO_BASE/o3de-ros2-gem
+~$ git clone https://github.com/o3de/o3de-extras.git
+~$ $DEMO_BASE/o3de/scripts/o3de.sh register -gp $DEMO_BASE/Gems/ROS2
 ```
 
 ### 3. Clone and register the Loft Scene project locally
@@ -72,20 +72,20 @@ $ cd $DEMO_BASE
 
 ```
 $ cd $DEMO_BASE
-~/$ git clone https://github.com/RobotecAI/o3de-demo-project.git
-~$ cd o3de-demo-project
-~/o3de-demo-project$ git lfs install
-~/o3de-demo-project$ $DEMO_BASE/scripts/o3de.sh register -pp .
-~/o3de-demo-project$ cmake -B build/linux -G "Ninja Multi-Config" -DLY_STRIP_DEBUG_SYMBOLS=TRUE -DLY_DISABLE_TEST_MODULES=ON
-~/o3de-demo-project$ cmake --build build/linux --config profile --target RobotVacuumSample Editor AssetProcessor
+~/$ git clone https://github.com/o3de/RobotVacuumSample.git
+~$ cd RobotVacuumSample
+~/RobotVacuumSample$ git lfs install
+~/RobotVacuumSample$ $DEMO_BASE/scripts/o3de.sh register -pp .
+~/RobotVacuumSample$ cmake -B build/linux -G "Ninja Multi-Config" -DLY_STRIP_DEBUG_SYMBOLS=TRUE -DLY_DISABLE_TEST_MODULES=ON
+~/RobotVacuumSample$ cmake --build build/linux --config profile --target RobotVacuumSample Editor AssetProcessor
 ```
 
 ### 5. Launch Editor
 
 ```
 $ cd $DEMO_BASE
-~/$ cd o3de-demo-project/build/linux/bin/profile
-~/o3de-demo-project/build/linux/bin/profile$ ./Editor
+~/$ cd RobotVacuumSample/build/linux/bin/profile
+~/RobotVacuumSample/build/linux/bin/profile$ ./Editor
 ```
 
 ## Running ROS2 navigation example
@@ -114,7 +114,7 @@ sudo apt install -y ros-${ROS_DISTRO}-slam-toolbox ros-${ROS_DISTRO}-navigation2
 The launch file is included in this repository
 
 ```
-~/o3de-demo-project/launch$ ros2 launch navigation.launch.py
+~/RobotVacuumSample/launch$ ros2 launch navigation.launch.py
 ```
 
 You should see output in the console as well as RViz2 window.