Skip to content

Commit

Permalink
chore(ci): adopt METAL_AUTH_TOKEN to align with other tools (#201)
Browse files Browse the repository at this point in the history
  • Loading branch information
ctreatma authored Aug 6, 2024
2 parents 60c99f0 + 4a104ad commit 2ad8a88
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,6 @@ jobs:
- name: run tests
run: make testall
env:
METAL_API_TOKEN: ${{ secrets.METAL_API_TOKEN }}
METAL_AUTH_TOKEN: ${{ secrets.METAL_AUTH_TOKEN }}
ANSIBLE_ACC_METAL_DEDICATED_CONNECTION_ID: ${{ secrets.ANSIBLE_ACC_METAL_DEDICATED_CONNECTION_ID }}

3 changes: 1 addition & 2 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ jobs:
defaults:
run:
working-directory: .ansible/collections/ansible_collections/equinix/cloud
environment: 'METAL_API_TOKEN'
steps:
- name: checkout repo
uses: actions/checkout@v3
Expand Down Expand Up @@ -50,5 +49,5 @@ jobs:
- name: run tests
run: make testall
env:
METAL_API_TOKEN: ${{ secrets.METAL_API_TOKEN }}
METAL_AUTH_TOKEN: ${{ secrets.METAL_AUTH_TOKEN }}
ANSIBLE_ACC_METAL_DEDICATED_CONNECTION_ID: ${{ secrets.ANSIBLE_ACC_METAL_DEDICATED_CONNECTION_ID }}
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ integration-test: create-integration-config
ansible-test integration $(TEST_ARGS)

create-integration-config:
ifneq ("${METAL_API_TOKEN}", "")
@echo "metal_api_token: ${METAL_API_TOKEN}" > $(INTEGRATION_CONFIG);
ifneq ("${METAL_AUTH_TOKEN}", "")
@echo "metal_api_token: ${METAL_AUTH_TOKEN}" > $(INTEGRATION_CONFIG);
else
echo "METAL_API_TOKEN must be set"; \
echo "METAL_AUTH_TOKEN must be set"; \
exit 1;
endif
echo "metal_ua_prefix: E2E" >> $(INTEGRATION_CONFIG)
Expand Down

0 comments on commit 2ad8a88

Please sign in to comment.