84 lines
3.6 KiB
Diff
84 lines
3.6 KiB
Diff
From 20b0b2d7973049d918a69025c5d6b6cbe00f5f41 Mon Sep 17 00:00:00 2001
|
|
From: Luca Boccassi <luca.boccassi@gmail.com>
|
|
Date: Thu, 2 Jan 2025 16:21:42 +0000
|
|
Subject: [PATCH] test: update README's Ubuntu CI section for mkosi changes
|
|
|
|
(cherry picked from commit 01829580471eb1958bc5c43caa871b243edb1055)
|
|
---
|
|
test/README.testsuite | 30 ++++++------------------------
|
|
1 file changed, 6 insertions(+), 24 deletions(-)
|
|
|
|
diff --git a/test/README.testsuite b/test/README.testsuite
|
|
index 25b44912e9..da2d17a6db 100644
|
|
--- a/test/README.testsuite
|
|
+++ b/test/README.testsuite
|
|
@@ -155,23 +155,7 @@ that make use of `run_testcases`.
|
|
|
|
New PRs submitted to the project are run through regression tests, and one set
|
|
of those is the 'autopkgtest' runs for several different architectures, called
|
|
-'Ubuntu CI'. Part of that testing is to run all these tests. Sometimes these
|
|
-tests are temporarily deny-listed from running in the 'autopkgtest' tests while
|
|
-debugging a flaky test; that is done by creating a file in the test directory
|
|
-named 'deny-list-ubuntu-ci', for example to prevent the TEST-01-BASIC test from
|
|
-running in the 'autopkgtest' runs, create the file
|
|
-'TEST-01-BASIC/deny-list-ubuntu-ci'.
|
|
-
|
|
-The tests may be disabled only for specific archs, by creating a deny-list file
|
|
-with the arch name at the end, e.g.
|
|
-'TEST-01-BASIC/deny-list-ubuntu-ci-arm64' to disable the TEST-01-BASIC test
|
|
-only on test runs for the 'arm64' architecture.
|
|
-
|
|
-Note the arch naming is not from 'uname -m', it is Debian arch names:
|
|
-https://wiki.debian.org/ArchitectureSpecificsMemo
|
|
-
|
|
-For PRs that fix a currently deny-listed test, the PR should include removal
|
|
-of the deny-list file.
|
|
+'Ubuntu CI'. Part of that testing is to run all these tests.
|
|
|
|
In case a test fails, the full set of artifacts, including the journal of the
|
|
failed run, can be downloaded from the artifacts.tar.gz archive which will be
|
|
@@ -268,7 +252,7 @@ the PR (set by the `$UPSTREAM_PULL_REQUEST` env variable) you'd like to debug:
|
|
```shell
|
|
$ git clone https://salsa.debian.org/systemd-team/systemd.git
|
|
$ cd systemd
|
|
-$ git checkout upstream-ci
|
|
+$ git checkout ci/v<XYZ>-stable
|
|
$ TEST_UPSTREAM=1 UPSTREAM_PULL_REQUEST=12345 ./debian/extra/checkout-upstream
|
|
```
|
|
|
|
@@ -278,22 +262,20 @@ Now install necessary build & test dependencies:
|
|
# PPA with some newer Ubuntu packages required by upstream systemd
|
|
$ add-apt-repository -y --enable-source ppa:upstream-systemd-ci/systemd-ci
|
|
$ apt build-dep -y systemd
|
|
-$ apt install -y autopkgtest debhelper genisoimage git qemu-system-x86 \
|
|
- libcurl4-openssl-dev libfdisk-dev libtss2-dev libfido2-dev \
|
|
- libssl-dev python3-pefile
|
|
+$ apt install -y autopkgtest fakemachine qemu-system-x86
|
|
```
|
|
|
|
Build systemd deb packages with debug info:
|
|
|
|
```shell
|
|
-$ TEST_UPSTREAM=1 DEB_BUILD_OPTIONS="nocheck nostrip noopt" dpkg-buildpackage -us -uc
|
|
+$ TEST_UPSTREAM=1 DEB_BUILD_OPTIONS="nocheck nostrip noopt pkg.systemd.upstream" dpkg-buildpackage -us -uc -b
|
|
$ cd ..
|
|
```
|
|
|
|
Prepare a testbed image for autopkgtest (tweak the release as necessary):
|
|
|
|
```shell
|
|
-$ autopkgtest-buildvm-ubuntu-cloud --ram-size 1024 -v -a amd64 -r jammy
|
|
+$ autopkgtest-buildvm-ubuntu-cloud --ram-size 1024 -v -a amd64 -r noble
|
|
```
|
|
|
|
And finally run the autopkgtest itself:
|
|
@@ -304,7 +286,7 @@ $ autopkgtest -o logs *.deb systemd/ \
|
|
--timeout-factor=3 \
|
|
--test-name=boot-and-services \
|
|
--shell-fail \
|
|
- -- autopkgtest-virt-qemu --cpus 4 --ram-size 2048 autopkgtest-jammy-amd64.img
|
|
+ -- autopkgtest-virt-qemu --cpus 4 --ram-size 2048 autopkgtest-noble-amd64.img
|
|
```
|
|
|
|
where `--test-name=` is the name of the test you want to run/debug. The
|