Add new arches/OSes for binary_modules tests

test/integration/targets/binary_modules/Makefile

@@ -5,10 +5,12 @@ all:
 	# This avoids a dependency on go and keeps the binaries out of our git repository.
 	# https://ansible-ci-files.s3.amazonaws.com/test/integration/roles/test_binary_modules/
 	cd library; \
-	GOOS=linux   GOARCH=amd64 go build -o helloworld_linux       helloworld.go; \
-	GOOS=windows GOARCH=amd64 go build -o helloworld_win32nt.exe helloworld.go; \
-	GOOS=darwin  GOARCH=amd64 go build -o helloworld_darwin      helloworld.go; \
-	GOOS=freebsd GOARCH=amd64 go build -o helloworld_freebsd     helloworld.go
+	GOOS=linux   GOARCH=amd64   go build -o helloworld_linux_x86_64       helloworld.go; \
+	GOOS=linux   GOARCH=ppc64le go build -o helloworld_linux_ppc64le      helloworld.go; \
+	GOOS=aix     GOARCH=ppc64   go build -o helloworld_aix_chrp           helloworld.go; \
+	GOOS=windows GOARCH=amd64   go build -o helloworld_win32nt_64-bit.exe helloworld.go; \
+	GOOS=darwin  GOARCH=amd64   go build -o helloworld_darwin_x86_64      helloworld.go; \
+	GOOS=freebsd GOARCH=amd64   go build -o helloworld_freebsd_x86_64     helloworld.go
 
 clean:
 	rm -f library/helloworld_*

test/integration/targets/binary_modules/download_binary_modules.yml

@@ -1,21 +1,18 @@
 - hosts: testhost
   tasks:
-    - debug: var=ansible_system
-
-    - name: set module filename (POSIX)
+    # If you change these, change them in the role too.
+    - name: Make our architecture and OS match binary filenames
       set_fact:
-        module_filename: "helloworld_{{ ansible_system | lower }}"
-      when: ansible_system != 'Win32NT'
+        filename: "helloworld_{{ system }}_{{ ansible_architecture }}{{ suffix }}"
+      vars:
+        system: "{{ ansible_system|lower }}"
+        suffix: "{{ '.exe' if system == 'win32nt' else '' }}"
 
-    - name: set module filename (Win32NT)
-      set_fact:
-        module_filename: "helloworld_{{ ansible_system | lower }}.exe"
-      when: ansible_system == 'Win32NT'
 
     - name: download binary module
       tags: test_binary_modules
       get_url:
-        url: "https://ansible-ci-files.s3.amazonaws.com/test/integration/roles/test_binary_modules/{{ module_filename }}"
-        dest: "{{ playbook_dir }}/library/{{ module_filename }}"
+        url: "https://ansible-ci-files.s3.amazonaws.com/test/integration/roles/test_binary_modules/{{ filename }}"
+        dest: "{{ playbook_dir }}/library/{{ filename }}"
         mode: 0755
       delegate_to: localhost

test/integration/targets/binary_modules/roles/test_binary_modules/tasks/main.yml

@@ -8,16 +8,24 @@
   action: win_ping
   when: ansible_system == 'Win32NT'
 
+# If you change these, change them in the download playbook in the target root too.
+- name: Make our architecture and OS match binary filenames
+  set_fact:
+    filename: "helloworld_{{ system }}_{{ ansible_architecture }}{{ suffix }}"
+  vars:
+    system: "{{ ansible_system|lower }}"
+    suffix: "{{ '.exe' if system == 'win32nt' else '' }}"
+
 - name: Hello, World!
-  action: "helloworld_{{ ansible_system|lower }}"
+  action: "{{ filename }}"
   register: hello_world
 
 - assert:
     that:
       - 'hello_world.msg == "Hello, World!"'
 
 - name: Hello, Ansible!
-  action: "helloworld_{{ ansible_system|lower }}"
+  action: "{{ filename }}"
   args:
     name: Ansible
   register: hello_ansible
@@ -27,7 +35,7 @@
       - 'hello_ansible.msg == "Hello, Ansible!"'
 
 - name: Async Hello, World!
-  action: "helloworld_{{ ansible_system|lower }}"
+  action: "{{ filename }}"
   async: 10
   poll: 1
   when: ansible_system != 'Win32NT'
@@ -39,7 +47,7 @@
   when: async_hello_world is not skipped
 
 - name: Async Hello, Ansible!
-  action: "helloworld_{{ ansible_system|lower }}"
+  action: "{{ filename }}"
   args:
     name: Ansible
   async: 10

test/integration/targets/binary_modules_posix/aliases

@@ -1,4 +1,2 @@
 shippable/posix/group3
-needs/target/binary_modules
-skip/aix
-skip/power/centos
+needs/target/binary_modules