Skip to content

Commit 5578257

Browse files
Miqueasherthpierce
andauthored
Vherremi/3p updates (#461)
This pr updates java-eks-otlp-test 3p actions from VID to CSHA after we've verified functionality. Dotnet: https://github.com/aws-observability/aws-otel-dotnet-instrumentation/actions/runs/17954504745 JS: https://github.com/aws-observability/aws-otel-js-instrumentation/actions/runs/17953179640 Java: https://github.com/aws-observability/aws-otel-java-instrumentation/actions/runs/17954706776 Python: https://github.com/aws-observability/aws-otel-python-instrumentation/actions/runs/17953142892 To do so, create a `test.yml` file with `name: Test` and workflow description to test your changes, then remove the file for your PR. Link your test run in your PR description. This process is a short term solution while we work on creating a staging environment for testing. NOTE: TESTS RUNNING ON A SINGLE EKS CLUSTER CANNOT BE RUN IN PARALLEL. See the [needs](https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idneeds) keyword to run tests in succession. - Run Java EKS on `e2e-playground` in us-east-1 and eu-central-2 - Run Python EKS on `e2e-playground` in us-east-1 and eu-central-2 - Run metric limiter on EKS cluster `e2e-playground` in us-east-1 and eu-central-2 - Run EC2 tests in all regions - Run K8s on a separate K8s cluster (check IAD test account for master node endpoints; these will change as we create and destroy clusters for OS patching) By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. --------- Co-authored-by: Thomas Pierce <thp@amazon.com>
1 parent 7a00fb0 commit 5578257

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

.github/workflows/java-ec2-adaptive-sampling-test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Generate testing id
3434
run: echo TESTING_ID="${{ github.run_id }}-${{ github.run_number }}-${RANDOM}" >> $GITHUB_ENV
3535

36-
- uses: actions/checkout@v4
36+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
3737
with:
3838
repository: 'aws-observability/aws-application-signals-test-framework'
3939
ref: ${{ env.CALLER_WORKFLOW_NAME == 'main-build' && 'main' || github.ref }}
@@ -50,20 +50,20 @@ jobs:
5050
sleep_time: 60
5151

5252
- name: Configure AWS Credentials
53-
uses: aws-actions/configure-aws-credentials@v4
53+
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #v5.0.0
5454
with:
5555
role-to-assume: arn:aws:iam::${{ env.E2E_TEST_ACCOUNT_ID }}:role/${{ env.E2E_TEST_ROLE_NAME }}
5656
aws-region: us-east-1
5757

5858
- name: Retrieve account
59-
uses: aws-actions/aws-secretsmanager-get-secrets@v1
59+
uses: aws-actions/aws-secretsmanager-get-secrets@a9a7eb4e2f2871d30dc5b892576fde60a2ecc802 #v2.0.10
6060
with:
6161
secret-ids: |
6262
ACCOUNT_ID, adaptive-sampling-region-account/prod-${{ env.E2E_TEST_AWS_REGION }}
6363
6464
# Get the credentials for the adaptive sampling account specifically
6565
- name: Configure AWS Credentials
66-
uses: aws-actions/configure-aws-credentials@v4
66+
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #v5.0.0
6767
with:
6868
role-to-assume: arn:aws:iam::${{ env.ACCOUNT_ID }}:role/${{ env.E2E_TEST_ROLE_NAME }}
6969
aws-region: ${{ env.E2E_TEST_AWS_REGION }}
@@ -163,7 +163,7 @@ jobs:
163163

164164
- name: Refresh AWS Credentials
165165
if: ${{ github.event.repository.name == 'aws-application-signals-test-framework' }}
166-
uses: aws-actions/configure-aws-credentials@v4
166+
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #v5.0.0
167167
with:
168168
role-to-assume: arn:aws:iam::${{ env.ACCOUNT_ID }}:role/${{ env.E2E_TEST_ROLE_NAME }}
169169
aws-region: ${{ env.E2E_TEST_AWS_REGION }}

.github/workflows/java-eks-otlp-ocb-test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
echo TESTING_ID="${{ github.job }}-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}" >> $GITHUB_ENV
7676
echo SAMPLE_APP_NAMESPACE="ns-${{ github.run_id }}-${{ github.run_number }}" >> $GITHUB_ENV
7777
78-
- uses: actions/checkout@v4
78+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #5.0.0
7979
with:
8080
repository: 'aws-observability/aws-application-signals-test-framework'
8181
ref: ${{ env.CALLER_WORKFLOW_NAME == 'main-build' && 'main' || github.ref }}
@@ -102,21 +102,21 @@ jobs:
102102
post-command: "chmod +x install-otel-operator.sh"
103103

104104
- name: Configure AWS Credentials
105-
uses: aws-actions/configure-aws-credentials@v4
105+
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #5.0.0
106106
with:
107107
role-to-assume: arn:aws:iam::${{ env.E2E_TEST_ACCOUNT_ID }}:role/${{ env.E2E_TEST_ROLE_NAME }}
108108
aws-region: us-east-1
109109

110110
- name: Retrieve account
111-
uses: aws-actions/aws-secretsmanager-get-secrets@v2
111+
uses: aws-actions/aws-secretsmanager-get-secrets@a9a7eb4e2f2871d30dc5b892576fde60a2ecc802 #v2.0.10
112112
with:
113113
secret-ids: |
114114
ACCOUNT_ID, otlp-region-account/gamma-${{ env.E2E_TEST_AWS_REGION }}
115115
JAVA_MAIN_SAMPLE_APP_IMAGE, e2e-test/java-main-sample-app-image
116116
JAVA_REMOTE_SAMPLE_APP_IMAGE, e2e-test/java-remote-sample-app-image
117117
118118
- name: Configure AWS Credentials
119-
uses: aws-actions/configure-aws-credentials@v4
119+
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #5.0.0
120120
with:
121121
role-to-assume: arn:aws:iam::${{ env.ACCOUNT_ID }}:role/${{ env.E2E_TEST_ROLE_NAME }}
122122
aws-region: ${{ env.E2E_TEST_AWS_REGION }}
@@ -327,7 +327,7 @@ jobs:
327327
--rollup'
328328

329329
- name: Refresh AWS Credentials
330-
uses: aws-actions/configure-aws-credentials@v4
330+
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #5.0.0
331331
with:
332332
role-to-assume: arn:aws:iam::${{ env.ACCOUNT_ID }}:role/${{ env.E2E_TEST_ROLE_NAME }}
333333
aws-region: ${{ env.E2E_TEST_AWS_REGION }}

0 commit comments

Comments
 (0)