From: Akshita Jha <zenith158@gmail.com>
Date: Wed, 10 May 2017 16:49:20 +0000 (+0530)
Subject: Add carbon .deb for `packaging-test-deb` job
X-Git-Tag: release/carbon~9
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=releng%2Fbuilder.git;a=commitdiff_plain;h=5e54d8fbfadf30daf4a78e57a3ee982b021f78c5

Add carbon .deb for `packaging-test-deb` job

Change-Id: Ib0553255bd6e0b883f8a3f9a6af4213be06b95ae
Signed-off-by: Akshita Jha <zenith158@gmail.com>
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>
---

diff --git a/jjb/packaging/include-raw-test-deb.sh b/jjb/packaging/include-raw-test-deb.sh
index 2b22fd541..f5cea65d1 100644
--- a/jjb/packaging/include-raw-test-deb.sh
+++ b/jjb/packaging/include-raw-test-deb.sh
@@ -17,7 +17,7 @@ then
   # shellcheck disable=SC2154
   pkg_basename="${{PACKAGE##*/}}"
   # NB: Apt can't install directly from URL, so need this intermediary file
-  curl -o "$pkg_basename" "$PACKAGE"
+  curl -L --silent -o "$pkg_basename" "$PACKAGE"
   sudo dpkg --install ./"$pkg_basename"
 elif [[ $PACKAGE == ppa:* ]]
 then
diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 86f2139cc..237c811f8 100644
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -171,8 +171,8 @@
       - string:
           name: PACKAGE
           # yamllint disable-line rule:line-length
-          default: 'http://ftp.gwdg.de/pub/opensuse/repositories/home:/akshitajha/xUbuntu_16.04/all/opendaylight_5.0.0-1_all.deb'
-          description: 'Link to .deb file or name of custom PPA repo (ppa:odl-team/boron)'
+          default: 'https://launchpad.net/~odl-team/+archive/ubuntu/carbon/+files/opendaylight_6.0.0-1_all.deb'
+          description: 'Link to .deb file or name of custom PPA repo (ppa:odl-team/carbon)'
 
     scm:
       - integration-gerrit-scm: