openstack
/
fuel-mirror
Code Issues Proposed changes

[build][rpm] Fix yaml report 

Get source package name from srpm package instead of spec file

Change-Id: Ibf88f133c8af50f756e9abcecb7f2b79030efca4
This commit is contained in:
Dmitry Burmistrov 2017-02-07 13:38:49 +04:00
parent ea888357b7
commit 4d167df854
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
perestroika/build-fuel-rpm.sh
View File

@ -37,8 +37,6 @@ main () {
local specfile=`find $_specpath -name *.spec`
local version=`rpm -q --specfile $specfile --queryformat '%{VERSION}\n' | head -1`
local release=`rpm -q --specfile $specfile --queryformat '%{RELEASE}\n' | head -1`
local srcpackagename=${specfile##*/}
srcpackagename=${srcpackagename%.spec}
## Add changelog section if it doesn't exist
[ `cat ${specfile} | grep -c '^%changelog'` -eq 0 ] && echo "%changelog" >> ${specfile}
local _rev=`git -C $_srcpath rev-list --no-merges origin/${SOURCE_BRANCH} | wc -l`
@ -183,17 +181,16 @@ main () {
DIST=$DIST
EOL
# Fill yaml file
yaml_report_file=${tmpdir}/${srcpackagename}.yaml
local srpmfile=$(find ${tmpdir}/ -name *.src.rpm)
local newrelease=`rpm -qp $srpmfile --queryformat %{RELEASE}"\n" | head -1`
local srcpackagename=$(rpm -qp $srpmfile --queryformat %{NAME}"\n" | head -1)
local newrelease=$(rpm -qp $srpmfile --queryformat %{RELEASE}"\n" | head -1)
local yaml_report_file=${tmpdir}/${srcpackagename}.yaml
echo "Source: ${srcpackagename}" > $yaml_report_file
echo "Version: ${version}-${newrelease}" >> $yaml_report_file
echo "Binary:" >> $yaml_report_file
for binary in $(find ${tmpdir}/ -name *.rpm | egrep -v '\.src\.rpm$') ; do
_binary=${binary##*/}
_binary=${_binary%-*}
_binary=${_binary%-*}
echo " - ${_binary}" >> $yaml_report_file
local binary_name=$(rpm -qp $binary --queryformat %{NAME}"\n" | head -1)
echo " - ${binary_name}" >> $yaml_report_file
done
echo "Build_time: $(date '+%F-%H-%M-%S')" >> $yaml_report_file
echo "Code_project:" >> $yaml_report_file

13
perestroika/build-rpm.sh
View File

@ -24,8 +24,6 @@ main () {
# Update specs
local specfile=`find $_specpath -name *.spec`
local srcpackagename=${specfile##*/}
srcpackagename=${srcpackagename%.spec}
#local binpackagename=`rpm -q $RPMQUERYPARAMS --specfile $specfile --queryformat %{NAME}"\n" | head -1`
local define_macros=(
-D 'kernel_module_package_buildreqs kernel-devel'
@ -232,17 +230,16 @@ This package provides the %{-n*} kernel modules
DIST=$DIST
EOL
# Fill yaml file
yaml_report_file=${tmpdir}/${srcpackagename}.yaml
local srpmfile=$(find ${tmpdir}/ -name *.src.rpm)
local newrelease=`rpm -qp $srpmfile --queryformat %{RELEASE}"\n" | head -1`
local srcpackagename=$(rpm -qp $srpmfile --queryformat %{NAME}"\n" | head -1)
local newrelease=$(rpm -qp $srpmfile --queryformat %{RELEASE}"\n" | head -1)
local yaml_report_file=${tmpdir}/${srcpackagename}.yaml
echo "Source: ${srcpackagename}" > $yaml_report_file
echo "Version: ${version}-${newrelease}" >> $yaml_report_file
echo "Binary:" >> $yaml_report_file
for binary in $(find ${tmpdir}/ -name *.rpm | egrep -v '\.src\.rpm$') ; do
_binary=${binary##*/}
_binary=${_binary%-*}
_binary=${_binary%-*}
echo " - ${_binary}" >> $yaml_report_file
local binary_name=$(rpm -qp $binary --queryformat %{NAME}"\n" | head -1)
echo " - ${binary_name}" >> $yaml_report_file
done
echo "Build_time: $(date '+%F-%H-%M-%S')" >> $yaml_report_file
echo "Code_project:" >> $yaml_report_file