Skip to content

Commit

Permalink
Use fuzzy matching when checking LINUX_DISTR for rhel
Browse files Browse the repository at this point in the history
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
  • Loading branch information
kklimonda committed May 15, 2018
1 parent 15a9146 commit faf8578
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion parse-env.sh
Expand Up @@ -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'}
Expand Down

0 comments on commit faf8578

Please sign in to comment.