Skip to content

Commit

Permalink
ansible: fixes for AIX (#2561)
Browse files Browse the repository at this point in the history
Fixes a couple of errors introduced by #2539.

* ansible: fix mounting /aha on AIX

Mounting ahafs on AIX will fail if already mounted.

* ansible: fix syntax error in tap2junit/aix.yml
  • Loading branch information
richardlau committed Mar 10, 2021
1 parent f8efa3a commit f95880c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
11 changes: 7 additions & 4 deletions ansible/roles/bootstrap/tasks/partials/aix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,17 @@
# This is to mount the AIX file event infrastructure to get the file watcher tests passing

- name: check for /aha filesystem
stat:
path: /aha
ansible.builtin.find:
file_type: any
paths: /aha
register: ahafs

- name: create /aha filesystem
when: ahafs.stat.exists == false
raw: mkdir /aha
ansible.builtin.file:
path: /aha
state: directory

- name: Mount /aha filesystem
shell:
cmd: mount -v ahafs /aha /aha
when: ahafs.matched == 0
4 changes: 2 additions & 2 deletions ansible/roles/jenkins-worker/tasks/partials/tap2junit/aix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@

- name: install pip AIX71
raw: /usr/bin/python /home/iojs/get-pip.py
when: pip_exists.stat.exists == False && os == "aix71"
when: pip_exists.stat.exists == False and os == "aix71"

- name: install pip AIX72
raw: /opt/bin/python3 /home/iojs/get-pip.py
when: pip_exists.stat.exists == False && os == "aix72"
when: pip_exists.stat.exists == False and os == "aix72"

- name: create symbolic link AIX71
file:
Expand Down

0 comments on commit f95880c

Please sign in to comment.