Fix openstack-congress package name

JIRA: APEX-287

openstack-congress rpm-spec use '%dist' macro as name
suffix, '%dist' macro is different over various distros
which may cause name mismatch when uploading package to
overcloud images; fix it by using '%dist' macro in
package name to avoid possible mismatch.

Change-Id: Iaa7068d7da3e5fe3728baf2fa3c67eb45355c74a
Signed-off-by: zshi <zshi@redhat.com>

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index b148542..5ed2bdb 100755 (executable)
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -125,8 +125,8 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --run-command "yum remove -y qemu-system-x86" \
     --upload ../os-net-config.tar.gz:/usr/lib/python2.7/site-packages \
     --run-command "cd /usr/lib/python2.7/site-packages/ && rm -rf os_net_config && tar xzf os-net-config.tar.gz" \
-    --upload ../noarch/openstack-congress-2016.1-1.el7.centos.noarch.rpm:/root/ \
-    --install /root/openstack-congress-2016.1-1.el7.centos.noarch.rpm \
+    --upload ../noarch/$openstack_congress_pkg:/root/ \
+    --install /root/$openstack_congress_pkg \
     --install "python2-congressclient" \
     --upload puppet-congress.tar.gz:/etc/puppet/modules/ \
     --run-command "cd /etc/puppet/modules/ && tar xzf puppet-congress.tar.gz" \

diff --git a/build/variables.sh b/build/variables.sh
index ce9eb03..b26e740 100644 (file)
--- a/build/variables.sh
+++ b/build/variables.sh
@@ -14,6 +14,7 @@ onos_release_file=onos-1.6.0-rc2.tar.gz
 onos_jdk_uri=http://artifacts.opnfv.org/apex/colorado
 onos_ovs_uri=http://artifacts.opnfv.org/apex/colorado
 onos_ovs_pkg=package_ovs_rpm3.tar.gz
+openstack_congress_pkg="openstack-congress-2016.1-1$(rpm -E '%dist').noarch.rpm"
 doctor_driver=https://raw.githubusercontent.com/openstack/congress/master/congress/datasources/doctor_driver.py
 if [ -z ${GS_PATHNAME+x} ]; then
     GS_PATHNAME=/colorado