From f8ca681309538f465baceceb60b75d45cd194c8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= <ms@suse.de>
Date: Wed, 28 Feb 2018 15:41:58 +0100
Subject: [PATCH] Fixup obs test status helper

Use osc results output to get better status information
---
 .obs_test        | 17 ++++-------------
 .obs_test_status | 38 ++++++++++++++++----------------------
 2 files changed, 20 insertions(+), 35 deletions(-)

diff --git a/.obs_test b/.obs_test
index 3a34fe96..04039957 100644
--- a/.obs_test
+++ b/.obs_test
@@ -1,13 +1,4 @@
-Virtualization:Appliances:Images:Testing_x86/test-image-oem images x86_64
-Virtualization:Appliances:Images:Testing_x86/test-image-iso images x86_64
-Virtualization:Appliances:Images:Testing_x86/test-image-vmx images x86_64
-Virtualization:Appliances:Images:Testing_x86/test-image-pxe images x86_64
-Virtualization:Appliances:Images:Testing_x86/test-image-docker images x86_64
-Virtualization:Appliances:Images:Testing_x86/test-image-orthos-oem images x86_64
-Virtualization:Appliances:Images:Testing_x86/test-image-ec2 images x86_64
-Virtualization:Appliances:Images:Testing_x86/test-image-azure images x86_64
-Virtualization:Appliances:Images:Testing_x86/test-image-fedora-vmx images x86_64
-Virtualization:Appliances:Images:Testing_arm/test-image-panda-oem images armv7l
-Virtualization:Appliances:Images:Testing_s390/test-image-oem images s390x
-Virtualization:Appliances:Images/dice-image-docker images x86_64
-Virtualization:Appliances:Images/dice-image-vagrant-libvirt images x86_64
+Virtualization:Appliances:Images:Testing_x86 x86_64
+Virtualization:Appliances:Images:Testing_arm armv7l
+Virtualization:Appliances:Images:Testing_s390 s390x
+Virtualization:Appliances:Images x86_64
diff --git a/.obs_test_status b/.obs_test_status
index 7c703e7a..0c0c5bac 100755
--- a/.obs_test_status
+++ b/.obs_test_status
@@ -8,30 +8,24 @@ function kiwi_build_version {
     echo -n "$1" | grep python3-kiwi- | head -n 1 | cut -f 3 -d -
 }
 
-function have_build_result {
-    echo -n "$1" | grep -q 'extracting built packages'
-}
-
-function have_failed_build_result {
-    echo -n "$1" | grep -q 'failed "build appliance.kiwi"'
-}
-
 kiwi_local_version=$(kiwi_version)
 
-while read test; do
-    status=$(osc rbuildlog --last $test)
-    kiwi_obs_version=$(kiwi_build_version "$status")
-    if [ "$kiwi_obs_version" = "$kiwi_local_version" ];then
-        if have_build_result "$status"; then
-            result="success"
-        elif have_failed_build_result "$status"; then
-            result="failed"
+while read -r project arch; do
+    echo $project
+    while read -r result; do
+        test -z "${result}" && continue
+        package=$(echo "${result}" | cut -f2 -d \")
+        build_log=$(osc rbuildlog --last ${project} ${package} images ${arch})
+        kiwi_obs_version=$(kiwi_build_version "${build_log}")
+        if [ "$kiwi_obs_version" = "$kiwi_local_version" ];then
+            result="${result} kiwi=\"${kiwi_obs_version}\""
         else
-            result="no_build_results"
+            result="${result} kiwi=\"want: ${kiwi_local_version} "
+            result="${result} got: ${kiwi_obs_version}\""
         fi
-    else
-        result="pending_build: want: $kiwi_local_version got: $kiwi_obs_version"
-    fi
-    echo "$test:"
-    echo "--> $result"
+        echo "  ${result}"
+    done < <(
+        osc results "${project}" --xml |\
+            grep status | cut -f2 -d \< | cut -f1 -d \/
+    )
 done < .obs_test