From: Daniel Farrell <dfarrell@redhat.com>
Date: Wed, 5 Apr 2017 16:36:39 +0000 (-0400)
Subject: Find RPM repo file name automatically, rm param
X-Git-Tag: release/carbon~181^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=be3b522920a1bad5ad337a8e6d9423711b79c309;p=releng%2Fbuilder.git

Find RPM repo file name automatically, rm param

Change-Id: I5c8fdafa6cf1b084413d8b9a812a8d877bc2ab6f
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>
---

diff --git a/jjb/packaging/include-raw-test-rpm.sh b/jjb/packaging/include-raw-test-rpm.sh
index 1ebe85531..bb321a8a5 100644
--- a/jjb/packaging/include-raw-test-rpm.sh
+++ b/jjb/packaging/include-raw-test-rpm.sh
@@ -18,7 +18,9 @@ then
   sudo yum install -y "$URL"
 elif [[ $URL == *.repo ]]
 then
-  sudo curl --silent -o "$REPO_FILE" "$URL"
+  # shellcheck disable=SC2154
+  repo_file="${{URL##*/}}"
+  sudo curl --silent -o /etc/yum.repos.d/"$repo_file" "$URL"
   sudo yum install -y opendaylight
 else
   echo "URL is not a link to .rpm or .repo"
diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 9be194a7b..13513a377 100644
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -173,10 +173,6 @@
           # yamllint disable-line rule:line-length
           default: 'https://raw.githubusercontent.com/opendaylight/integration-packaging/master/rpm/example_repo_configs/opendaylight-52-release.repo'
           description: 'Link to .repo or .rpm file'
-      - string:
-          name: REPO_FILE
-          default: '/etc/yum.repos.d/opendaylight-52-release.repo'
-          description: 'Name of the .repo file'
 
     scm:
       - integration-gerrit-scm: