diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml index c5785b5147..cba7f2870c 100644 --- a/.github/workflows/test-build.yml +++ b/.github/workflows/test-build.yml @@ -8,13 +8,13 @@ env: on: workflow_dispatch: inputs: - ContainerRepositoryNameAndTag: - # e.g. "cwagent-integration-test:SHA" - # e.g. "cwa-release:latest" - # e.g. "cwa_nonprod:latest" - description: "ECR repo name and tag" - required: true - type: string +# ContainerRepositoryNameAndTag: +# # e.g. "cwagent-integration-test:SHA" +# # e.g. "cwa-release:latest" +# # e.g. "cwa_nonprod:latest" +# description: "ECR repo name and tag" +# required: true +# type: string BucketKey: # e.g. s3:///integration-test/binary/" # e.g. s3:///nonprod @@ -28,13 +28,13 @@ on: type: string workflow_call: inputs: - ContainerRepositoryNameAndTag: - # e.g. "cwagent-integration-test:SHA" - # e.g. "cwa-release:latest" - # e.g. "cwa_nonprod:latest" - description: "ECR repo name and tag" - required: true - type: string +# ContainerRepositoryNameAndTag: +# # e.g. "cwagent-integration-test:SHA" +# # e.g. "cwa-release:latest" +# # e.g. "cwa_nonprod:latest" +# description: "ECR repo name and tag" +# required: true +# type: string BucketKey: # e.g. s3:///integration-test/binary/" # e.g. s3:///nonprod @@ -117,34 +117,34 @@ jobs: aws s3 cp build/bin/linux/amd64/amazon-cloudwatch-agent.rpm s3://${{ secrets.S3_INTEGRATION_BUCKET }}/${{ inputs.BucketKey }}/amazon_linux/amd64/latest/amazon-cloudwatch-agent.rpm aws s3 cp build/bin/linux/arm64/amazon-cloudwatch-agent.rpm s3://${{ secrets.S3_INTEGRATION_BUCKET }}/${{ inputs.BucketKey }}/amazon_linux/arm64/latest/amazon-cloudwatch-agent.rpm - - name: Login ECR - if: contains(inputs.BucketKey, 'test') == false || steps.cached_binaries.outputs.cache-hit == false - id: login-ecr - uses: aws-actions/amazon-ecr-login@v1 - - - name: Set up Docker Buildx - if: contains(inputs.BucketKey, 'test') == false || steps.cached_binaries.outputs.cache-hit == false - uses: docker/setup-buildx-action@v1 - - - name: Set up QEMU - if: contains(inputs.BucketKey, 'test') == false || steps.cached_binaries.outputs.cache-hit == false - uses: docker/setup-qemu-action@v1 - - # Build dir is ignored in our .dockerignore thus need to copy to another dir. - - name: Copy Binary For Agent Image Build - if: contains(inputs.BucketKey, 'test') == false || steps.cached_binaries.outputs.cache-hit == false - run: cp -r build/bin/linux/* . - - - name: Build Cloudwatch Agent Image - uses: docker/build-push-action@v4 - if: contains(inputs.BucketKey, 'test') == false || steps.cached_binaries.outputs.cache-hit == false - with: - file: amazon-cloudwatch-container-insights/cloudwatch-agent-dockerfile/localdeb/Dockerfile - context: . - push: true - tags: | - ${{ steps.login-ecr.outputs.registry }}/${{ inputs.ContainerRepositoryNameAndTag }} - platforms: linux/amd64, linux/arm64 +# - name: Login ECR +# if: contains(inputs.BucketKey, 'test') == false || steps.cached_binaries.outputs.cache-hit == false +# id: login-ecr +# uses: aws-actions/amazon-ecr-login@v1 +# +# - name: Set up Docker Buildx +# if: contains(inputs.BucketKey, 'test') == false || steps.cached_binaries.outputs.cache-hit == false +# uses: docker/setup-buildx-action@v1 +# +# - name: Set up QEMU +# if: contains(inputs.BucketKey, 'test') == false || steps.cached_binaries.outputs.cache-hit == false +# uses: docker/setup-qemu-action@v1 +# +# # Build dir is ignored in our .dockerignore thus need to copy to another dir. +# - name: Copy Binary For Agent Image Build +# if: contains(inputs.BucketKey, 'test') == false || steps.cached_binaries.outputs.cache-hit == false +# run: cp -r build/bin/linux/* . +# +# - name: Build Cloudwatch Agent Image +# uses: docker/build-push-action@v4 +# if: contains(inputs.BucketKey, 'test') == false || steps.cached_binaries.outputs.cache-hit == false +# with: +# file: amazon-cloudwatch-container-insights/cloudwatch-agent-dockerfile/localdeb/Dockerfile +# context: . +# push: true +# tags: | +# ${{ steps.login-ecr.outputs.registry }}/${{ inputs.ContainerRepositoryNameAndTag }} +# platforms: linux/amd64, linux/arm64 MakeMSIZip: name: 'MakeMSIZip'