diff --git a/inventory/host_vars/armv7-test01.fedorainfracloud.org b/inventory/host_vars/armv7-test01.fedorainfracloud.org new file mode 100644 index 0000000000..79ef8f12d1 --- /dev/null +++ b/inventory/host_vars/armv7-test01.fedorainfracloud.org @@ -0,0 +1,36 @@ +--- +vmhost: cloudvmhost-aarch64-01.fedorainfracloud.org +eth0_ip: 38.145.48.52 +nm: 255.255.254.0 +gw: 38.145.49.254 +dns: 8.8.8.8 +ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora-31-ext-aarch64 +ks_repo: http://infrastructure.fedoraproject.org/pub/fedora/linux/releases/31/Server/aarch64/os/ + +virt_install_command_one_nic: virt-install -n {{ inventory_hostname }} + --memory={{ mem_size }},maxmemory={{ max_mem_size }} + --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} + --vcpus={{ num_cpus }},maxvcpus={{ max_cpu }} -l {{ ks_repo }} -x + 'net.ifnames=0 ksdevice=eth0 ks={{ ks_url }} console=ttyS0 + hostname={{ inventory_hostname }} nameserver={{ dns }} + ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none' + --network bridge={{ main_bridge }},model=virtio,mac={{ mac_address }} + --autostart --noautoconsole --rng /dev/random + +volgroup: /dev/vg_guests +lvm_size: 140000 +mem_size: 40960 +max_mem_size: "{{ mem_size }}" +num_cpus: 5 +datacenter: cloud + +nagios_Check_Services: + mail: false + nrpe: false + sshd: false + named: false + dhcpd: false + httpd: false + swap: false + ping: false + raid: false diff --git a/inventory/host_vars/armv7-test02.fedorainfracloud.org b/inventory/host_vars/armv7-test02.fedorainfracloud.org new file mode 100644 index 0000000000..cb0a54f178 --- /dev/null +++ b/inventory/host_vars/armv7-test02.fedorainfracloud.org @@ -0,0 +1,36 @@ +--- +vmhost: cloudvmhost-aarch64-01.fedorainfracloud.org +eth0_ip: 38.145.48.50 +nm: 255.255.254.0 +gw: 38.145.49.254 +dns: 8.8.8.8 +ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora-31-ext-aarch64 +ks_repo: http://infrastructure.fedoraproject.org/pub/fedora/linux/releases/31/Server/aarch64/os/ + +virt_install_command_one_nic: virt-install -n {{ inventory_hostname }} + --memory={{ mem_size }},maxmemory={{ max_mem_size }} + --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} + --vcpus={{ num_cpus }},maxvcpus={{ max_cpu }} -l {{ ks_repo }} -x + 'net.ifnames=0 ksdevice=eth0 ks={{ ks_url }} console=ttyS0 + hostname={{ inventory_hostname }} nameserver={{ dns }} + ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none' + --network bridge={{ main_bridge }},model=virtio,mac={{ mac_address }} + --autostart --noautoconsole --rng /dev/random + +volgroup: /dev/vg_guests +lvm_size: 140000 +mem_size: 40960 +max_mem_size: "{{ mem_size }}" +num_cpus: 5 +datacenter: cloud + +nagios_Check_Services: + mail: false + nrpe: false + sshd: false + named: false + dhcpd: false + httpd: false + swap: false + ping: false + raid: false diff --git a/inventory/inventory b/inventory/inventory index 70216cb919..eb4f184366 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -957,6 +957,10 @@ ppc64le-test.fedorainfracloud.org aarch64-test01.fedorainfracloud.org aarch64-test02.fedorainfracloud.org +[armv7_test] +armv7-test01.fedorainfracloud.org +armv7-test02.fedorainfracloud.org + [osuosl] proxy06.fedoraproject.org diff --git a/playbooks/groups/maintainer-test.yml b/playbooks/groups/maintainer-test.yml index ce678275f2..d417251be5 100644 --- a/playbooks/groups/maintainer-test.yml +++ b/playbooks/groups/maintainer-test.yml @@ -1,7 +1,7 @@ -- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=aarch64_test" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=aarch64_test:armv7_test" - name: Do some basic cloud setup on them - hosts: maintainer_test:aarch64_test + hosts: maintainer_test:aarch64_test:armv7_test gather_facts: True vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -14,7 +14,7 @@ hostname: name="{{inventory_hostname}}" - name: Setup maintainer test hosts - hosts: maintainer_test:aarch64_test + hosts: maintainer_test:aarch64_test:armv7_test gather_facts: True tags: - maintainer-test diff --git a/tasks/virt_instance_create.yml b/tasks/virt_instance_create.yml index 8fe27d474b..f8fbd2b3ca 100644 --- a/tasks/virt_instance_create.yml +++ b/tasks/virt_instance_create.yml @@ -38,7 +38,7 @@ - name: ARMv7 copy the kernel out shell: "virt-builder --get-kernel {{ volgroup }}/{{ inventory_hostname }} --output /var/lib/libvirt/images/ | awk -F/ '{print $NF}' > /var/lib/libvirt/images/{{ inventory_hostname }}-details.txt" delegate_to: "{{ vmhost}}" - when: inventory_hostname.startswith('buildvm-armv7') and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined ) + when: inventory_hostname.startswith(('buildvm-armv7','armv7-test') and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined ) tags: - armv7-kernel @@ -46,7 +46,7 @@ command: "head -n1 /var/lib/libvirt/images/{{ inventory_hostname }}-details.txt" delegate_to: "{{ vmhost}}" register: host_armv7kernel - when: inventory_hostname.startswith('buildvm-armv7') and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined ) + when: inventory_hostname.startswith(('buildvm-armv7','armv7-test') and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined ) tags: - armv7-kernel @@ -54,7 +54,7 @@ command: "tail -n1 /var/lib/libvirt/images/{{ inventory_hostname }}-details.txt" delegate_to: "{{ vmhost}}" register: host_armv7initrd - when: inventory_hostname.startswith('buildvm-armv7') and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined ) + when: inventory_hostname.startswith(('buildvm-armv7','armv7-test') and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined ) tags: - armv7-kernel @@ -62,7 +62,7 @@ shell: "virt-cat -a {{ volgroup }}/{{ inventory_hostname }} /boot/extlinux/extlinux.conf | grep -m1 append | sed -e 's/append //'" delegate_to: "{{ vmhost}}" register: host_cmdline - when: inventory_hostname.startswith('buildvm-armv7') and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined ) + when: inventory_hostname.startswith(('buildvm-armv7','armv7-test') and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined ) tags: - armv7-kernel @@ -71,7 +71,7 @@ ansible_python_interpreter: /usr/bin/python3 virt_boot: domain={{ inventory_hostname }} kernel=/var/lib/libvirt/images/{{ host_armv7kernel.stdout }} initrd=/var/lib/libvirt/images/{{ host_armv7initrd.stdout }} cmdline={{ host_cmdline.stdout }} delegate_to: "{{ vmhost }}" - when: inventory_hostname.startswith('buildvm-armv7') and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined ) + when: inventory_hostname.startswith(('buildvm-armv7','armv7-test') and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined ) tags: - armv7-kernel @@ -86,7 +86,7 @@ - name: ARMv7 pause while VM updates pause: seconds=5 - when: inventory_hostname.startswith('buildvm-armv7') and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined ) + when: inventory_hostname.startswith(('buildvm-armv7','armv7-test') and ( inventory_hostname not in result.list_vms or armv7kernelupdate is defined ) tags: - armv7-kernel