From b382b8de1eccd6f8893673df3f9ccebe23adc4ce Mon Sep 17 00:00:00 2001
From: Luca Boccassi <bluca@debian.org>
Date: Sat, 19 Dec 2020 18:41:03 +0000
Subject: [PATCH 1/4] test: use deny-list in run-integration-tests.sh

The old env var doesn't seem to be used anywhere, and the script
currently doesn't work, so it seems safe to change immediately
---
 test/run-integration-tests.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/run-integration-tests.sh b/test/run-integration-tests.sh
index 04b8385be9..2d3f0ee94f 100755
--- a/test/run-integration-tests.sh
+++ b/test/run-integration-tests.sh
@@ -30,10 +30,10 @@ if [ $do_clean = 1 ]; then
     [ -n "$args_no_clean" ] || exit 0
 fi
 
-pass_blacklist() {
-    for marker in $BLACKLIST_MARKERS; do
+pass_deny_list() {
+    for marker in $DENY_LIST_MARKERS $BLACKLIST_MARKERS; do
         if [ -f "$1/$marker" ]; then
-            echo "========== BLACKLISTED: $1 ($marker) =========="
+            echo "========== DENY-LISTED: $1 ($marker) =========="
             return 1
         fi
     done
@@ -43,7 +43,7 @@ pass_blacklist() {
 for TEST in TEST-??-* ; do
     COUNT=$(($COUNT+1))
 
-    pass_blacklist $TEST || continue
+    pass_deny_list $TEST || continue
     start=$(date +%s)
 
     echo -e "\n--x-- Running $TEST --x--"

From 92fa741cf2824f47a1ad81dd6d2f08d7f0266272 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <bluca@debian.org>
Date: Sat, 19 Dec 2020 18:42:20 +0000
Subject: [PATCH 2/4] test: fix regex in run-integration-tests.sh

The regex results in calls of "make setup run -again" which is broken
---
 test/run-integration-tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/run-integration-tests.sh b/test/run-integration-tests.sh
index 2d3f0ee94f..3c01adfca3 100755
--- a/test/run-integration-tests.sh
+++ b/test/run-integration-tests.sh
@@ -7,7 +7,7 @@ if [ $# -gt 0 ]; then
 else
     args="setup run clean-again"
 fi
-args_no_clean=$(sed -r 's/\bclean\b//g' <<<$args)
+args_no_clean=$(sed -r 's/\bclean.*\b//g' <<<$args)
 do_clean=$( [ "$args" = "$args_no_clean" ]; echo $? )
 
 ninja -C "$BUILD_DIR"

From d78911e9f7505c142a96be4de8633d2f4346a8e4 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <bluca@debian.org>
Date: Sat, 19 Dec 2020 18:43:27 +0000
Subject: [PATCH 3/4] False positives in GA labeler bot

Don't automatically match on man/* and **/meson.build, since we change those
files as part of larger changes that we usually don't mark that way
---
 .github/labeler.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/labeler.yml b/.github/labeler.yml
index d96566a2ed..cda0a59b9d 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -4,7 +4,6 @@ units:
   - units/**/*
 documentation:
   - NEWS
-  - man/*
   - docs/*
 network:
   - src/libsystemd-network/**/*
@@ -17,7 +16,6 @@ selinux:
 apparmor:
   - '**/*apparmor*'
 meson:
-  - '**/meson.build'
   - meson_option.txt
 busctl:
   - src/busctl/*

From d9107e16f2100f39fb1e1dda84e3ed274ce53c18 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <bluca@debian.org>
Date: Sat, 19 Dec 2020 18:43:59 +0000
Subject: [PATCH 4/4] Add more matching rules to GA labeler bot for
 subcomponents

---
 .github/labeler.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.github/labeler.yml b/.github/labeler.yml
index cda0a59b9d..121f4b734d 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -17,6 +17,9 @@ apparmor:
   - '**/*apparmor*'
 meson:
   - meson_option.txt
+mkosi:
+  - .mkosi/*
+  - mkosi.build
 busctl:
   - src/busctl/*
 systemctl:
@@ -25,3 +28,12 @@ journal:
   - src/journal/*
 journal-remote:
   - src/journal-remote/*
+portable:
+  - src/portable/**/*
+resolve:
+  - src/resolve/*
+timedate:
+  - src/timedate/*
+timesync:
+  - src/timesync/*
+  - src/time-wait-sync/*