Merge branch '2.2' into 2.3

This commit is contained in:
Markus Mäkelä
2019-04-15 16:02:51 +03:00
5 changed files with 39 additions and 29 deletions

View File

@ -8,7 +8,10 @@ if [ "$box_type" == "RPM" ] ; then
# Build can be executed to check if it is possible to build
# and to run install and upgrade tests
# with thre real RHEL, but we use CentOS packages for production
if [ "$platform" != "rhel" ] ; then
if [[ "$platform" != "rhel" || ( "$platform" == "rhel" && "$platform_version" == "8" ) ]]; then
if [[ "$platform" == "rhel" && "$platform_version" == "8" ]]; then
export platform="centos"
fi
export arch=`ssh $sshopt "arch"`
. ${script_dir}/generate_build_info_path.sh