Skip to content

Commit 759f495

Browse files
committed
REVERT-ME:Test Build using autobuild image
1 parent fbc63e1 commit 759f495

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

.github/workflows/dotnet-eks-windows-test.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ permissions:
3434
contents: read
3535

3636
env:
37-
E2E_TEST_ACCOUNT_ID: ${{ secrets.XZH_APPLICATION_SIGNALS_E2E_TEST_ACCOUNT_ID }}
38-
ACCOUNT_ID: ${{ secrets.XZH_APPLICATION_SIGNALS_E2E_TEST_ACCOUNT_ID }}
37+
E2E_TEST_ACCOUNT_ID: ${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ACCOUNT_ID }}
3938
E2E_TEST_ROLE_NAME: ${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ROLE_NAME }}
4039
E2E_TEST_AWS_REGION: ${{ inputs.aws-region }}
4140
CLUSTER_NAME: ${{ inputs.test-cluster-name }}
@@ -102,11 +101,11 @@ jobs:
102101
role-to-assume: arn:aws:iam::${{ env.E2E_TEST_ACCOUNT_ID }}:role/${{ env.E2E_TEST_ROLE_NAME }}
103102
aws-region: us-east-1
104103

105-
# - name: Retrieve account
106-
# uses: aws-actions/aws-secretsmanager-get-secrets@v1
107-
# with:
108-
# secret-ids: |
109-
# ACCOUNT_ID, region-account/${{ env.E2E_TEST_AWS_REGION }}
104+
- name: Retrieve account
105+
uses: aws-actions/aws-secretsmanager-get-secrets@v1
106+
with:
107+
secret-ids: |
108+
ACCOUNT_ID, region-account/${{ env.E2E_TEST_AWS_REGION }}
110109
111110
# ADOT_E2E_TEST_ROLE_ARN is used to access main build e2e test cluster
112111
# E2E_TEST_ROLE_ARN is used to access canary e2e test cluster
@@ -429,8 +428,8 @@ jobs:
429428
-var="eks_cluster_name=${{ inputs.test-cluster-name }}" \
430429
-var="test_namespace=${{ env.DOTNET_SAMPLE_APP_NAMESPACE }}" \
431430
-var="service_account_aws_access=service-account-${{ env.TESTING_ID }}" \
432-
-var="dotnet_app_image=${{ env.ACCOUNT_ID }}.dkr.ecr.${{ env.E2E_TEST_AWS_REGION }}.amazonaws.com/${{ secrets.APP_SIGNALS_DOTNET_E2E_FE_SA_IMG }}" \
433-
-var="dotnet_remote_app_image=${{ env.ACCOUNT_ID }}.dkr.ecr.${{ env.E2E_TEST_AWS_REGION }}.amazonaws.com/${{ secrets.APP_SIGNALS_DOTNET_E2E_RE_SA_IMG }}"
431+
-var="dotnet_app_image=${{ env.MAIN_SAMPLE_APP_IMAGE_ARN }}" \
432+
-var="dotnet_remote_app_image=${{ env.REMOTE_SAMPLE_APP_IMAGE_ARN }}"
434433
435434
- name: Remove aws access service account
436435
if: always()

.github/workflows/dotnet-windows-canary.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
strategy:
2929
fail-fast: false
3030
matrix:
31-
aws-region: ['us-east-1']
31+
aws-region: ['eu-west-1']
3232
uses: ./.github/workflows/dotnet-eks-windows-test.yml
3333
secrets: inherit
3434
with:

0 commit comments

Comments
 (0)