From 0da5c2cac7a0dbde225833fd48be82a0ef689c00 Mon Sep 17 00:00:00 2001 From: Tadas Sutkaitis Date: Wed, 15 Mar 2023 10:00:40 +0100 Subject: [PATCH] add: awx 21.13.0 support --- Dockerfile | 2 +- README.md | 16 ++++++++++------ entrypoint.sh | 4 ++-- requirements.txt | 2 +- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5286206..464dd45 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM t42x/awxkit_base:21.11.0 +FROM t42x/awxkit_base:21.13.0 ADD entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh diff --git a/README.md b/README.md index 66380cc..a3d0537 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,10 @@ This Github action aims to interact with AWX or Tower servers. It connects to an AWX or Tower server and launches a job or workflow_job template or updates project. +> **Note** +> +> For best compatibility and if it possible always use the identical version of this action to your installed AWX version. + ## Usage See [action.yml](action.yml) @@ -17,7 +21,7 @@ See [action.yml](action.yml) runs-on: ubuntu-latest steps: - name: "Test AWX: Simple job template" - uses: fitbeard/action-trigger-awx@v1 + uses: fitbeard/action-trigger-awx@v21.13.0 with: tower_url: ${{ secrets.TOWER_HOST }} tower_token: ${{ secrets.TOWER_OAUTH_TOKEN }} @@ -25,7 +29,7 @@ See [action.yml](action.yml) resource_name: actions-awxkit-test - name: "Test AWX: Simple workflow template" - uses: fitbeard/action-trigger-awx@v1 + uses: fitbeard/action-trigger-awx@v21.13.0 with: tower_url: ${{ secrets.TOWER_HOST }} tower_token: ${{ secrets.TOWER_OAUTH_TOKEN }} @@ -33,7 +37,7 @@ See [action.yml](action.yml) resource_name: actions-awxkit-workflow-test - name: "Test AWX: Project update" - uses: fitbeard/action-trigger-awx@v1 + uses: fitbeard/action-trigger-awx@v21.13.0 with: tower_url: ${{ secrets.TOWER_HOST }} tower_token: ${{ secrets.TOWER_OAUTH_TOKEN }} @@ -41,7 +45,7 @@ See [action.yml](action.yml) resource_name: ansible-project - name: "Test AWX: Random options job template 1" - uses: fitbeard/action-trigger-awx@v1 + uses: fitbeard/action-trigger-awx@v21.13.0 with: tower_url: ${{ secrets.TOWER_HOST }} tower_token: ${{ secrets.TOWER_OAUTH_TOKEN }} @@ -52,7 +56,7 @@ See [action.yml](action.yml) timeout: 300 - name: "Test AWX: Random options job template 2" - uses: fitbeard/action-trigger-awx@v1 + uses: fitbeard/action-trigger-awx@v21.13.0 with: tower_url: ${{ secrets.TOWER_HOST }} tower_token: ${{ secrets.TOWER_OAUTH_TOKEN }} @@ -66,7 +70,7 @@ See [action.yml](action.yml) skip_tags: "nonsense" - name: "Test AWX: Simple job template without waiting" - uses: fitbeard/action-trigger-awx@v1 + uses: fitbeard/action-trigger-awx@v21.13.0 with: tower_url: ${{ secrets.TOWER_HOST }} tower_token: ${{ secrets.TOWER_OAUTH_TOKEN }} diff --git a/entrypoint.sh b/entrypoint.sh index 1e6518a..1c2de26 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -56,9 +56,9 @@ else fi if [ -z "$TIMEOUT" ]; then - TIMEOUT_VALUE="--timeout 3600" + TIMEOUT_VALUE="--action-timeout 3600" else - TIMEOUT_VALUE="--timeout $TIMEOUT" + TIMEOUT_VALUE="--action-timeout $TIMEOUT" fi if [ -z "$INVENTORY" ]; then diff --git a/requirements.txt b/requirements.txt index 4d0e72c..0b751e1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -awxkit==21.11.0 +awxkit==21.13.0