Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions tests/testlib.bash
Original file line number Diff line number Diff line change
Expand Up @@ -564,15 +564,7 @@ function runJmcFromDir() {

sclrepo="false"
function el7SclRepo() {
# shellcheck disable=SC2155
local a=$(mktemp)
echo "[rhel-7-server-rhscl-rpms-guisuite]
name=RHSCL RPMS for RHEL 7 System
baseurl=http://rhsm-pulp.corp.redhat.com/content/dist/rhel/server/7/\$releasever/\$basearch/rhscl/1/os/
enabled=1
gpgcheck=0" > "$a"
REPOFILE=/etc/yum.repos.d/rhel-7-server-rhscl-rpms-guisuite.repo
sudo cp -v "$a" $REPOFILE
sudo sed -i 's;^enabled=0;enabled=1;g' /etc/yum.repos.d/rhel-7-server-rhscl-rpms.repo
sclrepo="true"
}

Expand Down Expand Up @@ -801,6 +793,6 @@ function allTraps() {
$LOCAL_VNC -kill $futureVnc || true
fi
if [ "x$sclrepo" = "xtrue" ] ; then
sudo rm -fv $REPOFILE
sudo sed -i 's;^enabled=1;enabled=0;g' /etc/yum.repos.d/rhel-7-server-rhscl-rpms.repo
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Disadvantage is that now the suite can to be run on el7 out of our infra, which is extremely likely, Isn't it?-))) The original repo was behind fw too.. k to go with prayer to leave el7 finally behind...

fi
}