Merge "Revert "run_tests: strip locale archive to en_* locales""

This commit is contained in:
Jenkins 2016-05-23 12:00:18 +00:00 committed by Gerrit Code Review
commit 61a7b447ae

View File

@ -73,20 +73,6 @@ if uses_debs; then
$SUDO apt-get install -y dstat ${PUPPET_PKG} $SUDO apt-get install -y dstat ${PUPPET_PKG}
elif is_fedora; then elif is_fedora; then
print_header 'Setup (RedHat based)' print_header 'Setup (RedHat based)'
# TODO(emilien): this is a workaround until this patch is merged:
# https://review.openstack.org/#/c/304399/
# strip down to en_* locales
$SUDO yum reinstall -y glibc-common glibc
$SUDO localedef --delete-from-archive \
$(localedef --list-archive | grep -v -i '^en' | xargs)
# prepare template
$SUDO mv /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl
# rebuild archive
$SUDO /usr/sbin/build-locale-archive
# empty template
$SUDO mkdir -p /usr/locale
echo | $SUDO tee --append /usr/locale/locale-archive.tmpl
if rpm --quiet -q $PUPPET_RELEASE_FILE; then if rpm --quiet -q $PUPPET_RELEASE_FILE; then
$SUDO rpm -e $PUPPET_RELEASE_FILE $SUDO rpm -e $PUPPET_RELEASE_FILE
fi fi