Merge ~roxanan/ubuntu/+source/dkms:trigger-build-when-meta-only into ubuntu/+source/dkms:ubuntu/devel

[Roxana Nicolescu]

[Dan Bungert (dbungert)]

Hi Roxana,

This looks correct to me. I think this isn't Ubuntu specific, so I suggest that we also propose it to Debian. Once that upstream proposal is at least open (debbug and/or MP against https://salsa.debian.org/debian/dkms) I think this is ready.

[Sergio Durigan Junior (sergiodj)]

If this is really not Ubuntu-specific, then I agree with Dan here. Either way, I'm leaving a comment asking for clarification below and I'm marking this MP as "Needs Information" to reflect that we're waiting for your reply before moving forward. Thanks!

review: Needs Information

[Roxana Nicolescu (roxanan)]

Apologize for the late reply, I was on holiday. And thanks for the review.

I am not sure if this applies to Debian as well because we have a specific linux-meta versioning system where we replace the '-' with the '.' That's why I did not propose it there. This commit should not affect their stuff, but I wonder if there's a justification to add it there just for Ubuntu purposes. I am not familiar with how we deal with them in these cases

[Roxana Nicolescu (roxanan)]

I think the inline comment for was deleted because I did a forced pushed. The comment in the code was wrong, abistem is without -generic.

Unmerged commits

70ddc65... by Roxana Nicolescu on 2023-03-15

dkms-autopkgtest: Add extra check for meta version in ADT_TEST_TRIGGERS

LP: #2009436

This patch will trigger the builds of a dkms module even when
ADT_TEST_TRIGGERS consists of
linux-meta-<type>/<kernel_version>.<abi_version>.<upload_version> only.

abistem variable will always have the format <kernel_version>_<abi_version>.
When autopkgtest is triggered once the kernel is in proposed,
ADT_TEST_TRIGGERS includes the meta version, the generic version
and the signed/unsigned version thus abistem will always match the generic version.

To overcome this, a new check of meta version (with . instead of -) was added.

Signed-off-by: Roxana Nicolescu <email address hidden>

diff --git a/debian/scripts/dkms-autopkgtest b/debian/scripts/dkms-autopkgtest
index a8fe3df..f0e0a4a 100755
--- a/debian/scripts/dkms-autopkgtest
+++ b/debian/scripts/dkms-autopkgtest
@@ -112,11 +112,19 @@ run_pkg() {
         # against each individual linux-meta and tracks unique results
         # per kernel abi.
         abistem=$(echo $kver | sed 's/-[a-z]*$//')
+
+        # abistem will be something like 5.15.0-60
+        # For manual retries, ADT_TEST_TRIGGERS var consists of
+        # the meta version only which has a dot instead of a dash:
+        # 5.15.0.60
+        meta_version=$(echo "$abistem" | sed -r 's/-/\./')
         case "${ADT_TEST_TRIGGERS-}" in
             *linux-meta*)
                 case "$ADT_TEST_TRIGGERS" in
                     *"$abistem"*)
                         ;;
+                    *"$meta_version"*)
+                        ;;
                     *)
                         continue
                         ;;