Fix minor bugs

Author: nhatnghiho

tests/ci/cdk/cdk/aws_lc_github_ci_stack.py

@@ -23,7 +23,6 @@
     GITHUB_PUSH_CI_BRANCH_TARGETS,
     GITHUB_REPO_OWNER,
     GITHUB_REPO_NAME,
-    PIPELINE_ACCOUNT,
     PRE_PROD_ACCOUNT,
     STAGING_GITHUB_REPO_OWNER,
     STAGING_GITHUB_REPO_NAME,

tests/ci/cdk/cdk/ssm/windows_docker_build_ssm_document.yaml

@@ -13,7 +13,7 @@ mainSteps:
     - $ErrorActionPreference = 'Stop'
     - $TRIGGER_TYPE = '{{ TriggerType }}'
     - "Get-ChildItem Env: | Sort-Object Name"
-    - rm -Recurse -Force docker-images
+    - if (Test-Path "docker-images") { Remove-Item -Recurse -Force "docker-images" }
     - mkdir docker-images
     - cd docker-images
     - Set-ExecutionPolicy Bypass -Scope Process -Force; [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; $env:chocolateyUseWindowsCompression = 'true'; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) | Out-Null

tests/ci/cdk/pipeline/pipeline_stack.py

@@ -268,12 +268,12 @@ def deploy_to_environment(
 
         docker_build_wave.add_post(
             CodeBuildStep(
-                f"{deploy_environment_type.value}-CompleteDockerBuild",
+                f"{deploy_environment_type.value}-FinalizeImages",
                 input=source,
                 commands=[
                     "cd tests/ci/cdk/pipeline/scripts",
                     "chmod +x finalize_images.sh",
-                    # "./finalize_images.sh --repos \"${ECR_REPOS}\"",
+                    "./finalize_images.sh --repos \"${ECR_REPOS}\"",
                 ],
                 env={
                     **codebuild_environment_variables,

tests/ci/cdk/pipeline/scripts/build_target.sh

@@ -37,15 +37,19 @@ function build_codebuild_ci_project() {
   start_codebuild_project "${project}" "${source_version}"
 
   while [[ ${attempt} -le ${MAX_RETRY} ]]; do
+    if [[ $attempt -gt 0 ]]; then
+      echo "Retrying ${attempt}/${MAX_RETRY}..."
+    fi
+
     attempt=$((attempt + 1))
 
     echo "Waiting for CI tests for complete. This may take anywhere from 15 minutes to 1 hour"
     if ! codebuild_build_status_check "${TIMEOUT}"; then
-      echo "Tests failed, retrying ${attempt}/${MAX_RETRY}..."
+      echo "Tests failed."
       if [[ ${attempt} -le ${MAX_RETRY} ]]; then
         retry_batch_build
       else
-        echo "CI tests failed"
+        echo "CI tests failed."
         exit 1
       fi
     fi
@@ -61,12 +65,16 @@ function build_linux_docker_images() {
   start_codebuild_project aws-lc-docker-image-build-linux "${COMMIT_HASH}"
 
   while [[ ${attempt} -le ${MAX_RETRY} ]]; do
+    if [[ $attempt -gt 0 ]]; then
+      echo "Retrying ${attempt}/${MAX_RETRY}..."
+    fi
+
     attempt=$((attempt + 1))
 
     echo "Waiting for docker images creation. Building the docker images need to take 1 hour."
     # TODO(CryptoAlg-624): These image build may fail due to the Docker Hub pull limits made on 2020-11-01.
     if ! codebuild_build_status_check "${TIMEOUT}"; then
-      echo "Build failed, retrying ${attempt}/${MAX_RETRY}..."
+      echo "Build failed."
       if [[ ${attempt} -le ${MAX_RETRY} ]]; then
         retry_batch_build
       else
@@ -83,17 +91,22 @@ function build_win_docker_images() {
   local attempt=0
 
   while [[ ${attempt} -le ${MAX_RETRY} ]]; do
+    if [[ $attempt -gt 0 ]]; then
+      echo "Retrying ${attempt}/${MAX_RETRY}..."
+    fi
+
     attempt=$((attempt + 1))
+
     echo "Executing AWS SSM commands to build Windows docker images."
     if ! start_windows_img_build; then
-      echo "Failed to start build, retrying ${attempt}/${MAX_RETRY}..."
+      echo "Failed to start build"
       continue
     fi
 
     echo "Waiting for docker images creation. Building the docker images need to take 1 hour."
     # TODO(CryptoAlg-624): These image build may fail due to the Docker Hub pull limits made on 2020-11-01.
     if ! win_docker_img_build_status_check "${TIMEOUT}"; then
-      echo "Build failed, retrying ${attempt}/${MAX_RETRY}..."
+      echo "Build failed"
       continue
     fi
 

tests/ci/cdk/pipeline/scripts/check_trigger_conditions.sh

@@ -6,7 +6,7 @@ set -exuo pipefail
 
 source util.sh
 
-NEED_REBUILD=${NEED_REBUILD:-1}
+NEED_REBUILD=${NEED_REBUILD:-0}
 COMMIT_HASH=${COMMIT_HASH:-$CODEBUILD_RESOLVED_SOURCE_VERSION}
 
 LINUX_DOCKER_PATH="tests/ci/docker_images/(dependencies|linux)"

tests/ci/cdk/run-cdk.sh

@@ -296,8 +296,8 @@ For aws-lc continuous integration setup, this script uses aws cli to build some
 
 Options:
     --help                       Displays this help
-    --aws-account                AWS account for CDK deploy/destroy. Default to '620771051181'.
-    --aws-region                 AWS region for AWS resources creation. Default to 'us-west-2'.
+    --deploy-account                AWS account for CDK deploy/destroy. Default to '620771051181'.
+    --deploy-region                 AWS region for AWS resources creation. Default to 'us-west-2'.
     --github-repo-owner          GitHub repository owner. Default to 'aws'.
     --github-source-version      GitHub source version. Default to 'main'.
     --action                     Required. The value can be
@@ -313,6 +313,7 @@ Options:
                                    'synth': synthesizes and prints the CloudFormation template for the stacks.
                                    'bootstrap': Bootstraps the CDK stack. This is needed before deployment or updating the CI.
                                    'invoke': invoke a custom command. Provide the custom command through '--command <YOUR_CUSTOM_COMMAND>'
+    --command                    Custom command to invoke. Required for '--action invoke'.
 EOF
 }