fix-build-5bd97b39a03

commit 5bd97b39a0321f279f521ee6c8c043778cb3d7d8
Author: Sergio Cazzolato <sergio.cazzolato@canonical.com>
Date:   Tue Aug 23 12:01:00 2022 -0300

    tests: fix sbuild test on debian sid (#12043)

    * Fix sbuild test on debian sid

    The test was failing because of 2 problems:
    1. not enough space in the disk to run the test
    2. it was failing to find package "github.com/canonical/go-tpm2" in the
    file
    src/github.com/snapcore/snapd/tests/nested/manual/core20-da-lockout/getdalockout.go

    The solution for the second point is to add the dummy file so debian
    does not pick it up when building

    * tests: rename getdalockout_dummy.go->getdalockout_nosecboot.go

    Co-authored-by: Michael Vogt <mvo@ubuntu.com>
Gbp-Pq: Name 0015-fix-build-5bd97b39a03.patch

diff --git a/spread.yaml b/spread.yaml
index e7dc9ccb828a5758d06a6f7a45eaa089cfd9c4b1..4b0dca6b70c9f40441c8e52431fa82201bc5dd3e 100644 (file)
--- a/spread.yaml
+++ b/spread.yaml
@@ -138,6 +138,7 @@ backends:
             - debian-11-64:
                   workers: 6
             - debian-sid-64:
+                  storage: 12G
                   workers: 6
 
             - fedora-35-64:

diff --git a/tests/nested/manual/core20-da-lockout/getdalockout.go b/tests/nested/manual/core20-da-lockout/getdalockout.go
index 584bd09aa102f66891b0cb0a5770f3334fb99931..f492f3480f60cb6e739026752a0b5428e19e41fd 100644 (file)
--- a/tests/nested/manual/core20-da-lockout/getdalockout.go
+++ b/tests/nested/manual/core20-da-lockout/getdalockout.go
@@ -1,3 +1,6 @@
+//go:build !nosecboot
+// +build !nosecboot
+
 package main
 
 import (

diff --git a/tests/nested/manual/core20-da-lockout/getdalockout_nosecboot.go b/tests/nested/manual/core20-da-lockout/getdalockout_nosecboot.go
new file mode 100644 (file)
index 0000000..99150a2
--- /dev/null
+++ b/tests/nested/manual/core20-da-lockout/getdalockout_nosecboot.go
@@ -0,0 +1,10 @@
+//go:build nosecboot
+// +build nosecboot
+
+// Note: This file is needed to ensure that debian does not pick it up when building,
+// otherwise it produces the error: cannot find package "github.com/canonical/go-tpm2"
+
+package main
+
+func main() {
+}