add PIPELINE_BUCKET env var, latest build image, replace S3 bucket na…

…me using token

.taskcat.yml

@@ -18,8 +18,8 @@ tests:
   beanstalk:
     parameters:
       EmailAddress: fake-email@fake-fake-fake-email.com
-      S3Bucket: deoa-wkshop-abcd
-      S3Key: deoa-beanstalk-examples.zip
-      CodeCommitS3Bucket: deoa-wkshop-abcd
-      CodeCommitS3Key: deoa-beanstalk-examples.zip
+      S3Bucket: S3_BUCKET_TOKEN
+      S3Key: doea-beanstalk-examples.zip
+      CodeCommitS3Bucket: S3_BUCKET_TOKEN
+      CodeCommitS3Key: doea-beanstalk-examples.zip
     template: ./samples/beanstalk/pipeline.yml

buildspec-setup.yml

@@ -5,21 +5,21 @@ phases:
       python: 3.7
     commands:
       - python --version
+  pre_build:
+    commands:
+      - >-
+        ls -las
+      - chmod +x *.sh
+      - ./update-taskcat.sh $PIPELINE_BUCKET
   build:
     commands:
       - echo In buildspec-setup.yml Build started on `date`
       - >-
-        aws s3api list-buckets --query 'Buckets[?starts_with(Name,
-        `deoa-wkshop-abcd`) == `true`].[Name]' --output text | xargs -I {} aws s3 rb s3://{} --force
-      - 'sleep 10'
-      - 'aws s3 mb s3://deoa-wkshop-abcd'
-      - 'aws s3 sync . s3://deoa-wkshop-abcd'
-      - cd samples/ec2
-      - zip deoa-ec2-examples.zip *.*
-      - 'aws s3 sync . s3://deoa-wkshop-abcd'
-      - cd ../beanstalk
-      - zip deoa-beanstalk-examples.zip *.*
-      - 'aws s3 sync . s3://deoa-wkshop-abcd'
+        zip -r doea-ec2-examples.zip ./samples/ec2 -j -x '*.git*'
+      - >-
+        zip -r doea-beanstalk-examples.zip ./samples/beanstalk -j -x '*.git*'
+      - >-
+        aws s3 sync . s3://$PIPELINE_BUCKET
   post_build:
     commands:
       - echo In buildspec-setup.yml Build completed on `date`

pipeline-taskcat.yml

@@ -144,7 +144,12 @@ Resources:
       Environment:
         Type: LINUX_CONTAINER
         ComputeType: BUILD_GENERAL1_SMALL
-        Image: "aws/codebuild/amazonlinux2-x86_64-standard:1.0"
+        Image: "aws/codebuild/amazonlinux2-x86_64-standard:3.0"
+        EnvironmentVariables:
+          - Name: PIPELINE_BUCKET
+            Type: PLAINTEXT
+            Value:
+              Fn::Sub: ${PipelineBucket}
       Source:
         Type: GITHUB
         Location: !Sub https://github.com/${GitHubUser}/${GitHubRepo}.git
@@ -162,7 +167,7 @@ Resources:
       Environment:
         Type: LINUX_CONTAINER
         ComputeType: BUILD_GENERAL1_SMALL
-        Image: "aws/codebuild/amazonlinux2-x86_64-standard:1.0"
+        Image: "aws/codebuild/amazonlinux2-x86_64-standard:3.0"
       Source:
         Type: GITHUB
         Location: !Sub https://github.com/${GitHubUser}/${GitHubRepo}.git
@@ -180,7 +185,7 @@ Resources:
       Environment:
         Type: LINUX_CONTAINER
         ComputeType: BUILD_GENERAL1_SMALL
-        Image: "aws/codebuild/amazonlinux2-x86_64-standard:1.0"
+        Image: "aws/codebuild/amazonlinux2-x86_64-standard:3.0"
       Source:
         Type: CODEPIPELINE
       TimeoutInMinutes: 60
@@ -196,7 +201,7 @@ Resources:
       Environment:
         Type: LINUX_CONTAINER
         ComputeType: BUILD_GENERAL1_SMALL
-        Image: "aws/codebuild/amazonlinux2-x86_64-standard:1.0"
+        Image: "aws/codebuild/amazonlinux2-x86_64-standard:3.0"
       Source:
         Type: CODEPIPELINE
         BuildSpec: !Sub |

samples/beanstalk/pipeline.yml

@@ -26,7 +26,7 @@ Parameters:
     AllowedPattern: "[\\x20-\\x7E]*"
     ConstraintDescription: Can contain only ASCII characters.
   S3Key:
-    Description: S3 Bucket that hosts the application code
+    Description: Zip file that contains application code 
     Type: String
     Default: html.zip
     AllowedPattern: "[\\x20-\\x7E]*"