PR feedback: use env to find bash, change docker image to amazonlinux…

… 2023 to get a more modern CMake.
aws · Oct 15, 2023 · 3e7c79b · 3e7c79b
1 parent e72b98b
commit 3e7c79b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/tests/ci/cdk/cdk/codebuild/github_ci_integration_omnibus.yaml b/tests/ci/cdk/cdk/codebuild/github_ci_integration_omnibus.yaml
@@ -22,7 +22,7 @@ batch:
         type: LINUX_CONTAINER
         privileged-mode: false
         compute-type: BUILD_GENERAL1_SMALL
-        image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-x86:amazonlinux-2_gcc-7x_latest
+        image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-x86:amazonlinux-2023_gcc-11x_latest
         variables:
           AWS_LC_CI_TARGET: "tests/ci/integration/run_crt_integration.sh"
 
@@ -32,7 +32,7 @@ batch:
         type: ARM_CONTAINER
         privileged-mode: false
         compute-type: BUILD_GENERAL1_SMALL
-        image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-aarch:amazonlinux-2_gcc-7x_latest
+        image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-aarch:amazonlinux-2023_gcc-11x_latest
         variables:
           AWS_LC_CI_TARGET: "tests/ci/integration/run_crt_integration.sh"
 

diff --git a/tests/ci/integration/run_crt_integration.sh b/tests/ci/integration/run_crt_integration.sh
@@ -1,11 +1,12 @@
-#!/bin/bash -exu
+#!/usr/bin/env bash
+set -exu
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0 OR ISC
 
 source tests/ci/common_posix_setup.sh
 
 # Assumes script is executed from the root of aws-lc directory
-SCRATCH_FOLDER=${SYS_ROOT}/"SCRATCH_AWSLC_CRT_TEST"
+SCRATCH_FOLDER=${SYS_ROOT}/SCRATCH_AWSLC_CRT_TEST
 
 # Make script execution idempotent.
 mkdir -p ${SCRATCH_FOLDER}
@@ -21,6 +22,6 @@ cp -r ${SRC_ROOT}/* crt/aws-lc/
 
 # Don't pre-build AWS-LC, the CRT will build all of it's dependencies how it wants them built
 mkdir build && cd build
-cmake -GNinja ../
+${CMAKE_COMMAND} -GNinja ../
 ninja
-ninja test
+ninja test