diff --git a/.github/workflows/java-eks-test.yml b/.github/workflows/java-eks-test.yml index 6834cf476..62e44671a 100644 --- a/.github/workflows/java-eks-test.yml +++ b/.github/workflows/java-eks-test.yml @@ -442,7 +442,7 @@ jobs: --rollup' - name: test - continue-on-error: true + if: always() run: sleep 500 - name: Refresh AWS Credentials diff --git a/.github/workflows/traffic-generator-image-build.yml b/.github/workflows/traffic-generator-image-build.yml index ad8808050..d12bce284 100644 --- a/.github/workflows/traffic-generator-image-build.yml +++ b/.github/workflows/traffic-generator-image-build.yml @@ -4,11 +4,6 @@ name: Create and Push Traffic Generator on: workflow_dispatch: - push: - branches: - - main - paths: - - 'sample-apps/traffic-generator/**' permissions: id-token: write @@ -23,10 +18,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - aws-region: ['af-south-1','ap-east-1','ap-northeast-1','ap-northeast-2','ap-northeast-3','ap-south-1','ap-south-2','ap-southeast-1', - 'ap-southeast-2','ap-southeast-3','ap-southeast-4','ca-central-1','eu-central-1','eu-central-2','eu-north-1', - 'eu-south-1','eu-south-2','eu-west-1','eu-west-2','eu-west-3','il-central-1','me-central-1','me-south-1', 'sa-east-1', - 'us-east-1','us-east-2', 'us-west-1', 'us-west-2'] + aws-region: ['us-east-1'] steps: - name: Checkout repository uses: actions/checkout@v4 @@ -63,38 +55,38 @@ jobs: docker build -t $REGISTRY/$REPOSITORY:$IMAGE_TAG . docker push $REGISTRY/$REPOSITORY:$IMAGE_TAG - upload-files-to-s3: - runs-on: ubuntu-latest - strategy: - matrix: - aws-region: ['af-south-1','ap-east-1','ap-northeast-1','ap-northeast-2','ap-northeast-3','ap-south-1','ap-south-2','ap-southeast-1', - 'ap-southeast-2','ap-southeast-3','ap-southeast-4','ca-central-1','eu-central-1','eu-central-2','eu-north-1', - 'eu-south-1','eu-south-2','eu-west-1','eu-west-2','eu-west-3','il-central-1','me-central-1','me-south-1', 'sa-east-1', - 'us-east-1','us-east-2', 'us-west-1', 'us-west-2'] - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v4 - with: - role-to-assume: arn:aws:iam::${{ env.E2E_TEST_ACCOUNT_ID }}:role/${{ env.E2E_TEST_ROLE_NAME }} - aws-region: us-east-1 - - - name: Retrieve account - uses: aws-actions/aws-secretsmanager-get-secrets@v1 - with: - secret-ids: | - ACCOUNT_ID, region-account/${{ matrix.aws-region }} - - - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v4 - with: - role-to-assume: arn:aws:iam::${{ env.ACCOUNT_ID }}:role/${{ env.E2E_TEST_ROLE_NAME }} - aws-region: ${{ matrix.aws-region }} - - - name: Upload traffic generator files - working-directory: sample-apps/traffic-generator - run: | - zip traffic-generator.zip ./index.js ./package.json - aws s3 cp traffic-generator.zip s3://aws-appsignals-sample-app-prod-${{ matrix.aws-region }}/traffic-generator.zip \ No newline at end of file +# upload-files-to-s3: +# runs-on: ubuntu-latest +# strategy: +# matrix: +# aws-region: ['af-south-1','ap-east-1','ap-northeast-1','ap-northeast-2','ap-northeast-3','ap-south-1','ap-south-2','ap-southeast-1', +# 'ap-southeast-2','ap-southeast-3','ap-southeast-4','ca-central-1','eu-central-1','eu-central-2','eu-north-1', +# 'eu-south-1','eu-south-2','eu-west-1','eu-west-2','eu-west-3','il-central-1','me-central-1','me-south-1', 'sa-east-1', +# 'us-east-1','us-east-2', 'us-west-1', 'us-west-2'] +# steps: +# - name: Checkout repository +# uses: actions/checkout@v4 +# +# - name: Configure AWS Credentials +# uses: aws-actions/configure-aws-credentials@v4 +# with: +# role-to-assume: arn:aws:iam::${{ env.E2E_TEST_ACCOUNT_ID }}:role/${{ env.E2E_TEST_ROLE_NAME }} +# aws-region: us-east-1 +# +# - name: Retrieve account +# uses: aws-actions/aws-secretsmanager-get-secrets@v1 +# with: +# secret-ids: | +# ACCOUNT_ID, region-account/${{ matrix.aws-region }} +# +# - name: Configure AWS Credentials +# uses: aws-actions/configure-aws-credentials@v4 +# with: +# role-to-assume: arn:aws:iam::${{ env.ACCOUNT_ID }}:role/${{ env.E2E_TEST_ROLE_NAME }} +# aws-region: ${{ matrix.aws-region }} +# +# - name: Upload traffic generator files +# working-directory: sample-apps/traffic-generator +# run: | +# zip traffic-generator.zip ./index.js ./package.json +# aws s3 cp traffic-generator.zip s3://aws-appsignals-sample-app-prod-${{ matrix.aws-region }}/traffic-generator.zip \ No newline at end of file diff --git a/sample-apps/traffic-generator/index.js b/sample-apps/traffic-generator/index.js index 7ba051126..336fc9c21 100644 --- a/sample-apps/traffic-generator/index.js +++ b/sample-apps/traffic-generator/index.js @@ -43,7 +43,6 @@ const trafficGenerator = async (interval) => { `http://${mainEndpoint}/aws-sdk-call?ip=${remoteEndpoint}&testingId=${id}`, `http://${mainEndpoint}/remote-service?ip=${remoteEndpoint}&testingId=${id}`, `http://${mainEndpoint}/client-call`, - `http://${mainEndpoint}/mysql`, ]; await sendRequests(urls);