From: Paul Vinciguerra <pvinci@vinciconsulting.com>
Date: Tue, 19 Feb 2019 05:14:19 +0000 (-0500)
Subject: Fix opensuse packagecloud push failures.
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=be612c3280a8e8e7a67431bf2f8aa55c81b255cb;p=ci-management.git

Fix opensuse packagecloud push failures.

For an example failure, see:
https://jenkins.fd.io/job/vpp-merge-master-osleap15/2443/console

Change-Id: I84a05512b1a7d5ef0e8fce963e3917f42929605e
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
---

diff --git a/jjb/scripts/packagecloud_push.sh b/jjb/scripts/packagecloud_push.sh
index c37ac55fb..95ea92ed9 100644
--- a/jjb/scripts/packagecloud_push.sh
+++ b/jjb/scripts/packagecloud_push.sh
@@ -29,8 +29,11 @@ if [ -f ~/.packagecloud ]; then
       openSUSE)
         # Use /etc/os-release on openSUSE to get $VERSION
         . /etc/os-release
-        RPMS=$(find . -type f -iregex '.*/.*\.\(s\)?rpm')
+        RPMS=$(find . -type f -iregex '.*/.*\.\(s\)?rpm' | grep -v 'vpp-ext-deps')
+        VPP_EXT_RPMS=$(find . -type f -iregex '.*/.*\.\(s\)?rpm' | grep 'vpp-ext-deps')
         package_cloud push "${PCIO_CO}/${STREAM}/opensuse/${VERSION}/" ${RPMS}
+        # This file may have already been uploaded. Don't error out if it exists.
+        package_cloud push "${PCIO_CO}/${STREAM}/opensuse/${VERSION}/" ${VPP_EXT_RPMS} --skip-errors
       ;;
     esac
 fi