Update restraint and cki_lib environment part 2 of 2 (#483)

Updated cki beaker tests including sub-tests: networking pciutils sound storage test tracepoints packages power-management rt-tests standards stress trace vm Co-authored-by: Rachel Sibley <[email protected]>
cki-project · Mar 31, 2020 · 43e7165 · 43e7165
1 parent 1b8eaa7
commit 43e7165
Show file tree

Hide file tree

Showing 122 changed files with 116 additions and 204 deletions.
diff --git a/networking/bridge/common/common.sh b/networking/bridge/common/common.sh
@@ -17,7 +17,6 @@
 # Boston, MA 02110-1301, USA.
 #
 
-. /usr/bin/rhts_environment.sh
 
 log()
 {

diff --git a/networking/bridge/sanity_check/Makefile b/networking/bridge/sanity_check/Makefile
@@ -59,9 +59,8 @@ $(METADATA): Makefile
 	@echo "Requires:     $(PACKAGE_NAME)" >> $(METADATA)
 	@echo "repoRequires: networking/common" >> $(METADATA)
 	@echo "repoRequires: networking/bridge/common" >> $(METADATA)
+	@echo "repoRequires: cki_lib" >> $(METADATA)
 	@echo "Priority:     Normal" >> $(METADATA)
 	@echo "License:      GPLv2 or above" >> $(METADATA)
 	@echo "Confidential: no" >> $(METADATA)
 	@echo "Destructive:  no" >> $(METADATA)
-
-	rhts-lint $(METADATA)
diff --git a/networking/bridge/sanity_check/runtest.sh b/networking/bridge/sanity_check/runtest.sh
@@ -23,6 +23,7 @@ CDIR=$(dirname $FILE)
 RPATH=${RELATIVE_PATH:-"networking/bridge/sanity_check"}
 
 # Include Beaker environment
+. ../../../cki_lib/libcki.sh || exit 1
 source ${CDIR%/$RPATH}/networking/common/include.sh || exit 1
 source ${CDIR%/$RPATH}/networking/bridge/common/lib.sh || exit 1
 

diff --git a/networking/common/Makefile b/networking/common/Makefile
@@ -80,7 +80,3 @@ $(METADATA): Makefile
 	@echo "Requires:     expect pexpect python3-pexpect" >> $(METADATA)
 	@echo "Requires:     bc wget bzip2 gcc" >> $(METADATA)
 	@echo "Requires:     git patch rsync" >> $(METADATA)
-# add any other requirements for the script to run here
-
-# You may need other fields here; see the documentation
-	rhts-lint $(METADATA)
diff --git a/networking/common/include.sh b/networking/common/include.sh
@@ -5,8 +5,7 @@ NETWORK_COMMONLIB_DIR=$(dirname $(readlink -f $BASH_SOURCE))
 networkLib=$NETWORK_COMMONLIB_DIR
 
 # include beaker default environmnet
-. /usr/bin/rhts_environment.sh
-. /usr/share/beakerlib/beakerlib.sh || . /usr/lib/beakerlib/beakerlib.sh
+. /usr/share/beakerlib/beakerlib.sh || exit 1
 
 # select tool to manage package, which could be "yum" or "dnf"
 function select_yum_tool() {

diff --git a/networking/driver/sanity/Makefile b/networking/driver/sanity/Makefile
@@ -62,6 +62,4 @@ $(METADATA): Makefile
 	@echo "License:         GPLv2" >> $(METADATA)
 	@echo "Confidential:    no" >> $(METADATA)
 	@echo "Destructive:     no" >> $(METADATA)
-
-	rhts-lint $(METADATA)
-
+	@echo "repoRequires:    cki_lib" >> $(METADATA)
diff --git a/networking/driver/sanity/runtest.sh b/networking/driver/sanity/runtest.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. /usr/bin/rhts_environment.sh
+. ../../../cki_lib/libcki.sh || exit 1
 
 COUNT=0
 

diff --git a/networking/firewall/000infralib/Makefile b/networking/firewall/000infralib/Makefile
@@ -83,6 +83,3 @@ $(METADATA): Makefile
 	@echo "RhtsRequires: beakerlib" >> $(METADATA)
 	@echo "RhtsRequires: beakerlib-redhat" >> $(METADATA)
 	@echo "repoRequires: networking/common" >> $(METADATA)
-
-# You may need other fields here; see the documentation
-	rhts-lint $(METADATA)
diff --git a/networking/firewall/000infralib/runtest.sh b/networking/firewall/000infralib/runtest.sh
@@ -29,7 +29,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 #

diff --git a/networking/firewall/netfilter/target/Makefile b/networking/firewall/netfilter/target/Makefile
@@ -85,9 +85,8 @@ $(METADATA): Makefile
 	@echo "Requires:     tree" >> $(METADATA)
 	@echo "repoRequires: networking/common" >> $(METADATA)
 	@echo "repoRequires: networking/firewall/000infralib" >> $(METADATA)
+	@echo "repoRequires: cki_lib" >> $(METADATA)
 	@echo "Priority:     Normal" >> $(METADATA)
 	@echo "License:      GPLv2" >> $(METADATA)
 	@echo "Confidential: no" >> $(METADATA)
 	@echo "Destructive:  no" >> $(METADATA)
-
-	rhts-lint $(METADATA)
diff --git a/networking/firewall/netfilter/target/runtest.sh b/networking/firewall/netfilter/target/runtest.sh
@@ -33,7 +33,7 @@ NAME=$(basename $FILE)
 CDIR=$(dirname  $FILE)
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
+. ../../../../cki_lib/libcki.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 ###########################################################

diff --git a/networking/igmp/conformance/Makefile b/networking/igmp/conformance/Makefile
@@ -69,5 +69,3 @@ $(METADATA): Makefile
 	@echo "Requires:        kernel-modules-extra" >> $(METADATA)
 	@echo "Requires:        tcpdump" >> $(METADATA)
 	@echo "repoRequires:    cki_lib" >> $(METADATA)
-
-	rhts-lint $(METADATA)
diff --git a/networking/igmp/conformance/runtest.sh b/networking/igmp/conformance/runtest.sh
@@ -27,12 +27,11 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include common and beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
+. ../../../cki_lib/libcki.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 . ./common/include.sh || exit 1
 . ./common/network.sh || exit 1
 . ./common/service.sh || exit 1
-. ../../../cki_lib/libcki.sh || exit 1
 
 YUM=$(cki_get_yum_tool)
 

diff --git a/networking/ipsec/ipsec_basic/ipsec_basic_netns/Makefile b/networking/ipsec/ipsec_basic/ipsec_basic_netns/Makefile
@@ -78,8 +78,4 @@ $(METADATA): Makefile
 	@echo "RunFor:       $(PACKAGE_NAME)" >> $(METADATA)
 # add any other packages for which your test ought to run here
 	@echo "Requires:     socat" >> $(METADATA)
-# add any other requirements for the script to run here
-
-# You may need other fields here; see the documentation
-	rhts-lint $(METADATA)
-
+	@echo "repoRequires: cki_lib" >> $(METADATA)
diff --git a/networking/ipsec/ipsec_basic/ipsec_basic_netns/metadata b/networking/ipsec/ipsec_basic/ipsec_basic_netns/metadata
@@ -9,4 +9,4 @@ destructive=no
 [restraint]
 entry_point=make run
 dependencies=socat;iproute
-repoRequires=networking/common
+repoRequires=networking/common;cki_lib
diff --git a/networking/ipsec/ipsec_basic/ipsec_basic_netns/runtest.sh b/networking/ipsec/ipsec_basic/ipsec_basic_netns/runtest.sh
@@ -27,6 +27,7 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # Global parameters
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+. ../../../../cki_lib/libcki.sh || exit 1
 . ../../../common/include.sh
 
 ipsec_stat(){

diff --git a/networking/macsec/sanity_check/Makefile b/networking/macsec/sanity_check/Makefile
@@ -58,9 +58,8 @@ $(METADATA): Makefile
 	@echo "RunFor:       $(PACKAGE_NAME)" >> $(METADATA)
 	@echo "Requires:     $(PACKAGE_NAME)" >> $(METADATA)
 	@echo "repoRequires: networking/common" >> $(METADATA)
+	@echo "repoRequires: cki_lib" >> $(METADATA)
 	@echo "Priority:     Normal" >> $(METADATA)
 	@echo "License:      GPLv2 or above" >> $(METADATA)
 	@echo "Confidential: no" >> $(METADATA)
 	@echo "Destructive:  no" >> $(METADATA)
-
-	rhts-lint $(METADATA)
diff --git a/networking/macsec/sanity_check/runtest.sh b/networking/macsec/sanity_check/runtest.sh
@@ -23,6 +23,7 @@ CDIR=$(dirname $FILE)
 RPATH=${RELATIVE_PATH:-"networking/macsec/sanity_check"}
 
 # Include Beaker environment
+. ../../../cki_lib/libcki.sh || exit 1
 source ${CDIR%/$RPATH}/networking/common/include.sh || exit 1
 
 KEY_0=81818181818181818181818181816161

diff --git a/networking/route/pmtu/Makefile b/networking/route/pmtu/Makefile
@@ -86,7 +86,3 @@ $(METADATA): Makefile
 	@echo "RhtsRequires: kernel-kernel-networking-common" >> $(METADATA)
 	@echo "RhtsRequires: library(kernel/network)" >> $(METADATA)
 	@echo "repoRequires: cki_lib" >> $(METADATA)
-# add any other requirements for the script to run here
-
-# You may need other fields here; see the documentation
-	rhts-lint $(METADATA)
diff --git a/networking/route/pmtu/common/include.sh b/networking/route/pmtu/common/include.sh
@@ -5,8 +5,7 @@ NETWORK_COMMONLIB_DIR=$(dirname $(readlink -f $BASH_SOURCE))
 networkLib=$NETWORK_COMMONLIB_DIR
 
 # include beaker default environmnet
-. /usr/bin/rhts_environment.sh
-. /usr/share/beakerlib/beakerlib.sh || . /usr/lib/beakerlib/beakerlib.sh
+. /usr/share/beakerlib/beakerlib.sh || exit 1
 
 # variables to control some default action
 NM_CTL=${NM_CTL:-"no"}

diff --git a/networking/route/pmtu/runtest.sh b/networking/route/pmtu/runtest.sh
@@ -26,11 +26,11 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
+. ../../../cki_lib/libcki.sh || exit 1
 . ./common/include.sh || exit 1
 . ./common/network.sh || exit 1
 . ./common/service.sh || exit 1
 . ./common/install.sh || exit 1
-. ../../../cki_lib/libcki.sh || exit 1
 
 YUM=$(cki_get_yum_tool)
 

diff --git a/networking/route/route_func/Makefile b/networking/route/route_func/Makefile
@@ -65,7 +65,4 @@ $(METADATA): Makefile
 # add any other packages for which your test ought to run here
 	@echo "Requires:     $(PACKAGE_NAME)" >> $(METADATA)
 	@echo "Requires:     net-tools" >> $(METADATA)
-# add any other requirements for the script to run here
-
-# You may need other fields here; see the documentation
-	rhts-lint $(METADATA)
+	@echo "repoRequires: cki_lib" >> $(METADATA)
diff --git a/networking/route/route_func/common/include.sh b/networking/route/route_func/common/include.sh
@@ -5,8 +5,7 @@ NETWORK_COMMONLIB_DIR=$(dirname $(readlink -f $BASH_SOURCE))
 networkLib=$NETWORK_COMMONLIB_DIR
 
 # include beaker default environmnet
-. /usr/bin/rhts_environment.sh
-. /usr/share/beakerlib/beakerlib.sh || . /usr/lib/beakerlib/beakerlib.sh
+. /usr/share/beakerlib/beakerlib.sh || exit 1
 
 # select tool to manage package, which could be "yum" or "dnf"
 function select_yum_tool() {

diff --git a/networking/route/route_func/metadata b/networking/route/route_func/metadata
@@ -9,4 +9,4 @@ destructive=no
 [restraint]
 entry_point=make run
 dependencies=net-tools
-repoRequires=networking/common
+repoRequires=networking/common;cki_lib
diff --git a/networking/route/route_func/runtest.sh b/networking/route/route_func/runtest.sh
@@ -26,6 +26,7 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include internal libray
+. ../../../cki_lib/libcki.sh || exit 1
 . ../../common/include.sh || exit 1
 
 TEST_TYPE=${TEST_TYPE:-"netns"}

diff --git a/networking/sctp/auth/sockopts/Makefile b/networking/sctp/auth/sockopts/Makefile
@@ -63,4 +63,3 @@ $(METADATA): Makefile
 	@echo "Requires:        python3-lxml" >> $(METADATA)
 	@echo "Requires:        kernel-modules-extra" >> $(METADATA)
 	@echo "repoRequires:    cki_lib" >> $(METADATA)
-	rhts-lint $(METADATA)
diff --git a/networking/sctp/auth/sockopts/runtest.sh b/networking/sctp/auth/sockopts/runtest.sh
@@ -16,10 +16,9 @@
 # Jianwen Ji: <[email protected]> 
 
 # include common  and Beaker environments
-. /usr/bin/rhts-environment.sh || exit 1
+. ../../../../cki_lib/libcki.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 . ./common/include.sh || exit 1
-. ../../../../cki_lib/libcki.sh || exit 1
 
 rlJournalStart
 

diff --git a/networking/socket/fuzz/Makefile b/networking/socket/fuzz/Makefile
@@ -84,7 +84,4 @@ $(METADATA): Makefile
 # add any other packages for which your test ought to run here
 	@echo "Requires:     $(PACKAGE_NAME)" >> $(METADATA)
 	@echo "Requires:     gcc lksctp-tools-devel" >> $(METADATA)
-# add any other requirements for the script to run here
-
-# You may need other fields here; see the documentation
-	rhts-lint $(METADATA)
+	@echo "repoRequires: cki_lib" >> $(METADATA)
diff --git a/networking/socket/fuzz/metadata b/networking/socket/fuzz/metadata
@@ -8,4 +8,4 @@ destructive=no
 
 [restraint]
 entry_point=make run
-repoRequires=networking/common
+repoRequires=networking/common;cki_lib
diff --git a/networking/socket/fuzz/runtest.sh b/networking/socket/fuzz/runtest.sh
@@ -27,6 +27,7 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
+. ../../../cki_lib/libcki.sh || exit 1
 . ../../common/include.sh || exit 1
 
 disable_avc_check

diff --git a/networking/tcp/tcp_keepalive/Makefile b/networking/tcp/tcp_keepalive/Makefile
@@ -84,7 +84,3 @@ $(METADATA): Makefile
 	@echo "Requires:     python3-lxml" >> $(METADATA)
 	@echo "Requires:     kernel-modules-extra" >> $(METADATA)
 	@echo "repoRequires: cki_lib" >> $(METADATA)
-
-# You may need other fields here; see the documentation
-	rhts-lint $(METADATA)
-
diff --git a/networking/tcp/tcp_keepalive/runtest.sh b/networking/tcp/tcp_keepalive/runtest.sh
@@ -26,9 +26,8 @@
 #
 
 # include common and Beaker environments
-. /usr/bin/rhts-environment.sh || exit 1
-. /usr/share/beakerlib/beakerlib.sh || exit 1
 . ../../../cki_lib/libcki.sh || exit 1
+. /usr/share/beakerlib/beakerlib.sh || exit 1
 
 YUM=$(cki_get_yum_tool)
 

diff --git a/networking/tunnel/common/Makefile b/networking/tunnel/common/Makefile
@@ -64,7 +64,3 @@ $(METADATA): Makefile
 	@echo "RunFor:       $(PACKAGE_NAME)" >> $(METADATA) 
 # add any other packages for which your test ought to run here
 	@echo "Requires:     $(PACKAGE_NAME)" >> $(METADATA)
-# add any other requirements for the script to run here
-
-# You may need other fields here; see the documentation
-	rhts-lint $(METADATA)
diff --git a/networking/tunnel/common/metadata b/networking/tunnel/common/metadata
@@ -9,4 +9,4 @@ destructive=no
 [restraint]
 entry_point=make run
 dependencies=net-tools;iproute;tcpdump;ethtool
-repoRequires=networking/common
+repoRequires=networking/common;cki_lib
diff --git a/networking/tunnel/geneve/basic/Makefile b/networking/tunnel/geneve/basic/Makefile
@@ -70,3 +70,4 @@ $(METADATA): Makefile
 	@echo "Requires:     python3-lxml" >> $(METADATA)
 	@echo "Requires:     kernel-modules-extra" >> $(METADATA)
 	@echo "Requires:     tcpdump" >> $(METADATA)
+	@echo "repoRequires: cki_lib" >> $(METADATA)
diff --git a/networking/tunnel/geneve/basic/runtest.sh b/networking/tunnel/geneve/basic/runtest.sh
@@ -27,11 +27,10 @@
 
 
 # include common and beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
+. ../../../../cki_lib/libcki.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 . ../../../common/include.sh || exit 1
 . ../../common/include.sh || exit 1
-. ../../../../cki_lib/libcki.sh || exit 1
 
 YUM=$(cki_get_yum_tool)
 

diff --git a/networking/tunnel/gre/basic/Makefile b/networking/tunnel/gre/basic/Makefile
@@ -67,7 +67,4 @@ $(METADATA): Makefile
 	@echo "Requires:     net-tools socat" >> $(METADATA)
 	@echo "Requires:     python3-lxml" >> $(METADATA)
 	@echo "Requires:     kernel-modules-extra" >> $(METADATA)
-# add any other requirements for the script to run here
-
-# You may need other fields here; see the documentation
-	rhts-lint $(METADATA)
+	@echo "repoRequires: cki_lib" >> $(METADATA)
diff --git a/networking/tunnel/gre/basic/runtest.sh b/networking/tunnel/gre/basic/runtest.sh
@@ -24,11 +24,10 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Common and Beaker environments
-. /usr/bin/rhts-environment.sh || exit 1
+. ../../../../cki_lib/libcki.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 . ../../../common/include.sh || exit 1
 . ../../common/include.sh || exit 1
-. ../../../../cki_lib/libcki.sh || exit 1
 
 YUM=$(cki_get_yum_tool)
 

diff --git a/networking/tunnel/l2tp/basic/Makefile b/networking/tunnel/l2tp/basic/Makefile
@@ -67,7 +67,4 @@ $(METADATA): Makefile
 	@echo "Requires:     net-tools" >> $(METADATA)
 	@echo "repoRequires:    networking/common" >> $(METADATA)
 	@echo "repoRequires:    networking/tunnel/common" >> $(METADATA)
-# add any other requirements for the script to run here
-
-# You may need other fields here; see the documentation
-	rhts-lint $(METADATA)
+	@echo "repoRequires:    cki_lib" >> $(METADATA)
diff --git a/networking/tunnel/l2tp/basic/runtest.sh b/networking/tunnel/l2tp/basic/runtest.sh
@@ -26,6 +26,7 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
+. ../../../../cki_lib/libcki.sh || exit 1
 . ../../../common/include.sh || exit 1
 . ../../common/include.sh || exit 1
 

diff --git a/networking/tunnel/vxlan/basic/Makefile b/networking/tunnel/vxlan/basic/Makefile
@@ -65,7 +65,4 @@ $(METADATA): Makefile
 # add any other packages for which your test ought to run here
 	@echo "Requires:     $(PACKAGE_NAME)" >> $(METADATA)
 	@echo "Requires:     net-tools" >> $(METADATA)
-# add any other requirements for the script to run here
-
-# You may need other fields here; see the documentation
-	rhts-lint $(METADATA)
+	@echo "repoRequires: cki_lib" >> $(METADATA)
diff --git a/networking/tunnel/vxlan/basic/runtest.sh b/networking/tunnel/vxlan/basic/runtest.sh
@@ -30,9 +30,9 @@
 # for CKI
 [ ! -f /usr/local/bin/netns_clean.sh ] && rm /dev/shm/network_common_initalized -f
 
+. ../../../../cki_lib/libcki.sh || exit 1
 . ../../../common/include.sh || exit 1
 . ../../common/include.sh || exit 1
-. ../../../../cki_lib/libcki.sh || exit 1
 
 YUM=$(cki_get_yum_tool)
 

diff --git a/networking/udp/udp_socket/Makefile b/networking/udp/udp_socket/Makefile
@@ -84,9 +84,8 @@ $(METADATA): Makefile
 	@echo "Requires:     make" >> $(METADATA)
 	@echo "Requires:     gcc" >> $(METADATA)
 	@echo "repoRequires: networking/common" >> $(METADATA)
+	@echo "repoRequires: cki_lib" >> $(METADATA)
 	@echo "Priority:     Normal" >> $(METADATA)
 	@echo "License:      GPLv2" >> $(METADATA)
 	@echo "Confidential: no" >> $(METADATA)
 	@echo "Destructive:  no" >> $(METADATA)
-
-	rhts-lint $(METADATA)
diff --git a/networking/udp/udp_socket/runtest.sh b/networking/udp/udp_socket/runtest.sh
@@ -17,6 +17,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
+. ../../../cki_lib/libcki.sh || exit 1
 source ../../common/include.sh || exit 1
 
 ns1="ip netns exec ha"
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,6 @@ @@
     # Boston, MA 02110-1301, USA.
     #
-    . /usr/bin/rhts_environment.sh
     log()
     {
@@ Expand Down @@