Skip to content

Commit adcfcd7

Browse files
d4l3kfacebook-github-bot
authored andcommitted
github/workflows: switch to configure-aws-credentials (#386)
Summary: Our integration tests are hitting an error when acquiring AWS credentials. ``` botocore.errorfactory.InvalidIdentityTokenException: An error occurred (InvalidIdentityToken) when calling the AssumeRoleWithWebIdentity operation: Couldn't retrieve verification key from your identity provider, please reference AssumeRoleWithWebIdentity documentation for requirements ``` https://github.com/pytorch/torchx/runs/5147711223?check_suite_focus=true This switches to the `aws-actions/configure-aws-credentials` GitHub action since it includes retries as of aws-actions/configure-aws-credentials#350 Pull Request resolved: #386 Test Plan: CI Reviewed By: kiukchung Differential Revision: D34158910 Pulled By: d4l3k fbshipit-source-id: 6b6b9516b0233ea5b0f05f0fc5e6483829587c82
1 parent 90f2eb5 commit adcfcd7

5 files changed

+30
-70
lines changed

.github/workflows/aws-batch-integration-tests.yaml

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,12 @@ jobs:
2020
architecture: x64
2121
- name: Checkout TorchX
2222
uses: actions/checkout@v2
23-
- name: Configure AWS
24-
env:
25-
AWS_ROLE_ARN: ${{ secrets.AWS_ROLE_ARN }}
26-
run: |
27-
if [ -n "$AWS_ROLE_ARN" ]; then
28-
export AWS_WEB_IDENTITY_TOKEN_FILE=/tmp/awscreds
29-
export AWS_DEFAULT_REGION=us-west-2
30-
31-
echo AWS_WEB_IDENTITY_TOKEN_FILE=$AWS_WEB_IDENTITY_TOKEN_FILE >> $GITHUB_ENV
32-
echo AWS_ROLE_ARN=$AWS_ROLE_ARN >> $GITHUB_ENV
33-
echo AWS_DEFAULT_REGION=$AWS_DEFAULT_REGION >> $GITHUB_ENV
34-
35-
curl -H "Authorization: bearer $ACTIONS_ID_TOKEN_REQUEST_TOKEN" "$ACTIONS_ID_TOKEN_REQUEST_URL" | jq -r '.value' > $AWS_WEB_IDENTITY_TOKEN_FILE
36-
fi
23+
- name: Configure AWS Credentials
24+
uses: aws-actions/[email protected]
25+
with:
26+
aws-region: us-west-2
27+
role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
28+
role-session-name: github-torchx
3729
- name: Install dependencies
3830
run: |
3931
set -eux

.github/workflows/components-integration-tests.yaml

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,12 @@ jobs:
2020
architecture: x64
2121
- name: Checkout TorchX
2222
uses: actions/checkout@v2
23-
- name: Configure AWS
24-
env:
25-
AWS_ROLE_ARN: ${{ secrets.AWS_ROLE_ARN }}
26-
run: |
27-
if [ -n "$AWS_ROLE_ARN" ]; then
28-
export AWS_WEB_IDENTITY_TOKEN_FILE=/tmp/awscreds
29-
export AWS_DEFAULT_REGION=us-west-2
30-
31-
echo AWS_WEB_IDENTITY_TOKEN_FILE=$AWS_WEB_IDENTITY_TOKEN_FILE >> $GITHUB_ENV
32-
echo AWS_ROLE_ARN=$AWS_ROLE_ARN >> $GITHUB_ENV
33-
echo AWS_DEFAULT_REGION=$AWS_DEFAULT_REGION >> $GITHUB_ENV
34-
35-
curl -H "Authorization: bearer $ACTIONS_ID_TOKEN_REQUEST_TOKEN" "$ACTIONS_ID_TOKEN_REQUEST_URL" | jq -r '.value' > $AWS_WEB_IDENTITY_TOKEN_FILE
36-
fi
23+
- name: Configure AWS Credentials
24+
uses: aws-actions/[email protected]
25+
with:
26+
aws-region: us-west-2
27+
role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
28+
role-session-name: github-torchx
3729
- name: Configure Kube Config
3830
env:
3931
AWS_ROLE_ARN: ${{ secrets.AWS_ROLE_ARN }}

.github/workflows/kfp-integration-tests.yaml

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,12 @@ jobs:
2121
mkdir -p ~/.local/bin/kubectl
2222
mv ./kubectl ~/.local/bin/kubectl
2323
export PATH=$PATH:~/.local/bin/kubectl
24-
- name: Configure AWS
25-
env:
26-
AWS_ROLE_ARN: ${{ secrets.AWS_ROLE_ARN }}
27-
run: |
28-
if [ -n "$AWS_ROLE_ARN" ]; then
29-
export AWS_WEB_IDENTITY_TOKEN_FILE=/tmp/awscreds
30-
export AWS_DEFAULT_REGION=us-west-2
31-
32-
echo AWS_WEB_IDENTITY_TOKEN_FILE=$AWS_WEB_IDENTITY_TOKEN_FILE >> $GITHUB_ENV
33-
echo AWS_ROLE_ARN=$AWS_ROLE_ARN >> $GITHUB_ENV
34-
echo AWS_DEFAULT_REGION=$AWS_DEFAULT_REGION >> $GITHUB_ENV
35-
36-
curl -H "Authorization: bearer $ACTIONS_ID_TOKEN_REQUEST_TOKEN" "$ACTIONS_ID_TOKEN_REQUEST_URL" | jq -r '.value' > $AWS_WEB_IDENTITY_TOKEN_FILE
37-
fi
24+
- name: Configure AWS Credentials
25+
uses: aws-actions/[email protected]
26+
with:
27+
aws-region: us-west-2
28+
role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
29+
role-session-name: github-torchx
3830
- name: Configure Kube Config
3931
env:
4032
AWS_ROLE_ARN: ${{ secrets.AWS_ROLE_ARN }}

.github/workflows/kubernetes-dist-train-integration-tests.yaml

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,12 @@ jobs:
2020
architecture: x64
2121
- name: Checkout TorchX
2222
uses: actions/checkout@v2
23-
- name: Configure AWS
24-
env:
25-
AWS_ROLE_ARN: ${{ secrets.AWS_ROLE_ARN }}
26-
run: |
27-
if [ -n "$AWS_ROLE_ARN" ]; then
28-
export AWS_WEB_IDENTITY_TOKEN_FILE=/tmp/awscreds
29-
export AWS_DEFAULT_REGION=us-west-2
30-
31-
echo AWS_WEB_IDENTITY_TOKEN_FILE=$AWS_WEB_IDENTITY_TOKEN_FILE >> $GITHUB_ENV
32-
echo AWS_ROLE_ARN=$AWS_ROLE_ARN >> $GITHUB_ENV
33-
echo AWS_DEFAULT_REGION=$AWS_DEFAULT_REGION >> $GITHUB_ENV
34-
35-
curl -H "Authorization: bearer $ACTIONS_ID_TOKEN_REQUEST_TOKEN" "$ACTIONS_ID_TOKEN_REQUEST_URL" | jq -r '.value' > $AWS_WEB_IDENTITY_TOKEN_FILE
36-
fi
23+
- name: Configure AWS Credentials
24+
uses: aws-actions/[email protected]
25+
with:
26+
aws-region: us-west-2
27+
role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
28+
role-session-name: github-torchx
3729
- name: Configure Kube Config
3830
env:
3931
AWS_ROLE_ARN: ${{ secrets.AWS_ROLE_ARN }}

.github/workflows/slurm-integration-tests.yaml

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,12 @@ jobs:
2020
architecture: x64
2121
- name: Checkout TorchX
2222
uses: actions/checkout@v2
23-
- name: Configure AWS
24-
env:
25-
AWS_ROLE_ARN: ${{ secrets.AWS_ROLE_ARN }}
26-
run: |
27-
if [ -n "$AWS_ROLE_ARN" ]; then
28-
export AWS_WEB_IDENTITY_TOKEN_FILE=/tmp/awscreds
29-
export AWS_DEFAULT_REGION=us-west-2
30-
31-
echo AWS_WEB_IDENTITY_TOKEN_FILE=$AWS_WEB_IDENTITY_TOKEN_FILE >> $GITHUB_ENV
32-
echo AWS_ROLE_ARN=$AWS_ROLE_ARN >> $GITHUB_ENV
33-
echo AWS_DEFAULT_REGION=$AWS_DEFAULT_REGION >> $GITHUB_ENV
34-
35-
curl -H "Authorization: bearer $ACTIONS_ID_TOKEN_REQUEST_TOKEN" "$ACTIONS_ID_TOKEN_REQUEST_URL" | jq -r '.value' > $AWS_WEB_IDENTITY_TOKEN_FILE
36-
fi
23+
- name: Configure AWS Credentials
24+
uses: aws-actions/[email protected]
25+
with:
26+
aws-region: us-west-2
27+
role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
28+
role-session-name: github-torchx
3729
- name: Install Dependencies
3830
run:
3931
set -ex

0 commit comments

Comments
 (0)