diff --git a/tests/ci/cdk/cdk/ssm/general_test_run_ssm_document.yaml b/tests/ci/cdk/cdk/ssm/general_test_run_ssm_document.yaml index 5e867905eb..3fc27b763f 100644 --- a/tests/ci/cdk/cdk/ssm/general_test_run_ssm_document.yaml +++ b/tests/ci/cdk/cdk/ssm/general_test_run_ssm_document.yaml @@ -19,7 +19,7 @@ mainSteps: - export CPU_TYPE=$(dpkg --print-architecture) - export SOURCE={SOURCE} # if we have a cpu type of x86, we want linux-x86 - - if [ "${CPU_TYPE}" = amd64 ]; then export CPU_ARCH=linux-x86; export AWS_CLI_PREFIX=x86_; sudo sh -c "echo 1 > /sys/devices/system/cpu/intel_pstate/no_turbo"; fi + - if [ "${CPU_TYPE}" = amd64 ]; then export CPU_ARCH=linux-x86; export AWS_CLI_PREFIX=x86_; fi # if we have a cpu type of arm, we want linux-aarch - if [ "${CPU_TYPE}" = arm64 ]; then export CPU_ARCH=linux-aarch; export AWS_CLI_PREFIX=aarch; fi # install aws-cli @@ -39,6 +39,10 @@ mainSteps: cd aws-lc-pr git fetch origin pull/{PR_NUM}/head:temp git checkout temp + git show + if [ "$(git log -n 1 --pretty=format:"%H")" != "{COMMIT_ID}" ]; then + exit 1 + fi fi # install docker if its not already installed - chmod +x ./tests/ci/benchmark_framework/install_docker.sh diff --git a/tests/ci/run_ec2_test_framework.sh b/tests/ci/run_ec2_test_framework.sh index 32d7ecc135..45e39f298d 100755 --- a/tests/ci/run_ec2_test_framework.sh +++ b/tests/ci/run_ec2_test_framework.sh @@ -20,6 +20,7 @@ generate_ssm_document_file() { # use sed to replace placeholder values inside preexisting document sed -e "s,{AWS_ACCOUNT_ID},${AWS_ACCOUNT_ID},g" \ -e "s,{PR_NUM},${CODEBUILD_WEBHOOK_TRIGGER//pr\/},g" \ + -e "s,{COMMIT_ID},${CODEBUILD_SOURCE_VERSION},g" \ -e "s,{SOURCE},${CODEBUILD_SOURCE_REPO_URL},g" \ -e "s,{S3_BUCKET},${s3_bucket_name},g" \ -e "s,{ECR_DOCKER_TAG},${ecr_docker_tag},g" \