-
Notifications
You must be signed in to change notification settings - Fork 42
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
NASA Challenge_[franklinselva]_[Restructure the contents of demos to be modular and scalable] #31
base: main
Are you sure you want to change the base?
Conversation
Note for reviewers: This is a large refactoring related to the referenced issue. I think it would be easier to review the work from clear slate. If there is any information needed, please let me know. |
Overall I like the changes, but I do have some concern about using a |
Also, I'm planning to add a GH action build flow, see issue #35. If I get that in, I'm going to ask you to add |
Hi @mkhansenbot, Thanks for your review. I understand the use of
I would not go for Earthly builds for demo since this will also be an addtional runtime dependency for working with the demos. At the moment, Earthly builds are only used as internal tool within collaborators and the scope of the build tool doesn't need to be expanded beyond this point. As mentioned here in the issue, using docker-compose for show casing different demos supported by shell scripts would be an good choice in my opinion. This will ensure, we still have the required entrypoints to the demos. EDIT: I still see the |
I have replaced the Makefiles with the build.sh. |
Thanks for consolidating the simulation assets into one repository! This is a much more straightforward package layout. |
Related to space-ros/space-ros#178 Related to space-ros#18 - Moved the simulation assets to space-ros/demos#31 - Repurpose the repository for the simulation assets of Nvidia's Isaac Sim
95acc36
to
7c5dbc6
Compare
Related to space-ros/space-ros#178 Related to space-ros#18 - Moved the simulation assets to space-ros/demos#31 - Repurpose the repository for the simulation assets of Nvidia's Isaac Sim
resolves #178 - Group demos to its robot content
resolves space-ros/space-ros#178 - Add canadarm_description - Fix model asset paths - Reverse control configuration for canadarm model
resolves space-ros/space-ros#178 - Add curiosity_description - Strip third party dependencies of mars_rover
resolves space-ros/space-ros#178 - Fix control parameters for curiosity_description - Move curiosity_path world to curiosity_gazebo - Add launch file for spinning of gazebo world
related to space-ros/space-ros#178 - Cleaned up rover launch file for the demo - Updated comments for demo node
related to space-ros/space-ros#178 - Add dockerfile for demo - Add makefile for build, run and clean automation
related to space-ros/space-ros#178 - Add README.md for Curiosity Rover demo - Update Main README.md of the demos repository
resolves space-ros/space-ros#178 - Add canadarm_description package - Move earth and iss world models to canadarm_gazebo
related to space-ros/space-ros#178 - Cleaned up canadarm launch file for the demo - Updated comments for demo node - Strip Moveit Redundant Node - Cleanup packages.xml - Remove ros control parameters for gazebo
related to space-ros/space-ros#178 - Add README.md for Canadarm2 demo - Update Main README.md of the demos repository
Related to space-ros/space-ros#178 - Update package.xml for canadarm2 packages - Update package.xml for curiosity_rover packages
Related to space-ros/space-ros#178 - Remove makefiles for canadarm2 and curiosity rover demo - Add build.sh for building canadarm2 and curiosity rover demo - Add run.sh for running the demos - Update README.md of demos to the new process
d92ae92
to
aa27bb5
Compare
@mkhansenbot Can you approve the changes for the CI run? |
Is it possible to include docker-compose for the CI run? |
@franklinselva - according to GitHub, Docker Compose v1 is no longer supported, can you change your script to use v2? https://github.blog/changelog/2024-04-10-github-hosted-runner-images-deprecation-notice-docker-compose-v1/ |
Fixes space-ros/space-ros#178
This PR restructures the contents of the demo (from space-ros/simulations, space-ros/docker, space-ros/demos) under a single tree. The main changes include
This PR also restructure the workflow of the past demo in such a way the GUI apps are ran outside the docker. The reason for this change is to adapt different simulation tools and have a reproducible demo across the simulation tools.