MDBF-1118: OpenSUSE 16.0 SRPM

Addition globs in srpm.Dockerfile to be more inclusive

Author: grooverdan

.github/workflows/build-srpm.yml

@@ -76,6 +76,11 @@ jobs:
             tag: opensuse1506-srpm
             platforms: linux/amd64
 
+          - dockerfile: srpm.Dockerfile
+            image: opensuse/leap:16.0
+            tag: opensuse1600-srpm
+            platforms: linux/amd64
+
           - dockerfile: srpm.Dockerfile
             image: registry.suse.com/bci/bci-base:15.6
             tag: sles1506-srpm

ci_build_images/srpm.Dockerfile

@@ -26,33 +26,27 @@ RUN source /etc/os-release \
             dnf install -y ccache \
             && dnf clean all; \
             ;; \
-        *) \
-            # No $PLATFORM_ID in SUSE nor RH7
-            case $BASE_IMAGE in \
-                *leap:15.6|*bci-base:15.6) \
-                    zypper -n update \
-                    && zypper -n install rpm-build wget which sudo gcc-c++ ccache \
-                    && zypper clean; \
-                ;; \
-                # Only AMD64 until EOL
-                *ubi7) \
-                    yum -y upgrade \
-                    && rpm -ivh https://dl.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm \
-                    && yum -y install rpm-build \
-                        yum-utils \
-                        wget \
-                        which \
-                        perl-generators \
-                        sudo \
-                        gcc-c++ \
-                        ccache \
-                    && yum clean all; \
-                ;; \
-            *) \
-                echo "Unsupported base image: $BASE_IMAGE"; \
-                exit 1; \
+        sles:*|opensuse-leap:*) \
+            zypper -n update \
+            && zypper -n install rpm-build wget which sudo gcc-c++ ccache \
+            && zypper clean; \
+            ;; \
+        rhel:7*) \
+            yum -y upgrade \
+            && rpm -ivh https://dl.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm \
+            && yum -y install rpm-build \
+                yum-utils \
+                wget \
+                which \
+                perl-generators \
+                sudo \
+                gcc-c++ \
+                ccache \
+            && yum clean all; \
             ;; \
-            esac; \
+        *) \
+            echo "Unsupported base image: $BASE_IMAGE"; \
+            exit 1; \
         ;; \
     esac