Skip to content

Commit e1507b6

Browse files
committed
additional changes needed after running the playbook
1 parent 48e07d7 commit e1507b6

File tree

4 files changed

+53
-9
lines changed

4 files changed

+53
-9
lines changed

ansible.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ become_method = sudo
2626

2727
[hosts:aix]
2828
ansible_python_interpreter = /opt/freeware/libexec/python3
29+
ansible_remote_tmp = /tmp
2930

3031
[hosts:smartos]
3132
ansible_python_interpreter = /opt/local/bin/python

ansible/roles/baselayout/tasks/partials/clang/aix.yml

Lines changed: 47 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,51 @@
33
# Downloads and installs clang
44
#
55

6-
- name: "clang : extract tarball - aix"
7-
ansible.builtin.unarchive:
8-
src: https://github.com/IBM/llvm-project/releases/download/llvmorg-20.1.7/clang+llvm-20.1.7-powerpc64-ibm-aix-7.2.tar.xz
9-
dest: /opt
6+
# - name: "clang : extract tarball - aix"
7+
# ansible.builtin.unarchive:
8+
# src: https://github.com/IBM/llvm-project/releases/download/llvmorg-20.1.7/clang+llvm-20.1.7-powerpc64-ibm-aix-7.2.tar.xz
9+
# dest: /opt
10+
# remote_src: yes
11+
12+
13+
- name: Check if clang is already installed
14+
changed_when: no
15+
check_mode: no
16+
command: "/opt/clang+llvm-20.1.7-powerpc64-ibm-aix-7.2/bin/clang --version"
17+
register: clang
18+
ignore_errors: yes
19+
20+
# If we're already using the latest there is no need to do anything.
21+
# TODO improve the error handling
22+
- name: check existing clang version is up to date
23+
set_fact:
24+
update_clang: "{{ 'clang version 20.1.7' not in clang.stdout }}"
25+
26+
- name: create cache directory for clang binaries
27+
file:
28+
path: "/var/cache/clang-binaries"
29+
state: directory
30+
when: update_clang == True
31+
32+
- name: download clang binary
33+
get_url:
34+
checksum: sha256:a18aea07f5b977e64bc7fe7358e95897c7ba05fbe68eeefb1614631347be4b3a
35+
dest: "/var/cache/clang-binaries/clang+llvm-20.1.7-powerpc64-ibm-aix-7.2.tar.xz"
36+
url: "https://github.com/IBM/llvm-project/releases/download/llvmorg-20.1.7/clang+llvm-20.1.7-powerpc64-ibm-aix-7.2.tar.xz"
37+
register: clang_local
38+
when: update_clang == True
39+
40+
- name: unpack clang binary
41+
register: clang_unpacked
42+
unarchive:
43+
dest: "/opt/"
44+
list_files: yes
1045
remote_src: yes
46+
src: "{{ clang_local.dest }}"
47+
when: update_clang == True
48+
49+
50+
- name: Check if we have a runnable clang
51+
changed_when: no
52+
check_mode: no
53+
ansible.builtin.command: "/opt/clang+llvm-20.1.7-powerpc64-ibm-aix-7.2/bin/clang --version"

ansible/roles/baselayout/vars/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ common_packages: [
3737
# % ansible -m debug -a "var=os" HOST
3838
packages: {
3939
aix: [
40-
'bash,cmake,coreutils,curl,gcc-c++,tar,unzip,git,make,sudo,python3-setuptools,python3',
40+
'bash,cmake,coreutils,curl,gcc-c++,tar,unzip,git,make,sudo,python3-setuptools,python3,xz',
4141
],
4242

4343
# Appears to be some issue with the Ansible dnf task on AIX and gcc10-c++, so handle separately.

ansible/roles/bootstrap/tasks/partials/aix.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
size: 6G
1717
state: present
1818

19-
- name: Set size of /var to 2G
19+
- name: Set size of /var to 5G
2020
aix_filesystem:
2121
filesystem: /var
22-
size: 2G
22+
size: 5G
2323
state: present
2424

2525
- name: Set size of /tmp to 2G
@@ -34,10 +34,10 @@
3434
size: 50G
3535
state: present
3636

37-
- name: Set size of /opt to 5G
37+
- name: Set size of /opt to 12G
3838
aix_filesystem:
3939
filesystem: /opt
40-
size: 5G
40+
size: 12G
4141
state: present
4242

4343
# This is to mount the AIX file event infrastructure to get the file watcher tests passing

0 commit comments

Comments
 (0)