Sky333999/test mod

.github/workflows/build-test-artifacts.yml

@@ -34,71 +34,10 @@ jobs:
       TerraformAWSAssumeRole: ${{ vars.TERRAFORM_AWS_ASSUME_ROLE }}
       Bucket: ${{ vars.S3_INTEGRATION_BUCKET }}
 
-  BuildAndUploadPackages:
-    uses: ./.github/workflows/test-build-packages.yml
-    needs: [BuildAndUpload]
-    secrets: inherit
-    permissions:
-      id-token: write
-      contents: read
-    with:
-      BucketKey: "integration-test/binary/${{ github.sha }}"
-      PackageBucketKey: "integration-test/packaging/${{ github.sha }}"
-      TerraformAWSAssumeRole: ${{ vars.TERRAFORM_AWS_ASSUME_ROLE }}
-      Bucket: ${{ vars.S3_INTEGRATION_BUCKET }}
-
-  BuildDocker:
-    needs: [BuildAndUpload]
-    uses: ./.github/workflows/test-build-docker.yml
-    secrets: inherit
-    permissions:
-      id-token: write
-      contents: read
-    with:
-      ContainerRepositoryNameAndTag: "cwagent-integration-test:${{ github.sha }}"
-      BucketKey: "integration-test/binary/${{ github.sha }}"
-      PackageBucketKey: "integration-test/packaging/${{ github.sha }}"
-
-  BuildAndUploadITAR:
-    uses: ./.github/workflows/test-build.yml
-    secrets: inherit
-    permissions:
-      id-token: write
-      contents: read
-    with:
-      BucketKey: "integration-test/binary/${{ github.sha }}"
-      PackageBucketKey: "integration-test/packaging/${{ github.sha }}"
-      Region: "us-gov-east-1"
-      TerraformAWSAssumeRole: ${{ vars.TERRAFORM_AWS_ASSUME_ROLE_ITAR }}
-      Bucket: ${{ vars.S3_INTEGRATION_BUCKET_ITAR }}
-
-  BuildAndUploadCN:
-    uses: ./.github/workflows/test-build.yml
-    secrets: inherit
-    permissions:
-      id-token: write
-      contents: read
-    with:
-      BucketKey: "integration-test/binary/${{ github.sha }}"
-      PackageBucketKey: "integration-test/packaging/${{ github.sha }}"
-      Region: "cn-north-1"
-      TerraformAWSAssumeRole: ${{ vars.TERRAFORM_AWS_ASSUME_ROLE_CN }}
-      Bucket: ${{ vars.S3_INTEGRATION_BUCKET_CN }}
-
   StartIntegrationTests:
-    needs: [ BuildAndUploadPackages, BuildAndUploadITAR, BuildAndUploadCN, BuildDocker ]
+    needs: [ BuildAndUpload ]
     runs-on: ubuntu-latest
     steps:
       - run: gh workflow run integration-test.yml --ref ${{ github.ref_name }} --repo $GITHUB_REPOSITORY -f build_run_id=${{ github.run_id }} -f build_sha=${{ github.sha }}
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  StartApplicationSignalsE2ETests:
-    needs: [ BuildAndUploadPackages, BuildAndUploadITAR, BuildAndUploadCN, BuildDocker ]
-    # Workflow only runs against main
-    if: ${{ contains(github.ref_name, 'main') }}
-    runs-on: ubuntu-latest
-    steps:
-      - run: gh workflow run application-signals-e2e-test.yml --ref ${{ github.ref_name }} --repo $GITHUB_REPOSITORY -f build_run_id=${{ github.run_id }} -f build_sha=${{ github.sha }}
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ec2-integration-test.yml

@@ -48,7 +48,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arrays: ${{ fromJson(inputs.test_props) }}
+        arrays: '[ { "test_dir": "./test/ca_bundle", "os": "al2023", "family": "linux", "testType": "ec2_linux", "arc": "arm64", "instanceType": "m6g.medium", "ami": "cloudwatch-agent-integration-test-aarch64-al2023*", "binaryName": "amazon-cloudwatch-agent.rpm", "username": "ec2-user", "installAgentCommand": "go run ./install/install_agent.go rpm", "agentStartCommand": "", "caCertPath": "/etc/ssl/certs/ca-bundle.crt", "values_per_minute": 0, "k8s_version": "", "terraform_dir": "", "useSSM": false, "excludedTests": "", "metadataEnabled": "", "max_attempts": 0 }, { "test_dir": "./test/cloudwatchlogs", "os": "al2023", "family": "linux", "testType": "ec2_linux", "arc": "arm64", "instanceType": "m6g.medium", "ami": "cloudwatch-agent-integration-test-aarch64-al2023*", "binaryName": "amazon-cloudwatch-agent.rpm", "username": "ec2-user", "installAgentCommand": "go run ./install/install_agent.go rpm", "agentStartCommand": "", "caCertPath": "/etc/ssl/certs/ca-bundle.crt", "values_per_minute": 0, "k8s_version": "", "terraform_dir": "", "useSSM": false, "excludedTests": "", "metadataEnabled": "", "max_attempts": 0 }, { "test_dir": "./test/metric_value_benchmark", "os": "al2023", "family": "linux", "testType": "ec2_linux", "arc": "arm64", "instanceType": "m6g.medium", "ami": "cloudwatch-agent-integration-test-aarch64-al2023*", "binaryName": "amazon-cloudwatch-agent.rpm", "username": "ec2-user", "installAgentCommand": "go run ./install/install_agent.go rpm", "agentStartCommand": "", "caCertPath": "/etc/ssl/certs/ca-bundle.crt", "values_per_minute": 0, "k8s_version": "", "terraform_dir": "", "useSSM": false, "excludedTests": "", "metadataEnabled": "", "max_attempts": 0 }, { "test_dir": "./test/run_as_user", "os": "al2023", "family": "linux", "testType": "ec2_linux", "arc": "arm64", "instanceType": "m6g.medium", "ami": "cloudwatch-agent-integration-test-aarch64-al2023*", "binaryName": "amazon-cloudwatch-agent.rpm", "username": "ec2-user", "installAgentCommand": "go run ./install/install_agent.go rpm", "agentStartCommand": "", "caCertPath": "/etc/ssl/certs/ca-bundle.crt", "values_per_minute": 0, "k8s_version": "", "terraform_dir": "", "useSSM": false, "excludedTests": "", "metadataEnabled": "", "max_attempts": 0 }, { "test_dir": "./test/collection_interval", "os": "al2023", "family": "linux", "testType": "ec2_linux", "arc": "arm64", "instanceType": "m6g.medium", "ami": "cloudwatch-agent-integration-test-aarch64-al2023*", "binaryName": "amazon-cloudwatch-agent.rpm", "username": "ec2-user", "installAgentCommand": "go run ./install/install_agent.go rpm", "agentStartCommand": "", "caCertPath": "/etc/ssl/certs/ca-bundle.crt", "values_per_minute": 0, "k8s_version": "", "terraform_dir": "", "useSSM": false, "excludedTests": "", "metadataEnabled": "", "max_attempts": 0 }, { "test_dir": "./test/metric_dimension", "os": "al2023", "family": "linux", "testType": "ec2_linux", "arc": "arm64", "instanceType": "m6g.medium", "ami": "cloudwatch-agent-integration-test-aarch64-al2023*", "binaryName": "amazon-cloudwatch-agent.rpm", "username": "ec2-user", "installAgentCommand": "go run ./install/install_agent.go rpm", "agentStartCommand": "", "caCertPath": "/etc/ssl/certs/ca-bundle.crt", "values_per_minute": 0, "k8s_version": "", "terraform_dir": "", "useSSM": false, "excludedTests": "", "metadataEnabled": "", "max_attempts": 0 }, { "test_dir": "./test/restart", "os": "al2023", "family": "linux", "testType": "ec2_linux", "arc": "arm64", "instanceType": "m6g.medium", "ami": "cloudwatch-agent-integration-test-aarch64-al2023*", "binaryName": "amazon-cloudwatch-agent.rpm", "username": "ec2-user", "installAgentCommand": "go run ./install/install_agent.go rpm", "agentStartCommand": "", "caCertPath": "/etc/ssl/certs/ca-bundle.crt", "values_per_minute": 0, "k8s_version": "", "terraform_dir": "", "useSSM": false, "excludedTests": "", "metadataEnabled": "", "max_attempts": 0 }, { "test_dir": "./test/xray", "os": "al2023", "family": "linux", "testType": "ec2_linux", "arc": "arm64", "instanceType": "m6g.medium", "ami": "cloudwatch-agent-integration-test-aarch64-al2023*", "binaryName": "amazon-cloudwatch-agent.rpm", "username": "ec2-user", "installAgentCommand": "go run ./install/install_agent.go rpm", "agentStartCommand": "", "caCertPath": "/etc/ssl/certs/ca-bundle.crt", "values_per_minute": 0, "k8s_version": "", "terraform_dir": "", "useSSM": false, "excludedTests": "", "metadataEnabled": "", "max_attempts": 0 }, { "test_dir": "./test/otlp", "os": "al2023", "family": "linux", "testType": "ec2_linux", "arc": "arm64", "instanceType": "m6g.medium", "ami": "cloudwatch-agent-integration-test-aarch64-al2023*", "binaryName": "amazon-cloudwatch-agent.rpm", "username": "ec2-user", "installAgentCommand": "go run ./install/install_agent.go rpm", "agentStartCommand": "", "caCertPath": "/etc/ssl/certs/ca-bundle.crt", "values_per_minute": 0, "k8s_version": "", "terraform_dir": "", "useSSM": false, "excludedTests": "", "metadataEnabled": "", "max_attempts": 0 } ]'
     permissions:
       id-token: write
       contents: read
@@ -65,6 +65,14 @@ jobs:
           aws-region: ${{inputs.region}}
           role-duration-seconds: ${{ env.TERRAFORM_AWS_ASSUME_ROLE_DURATION }}
 
+      - name: Download go mod vendor from S3 and unzip
+        run: |
+          aws s3 cp s3://${{ inputs.s3_integration_bucket }}/integration-test/test-vendor/${{ github.sha }}/vendor.tar.gz ./vendor.tar.gz
+
+      - name: Extract vendor directory
+        run: |
+          tar -xzf vendor.tar.gz
+
       - name: Cache if success
         id: cache_if_success
         uses: actions/cache@v3
@@ -106,13 +114,13 @@ jobs:
               -var="ca_cert_path=${{ matrix.arrays.caCertPath }}" \
               -var="arc=${{ matrix.arrays.arc }}" \
               -var="binary_name=${{ matrix.arrays.binaryName }}" \
-              -var="local_stack_host_name=${{ inputs.localstack_host }}" \
               -var="region=${{ inputs.region }}" \
               -var="s3_bucket=${{ inputs.s3_integration_bucket }}" \
               -var="plugin_tests='${{ github.event.inputs.plugins }}'" \
               -var="excluded_tests='${{ matrix.arrays.excludedTests }}'" \
               -var="ssh_key_name=${{env.KEY_NAME}}" \
               -var="test_dir=${{ matrix.arrays.test_dir }}" \
+              -var="use_vendor=true" \
               -var="agent_start=${{ matrix.arrays.agentStartCommand }}"; then terraform destroy -var="region=${{ inputs.region }}" -var="ami=${{ matrix.arrays.ami }}" -auto-approve
             else
               terraform destroy -var="region=${{ inputs.region }}" -var="ami=${{ matrix.arrays.ami }}" -auto-approve && exit 1