4fbe94
From c748b95f5a00b6d9c46026c3d251c40437e6b64a Mon Sep 17 00:00:00 2001
4fbe94
From: Yu Watanabe <watanabe.yu+github@gmail.com>
4fbe94
Date: Thu, 1 Nov 2018 17:26:36 +0900
4fbe94
Subject: [PATCH] test: mask several unnecessary services
4fbe94
4fbe94
This may make CIs run faster.
4fbe94
4fbe94
(cherry picked from commit 056ae88152a722bdbea54ff33db815d585c8b9c6)
4fbe94
4fbe94
Related: #1761519
4fbe94
---
4fbe94
 test/TEST-02-CRYPTSETUP/test.sh    | 8 ++++++++
4fbe94
 test/TEST-03-JOBS/test.sh          | 8 ++++++++
4fbe94
 test/TEST-04-JOURNAL/test.sh       | 8 ++++++++
4fbe94
 test/TEST-05-RLIMITS/test.sh       | 8 ++++++++
4fbe94
 test/TEST-07-ISSUE-1981/test.sh    | 8 ++++++++
4fbe94
 test/TEST-11-ISSUE-3166/test.sh    | 8 ++++++++
4fbe94
 test/TEST-12-ISSUE-3171/test.sh    | 8 ++++++++
4fbe94
 test/TEST-13-NSPAWN-SMOKE/test.sh  | 8 ++++++++
4fbe94
 test/TEST-18-FAILUREACTION/test.sh | 7 +++++++
4fbe94
 test/TEST-19-DELEGATE/test.sh      | 8 ++++++++
4fbe94
 test/TEST-20-MAINPIDGAMES/test.sh  | 8 ++++++++
4fbe94
 test/TEST-23-TYPE-EXEC/test.sh     | 8 ++++++++
4fbe94
 12 files changed, 95 insertions(+)
4fbe94
4fbe94
diff --git a/test/TEST-02-CRYPTSETUP/test.sh b/test/TEST-02-CRYPTSETUP/test.sh
4fbe94
index c38e56f72e..97eb2f409e 100755
4fbe94
--- a/test/TEST-02-CRYPTSETUP/test.sh
4fbe94
+++ b/test/TEST-02-CRYPTSETUP/test.sh
4fbe94
@@ -45,6 +45,14 @@ test_setup() {
4fbe94
 
4fbe94
         setup_basic_environment
4fbe94
 
4fbe94
+        # mask some services that we do not want to run in these tests
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-machined.service
4fbe94
+
4fbe94
         # setup the testsuite service
4fbe94
         cat >$initdir/etc/systemd/system/testsuite.service <
4fbe94
 [Unit]
4fbe94
diff --git a/test/TEST-03-JOBS/test.sh b/test/TEST-03-JOBS/test.sh
4fbe94
index 08e5cfe6c8..93a387df59 100755
4fbe94
--- a/test/TEST-03-JOBS/test.sh
4fbe94
+++ b/test/TEST-03-JOBS/test.sh
4fbe94
@@ -19,6 +19,14 @@ test_setup() {
4fbe94
 
4fbe94
         setup_basic_environment
4fbe94
 
4fbe94
+        # mask some services that we do not want to run in these tests
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-machined.service
4fbe94
+
4fbe94
         # setup the testsuite service
4fbe94
         cat >$initdir/etc/systemd/system/testsuite.service <
4fbe94
 [Unit]
4fbe94
diff --git a/test/TEST-04-JOURNAL/test.sh b/test/TEST-04-JOURNAL/test.sh
4fbe94
index 30e7b181b2..80e5fb0a73 100755
4fbe94
--- a/test/TEST-04-JOURNAL/test.sh
4fbe94
+++ b/test/TEST-04-JOURNAL/test.sh
4fbe94
@@ -18,6 +18,14 @@ test_setup() {
4fbe94
 
4fbe94
         setup_basic_environment
4fbe94
 
4fbe94
+        # mask some services that we do not want to run in these tests
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-machined.service
4fbe94
+
4fbe94
         # setup the testsuite service
4fbe94
         cat >$initdir/etc/systemd/system/testsuite.service <
4fbe94
 [Unit]
4fbe94
diff --git a/test/TEST-05-RLIMITS/test.sh b/test/TEST-05-RLIMITS/test.sh
4fbe94
index a1b855c5fb..711f87f585 100755
4fbe94
--- a/test/TEST-05-RLIMITS/test.sh
4fbe94
+++ b/test/TEST-05-RLIMITS/test.sh
4fbe94
@@ -18,6 +18,14 @@ test_setup() {
4fbe94
 
4fbe94
         setup_basic_environment
4fbe94
 
4fbe94
+        # mask some services that we do not want to run in these tests
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-machined.service
4fbe94
+
4fbe94
         cat >$initdir/etc/systemd/system.conf <
4fbe94
 [Manager]
4fbe94
 DefaultLimitNOFILE=10000:16384
4fbe94
diff --git a/test/TEST-07-ISSUE-1981/test.sh b/test/TEST-07-ISSUE-1981/test.sh
4fbe94
index 88d143e479..8d3ed04712 100755
4fbe94
--- a/test/TEST-07-ISSUE-1981/test.sh
4fbe94
+++ b/test/TEST-07-ISSUE-1981/test.sh
4fbe94
@@ -21,6 +21,14 @@ test_setup() {
4fbe94
 
4fbe94
         setup_basic_environment
4fbe94
 
4fbe94
+        # mask some services that we do not want to run in these tests
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-machined.service
4fbe94
+
4fbe94
         # setup the testsuite service
4fbe94
         cat >$initdir/etc/systemd/system/testsuite.service <
4fbe94
 [Unit]
4fbe94
diff --git a/test/TEST-11-ISSUE-3166/test.sh b/test/TEST-11-ISSUE-3166/test.sh
4fbe94
index 8aae4d5ed9..e6e96101aa 100755
4fbe94
--- a/test/TEST-11-ISSUE-3166/test.sh
4fbe94
+++ b/test/TEST-11-ISSUE-3166/test.sh
4fbe94
@@ -20,6 +20,14 @@ test_setup() {
4fbe94
         setup_basic_environment
4fbe94
         dracut_install false touch
4fbe94
 
4fbe94
+        # mask some services that we do not want to run in these tests
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-machined.service
4fbe94
+
4fbe94
         # setup the testsuite service
4fbe94
         cat >$initdir/etc/systemd/system/testsuite.service <
4fbe94
 [Unit]
4fbe94
diff --git a/test/TEST-12-ISSUE-3171/test.sh b/test/TEST-12-ISSUE-3171/test.sh
4fbe94
index 559fa469cd..915cc21cd8 100755
4fbe94
--- a/test/TEST-12-ISSUE-3171/test.sh
4fbe94
+++ b/test/TEST-12-ISSUE-3171/test.sh
4fbe94
@@ -20,6 +20,14 @@ test_setup() {
4fbe94
         setup_basic_environment
4fbe94
         dracut_install cat mv stat nc
4fbe94
 
4fbe94
+        # mask some services that we do not want to run in these tests
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-machined.service
4fbe94
+
4fbe94
         # setup the testsuite service
4fbe94
         cat >$initdir/etc/systemd/system/testsuite.service <
4fbe94
 [Unit]
4fbe94
diff --git a/test/TEST-13-NSPAWN-SMOKE/test.sh b/test/TEST-13-NSPAWN-SMOKE/test.sh
4fbe94
index a676384bfc..cec59fa24d 100755
4fbe94
--- a/test/TEST-13-NSPAWN-SMOKE/test.sh
4fbe94
+++ b/test/TEST-13-NSPAWN-SMOKE/test.sh
4fbe94
@@ -20,6 +20,14 @@ test_setup() {
4fbe94
         setup_basic_environment
4fbe94
         dracut_install busybox chmod rmdir unshare ip sysctl
4fbe94
 
4fbe94
+        # mask some services that we do not want to run in these tests
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-machined.service
4fbe94
+
4fbe94
         cp create-busybox-container $initdir/
4fbe94
 
4fbe94
         ./create-busybox-container $initdir/nc-container
4fbe94
diff --git a/test/TEST-18-FAILUREACTION/test.sh b/test/TEST-18-FAILUREACTION/test.sh
4fbe94
index e48ba9bac3..783b3aac6e 100755
4fbe94
--- a/test/TEST-18-FAILUREACTION/test.sh
4fbe94
+++ b/test/TEST-18-FAILUREACTION/test.sh
4fbe94
@@ -35,6 +35,13 @@ EOF
4fbe94
     ) || return 1
4fbe94
     setup_nspawn_root
4fbe94
 
4fbe94
+    # mask some services that we do not want to run in these tests
4fbe94
+    ln -s /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
4fbe94
+    ln -s /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
4fbe94
+    ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.service
4fbe94
+    ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
4fbe94
+    ln -s /dev/null $initdir/etc/systemd/system/systemd-resolved.service
4fbe94
+
4fbe94
     ddebug "umount $TESTDIR/root"
4fbe94
     umount $TESTDIR/root
4fbe94
 }
4fbe94
diff --git a/test/TEST-19-DELEGATE/test.sh b/test/TEST-19-DELEGATE/test.sh
4fbe94
index 841a29c06f..ef1d99932a 100755
4fbe94
--- a/test/TEST-19-DELEGATE/test.sh
4fbe94
+++ b/test/TEST-19-DELEGATE/test.sh
4fbe94
@@ -20,6 +20,14 @@ test_setup() {
4fbe94
 
4fbe94
         setup_basic_environment
4fbe94
 
4fbe94
+        # mask some services that we do not want to run in these tests
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-machined.service
4fbe94
+
4fbe94
         # setup the testsuite service
4fbe94
         cat >$initdir/etc/systemd/system/testsuite.service <
4fbe94
 [Unit]
4fbe94
diff --git a/test/TEST-20-MAINPIDGAMES/test.sh b/test/TEST-20-MAINPIDGAMES/test.sh
4fbe94
index b14083a256..4ec8081478 100755
4fbe94
--- a/test/TEST-20-MAINPIDGAMES/test.sh
4fbe94
+++ b/test/TEST-20-MAINPIDGAMES/test.sh
4fbe94
@@ -17,6 +17,14 @@ test_setup() {
4fbe94
 
4fbe94
         setup_basic_environment
4fbe94
 
4fbe94
+        # mask some services that we do not want to run in these tests
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-machined.service
4fbe94
+
4fbe94
         # setup the testsuite service
4fbe94
         cat >$initdir/etc/systemd/system/testsuite.service <
4fbe94
 [Unit]
4fbe94
diff --git a/test/TEST-23-TYPE-EXEC/test.sh b/test/TEST-23-TYPE-EXEC/test.sh
4fbe94
index bdcea239a7..2e76451f5b 100755
4fbe94
--- a/test/TEST-23-TYPE-EXEC/test.sh
4fbe94
+++ b/test/TEST-23-TYPE-EXEC/test.sh
4fbe94
@@ -17,6 +17,14 @@ test_setup() {
4fbe94
 
4fbe94
         setup_basic_environment
4fbe94
 
4fbe94
+        # mask some services that we do not want to run in these tests
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service
4fbe94
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-machined.service
4fbe94
+
4fbe94
         # setup the testsuite service
4fbe94
         cat >$initdir/etc/systemd/system/testsuite.service <
4fbe94
 [Unit]