From faf8578ae771f820fbff64c4bc7141f966fdb037 Mon Sep 17 00:00:00 2001 From: Krzysztof Klimonda Date: Tue, 15 May 2018 08:36:55 +0200 Subject: [PATCH] Use fuzzy matching when checking LINUX_DISTR for rhel parse-env.sh was matching LINUX_DISTR against "rhel" to set extra build variables, but LINUX_DISTR for RHEL is actually rhel7, so make the matching fuzzy. Closes-Bug: #1771355 Change-Id: Ife0d186ed736b13407028932091f02860244cc83 --- parse-env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parse-env.sh b/parse-env.sh index 553cd4eae..118aa683f 100644 --- a/parse-env.sh +++ b/parse-env.sh @@ -62,7 +62,7 @@ export GENERAL_EXTRA_RPMS=${GENERAL_EXTRA_RPMS="https://dl.fedoraproject.org/pub export BASE_EXTRA_RPMS=${BASE_EXTRA_RPMS="https://repos.fedorapeople.org/repos/openstack/openstack-$OPENSTACK_VERSION/rdo-release-$OPENSTACK_VERSION-$OPENSTACK_SUBVERSION.noarch.rpm"} export DOCKER_REPO=${DOCKER_REPO='https://download.docker.com/linux/centos/docker-ce.repo'} export YUM_ENABLE_REPOS=${YUM_ENABLE_REPOS:-} -if [[ "$LINUX_DISTR" == 'rhel' ]] ; then +if [[ "$LINUX_DISTR" == 'rhel'* ]] ; then export PYTHON_PIP_RPM='python27-python-pip' export PYTHON_PIP_VENV='/opt/rh/python27/enable' export RHEL_FORCE_REGISTRATION=${RHEL_FORCE_REGISTRATION:-'false'}