From ec4a54d90e4889456623ce59de082d2c66be1b6a Mon Sep 17 00:00:00 2001
From: Alex Iribarren <Alex.Iribarren@cern.ch>
Date: Tue, 15 Sep 2020 14:58:29 +0200
Subject: [PATCH] iproute is missing, iptraf doesn't work and show the branch
 we're on more prominently

---
 upstreamcentostests.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/upstreamcentostests.sh b/upstreamcentostests.sh
index ed92648..5f8adf2 100755
--- a/upstreamcentostests.sh
+++ b/upstreamcentostests.sh
@@ -3,7 +3,7 @@
 
 # libunistring host command is linked against libunistring on c8, which is not the case for c7
 # We need to install it although it is removed in the kickstart file
-yum install git jq libunistring -y
+yum install git jq libunistring iproute -y
 
 # Find the last commit that passed upstream's Jenkins
 PASSING=$(curl -s https://ci.centos.org/job/CentOS-Core-QA-t_functional-c8-64/lastSuccessfulBuild/api/json | jq -r '.actions[] | select(.lastBuiltRevision) | .lastBuiltRevision.SHA1')
@@ -11,7 +11,8 @@ PASSING=${PASSING:-master}
 
 git clone https://gitlab.cern.ch/linuxsupport/centos_functional_tests.git
 cd centos_functional_tests
-git reset --hard $PASSING
+BRANCH=$(git reset --hard $PASSING)
+echo -e "\e[1m\e[32m$BRANCH\e[0m"
 
 # Skipping list is way longer than for cc7-base as image creation is different,
 # cc7-base was systemd ready, meaning most of these skips are service related
@@ -43,6 +44,7 @@ cat > ./skipped-tests.list  <<DELIM
 8|tests/p_httpd/*|httpd results in 403 for all requests, disabling for now
 8|tests/p_initscripts/*|No systemd therefore cannot be tested
 8|tests/p_ipa-server/*|No Freeipa default tests, also, we use cern-get-keytab
+8|tests/p_iptraf/*|iptraf doesn't log any traffic
 8|tests/p_kernel/*|No kernel therefore cannot be tested
 8|tests/p_lftp/*|No systemd therefore cannot be tested
 8|tests/p_libvirt/*|No systemd therefore cannot be tested
-- 
GitLab