From d74cbf0c32d01f80933014b089493d3d48262b19 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Wed, 18 May 2016 16:24:23 -0400
Subject: [PATCH] Revert "run_tests: strip locale archive to en_* locales"

This reverts commit 0681b75c39a255e679fd0c612ab8ba103d2ca8b0.

Change-Id: I42b059cc774970c9eaa13e02c5f66a474dad3173
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 run_tests.sh | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/run_tests.sh b/run_tests.sh
index 6c601ed0d..63e087925 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -73,20 +73,6 @@ if uses_debs; then
     $SUDO apt-get install -y dstat ${PUPPET_PKG}
 elif is_fedora; then
     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
         $SUDO rpm -e $PUPPET_RELEASE_FILE
     fi