Camel-case AWS CI variables
This commit is contained in:
parent
06c30ea634
commit
c51f0d24da
|
@ -17,8 +17,8 @@ runs:
|
||||||
steps:
|
steps:
|
||||||
- uses: aws-actions/configure-aws-credentials@v1
|
- uses: aws-actions/configure-aws-credentials@v1
|
||||||
with:
|
with:
|
||||||
aws-access-key-id: ${{ env.AWS-ACCESS-KEY-ID }}
|
aws-access-key-id: ${{ env.AWS_ACCESS_KEY_ID }}
|
||||||
aws-secret-access-key: ${{ env.AWS-SECRET-ACCESS-KEY }}
|
aws-secret-access-key: ${{ env.AWS_SECRET_ACCESS_KEY }}
|
||||||
aws-region: ${{ env.AWS-DEFAULT-REGION }}
|
aws-region: ${{ env.AWS_DEFAULT_REGION }}
|
||||||
- run: .github/scripts/change-workflow-instance-states.py ${{ inputs.platform }} ${{ github.run_id }} ${{ inputs.new-state }} ${{ inputs.github-token }}
|
- run: .github/scripts/change-workflow-instance-states.py ${{ inputs.platform }} ${{ github.run_id }} ${{ inputs.new-state }} ${{ inputs.github-token }}
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
|
@ -6,9 +6,9 @@ runs:
|
||||||
steps:
|
steps:
|
||||||
- uses: aws-actions/configure-aws-credentials@v1
|
- uses: aws-actions/configure-aws-credentials@v1
|
||||||
with:
|
with:
|
||||||
aws-access-key-id: ${{ env.AWS-ACCESS-KEY-ID }}
|
aws-access-key-id: ${{ env.AWS_ACCESS_KEY_ID }}
|
||||||
aws-secret-access-key: ${{ env.AWS-SECRET-ACCESS-KEY }}
|
aws-secret-access-key: ${{ env.AWS_SECRET_ACCESS_KEY }}
|
||||||
aws-region: ${{ env.AWS-DEFAULT-REGION }}
|
aws-region: ${{ env.AWS_DEFAULT_REGION }}
|
||||||
- name: Install SSH key
|
- name: Install SSH key
|
||||||
uses: shimataro/ssh-key-action@v2
|
uses: shimataro/ssh-key-action@v2
|
||||||
with:
|
with:
|
||||||
|
|
|
@ -44,9 +44,9 @@ ci_repo_name = os.environ['GITHUB_REPOSITORY'] if not RUN_LOCAL else ""
|
||||||
# The following are environment variables used by AWS and AZURE to setup the corresponding
|
# The following are environment variables used by AWS and AZURE to setup the corresponding
|
||||||
# self-hosted Github Actions Runners
|
# self-hosted Github Actions Runners
|
||||||
|
|
||||||
ci_aws_access_key_id = os.environ['AWS-ACCESS-KEY-ID'] if not RUN_LOCAL else ""
|
ci_aws_access_key_id = os.environ['AWS_ACCESS_KEY_ID'] if not RUN_LOCAL else ""
|
||||||
ci_aws_secret_access_key = os.environ['AWS-SECRET-ACCESS-KEY'] if not RUN_LOCAL else ""
|
ci_aws_secret_access_key = os.environ['AWS_SECRET_ACCESS_KEY'] if not RUN_LOCAL else ""
|
||||||
ci_aws_default_region = os.environ['AWS-DEFAULT-REGION'] if not RUN_LOCAL else ""
|
ci_aws_default_region = os.environ['AWS_DEFAULT_REGION'] if not RUN_LOCAL else ""
|
||||||
|
|
||||||
ci_azure_client_id = os.environ['AZURE_CLIENT_ID'] if (not RUN_LOCAL) or RUN_AZURE_CREDITED_ENV else ""
|
ci_azure_client_id = os.environ['AZURE_CLIENT_ID'] if (not RUN_LOCAL) or RUN_AZURE_CREDITED_ENV else ""
|
||||||
ci_azure_client_secret = os.environ['AZURE_CLIENT_SECRET'] if (not RUN_LOCAL) or RUN_AZURE_CREDITED_ENV else ""
|
ci_azure_client_secret = os.environ['AZURE_CLIENT_SECRET'] if (not RUN_LOCAL) or RUN_AZURE_CREDITED_ENV else ""
|
||||||
|
|
|
@ -10,9 +10,9 @@ def run_aws_configure() -> None:
|
||||||
|
|
||||||
with cd(manager_fsim_dir), prefix("source ./sourceme-f1-manager.sh"):
|
with cd(manager_fsim_dir), prefix("source ./sourceme-f1-manager.sh"):
|
||||||
run(".github/scripts/firesim-managerinit.expect {} {} {}".format(
|
run(".github/scripts/firesim-managerinit.expect {} {} {}".format(
|
||||||
os.environ["AWS-ACCESS-KEY-ID"],
|
os.environ["AWS_ACCESS_KEY_ID"],
|
||||||
os.environ["AWS-SECRET-ACCESS-KEY"],
|
os.environ["AWS_SECRET_ACCESS_KEY"],
|
||||||
os.environ["AWS-DEFAULT-REGION"]))
|
os.environ["AWS_DEFAULT_REGION"]))
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
set_fabric_firesim_pem()
|
set_fabric_firesim_pem()
|
||||||
|
|
|
@ -7,9 +7,9 @@ on:
|
||||||
env:
|
env:
|
||||||
PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_A_PERSONAL_ACCESS_TOKEN }}
|
PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_A_PERSONAL_ACCESS_TOKEN }}
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
AWS-ACCESS-KEY-ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
|
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
|
||||||
AWS-SECRET-ACCESS-KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
|
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
|
||||||
AWS-DEFAULT-REGION: ${{ secrets.AWS_DEFAULT_REGION }}
|
AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
|
||||||
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
|
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
|
||||||
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
|
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
|
||||||
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
|
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
|
||||||
|
|
|
@ -16,9 +16,9 @@ on:
|
||||||
|
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
AWS-ACCESS-KEY-ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
|
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
|
||||||
AWS-SECRET-ACCESS-KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
|
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
|
||||||
AWS-DEFAULT-REGION: ${{ secrets.AWS_DEFAULT_REGION }}
|
AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
|
||||||
FIRESIM_PEM: ${{ secrets.FIRESIM_PEM }}
|
FIRESIM_PEM: ${{ secrets.FIRESIM_PEM }}
|
||||||
FIRESIM-REPO-DEP-KEY: ${{ secrets.FIRESIM_REPO_DEP_KEY }}
|
FIRESIM-REPO-DEP-KEY: ${{ secrets.FIRESIM_REPO_DEP_KEY }}
|
||||||
MANAGER_FIRESIM_LOCATION: "~/firesim"
|
MANAGER_FIRESIM_LOCATION: "~/firesim"
|
||||||
|
|
|
@ -10,9 +10,9 @@ on:
|
||||||
env:
|
env:
|
||||||
PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_A_PERSONAL_ACCESS_TOKEN }}
|
PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_A_PERSONAL_ACCESS_TOKEN }}
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
AWS-ACCESS-KEY-ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
|
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
|
||||||
AWS-SECRET-ACCESS-KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
|
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
|
||||||
AWS-DEFAULT-REGION: ${{ secrets.AWS_DEFAULT_REGION }}
|
AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
|
||||||
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
|
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
|
||||||
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
|
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
|
||||||
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
|
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
|
||||||
|
|
Loading…
Reference in New Issue