Merge pull request #461 from PickNikRobotics/rename-env-vars-to-moveit

Rename env vars STUDIO_ to MOVEIT_

Author: JWhitleyWork

Dockerfile

@@ -6,8 +6,8 @@
 #
 
 # Specify the MoveIt Pro release to build on top of.
-ARG MOVEIT_STUDIO_BASE_IMAGE=picknikciuser/moveit-studio:${STUDIO_DOCKER_TAG:-main}
-ARG USERNAME=studio-user
+ARG MOVEIT_PRO_BASE_IMAGE=picknikciuser/moveit-studio:${MOVEIT_DOCKER_TAG:-main}
+ARG USERNAME=moveit-pro-user
 ARG USER_UID=1000
 ARG USER_GID=1000
 
@@ -16,7 +16,7 @@ ARG USER_GID=1000
 ##################################################
 # The image tag is specified in the argument itself.
 # hadolint ignore=DL3006
-FROM ${MOVEIT_STUDIO_BASE_IMAGE} AS base
+FROM ${MOVEIT_PRO_BASE_IMAGE} AS base
 
 # Create a non-root user
 ARG USERNAME

src/hangar_sim/objectives/count_boxes.xml

@@ -11,14 +11,14 @@
       <Action
         ID="LogMessage"
         log_level="error"
-        message="Make sure to update the absolute path by replacing studio-user with your username, then you can delete this message"
+        message="Make sure to update the absolute path by replacing moveit-pro-user with your username, then you can delete this message"
       />
       <SubTree
         ID="Count Boxes Objective"
         _collapsed="true"
-        pose_path="/home/studio-user/user_ws/src/hangar_sim/poses"
-        scene_camera_folder="/home/studio-user/user_ws/src/hangar_sim/scene_camera_images"
-        wrist_camera_folder="/home/studio-user/user_ws/src/hangar_sim/wrist_camera_images"
+        pose_path="/home/moveit-pro-user/user_ws/src/hangar_sim/poses"
+        scene_camera_folder="/home/moveit-pro-user/user_ws/src/hangar_sim/scene_camera_images"
+        wrist_camera_folder="/home/moveit-pro-user/user_ws/src/hangar_sim/wrist_camera_images"
       />
     </Control>
   </BehaviorTree>

src/hangar_sim/objectives/count_boxes_objective.xml

@@ -106,21 +106,21 @@
       </MetadataFields>
       <inout_port
         name="wrist_camera_folder"
-        default="/home/studio-user/user_ws/src/hangar_sim/wrist_camera_images"
+        default="/home/moveit-pro-user/user_ws/src/hangar_sim/wrist_camera_images"
         type="std::string"
       >
         Absolute path to a directory for saving wrist camera pictures
       </inout_port>
       <inout_port
         name="scene_camera_folder"
-        default="/home/studio-user/user_ws/src/hangar_sim/scene_camera_images"
+        default="/home/moveit-pro-user/user_ws/src/hangar_sim/scene_camera_images"
         type="std::string"
       >
         Absolute path to a directory for saving scene camera pictures
       </inout_port>
       <inout_port
         name="pose_path"
-        default="/home/studio-user/user_ws/src/hangar_sim/poses"
+        default="/home/moveit-pro-user/user_ws/src/hangar_sim/poses"
         type="std::string"
       >
         Absolute path to a directory of pose YAML files

src/hangar_sim/objectives/count_boxes_subtree.xml

@@ -148,14 +148,14 @@
       </MetadataFields>
       <inout_port
         name="scene_camera_folder"
-        default="/home/studio-user/user_ws/src/hangar_sim/scene_camera_images"
+        default="/home/moveit-pro-user/user_ws/src/hangar_sim/scene_camera_images"
         type="std::string"
       >
         Absolute path to a directory for saving scene camera pictures
       </inout_port>
       <inout_port
         name="wrist_camera_folder"
-        default="/home/studio-user/user_ws/src/hangar_sim/wrist_camera_images"
+        default="/home/moveit-pro-user/user_ws/src/hangar_sim/wrist_camera_images"
         type="std::string"
       >
         Absolute path to a directory for saving wrist camera pictures

src/hangar_sim/objectives/verify_box_count.xml

@@ -11,12 +11,12 @@
       <Action
         ID="LogMessage"
         log_level="error"
-        message="Make sure to update the absolute path by replacing studio-user with your username, then you can delete this message"
+        message="Make sure to update the absolute path by replacing moveit-pro-user with your username, then you can delete this message"
       />
       <SubTree
         ID="Verify Box Count Subtree"
         _collapsed="true"
-        directory_path="/home/studio-user/user_ws/src/hangar_sim/wrist_camera_images"
+        directory_path="/home/moveit-pro-user/user_ws/src/hangar_sim/wrist_camera_images"
       />
     </Control>
   </BehaviorTree>

src/hangar_sim/objectives/verify_box_count_subtree.xml

@@ -79,7 +79,7 @@
       </MetadataFields>
       <inout_port
         name="directory_path"
-        default="/home/studio-user/user_ws/src/hangar_sim/wrist_camera_images"
+        default="/home/moveit-pro-user/user_ws/src/hangar_sim/wrist_camera_images"
         type="std::string"
       >
         Absolute path to wrist camera images

src/lab_sim/CMakeLists.txt

@@ -47,7 +47,7 @@ if(BUILD_TESTING)
   ament_add_pytest_test(
           objectives_integration_test test/objectives_integration_test.py
           TIMEOUT 600
-          ENV STUDIO_CONFIG_PACKAGE=lab_sim STUDIO_HOST_USER_WORKSPACE=${CMAKE_SOURCE_DIR})
+          ENV MOVEIT_CONFIG_PACKAGE=lab_sim MOVEIT_HOST_USER_WORKSPACE=${CMAKE_SOURCE_DIR})
 endif()
 
 ament_package()