From 9feb9aee9b923d805acd593cd41fc1a1603d34e1 Mon Sep 17 00:00:00 2001 From: Athmane Madjoudj Date: Nov 17 2011 11:13:04 +0000 Subject: Merge branch 'master' of gitorious.org:testautomation/t_functional --- diff --git a/tests/0_common/00_qa_repo_config.sh b/tests/0_common/00_qa_repo_config.sh index af9f67d..06f6d70 100755 --- a/tests/0_common/00_qa_repo_config.sh +++ b/tests/0_common/00_qa_repo_config.sh @@ -19,7 +19,7 @@ name=CentOS-\$releasever - OS baseurl=http://repo.centos.qa/srv/CentOS/\$releasever/os/\$basearch/ gpgcheck=1 enabled=1 -igpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-\$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-\$releasever [QA-updates] name=CentOS-\$releasever - Updates @@ -52,8 +52,10 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-\$releasever EOF +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-$(t_DistCheck) yum clean all yum repolist >/dev/null 2>&1 + t_CheckExitStatus $?