From d26e65a2aada33269f6044c809f4381eff563a75 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= Date: Wed, 18 Apr 2012 13:39:01 +0000 Subject: [PATCH] Try to find some difference in REPOS. --- org.glite.testsuites.ctb/LB/tests/lb-common-testbeds.sh | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/org.glite.testsuites.ctb/LB/tests/lb-common-testbeds.sh b/org.glite.testsuites.ctb/LB/tests/lb-common-testbeds.sh index 151d6c6..7522f04 100755 --- a/org.glite.testsuites.ctb/LB/tests/lb-common-testbeds.sh +++ b/org.glite.testsuites.ctb/LB/tests/lb-common-testbeds.sh @@ -216,12 +216,23 @@ function gen_repo_lists() else yum install -y -q yum-utils repoquery -a --qf "%{name} %{version} %{repoid}" > /tmp/allpkgs.$$.txt + repoquery -a --qf "%{repoid}" | sort | uniq > /tmp/allrepos.$$.txt fi - cat /tmp/allpkgs.$$.txt | grep " EMI" > $1 - cat /tmp/allpkgs.$$.txt | grep " ETICS" > $2 + grep -i etics /tmp/allrepos.$$.txt > /dev/null + if [ $? = 0 ]; then + PRODREPO="EMI" + TESTREPO="ETICS" + else + printf " etics repo not found, trying to distinguish between EMI repos " + PRODREPO=`cat /tmp/allrepos.$$.txt | grep -o -E "EMI-[0-9]+" | sort | uniq | head -n 1` + TESTREPO=`cat /tmp/allrepos.$$.txt | grep -o -E "EMI-[0-9]+" | sort | uniq | tail -n 1` + fi + + cat /tmp/allpkgs.$$.txt | grep " $PRODREPO" > $1 + cat /tmp/allpkgs.$$.txt | grep " $TESTREPO" > $2 - rm -f /tmp/allpkgs.$$.txt + rm -f /tmp/allpkgs.$$.txt /tmp/allrepos.$$.txt } function gen_test_report() -- 1.8.2.3