From 16d3d6a670923e9167a6175a8b76b104ce2a95d6 Mon Sep 17 00:00:00 2001 From: Nate Koenig Date: Tue, 14 Apr 2020 05:50:41 -0700 Subject: [PATCH 1/4] Cleanup after move from bitbucket --- .gitignore | 33 +++++++++++++++++++++++++++++++++ .hgignore | 8 -------- 2 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 .gitignore delete mode 100644 .hgignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..c2af3c69 --- /dev/null +++ b/.gitignore @@ -0,0 +1,33 @@ +# Prerequisites +*.d +*.orig + +# Compiled Object files +*.slo +*.lo +*.o +*.obj + +# Precompiled Headers +*.gch +*.pch + +# Compiled Dynamic libraries +*.so +*.dylib +*.dll + +# Fortran module files +*.mod +*.smod + +# Compiled Static libraries +*.lai +*.la +*.a +*.lib + +# Executables +*.exe +*.out +*.app diff --git a/.hgignore b/.hgignore deleted file mode 100644 index dd8fd64b..00000000 --- a/.hgignore +++ /dev/null @@ -1,8 +0,0 @@ -syntax: glob - -build -build_* -.DS_Store -*.swp -*.swo -*.pyc From 388b133ad14da73f1c64bbd40537da6ba257940f Mon Sep 17 00:00:00 2001 From: Nate Koenig Date: Tue, 14 Apr 2020 05:51:14 -0700 Subject: [PATCH 2/4] Cleanup --- .gitignore | 1 + docker/README.md | 4 ++-- docker/build.bash | 6 +----- docker/cloudsim_bridge/Dockerfile | 3 +-- docker/cloudsim_bridge/run_bridge.bash | 2 +- docker/cloudsim_sim/Dockerfile | 3 +-- docker/docker-compose.yml | 2 +- docker/download_models.sh | 13 +++++++++++++ docker/subt_shell/Dockerfile | 3 +-- docker/subt_sim_entry/Dockerfile | 3 +-- docker/subt_team_entry/Dockerfile | 3 +-- subt_ign/launch/cloudsim_bridge.ign | 2 +- subt_ign/launch/cloudsim_sim.ign | 3 ++- 13 files changed, 27 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index c2af3c69..3c393bdd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ # Prerequisites *.d *.orig +*.swp # Compiled Object files *.slo diff --git a/docker/README.md b/docker/README.md index c70112a0..498d5dcb 100644 --- a/docker/README.md +++ b/docker/README.md @@ -10,7 +10,7 @@ Each subdirectory contains a Dockerfile for a particular use case. ### `cloudsim_sim` This is the docker image that will run a simulation instance in the -same way as CloudSim. Refer to: https://bitbucket.org/osrf/subt/wiki/cloudsim_architecture. +same way as CloudSim. Refer to: https://github.com/osrf/subt/wiki/Cloudsim%20Architecture. This image should be used in conjunction with `cloudsim_bridge`. @@ -31,7 +31,7 @@ This image should be used in conjunction with `cloudsim_bridge`. ### `cloudsim_bridge` This is the docker image that with run the cloudsim bridge. Refer to: -https://bitbucket.org/osrf/subt/wiki/cloudsim_architecture. +https://github.com/osrf/subt/wiki/Cloudsim%20Architecture. This image should be used in conjunction with `cloudsim_sim`. diff --git a/docker/build.bash b/docker/build.bash index 03525d3b..3d08825a 100755 --- a/docker/build.bash +++ b/docker/build.bash @@ -37,14 +37,10 @@ fi user_id=$(id -u) image_name=$(basename $1) image_plus_tag=$image_name:$(date +%Y_%b_%d_%H%M) -# mercurial adds a + symbol if there are uncomitted changes in the repo -# that will break docker tag syntax -hg_id=$(hg id -i | tr -d '+') shift docker build --rm -t $image_plus_tag --build-arg user_id=$user_id "$@" -f $DIR/$image_name/Dockerfile . docker tag $image_plus_tag $image_name:latest -docker tag $image_plus_tag $image_name:$hg_id -echo "Built $image_plus_tag and tagged as $image_name:latest and $image_name:$hg_id" +echo "Built $image_plus_tag and tagged as $image_name:latest" diff --git a/docker/cloudsim_bridge/Dockerfile b/docker/cloudsim_bridge/Dockerfile index 2735b54b..e88e2b69 100644 --- a/docker/cloudsim_bridge/Dockerfile +++ b/docker/cloudsim_bridge/Dockerfile @@ -25,7 +25,6 @@ RUN apt-get update -qq \ libspnav-dev \ libusb-dev \ lsb-release \ - mercurial \ python3-dbg \ python3-empy \ python3-numpy \ @@ -103,7 +102,7 @@ RUN rosdep update # docker is run RUN mkdir -p subt_ws/src \ && cd subt_ws/src \ - && hg clone https://bitbucket.org/osrf/subt + && git clone https://github.com/osrf/subt WORKDIR /home/$USERNAME/subt_ws diff --git a/docker/cloudsim_bridge/run_bridge.bash b/docker/cloudsim_bridge/run_bridge.bash index 7f389120..93ad0e63 100755 --- a/docker/cloudsim_bridge/run_bridge.bash +++ b/docker/cloudsim_bridge/run_bridge.bash @@ -15,7 +15,7 @@ echo "log4j.logger.ros.roscpp.cached_parameters=INFO" >> /home/developer/.ros/co echo "log4j.logger.ros.roscpp=DEBUG" >> /home/developer/.ros/config/rosconsole.config # https://wiki.ros.org/rosconsole#Force_line_buffering_for_ROS_logger -# See also https://bitbucket.org/osrf/subt/issues/204 +# See also https://github.com/osrf/subt/issues/204 export ROSCONSOLE_STDOUT_LINE_BUFFERED=1 # atop process monitoring diff --git a/docker/cloudsim_sim/Dockerfile b/docker/cloudsim_sim/Dockerfile index deb1cefa..e0b2369e 100644 --- a/docker/cloudsim_sim/Dockerfile +++ b/docker/cloudsim_sim/Dockerfile @@ -25,7 +25,6 @@ RUN apt-get update -qq \ libspnav-dev \ libusb-dev \ lsb-release \ - mercurial \ python3-dbg \ python3-empy \ python3-numpy \ @@ -108,7 +107,7 @@ RUN rosdep update # docker is run RUN mkdir -p subt_ws/src \ && cd subt_ws/src \ - && hg clone https://bitbucket.org/osrf/subt + && git clone git@github.com:osrf/subt # Download the public models COPY download_models.sh ./ diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 1ea429fa..40c45fbb 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -7,7 +7,7 @@ # This setup replicates the cloud simulation setup for the SubT Virtual # Testbed. # -# See also: https://bitbucket.org/osrf/subt/wiki/cloudsim_architecture +# See also: https://github.com/osrf/subt/wiki/Cloudsim%20Architecture # # Usage: # diff --git a/docker/download_models.sh b/docker/download_models.sh index d8875953..0a5c34c7 100755 --- a/docker/download_models.sh +++ b/docker/download_models.sh @@ -112,14 +112,27 @@ ign fuel download --url "https://fuel.ignitionrobotics.org/openrobotics/models/C ign fuel download --url "https://fuel.ignitionrobotics.org/openrobotics/models/Cave Starting Area" -v 4 ign fuel download --url "https://fuel.ignitionrobotics.org/openrobotics/models/Cave Cap" -v 4 ign fuel download --url "https://fuel.ignitionrobotics.org/openrobotics/models/Cave 3 Way 01" -v 4 +ign fuel download --url "https://fuel.ignitionrobotics.org/openrobotics/models/Cave 3 Way 01 Lights" -v 4 ign fuel download --url "https://fuel.ignitionrobotics.org/openrobotics/models/Cave Vertical Shaft" -v 4 +ign fuel download --url "https://fuel.ignitionrobotics.org/openrobotics/models/Cave Vertical Shaft Lights" -v 4 ign fuel download --url "https://fuel.ignitionrobotics.org/openrobotics/models/Cave Elevation" -v 4 +ign fuel download --url "https://fuel.ignitionrobotics.org/openrobotics/models/Cave Elevation Lights" -v 4 ign fuel download --url "https://fuel.ignitionrobotics.org/openrobotics/models/Cave Corner 01" -v 4 +ign fuel download --url "https://fuel.ignitionrobotics.org/openrobotics/models/Cave Corner 01 Lights" -v 4 ign fuel download --url "https://fuel.ignitionrobotics.org/openrobotics/models/Cave Corner 02" -v 4 +ign fuel download --url "https://fuel.ignitionrobotics.org/openrobotics/models/Cave Corner 02 Lights" -v 4 ign fuel download --url "https://fuel.ignitionrobotics.org/openrobotics/models/Cave Corner 30" -v 4 +ign fuel download --url "https://fuel.ignitionrobotics.org/openrobotics/models/Cave Corner 30 D" -v 4 +ign fuel download --url "https://fuel.ignitionrobotics.org/openrobotics/models/Cave Corner 30 D Lights" -v 4 ign fuel download --url "https://fuel.ignitionrobotics.org/openrobotics/models/Cave Corner 30F" -v 4 +ign fuel download --url "https://fuel.ignitionrobotics.org/openrobotics/models/Cave Corner 30F D" -v 4 +ign fuel download --url "https://fuel.ignitionrobotics.org/openrobotics/models/Cave Corner 30F D Lights" -v 4 ign fuel download --url "https://fuel.ignitionrobotics.org/openrobotics/models/Cave Straight 01" -v 4 +ign fuel download --url "https://fuel.ignitionrobotics.org/openrobotics/models/Cave Straight 01 Lights" -v 4 ign fuel download --url "https://fuel.ignitionrobotics.org/openrobotics/models/Cave Straight 02" -v 4 +ign fuel download --url "https://fuel.ignitionrobotics.org/openrobotics/models/Cave Straight 02 Lights" -v 4 ign fuel download --url "https://fuel.ignitionrobotics.org/openrobotics/models/Cave Straight 03" -v 4 ign fuel download --url "https://fuel.ignitionrobotics.org/openrobotics/models/Cave Straight 04" -v 4 +ign fuel download --url "https://fuel.ignitionrobotics.org/openrobotics/models/Cave Straight 04 Lights" -v 4 ign fuel download --url "https://fuel.ignitionrobotics.org/openrobotics/models/Cave Straight 05" -v 4 +ign fuel download --url "https://fuel.ignitionrobotics.org/openrobotics/models/Cave Straight 05 Lights" -v 4 diff --git a/docker/subt_shell/Dockerfile b/docker/subt_shell/Dockerfile index 3fbfed2c..74cb6cb8 100644 --- a/docker/subt_shell/Dockerfile +++ b/docker/subt_shell/Dockerfile @@ -16,7 +16,6 @@ RUN apt-get update -qq \ libspnav-dev \ libusb-dev \ lsb-release \ - mercurial \ python3-dbg \ python3-empy \ python3-numpy \ @@ -103,7 +102,7 @@ RUN sudo apt-get update -qq \ # docker is run RUN mkdir -p subt_ws/src \ && cd subt_ws/src \ - && hg clone https://bitbucket.org/osrf/subt + && git clone git@github.com:osrf/subt # Download the public models COPY download_models.sh ./ diff --git a/docker/subt_sim_entry/Dockerfile b/docker/subt_sim_entry/Dockerfile index be4d81a2..c6c59592 100644 --- a/docker/subt_sim_entry/Dockerfile +++ b/docker/subt_sim_entry/Dockerfile @@ -15,7 +15,6 @@ RUN apt-get update -qq \ libspnav-dev \ libusb-dev \ lsb-release \ - mercurial \ python3-dbg \ python3-empy \ python3-numpy \ @@ -102,7 +101,7 @@ RUN sudo apt-get update -qq \ # docker is run RUN mkdir -p subt_ws/src \ && cd subt_ws/src \ - && hg clone https://bitbucket.org/osrf/subt + && git clone git@github.com:osrf/subt # Download the public models COPY download_models.sh ./ diff --git a/docker/subt_team_entry/Dockerfile b/docker/subt_team_entry/Dockerfile index 72a68761..bc883e5e 100644 --- a/docker/subt_team_entry/Dockerfile +++ b/docker/subt_team_entry/Dockerfile @@ -16,7 +16,6 @@ RUN apt-get update -qq \ libspnav-dev \ libusb-dev \ lsb-release \ - mercurial \ python3-dbg \ python3-empy \ python3-numpy \ @@ -103,7 +102,7 @@ RUN sudo apt-get update -qq \ # docker is run RUN mkdir -p subt_ws/src \ && cd subt_ws/src \ - && hg clone https://bitbucket.org/osrf/subt + && git clone https://github.com/osrf/subt # Download the public models COPY download_models.sh ./ diff --git a/subt_ign/launch/cloudsim_bridge.ign b/subt_ign/launch/cloudsim_bridge.ign index 49fd14a9..3781781d 100644 --- a/subt_ign/launch/cloudsim_bridge.ign +++ b/subt_ign/launch/cloudsim_bridge.ign @@ -5,7 +5,7 @@ development. For more information, please refer to - https://bitbucket.org/osrf/subt/wiki/tutorials/cloudsim + https://github.com/osrf/subt/wiki/Cloudsim Usage: ign launch cloudsim_bridge.ign [worldName:= diff --git a/subt_ign/launch/cloudsim_sim.ign b/subt_ign/launch/cloudsim_sim.ign index 0d84ce32..0c4f4836 100644 --- a/subt_ign/launch/cloudsim_sim.ign +++ b/subt_ign/launch/cloudsim_sim.ign @@ -4,7 +4,7 @@ cloudsim_bridge.ign, starts a ROS master and the ROS1-Ignition bridge. For more information, please refer to - https://bitbucket.org/osrf/subt/wiki/tutorials/cloudsim + https://github.com/osrf/subt/wiki/Cloudsim Usage: ign launch cloudsim_sim.ign [worldName:= @@ -362,6 +362,7 @@ gas_5 TYPE_GAS + From 51d05fa9362555feef79558959cf0003c8185fd0 Mon Sep 17 00:00:00 2001 From: Nate Koenig Date: Tue, 14 Apr 2020 05:53:07 -0700 Subject: [PATCH 3/4] Remove extra whitespace --- subt_ign/launch/cloudsim_sim.ign | 1 - 1 file changed, 1 deletion(-) diff --git a/subt_ign/launch/cloudsim_sim.ign b/subt_ign/launch/cloudsim_sim.ign index 0c4f4836..7ef0563c 100644 --- a/subt_ign/launch/cloudsim_sim.ign +++ b/subt_ign/launch/cloudsim_sim.ign @@ -362,7 +362,6 @@ gas_5 TYPE_GAS - From 0a4d7d0be79a550403bd6718a14889773090455e Mon Sep 17 00:00:00 2001 From: Nate Koenig Date: Tue, 14 Apr 2020 14:37:58 -0700 Subject: [PATCH 4/4] Use https for git --- docker/cloudsim_sim/Dockerfile | 2 +- docker/subt_shell/Dockerfile | 2 +- docker/subt_sim_entry/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/cloudsim_sim/Dockerfile b/docker/cloudsim_sim/Dockerfile index e0b2369e..81a2e391 100644 --- a/docker/cloudsim_sim/Dockerfile +++ b/docker/cloudsim_sim/Dockerfile @@ -107,7 +107,7 @@ RUN rosdep update # docker is run RUN mkdir -p subt_ws/src \ && cd subt_ws/src \ - && git clone git@github.com:osrf/subt + && git clone https://github.com/osrf/subt # Download the public models COPY download_models.sh ./ diff --git a/docker/subt_shell/Dockerfile b/docker/subt_shell/Dockerfile index 74cb6cb8..12c7b7a7 100644 --- a/docker/subt_shell/Dockerfile +++ b/docker/subt_shell/Dockerfile @@ -102,7 +102,7 @@ RUN sudo apt-get update -qq \ # docker is run RUN mkdir -p subt_ws/src \ && cd subt_ws/src \ - && git clone git@github.com:osrf/subt + && git clone https://github.com/osrf/subt # Download the public models COPY download_models.sh ./ diff --git a/docker/subt_sim_entry/Dockerfile b/docker/subt_sim_entry/Dockerfile index c6c59592..76037ed4 100644 --- a/docker/subt_sim_entry/Dockerfile +++ b/docker/subt_sim_entry/Dockerfile @@ -101,7 +101,7 @@ RUN sudo apt-get update -qq \ # docker is run RUN mkdir -p subt_ws/src \ && cd subt_ws/src \ - && git clone git@github.com:osrf/subt + && git clone https://github.com/osrf/subt # Download the public models COPY download_models.sh ./