From 6b502fd77a6ac22ed30f0a77230f257d43c3ca0b Mon Sep 17 00:00:00 2001 From: SaikrishnaBairamoni <saikrishna.bairamoni@leidos.com> Date: Tue, 28 Sep 2021 00:14:53 -0400 Subject: [PATCH 1/4] updated config files to point develop from 3.8.0 --- .circleci/config.yml | 2 +- Dockerfile | 4 ++-- docker/checkout.bash | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1403b2c..fc46f86 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: usdotfhwastol/autoware.ai:carma-system-3.8.0 + - image: usdotfhwastoldev/autoware.ai:develop user: carma environment: TERM: xterm # use xterm to get full display output from build diff --git a/Dockerfile b/Dockerfile index ad13b56..0d42357 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,14 +12,14 @@ # License for the specific language governing permissions and limitations under # the License. -FROM usdotfhwastol/autoware.ai:carma-system-3.8.0 as setup +FROM usdotfhwastoldev/autoware.ai:develop as setup RUN mkdir ~/src COPY --chown=carma . /home/carma/src/ RUN ~/src/docker/checkout.bash RUN ~/src/docker/install.sh -FROM usdotfhwastol/autoware.ai:carma-system-3.8.0 +FROM usdotfhwastoldev/autoware.ai:develop ARG BUILD_DATE="NULL" ARG VERSION="NULL" diff --git a/docker/checkout.bash b/docker/checkout.bash index bf35417..f9a183e 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 ${dir}/src/CARMAMsgs --branch carma-system-3.8.0 - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch carma-system-3.8.0 + git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/CARMAMsgs --branch develop + git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch develop else - git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/CARMAMsgs --branch carma-system-3.8.0 - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch carma-system-3.8.0 + git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/CARMAMsgs --branch develop + git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch develop fi From 55c87bb4af31978ff4318c7449574450adca294a Mon Sep 17 00:00:00 2001 From: SaikrishnaBairamoni <saikrishna.bairamoni@leidos.com> Date: Sat, 23 Oct 2021 12:25:54 -0400 Subject: [PATCH 2/4] update config to point candidate for battista --- .circleci/config.yml | 2 +- Dockerfile | 4 ++-- docker/checkout.bash | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fc46f86..105bdde 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/autoware.ai:develop + - image: usdotfhwastolcandidate/autoware.ai:battista user: carma environment: TERM: xterm # use xterm to get full display output from build diff --git a/Dockerfile b/Dockerfile index 0d42357..93177a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,14 +12,14 @@ # License for the specific language governing permissions and limitations under # the License. -FROM usdotfhwastoldev/autoware.ai:develop as setup +FROM usdotfhwastolcandidate/autoware.ai:battista as setup RUN mkdir ~/src COPY --chown=carma . /home/carma/src/ RUN ~/src/docker/checkout.bash RUN ~/src/docker/install.sh -FROM usdotfhwastoldev/autoware.ai:develop +FROM usdotfhwastolcandidate/autoware.ai:battista ARG BUILD_DATE="NULL" ARG VERSION="NULL" diff --git a/docker/checkout.bash b/docker/checkout.bash index f9a183e..a0e0b14 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 ${dir}/src/CARMAMsgs --branch develop - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch develop + git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/CARMAMsgs --branch release/battista + git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch release/battista else - git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/CARMAMsgs --branch develop - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch develop + git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/CARMAMsgs --branch release/battista + git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch release/battista fi From 47d4193d022e2fe49f2c90dabec15e03afbe2076 Mon Sep 17 00:00:00 2001 From: SaikrishnaBairamoni <saikrishna.bairamoni@leidos.com> Date: Fri, 3 Dec 2021 15:02:05 -0500 Subject: [PATCH 3/4] Updating version numbers for CARMA release 3.9.0 --- Dockerfile | 4 ++-- docker/checkout.bash | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 93177a0..74bf38c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,14 +12,14 @@ # License for the specific language governing permissions and limitations under # the License. -FROM usdotfhwastolcandidate/autoware.ai:battista as setup +FROM usdotfhwastol/autoware.ai:carma-system-3.9.0 as setup RUN mkdir ~/src COPY --chown=carma . /home/carma/src/ RUN ~/src/docker/checkout.bash RUN ~/src/docker/install.sh -FROM usdotfhwastolcandidate/autoware.ai:battista +FROM usdotfhwastol/autoware.ai:carma-system-3.9.0 ARG BUILD_DATE="NULL" ARG VERSION="NULL" diff --git a/docker/checkout.bash b/docker/checkout.bash index a0e0b14..55431f4 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 ${dir}/src/CARMAMsgs --branch release/battista - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch release/battista + git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/CARMAMsgs --branch carma-system-3.9.0 + git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch carma-system-3.9.0 else - git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/CARMAMsgs --branch release/battista - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch release/battista + git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/CARMAMsgs --branch carma-system-3.9.0 + git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch carma-system-3.9.0 fi From 48ea87e2a4b44a6f8c7a4bed8f4d30d4f2218d00 Mon Sep 17 00:00:00 2001 From: SaikrishnaBairamoni <saikrishna.bairamoni@leidos.com> Date: Fri, 3 Dec 2021 17:30:05 -0500 Subject: [PATCH 4/4] updated config with new version 3.9.0 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 105bdde..558de10 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/autoware.ai:battista + - image: usdotfhwastol/autoware.ai:carma-system-3.9.0 user: carma environment: TERM: xterm # use xterm to get full display output from build