Skip to content

Commit 0531e98

Browse files
committed
sync
1 parent 3f31af0 commit 0531e98

File tree

3 files changed

+33
-31
lines changed

3 files changed

+33
-31
lines changed

.github/workflows/main.yml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -17,41 +17,41 @@ on:
1717

1818

1919
jobs:
20-
# automation_controller_job:
21-
# runs-on: ubuntu-latest
22-
# name: Kick off Automation controller job
23-
# steps:
24-
# - name: Load the ansible-cloud action
25-
# id: controller_job
26-
# uses: ansible-cloud/[email protected]
27-
# with:
28-
# controller_host: ${{ secrets.CONTROLLER_HOST }}
29-
# controller_username: ${{ secrets.CONTROLLER_USERNAME }}
30-
# controller_password: ${{ secrets.CONTROLLER_PASSWORD }}
31-
# job_template: "AWS - ec2 enforce owner tag"
32-
# extra_vars: "your_region=us-west-1"
33-
# validate_certs: false
34-
workshop_job_provision:
20+
automation_controller_job:
3521
runs-on: ubuntu-latest
36-
name: Test provision workshop and teardown
22+
name: Kick off Automation controller job
3723
steps:
38-
- name: Load the ansible-cloud action for provision
39-
id: workshop_provision
40-
uses: ansible-cloud/[email protected]
41-
with:
42-
controller_host: ${{ secrets.CONTROLLER_HOST }}
43-
controller_username: ${{ secrets.CONTROLLER_USERNAME }}
44-
controller_password: ${{ secrets.CONTROLLER_PASSWORD }}
45-
job_template: "Workshop Provision Job"
46-
extra_vars: "ec2_name_prefix=github-action-test-sean"
47-
validate_certs: false
48-
- name: Load the ansible-cloud action for teardown
49-
id: workshop_teardown
24+
- name: Load the ansible-cloud action
25+
id: controller_job
5026
uses: ansible-cloud/[email protected]
5127
with:
5228
controller_host: ${{ secrets.CONTROLLER_HOST }}
5329
controller_username: ${{ secrets.CONTROLLER_USERNAME }}
5430
controller_password: ${{ secrets.CONTROLLER_PASSWORD }}
55-
job_template: "Teardown Workshop"
56-
extra_vars: "ec2_name_prefix=github-action-test-sean"
31+
job_template: "AWS - ec2 enforce owner tag"
32+
extra_vars: "your_region=us-west-1"
5733
validate_certs: false
34+
# workshop_job_provision:
35+
# runs-on: ubuntu-latest
36+
# name: Test provision workshop and teardown
37+
# steps:
38+
# - name: Load the ansible-cloud action for provision
39+
# id: workshop_provision
40+
# uses: ansible-cloud/[email protected]
41+
# with:
42+
# controller_host: ${{ secrets.CONTROLLER_HOST }}
43+
# controller_username: ${{ secrets.CONTROLLER_USERNAME }}
44+
# controller_password: ${{ secrets.CONTROLLER_PASSWORD }}
45+
# job_template: "Workshop Provision Job"
46+
# extra_vars: "ec2_name_prefix=github-action-test-sean"
47+
# validate_certs: false
48+
# - name: Load the ansible-cloud action for teardown
49+
# id: workshop_teardown
50+
# uses: ansible-cloud/[email protected]
51+
# with:
52+
# controller_host: ${{ secrets.CONTROLLER_HOST }}
53+
# controller_username: ${{ secrets.CONTROLLER_USERNAME }}
54+
# controller_password: ${{ secrets.CONTROLLER_PASSWORD }}
55+
# job_template: "Teardown Workshop"
56+
# extra_vars: "ec2_name_prefix=github-action-test-sean"
57+
# validate_certs: false

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@ RUN pip3 install pip --upgrade
66
RUN pip3 install ansible-core
77
RUN ansible-galaxy collection install awx.awx
88
RUN ansible-galaxy collection install community.general
9+
RUN ansible-galaxy collection install ansible.posix
910
RUN chmod +x /entrypoint.sh
1011
ENTRYPOINT ["/entrypoint.sh"]

entrypoint.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ tee ansible.cfg << EOF
2828
[defaults]
2929
COLLECTIONS_PATHS = /root/.ansible/collections
3030
stdout_callback=community.general.yaml
31+
callbacks_enabled=ansible.posix.profile_tasks
3132
3233
EOF
3334

@@ -68,7 +69,7 @@ tee playbook.yml << EOF
6869
when: job_template_var|length > 0 or workflow_template_var|length > 0
6970
awx.awx.job_wait:
7071
job_id: "{{ job_output.id }}"
71-
timeout: 1800
72+
timeout: 3600
7273
validate_certs: "$CONTROLLER_VERIFY_SSL"
7374
controller_username: "$CONTROLLER_USERNAME"
7475
controller_password: "$CONTROLLER_PASSWORD"

0 commit comments

Comments
 (0)