From d9852d95062fd3cf9dbfd4a0aa297f4d8698e5ad Mon Sep 17 00:00:00 2001 From: SaikrishnaBairamoni Date: Sat, 23 Oct 2021 20:21:20 -0400 Subject: [PATCH 1/4] updated config to point candidate for battista --- .circleci/config.yml | 2 +- Dockerfile | 2 +- docker/checkout.bash | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 088733d8..2fe280ff 100644 --- 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: usdotfhwastoldev/carma-base:develop + - image: usdotfhwastolcandidate/carma-base:battista user: carma environment: TERM: xterm diff --git a/Dockerfile b/Dockerfile index 5deedfbe..d7319c11 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations under # the License. -FROM usdotfhwastoldev/carma-base:develop as base +FROM usdotfhwastolcandidate/carma-base:battista as base FROM base as setup RUN mkdir ~/src diff --git a/docker/checkout.bash b/docker/checkout.bash index fc94822c..23b85b62 100755 --- a/docker/checkout.bash +++ b/docker/checkout.bash @@ -36,9 +36,9 @@ while [[ $# -gt 0 ]]; do done if [[ "$BRANCH" = "develop" ]]; then - git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ~/src/carma-msgs --branch develop --depth 1 - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ~/src/carma-utils --branch develop --depth 1 + git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ~/src/carma-msgs --branch release/battista --depth 1 + git clone https://github.com/usdot-fhwa-stol/carma-utils.git ~/src/carma-utils --branch release/battista --depth 1 else - git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/carma-msgs --branch develop --depth 1 - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/carma-utils --branch develop --depth 1 + git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/carma-msgs --branch release/battista --depth 1 + git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/carma-utils --branch release/battista --depth 1 fi From 52a3835580598ff432fbd790647f11a62a5a9f68 Mon Sep 17 00:00:00 2001 From: SaikrishnaBairamoni Date: Fri, 3 Dec 2021 15:01:55 -0500 Subject: [PATCH 2/4] Updating version numbers for CARMA release 3.9.0 --- Dockerfile | 2 +- docker/checkout.bash | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index d7319c11..e1851123 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations under # the License. -FROM usdotfhwastolcandidate/carma-base:battista as base +FROM usdotfhwastol/carma-base:carma-system-3.9.0 as base FROM base as setup RUN mkdir ~/src diff --git a/docker/checkout.bash b/docker/checkout.bash index 23b85b62..1b091343 100755 --- a/docker/checkout.bash +++ b/docker/checkout.bash @@ -36,9 +36,9 @@ while [[ $# -gt 0 ]]; do done if [[ "$BRANCH" = "develop" ]]; then - git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ~/src/carma-msgs --branch release/battista --depth 1 - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ~/src/carma-utils --branch release/battista --depth 1 + git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ~/src/carma-msgs --branch carma-system-3.9.0 + git clone https://github.com/usdot-fhwa-stol/carma-utils.git ~/src/carma-utils --branch carma-system-3.9.0 else - git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/carma-msgs --branch release/battista --depth 1 - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/carma-utils --branch release/battista --depth 1 + git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/carma-msgs --branch carma-system-3.9.0 + git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/carma-utils --branch carma-system-3.9.0 fi From 226bc28bcc3bb5f4694d47b81bc180412736f370 Mon Sep 17 00:00:00 2001 From: Saikrishna Bairamoni <84093461+SaikrishnaBairamoni@users.noreply.github.com> Date: Fri, 3 Dec 2021 17:46:58 -0500 Subject: [PATCH 3/4] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2fe280ff..b52d9711 100644 --- 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: usdotfhwastolcandidate/carma-base:battista + - image: usdotfhwastol/carma-base:carma-system-3.9.0 user: carma environment: TERM: xterm From c924c8618db65c038381dc38f05af14094ff1282 Mon Sep 17 00:00:00 2001 From: Michael McConnell Date: Mon, 6 Dec 2021 15:33:40 +0000 Subject: [PATCH 4/4] Change noetic-develop back to develop for builds --- docker/build-image.sh | 4 ++-- docker/checkout.bash | 2 +- hooks/pre_build | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/build-image.sh b/docker/build-image.sh index a4bcbf7a..ed48c4f3 100755 --- a/docker/build-image.sh +++ b/docker/build-image.sh @@ -41,7 +41,7 @@ while [[ $# -gt 0 ]]; do ;; -d|--develop) USERNAME=usdotfhwastoldev - COMPONENT_VERSION_STRING=noetic-develop + COMPONENT_VERSION_STRING=develop shift ;; esac @@ -55,7 +55,7 @@ echo "Building docker image for $IMAGE version: $COMPONENT_VERSION_STRING" echo "Final image name: $USERNAME/$IMAGE:$COMPONENT_VERSION_STRING" cd .. -if [[ $COMPONENT_VERSION_STRING = "noetic-develop" ]]; then +if [[ $COMPONENT_VERSION_STRING = "develop" ]]; then sed "s|usdotfhwastoldev/|$USERNAME/|g; s|usdotfhwastolcandidate/|$USERNAME/|g; s|usdotfhwastol/|$USERNAME/|g; s|:[0-9]*\.[0-9]*\.[0-9]*|:$COMPONENT_VERSION_STRING|g; s|checkout.bash|checkout.bash -d|g" \ Dockerfile | docker build -f - --no-cache -t $USERNAME/$IMAGE:$COMPONENT_VERSION_STRING \ --build-arg VERSION="$COMPONENT_VERSION_STRING" \ diff --git a/docker/checkout.bash b/docker/checkout.bash index 947c359b..1bfe05b8 100755 --- a/docker/checkout.bash +++ b/docker/checkout.bash @@ -24,7 +24,7 @@ while [[ $# -gt 0 ]]; do arg="$1" case $arg in -d|--develop) - BRANCH=noetic/develop + BRANCH=develop shift ;; -r|--root) diff --git a/hooks/pre_build b/hooks/pre_build index 5fa97f45..1b199017 100644 --- a/hooks/pre_build +++ b/hooks/pre_build @@ -1,8 +1,8 @@ #!/bin/bash -if [[ "$SOURCE_BRANCH" = "noetic/develop" ]]; then +if [[ "$SOURCE_BRANCH" = "develop" ]]; then # add -d flag to checkout.bash and update image dependencies - sed -i "s|checkout.bash|checkout.bash -d|g; s|usdotfhwastol/|usdotfhwastoldev/|g; s|:[0-9]*\.[0-9]*\.[0-9]*|:noetic-develop|g s|:CARMA[a-zA-Z]*_[0-9]*\.[0-9]*\.[0-9]*|:noetic-develop|g; s|:carma-[a-zA-Z]*-[0-9]*\.[0-9]*\.[0-9]*|:noetic-develop|g" \ + sed -i "s|checkout.bash|checkout.bash -d|g; s|usdotfhwastol/|usdotfhwastoldev/|g; s|:[0-9]*\.[0-9]*\.[0-9]*|:develop|g s|:CARMA[a-zA-Z]*_[0-9]*\.[0-9]*\.[0-9]*|:develop|g; s|:carma-[a-zA-Z]*-[0-9]*\.[0-9]*\.[0-9]*|:develop|g" \ Dockerfile elif [[ "$SOURCE_BRANCH" =~ ^release/.*$ ]]; then # swap checkout branch in checkout.bash to release branch