fix(experiment/run-library.sh): Deal better with stream releases

Author: pablomh

experiment/run-library.sh

@@ -35,40 +35,40 @@ if ! type ansible >/dev/null; then
     echo "ERROR: ansible not installed" >&2
     exit 1
 fi
-if ! type rpmdev-vercmp >/dev/null; then
-    echo "ERROR: rpmdev-vercmp (from rpmdevtools) not installed" >&2
-    exit 1
-fi
-
-function _vercmp() {
-    # Return values mimic `rpmdev-vercmp` ones
-    if [[ "$1" == "$2" ]]; then
-        return 0
-    elif [[ "$1" == 'stream' ]]; then
-        return 11
-    elif [[ "$2" == 'stream' ]]; then
-        return 12
-    else
-        ver1=$( echo "$1" | sed 's/^\(satellite\|katello\)-//' | sed 's/^\([^-]\+\)-.*$/\1/' )
-        ver2=$( echo "$2" | sed 's/^\(satellite\|katello\)-//' | sed 's/^\([^-]\+\)-.*$/\1/' )
-
-        rpmdev-vercmp "$ver1" "$ver2"
-    fi
-}
-
-function vercmp_gt() {
-    # Check if first parameter is greater than second using version string comparision
-    _vercmp "$1" "$2"
-    local rc=$?
-    [ "$rc" -eq 11 ] && return 0 || return 1
-}
-
-function vercmp_ge() {
-    # Check if first parameter is greater or equal than second using version string comparision
-    _vercmp "$1" "$2"
-    local rc=$?
-    [ "$rc" -eq 11 -o "$rc" -eq 0 ] && return 0 || return 1
-}
+# if ! type rpmdev-vercmp >/dev/null; then
+#     echo "ERROR: rpmdev-vercmp (from rpmdevtools) not installed" >&2
+#     exit 1
+# fi
+
+# function _vercmp() {
+#     # Return values mimic `rpmdev-vercmp` ones
+#     if [[ "$1" == "$2" ]]; then
+#         return 0
+#     elif [[ "$1" == 'stream' ]]; then
+#         return 11
+#     elif [[ "$2" == 'stream' ]]; then
+#         return 12
+#     else
+#         ver1=$( echo "$1" | sed 's/^\(satellite\|katello\)-//' | sed 's/^\([^-]\+\)-.*$/\1/' )
+#         ver2=$( echo "$2" | sed 's/^\(satellite\|katello\)-//' | sed 's/^\([^-]\+\)-.*$/\1/' )
+
+#         rpmdev-vercmp "$ver1" "$ver2"
+#     fi
+# }
+
+# function vercmp_gt() {
+#     # Check if first parameter is greater than second using version string comparision
+#     _vercmp "$1" "$2"
+#     local rc=$?
+#     [ "$rc" -eq 11 ] && return 0 || return 1
+# }
+
+# function vercmp_ge() {
+#     # Check if first parameter is greater or equal than second using version string comparision
+#     _vercmp "$1" "$2"
+#     local rc=$?
+#     [ "$rc" -eq 11 -o "$rc" -eq 0 ] && return 0 || return 1
+# }
 
 function measurement_add() {
     python -c "import csv; import sys; fp=open('$logs/measurement.log','a'); writer=csv.writer(fp); writer.writerow(sys.argv[1:]); fp.close()" "$@"
@@ -163,10 +163,12 @@ function status_data_create() {
     sd_kat_ver="$6"
     sd_kat_ver_short=$( echo "$sd_kat_ver" | sed 's/^katello-//' | sed 's/[^0-9.-]//g' | sed 's/^\([0-9]\+\.[0-9]\+\)\..*/\1/' | sed 's/^N\/A$/0.0/' )   # "katello-3.16.0-0.2.master.el7.noarch" -> "3.16"
     sd_sat_ver="$7"
-    if [[ "$(echo "$sd_sat_ver" | awk -F'.' '{print $(NF-2)}')" == 'stream' ]]; then
+    if [[ "$(echo "${sd_sat_ver}" | awk -F'.' '{print $(NF-2)}')" == 'stream' ]]; then
+        sd_sat_ver_short=stream
+    elif [[ "${sd_sat_ver}" == 'stream' ]]; then
         sd_sat_ver_short=stream
     else
-        sd_sat_ver_short=$( echo "$sd_sat_ver" | sed 's/^satellite-//' | sed 's/[^0-9.-]//g' | sed 's/^\([0-9]\+\.[0-9]\+\)\..*/\1/' | sed 's/^N\/A$/0.0/' )   # "satellite-6.6.0-1.el7.noarch" -> "6.6"
+        sd_sat_ver_short=$( echo "${sd_sat_ver}" | sed 's/^satellite-//' | sed 's/[^0-9.-]//g' | sed 's/^\([0-9]\+\.[0-9]\+\)\..*/\1/' | sed 's/^N\/A$/0.0/' )   # "satellite-6.6.0-1.el7.noarch" -> "6.6"
     fi
     sd_run="$8"
     sd_additional="$9"