Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

openqa/server: use jq for JSON comparison as json_diff died

Browse source 
Swiped from https://stackoverflow.com/questions/31930041/

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2020-04-30 12:33:50 -07:00
parent e6fe5f2598
commit 255ce6ebad
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
roles/openqa/server/tasks/main.yml
View file

@ -145,7 +145,7 @@
- name: Install various other required packages - name: Install various other required packages
package: package:
name: ['python3-libselinux', 'git', 'json_diff', 'libselinux-utils', 'python3-libsemanage', name: ['python3-libselinux', 'git', 'jq', 'libselinux-utils', 'python3-libsemanage',
'nfs-utils', 'perl(Class::DBI::Pg)', 'expect', 'libguestfs-tools-c', 'libguestfs-xfs', 'nfs-utils', 'perl(Class::DBI::Pg)', 'expect', 'libguestfs-tools-c', 'libguestfs-xfs',
'libvirt-daemon-config-network', 'libvirt-python3', 'python3-libguestfs', 'libvirt-daemon-config-network', 'libvirt-python3', 'python3-libguestfs',
'virt-install', 'withlock', 'genisoimage'] 'virt-install', 'withlock', 'genisoimage']
@ -360,7 +360,7 @@
changed_when: "1 != 1" changed_when: "1 != 1"
- name: Check if the tests changed in previous step - name: Check if the tests changed in previous step
shell: "/usr/share/openqa/script/dump_templates --json > /tmp/tmpl-new.json && json_diff /tmp/tmpl-old.json /tmp/tmpl-new.json" shell: "/usr/share/openqa/script/dump_templates --json > /tmp/tmpl-new.json && diff <(jq -S . /tmp/tmpl-old.json) <(jq -S . /tmp/tmpl-new.json)"
when: "(gittests is defined) and (gittests is changed)" when: "(gittests is defined) and (gittests is changed)"
register: testsdiff register: testsdiff
changed_when: "testsdiff.rc > 0" changed_when: "testsdiff.rc > 0"