Skip to content

Commit

Permalink
Merge pull request #17 from fitbeard/add/awx_21.13.0
Browse files Browse the repository at this point in the history
add: awx 21.13.0 support
  • Loading branch information
fitbeard authored Mar 15, 2023
2 parents 5261b6a + 0da5c2c commit 7c7393d
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
16 changes: 10 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -17,31 +21,31 @@ 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 }}
resource_type: job_template
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 }}
resource_type: workflow_job_template
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 }}
resource_type: project
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 }}
Expand All @@ -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 }}
Expand All @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
awxkit==21.11.0
awxkit==21.13.0

0 comments on commit 7c7393d

Please sign in to comment.