From dc837065a9a00f70c9b465dcdcff59e2403d7959 Mon Sep 17 00:00:00 2001
From: Quinn Sinclair <52372765+m-rph@users.noreply.github.com>
Date: Thu, 27 Jun 2024 10:51:59 +0100
Subject: [PATCH] Use latest codebuild version (#157)

---
 .../codebuild-local/codebuild_build.sh        | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/tests/integration/codebuild-local/codebuild_build.sh b/tests/integration/codebuild-local/codebuild_build.sh
index ffadfa3..45329d2 100755
--- a/tests/integration/codebuild-local/codebuild_build.sh
+++ b/tests/integration/codebuild-local/codebuild_build.sh
@@ -36,6 +36,7 @@ function usage {
     echo "  -a        Used to specify an artifact output directory."
     echo "Options:"
     echo "  -l IMAGE  Used to override the default local agent image."
+    echo "  -r        Used to specify a report output directory."
     echo "  -s        Used to specify source information. Defaults to the current working directory for primary source."
     echo "               * First (-s) is for primary source"
     echo "               * Use additional (-s) in <sourceIdentifier>:<sourceLocation> format for secondary source"
@@ -61,10 +62,11 @@ awsconfig_flag=false
 mount_src_dir_flag=false
 docker_privileged_mode_flag=false
 
-while getopts "cmdi:a:s:b:e:l:p:h" opt; do
+while getopts "cmdi:a:r:s:b:e:l:p:h" opt; do
     case $opt in
         i  ) image_flag=true; image_name=$OPTARG;;
         a  ) artifact_flag=true; artifact_dir=$OPTARG;;
+        r  ) report_dir=$OPTARG;;
         b  ) buildspec=$OPTARG;;
         c  ) awsconfig_flag=true;;
         m  ) mount_src_dir_flag=true;;
@@ -106,6 +108,11 @@ fi
 docker_command+="\"IMAGE_NAME=$image_name\" -e \
     \"ARTIFACTS=$(allOSRealPath "$artifact_dir")\""
 
+if [ -n "$report_dir" ]
+then
+    docker_command+=" -e \"REPORTS=$(allOSRealPath "$report_dir")\""
+fi
+
 if [ -z "$source_dirs" ]
 then
     docker_command+=" -e \"SOURCE=$(allOSRealPath "$PWD")\""
@@ -136,11 +143,6 @@ then
     docker_command+=" -v \"$environment_variable_file_dir:/LocalBuild/envFile/\" -e \"ENV_VAR_FILE=$environment_variable_file_basename\""
 fi
 
-if [ -n "$local_agent_image" ]
-then
-    docker_command+=" -e \"LOCAL_AGENT_IMAGE_NAME=$local_agent_image\""
-fi
-
 if $awsconfig_flag
 then
     if [ -d "$HOME/.aws" ]
@@ -176,7 +178,12 @@ else
     docker_command+=" -e \"INITIATOR=$USER\""
 fi
 
-docker_command+=" amazon/aws-codebuild-local:latest"
+if [ -n "$local_agent_image" ]
+then
+    docker_command+=" $local_agent_image"
+else
+    docker_command+=" public.ecr.aws/codebuild/local-builds:latest"
+fi
 
 # Note we do not expose the AWS_SECRET_ACCESS_KEY or the AWS_SESSION_TOKEN
 exposed_command=$docker_command
@@ -191,4 +198,4 @@ echo ""
 echo $exposed_command
 echo ""
 
-eval $docker_command
+eval $docker_command
\ No newline at end of file