Merge pull request #222 from usdot-fhwa-stol/release/hudson

Release/hudson
usdot-fhwa-stol · Jun 1, 2022 · a29b77f · a29b77f
2 parents 4d417a5 + 3da0e1f
commit a29b77f
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 11 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -28,7 +28,7 @@ jobs:
     # Pull docker image from docker hub
     # XTERM used for better catkin_make output
     docker:
-      - image: usdotfhwastol/carma-base:carma-system-4.0.0
+      - image: usdotfhwastol/carma-base:carma-system-4.1.0
         user: carma
         environment:
           TERM: xterm

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM usdotfhwastol/carma-base:carma-system-4.0.0 as base_image
+FROM usdotfhwastol/carma-base:carma-system-4.1.0 as base_image
 
 FROM base_image as build
 

diff --git a/common/map_file/nodes/map_param_loader/map_param_loader.cpp b/common/map_file/nodes/map_param_loader/map_param_loader.cpp
@@ -95,10 +95,15 @@ int main(int argc, char **argv)
   }
 
   // Broadcast the georeference
+  ros::Rate rate(0.5);
   ros::Publisher georef_pub = private_nh.advertise<std_msgs::String>("georeference", 1, true);
-  std_msgs::String georef_msg;
-  georef_msg.data = target_frame;
-  georef_pub.publish(georef_msg);
+  while (ros::ok()){
+    std_msgs::String georef_msg;
+    georef_msg.data = target_frame;
+    georef_pub.publish(georef_msg);
+    rate.sleep();
+  }
+
 
   ros::spin();
 

diff --git a/core_planning/mpc_follower/COLCON_IGNORE b/core_planning/mpc_follower/COLCON_IGNORE
diff --git a/docker/checkout.bash b/docker/checkout.bash
@@ -35,13 +35,13 @@ done
 cd ${dir}/autoware.ai
 
 if [[ "$BRANCH" = "develop" ]]; then
-      git clone --depth=1 https://github.com/usdot-fhwa-stol/carma-msgs.git --branch carma-system-4.0.0
-      git clone --depth=1 https://github.com/usdot-fhwa-stol/carma-utils.git --branch carma-system-4.0.0
-      git clone --depth=1 https://github.com/usdot-fhwa-stol/autoware.auto.git --branch carma-system-4.0.0
+      git clone --depth=1 https://github.com/usdot-fhwa-stol/carma-msgs.git --branch $BRANCH
+      git clone --depth=1 https://github.com/usdot-fhwa-stol/carma-utils.git --branch $BRANCH
+      git clone --depth=1 https://github.com/usdot-fhwa-stol/autoware.auto.git --branch $BRANCH
 else
-      git clone --depth=1 https://github.com/usdot-fhwa-stol/carma-msgs.git --branch carma-system-4.0.0
-      git clone --depth=1 https://github.com/usdot-fhwa-stol/carma-utils.git --branch carma-system-4.0.0
-      git clone --depth=1 https://github.com/usdot-fhwa-stol/autoware.auto.git --branch carma-system-4.0.0
+      git clone --depth=1 https://github.com/usdot-fhwa-stol/carma-msgs.git --branch carma-system-4.1.0
+      git clone --depth=1 https://github.com/usdot-fhwa-stol/carma-utils.git --branch carma-system-4.1.0
+      git clone --depth=1 https://github.com/usdot-fhwa-stol/autoware.auto.git --branch carma-system-4.1.0
 fi
 
 # Required to build pacmod_msgs

diff --git a/qpoases/COLCON_IGNORE b/qpoases/COLCON_IGNORE