diff options
| author |   Ed Warnicke <hagbard@gmail.com> | 2018-10-05 14:34:33 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2018-10-05 14:34:33 +0000 |
| commit | 36107f0f0fed6290985def5ef6e1233b31b7be53 (patch) | |
| tree | 954fb43033ac5f812b1b40d437d7559958d45dc1 | |
| parent | 29be786d3165364f61fadadf0fba430c2f377018 (diff) | |
| parent | 594ea6171dca58acb35fd052b6def35c50479161 (diff) | |
Merge "Use os-release for opensuse info"
| -rw-r--r-- | jjb/scripts/packagecloud_push.sh | 13 | ||||
| -rw-r--r-- | jjb/vpp/vpp-opensuse.yaml | 4 |
2 files changed, 9 insertions, 8 deletions
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 diff --git a/jjb/vpp/vpp-opensuse.yaml b/jjb/vpp/vpp-opensuse.yaml index 425b6f6d7..8d82e1265 100644 --- a/jjb/vpp/vpp-opensuse.yaml +++ b/jjb/vpp/vpp-opensuse.yaml @@ -300,11 +300,11 @@ - config-file-provider: files: - file-id: '.packagecloud' - target: '/home/jenkins' + target: '/root' - config-file-provider: files: - file-id: 'packagecloud_api' - target: '/home/jenkins' + target: '/root' - maven-target: maven-version: 'mvn33-new' goals: '--version' |