Merge release/k900 for 4.4.0 release (#107)

usdot-fhwa-stol · May 4, 2023 · 7d9155f · 7d9155f
2 parents 5ed75db + 3d00809
commit 7d9155f
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 55 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/autoware.ai:carma-system-4.3.0
+      - image: usdotfhwastol/autoware.ai:carma-system-4.4.0
         user: carma
         environment:
           TERM: xterm # use xterm to get full display output from build

diff --git a/Dockerfile b/Dockerfile
@@ -12,7 +12,7 @@
 #  License for the specific language governing permissions and limitations under
 #  the License.
 
-FROM usdotfhwastol/autoware.ai:carma-system-4.3.0 as setup
+FROM usdotfhwastol/autoware.ai:carma-system-4.4.0 as setup
 
 ARG ROS1_PACKAGES=""
 ENV ROS1_PACKAGES=${ROS1_PACKAGES}
@@ -24,7 +24,7 @@ COPY --chown=carma . /home/carma/src/
 RUN ~/src/docker/checkout.bash
 RUN ~/src/docker/install.sh
 
-FROM usdotfhwastol/autoware.ai:carma-system-4.3.0
+FROM usdotfhwastol/autoware.ai:carma-system-4.4.0
 
 
 ARG BUILD_DATE="NULL"

diff --git a/docker/build-image.sh b/docker/build-image.sh
@@ -23,43 +23,64 @@ echo ""
 echo "##### $IMAGE Docker Image Build Script #####"
 echo ""
 
+ROS1_PACKAGES=""
+ROS2_PACKAGES=""
+ROS1_PACKAGES_COLLECT=false
+ROS2_PACKAGES_COLLECT=false
+
 while [[ $# -gt 0 ]]; do
     arg="$1"
     case $arg in
         -v|--version)
+            ROS1_PACKAGES_COLLECT=false
+            ROS2_PACKAGES_COLLECT=false
+
             COMPONENT_VERSION_STRING="$2"
             shift
             shift
             ;;
         --system-release)
+            ROS1_PACKAGES_COLLECT=false
+            ROS2_PACKAGES_COLLECT=false
+
             SYSTEM_RELEASE=true
             shift
             ;;
         -p|--push)
+            ROS1_PACKAGES_COLLECT=false
+            ROS2_PACKAGES_COLLECT=false
+
             PUSH=true
             shift
             ;;
         -d|--develop)
+            ROS1_PACKAGES_COLLECT=false
+            ROS2_PACKAGES_COLLECT=false
+
             USERNAME=usdotfhwastoldev
             COMPONENT_VERSION_STRING=develop
             shift
             ;;
         --ros-1-packages|--ros1)
-            ROS1_PACKAGES=""
+            ROS1_PACKAGES_COLLECT=true
+            ROS2_PACKAGES_COLLECT=false
+
             shift
             ;;
         --ros-2-packages|--ros2)
-            ROS2_PACKAGES=""
+            ROS1_PACKAGES_COLLECT=false
+            ROS2_PACKAGES_COLLECT=true
+
             shift
             ;;
         *)
             # Var test based on Stack Overflow question: https://stackoverflow.com/questions/5406858/difference-between-unset-and-empty-variables-in-bash
             # Asker: green69
             # Answerer: geekosaur
-            if [ "${ROS2_PACKAGES+set}" = "set" ]; then
-                ROS2_PACKAGES="$ROS2_PACKAGES $arg"
-            elif [ "${ROS1_PACKAGES+set}" = "set" ]; then
+            if $ROS1_PACKAGES_COLLECT; then
                 ROS1_PACKAGES="$ROS1_PACKAGES $arg"
+            elif $ROS2_PACKAGES_COLLECT; then
+                ROS2_PACKAGES="$ROS2_PACKAGES $arg"
             else
                 echo "Unknown argument $arg..."
                 exit -1
@@ -70,7 +91,7 @@ while [[ $# -gt 0 ]]; do
 done
 
 if [[ ! -z "$ROS1_PACKAGES$ROS2_PACKAGES" ]]; then
-    echo "Performing incremental build of image to rebuild packages: $ROS1_PACKAGES $ROS2_PACKAGES..."
+    echo "Performing incremental build of image to rebuild packages: ROS1>> $ROS1_PACKAGES ROS2>> $ROS2_PACKAGES..."
 
     echo "Updating Dockerfile references to use most recent image as base image"
     # Trim of docker image LS command sourced from 

diff --git a/docker/checkout.bash b/docker/checkout.bash
@@ -39,6 +39,6 @@ if [[ "$BRANCH" = "develop" ]]; then
       git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/CARMAMsgs --branch $BRANCH
       git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch $BRANCH
 else
-      git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/CARMAMsgs --branch carma-system-4.3.0
-      git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch carma-system-4.3.0
+      git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/CARMAMsgs --branch carma-system-4.4.0
+      git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch carma-system-4.4.0
 fi
diff --git a/docs/pull_request_template.md b/docs/pull_request_template.md