packaging,spread.yaml: use needs-sudo to setup sudo

Sudo access is managed by the "needs-sudo" flag. We can drop our custom logic
and associated manipulation. This also ensures the testbed is correctly
selected, and incompatible systems are rejected.

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
Gbp-Pq: Name 0012-PATCH-11-18-packaging-spread.yaml-use-needs-sudo-to-.patch

diff --git a/packaging/debian-sid/tests/control b/packaging/debian-sid/tests/control
index 9b2b367a6ba67dadb860c45cfee146db71199ba4..724473db9e29a6d6900f482be8432869c1c0eb51 100644 (file)
--- a/packaging/debian-sid/tests/control
+++ b/packaging/debian-sid/tests/control
@@ -1,5 +1,5 @@
 Tests: integrationtests
-Restrictions: allow-stderr, rw-build-tree, needs-root, breaks-testbed, isolation-machine
+Restrictions: allow-stderr, rw-build-tree, needs-root, breaks-testbed, isolation-machine, needs-sudo
 Depends: bzr,
          ca-certificates,
          git,

diff --git a/spread.yaml b/spread.yaml
index 2206e102b35bea566b2ec04a26bf293748ec4f3b..3b4bf56319bbf8655c1a75f487836ff3293ac0e4 100644 (file)
--- a/spread.yaml
+++ b/spread.yaml
@@ -442,7 +442,6 @@ backends:
                 FATAL "adhoc only works inside autopkgtest"
                 exit 1
             fi
-            echo 'ubuntu ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/99-spread-users
             ADDRESS localhost:22
         discard: |
             echo "Discarding ad-hoc $SPREAD_SYSTEM"