X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fscripts%2Fpackagecloud_push.sh;h=c37ac55fb1fe9909928773ea33b94df48a5106c6;hb=594ea6171dca58acb35fd052b6def35c50479161;hp=c38d03b02052958fce7027b69ace322715f746d8;hpb=272a5c455974c7fd51b610a994810b268e5aa5d0;p=ci-management.git

diff --git a/jjb/scripts/packagecloud_push.sh b/jjb/scripts/packagecloud_push.sh
index c38d03b02..c37ac55fb 100644
--- a/jjb/scripts/packagecloud_push.sh
+++ b/jjb/scripts/packagecloud_push.sh
@@ -8,11 +8,11 @@ echo "STARTING PACKAGECLOUD PUSH"
 sleep 10
 
 if [ -f /usr/bin/zypper ]; then
-  echo "Since zypper exists, us it to install facter"
-  zypper -n install facter
+    FACTER_OS="openSUSE"
+else
+    FACTER_OS=$(/usr/bin/facter operatingsystem)
 fi
 
-FACTER_OS=$(/usr/bin/facter operatingsystem)
 if [ -f ~/.packagecloud ]; then
     case "$FACTER_OS" in
       Ubuntu)
@@ -26,10 +26,11 @@ if [ -f ~/.packagecloud ]; then
         RPMS=$(find . -type f -iregex '.*/.*\.\(s\)?rpm')
         package_cloud push "${PCIO_CO}/${STREAM}/el/${FACTER_OSMAJREL}/os/${FACTER_ARCH}/" ${RPMS}
       ;;
-      OpenSuSE)
-        FACTER_OSREL=$(/usr/bin/facter operatingsystemrelease)
+      openSUSE)
+        # Use /etc/os-release on openSUSE to get $VERSION
+        . /etc/os-release
         RPMS=$(find . -type f -iregex '.*/.*\.\(s\)?rpm')
-        package_cloud push "${PCIO_CO}/${STREAM}/opensuse/${FACTER_OSREL}/" ${RPMS}
+        package_cloud push "${PCIO_CO}/${STREAM}/opensuse/${VERSION}/" ${RPMS}
       ;;
     esac
 fi