Fix buildspec tagging and codebuild error handling (#995)

* update buildspec with set -e

* fix al2 buildspec tags

Author: prateekchaudhry

buildspec.yml

@@ -20,6 +20,8 @@ phases:
       # Execute build commands based on BUILD_VERSION
       - |
         if [ "$BUILD_VERSION" = "2" ]; then
+          # need this for multiline code blocks to raise any errors to codebuild
+          set -e
           echo "Building AWS for Fluent Bit version 2 (current behavior)"
           
           # Check latest image versions from dockerhub and from GitHub source file
@@ -39,16 +41,16 @@ phases:
           # Push the image to ECR with corresponding architecture as the tag.
           aws ecr get-login-password --region ${AWS_REGION}| docker login --username AWS --password-stdin ${AWS_ACCOUNT}.dkr.ecr.${AWS_REGION}.amazonaws.com
           aws ecr create-repository --repository-name amazon/aws-for-fluent-bit-test --image-scanning-configuration scanOnPush=true --region ${AWS_REGION}  || true
-          architecture=$(docker inspect --format='{{.Architecture}}'  amazon/aws-for-fluent-bit)
-          docker tag amazon/aws-for-fluent-bit:latest ${AWS_ACCOUNT}.dkr.ecr.${AWS_REGION}.amazonaws.com/amazon/aws-for-fluent-bit-test:$architecture
-          docker tag amazon/aws-for-fluent-bit:debug ${AWS_ACCOUNT}.dkr.ecr.${AWS_REGION}.amazonaws.com/amazon/aws-for-fluent-bit-test:$architecture-debug
+          architecture=$(docker inspect --format='{{.Architecture}}'  amazon/aws-for-fluent-bit:latest-al2)
+          docker tag amazon/aws-for-fluent-bit:latest-al2 ${AWS_ACCOUNT}.dkr.ecr.${AWS_REGION}.amazonaws.com/amazon/aws-for-fluent-bit-test:$architecture
+          docker tag amazon/aws-for-fluent-bit:debug-al2 ${AWS_ACCOUNT}.dkr.ecr.${AWS_REGION}.amazonaws.com/amazon/aws-for-fluent-bit-test:$architecture-debug
           docker push ${AWS_ACCOUNT}.dkr.ecr.${AWS_REGION}.amazonaws.com/amazon/aws-for-fluent-bit-test:$architecture
           docker push ${AWS_ACCOUNT}.dkr.ecr.${AWS_REGION}.amazonaws.com/amazon/aws-for-fluent-bit-test:$architecture-debug
           ./scripts/publish.sh cicd-verify-ecr-image-scan ${AWS_REGION} amazon/aws-for-fluent-bit-test $architecture
           ./scripts/publish.sh cicd-verify-ecr-image-scan ${AWS_REGION} amazon/aws-for-fluent-bit-test $architecture-debug
           # Image with Init Process
-          docker tag amazon/aws-for-fluent-bit:init-latest ${AWS_ACCOUNT}.dkr.ecr.${AWS_REGION}.amazonaws.com/amazon/aws-for-fluent-bit-test:init-$architecture
-          docker tag amazon/aws-for-fluent-bit:init-debug ${AWS_ACCOUNT}.dkr.ecr.${AWS_REGION}.amazonaws.com/amazon/aws-for-fluent-bit-test:init-$architecture-debug
+          docker tag amazon/aws-for-fluent-bit:init-latest-al2 ${AWS_ACCOUNT}.dkr.ecr.${AWS_REGION}.amazonaws.com/amazon/aws-for-fluent-bit-test:init-$architecture
+          docker tag amazon/aws-for-fluent-bit:init-debug-al2 ${AWS_ACCOUNT}.dkr.ecr.${AWS_REGION}.amazonaws.com/amazon/aws-for-fluent-bit-test:init-$architecture-debug
           docker push ${AWS_ACCOUNT}.dkr.ecr.${AWS_REGION}.amazonaws.com/amazon/aws-for-fluent-bit-test:init-$architecture
           docker push ${AWS_ACCOUNT}.dkr.ecr.${AWS_REGION}.amazonaws.com/amazon/aws-for-fluent-bit-test:init-$architecture-debug
           ./scripts/publish.sh cicd-verify-ecr-image-scan ${AWS_REGION} amazon/aws-for-fluent-bit-test init-$architecture

buildspec_integ.yml

@@ -19,6 +19,8 @@ phases:
       # Execute integration test commands based on BUILD_VERSION
       - |
         if [ "$BUILD_VERSION" = "2" ]; then
+          # need this for multiline code blocks to raise any errors to codebuild
+          set -e
           echo "Running integration tests for AWS for Fluent Bit version 2 (current behavior)"
           
           # Enforce STS regional endpoints

buildspec_load_test.yml

@@ -59,6 +59,8 @@ phases:
       # Execute load test commands based on BUILD_VERSION
       - |
         if [ "$BUILD_VERSION" = "2" ]; then
+          # need this for multiline code blocks to raise any errors to codebuild
+          set -e
           echo "Running load tests for AWS for Fluent Bit version 2 (current behavior)"
           
           # Activate Python virtual environment and install the AWS CDK core dependencies