diff options
| author | jessicamack <jmack@redhat.com> | 2024-10-01 01:19:24 +0200 |
|---|---|---|
| committer | jessicamack <jmack@redhat.com> | 2024-10-16 16:50:34 +0200 |
| commit | 42420ebde62695123966c861c730504814915bcb (patch) | |
| tree | 5f84d76ece4afc863df6d3bb7956ecb159ef5ecd /.github | |
| parent | 3rd party auth removal cleanup (diff) | |
| download | awx-42420ebde62695123966c861c730504814915bcb.tar.xz awx-42420ebde62695123966c861c730504814915bcb.zip | |
remove oauth use
Diffstat (limited to '.github')
| -rw-r--r-- | .github/actions/run_awx_devel/action.yml | 7 | ||||
| -rw-r--r-- | .github/workflows/ci.yml | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/.github/actions/run_awx_devel/action.yml b/.github/actions/run_awx_devel/action.yml index 59eb33f62c..e98e6479e2 100644 --- a/.github/actions/run_awx_devel/action.yml +++ b/.github/actions/run_awx_devel/action.yml @@ -13,9 +13,6 @@ outputs: ip: description: The IP of the tools_awx_1 container value: ${{ steps.data.outputs.ip }} - admin-token: - description: OAuth token for admin user - value: ${{ steps.data.outputs.admin_token }} runs: using: composite steps: @@ -62,6 +59,4 @@ runs: shell: bash run: | AWX_IP=$(docker inspect -f '{{.NetworkSettings.Networks.awx.IPAddress}}' tools_awx_1) - ADMIN_TOKEN=$(docker exec -i tools_awx_1 awx-manage create_oauth2_token --user admin) - echo "ip=$AWX_IP" >> $GITHUB_OUTPUT - echo "admin_token=$ADMIN_TOKEN" >> $GITHUB_OUTPUT + echo "ip=$AWX_IP" >> $GITHUB_OUTPUT
\ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5087175710..c60d28f803 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -291,7 +291,8 @@ jobs: echo "::remove-matcher owner=python::" # Disable annoying annotations from setup-python echo '[general]' > ~/.tower_cli.cfg echo 'host = https://${{ steps.awx.outputs.ip }}:8043' >> ~/.tower_cli.cfg - echo 'oauth_token = ${{ steps.awx.outputs.admin-token }}' >> ~/.tower_cli.cfg + echo 'username = admin' >> ~/.tower_cli.cfg + echo 'password = password' >> ~/.tower_cli.cfg echo 'verify_ssl = false' >> ~/.tower_cli.cfg TARGETS="$(ls awx_collection/tests/integration/targets | grep '${{ matrix.target-regex.regex }}' | tr '\n' ' ')" make COLLECTION_VERSION=100.100.100-git COLLECTION_TEST_TARGET="--requirements $TARGETS" test_collection_integration |