Merge pull request #18029 from bluca/minor_fixes

Minor test script runner and labeller bot fixes
mkosi: Add basic editors to final images
2026-03-06 13:15:06 +01:00 · 2020-12-20 10:01:59 +09:00 · 2020-12-19 22:04:31 +00:00 · 2020-12-19 21:56:57 +00:00 · 2020-12-19 21:56:57 +00:00 · 2020-12-19 21:56:57 +00:00
7 changed files with 27 additions and 7 deletions
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@ -4,7 +4,6 @@ units:
  - units/**/*
 documentation:
  - NEWS
-  - man/*
  - docs/*
 network:
  - src/libsystemd-network/**/*
@ -17,8 +16,10 @@ selinux:
 apparmor:
  - '**/*apparmor*'
 meson:
-  - '**/meson.build'
  - meson_option.txt
+mkosi:
+  - .mkosi/*
+  - mkosi.build
 busctl:
  - src/busctl/*
 systemctl:
@ -27,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/*
--- a/.mkosi/mkosi.arch
+++ b/.mkosi/mkosi.arch
@ -56,8 +56,10 @@ BuildPackages=
 Packages=
        gdb
        libidn2
+        nano
        qrencode
        strace
+        vi

 [Host]
 QemuHeadless=yes
--- a/.mkosi/mkosi.debian
+++ b/.mkosi/mkosi.debian
@ -73,7 +73,9 @@ Packages=
        # We pull in the -dev package here, since the binary ones appear to change names too often, and the -dev package pulls the right deps in automatically
        libtss2-dev
        locales
+        nano
        strace
+        vim-tiny

 [Host]
 QemuHeadless=yes
--- a/.mkosi/mkosi.fedora
+++ b/.mkosi/mkosi.fedora
@ -77,10 +77,12 @@ Packages=
        # libfido2 + libzstd can be dropped once the Fedora RPM gets a dependency on them
        libfido2
        libzstd
+        nano
        # procps-ng provides a set of useful utilies (ps, free, etc)
        procps-ng
        strace
        tpm2-tss
+        vi

 BuildDirectory=mkosi.builddir
 Cache=mkosi.cache
--- a/.mkosi/mkosi.opensuse
+++ b/.mkosi/mkosi.opensuse
@ -76,8 +76,10 @@ Packages=
        libqrencode4
        libseccomp2
        pam
+        nano
        strace
        util-linux
+        vi

 [Host]
 QemuHeadless=yes
--- a/.mkosi/mkosi.ubuntu
+++ b/.mkosi/mkosi.ubuntu
@ -76,7 +76,9 @@ Packages=
        # We pull in the -dev package here, since the binary ones appear to change names too often, and the -dev package pulls the right deps in automatically
        libtss2-dev
        locales
+        nano
        strace
+        vim-tiny

 [Host]
 QemuHeadless=yes
--- 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"
@ -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--"
Author	SHA1	Message	Date
Yu Watanabe	87cc47ba1d	Merge pull request #18029 from bluca/minor_fixes Minor test script runner and labeller bot fixes	2020-12-20 10:01:59 +09:00
Daan De Meyer	262cd9facd	mkosi: Add basic editors to final images It's often useful to have an editor available to edit some random config file in the final image. Let's install some basic editors that don't take up too much space.	2020-12-19 22:04:31 +00:00
Luca Boccassi	d9107e16f2	Add more matching rules to GA labeler bot for subcomponents	2020-12-19 21:56:57 +00:00
Luca Boccassi	d78911e9f7	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	2020-12-19 21:56:57 +00:00
Luca Boccassi	92fa741cf2	test: fix regex in run-integration-tests.sh The regex results in calls of "make setup run -again" which is broken	2020-12-19 21:56:57 +00:00
Luca Boccassi	b382b8de1e	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	2020-12-19 21:56:57 +00:00