From ca2896b9ba6d956be5768db0c35f75a040cb28e3 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Fri, 3 Apr 2020 15:45:52 -0700
Subject: rework

---
 bin/buildssrht-preupload | 50 +++++++++++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 20 deletions(-)

diff --git a/bin/buildssrht-preupload b/bin/buildssrht-preupload
index 5fa456c4..347aa771 100755
--- a/bin/buildssrht-preupload
+++ b/bin/buildssrht-preupload
@@ -48,32 +48,42 @@ my $chroot  = "$dist-amd64-sbuild";
 my $changes = "${source}_${version}_multi.changes";
 
 my $manifest->{image} = "debian/unstable";
-$manifest->{sources}  = [$clone_uri];
+$manifest->{sources} = [$clone_uri];
 $manifest->{packages}
   = ["autopkgtest", "devscripts", "dgit", "lintian", "piuparts", "sbuild"];
-$manifest->{tasks} = [{
-        setup => join "\n",
-        "cd $source",
-        "git deborig || origtargz",
-        join(
-            " ",
-            qw(sudo
-              sbuild-createchroot
-              --command-prefix=eatmydata
-              --include=eatmydata),
-            $dist,
-            "/srv/chroot/$chroot"
-        ),
-        ""
+my @tasks = ({
+        setup => [
+            "cd $source",
+            "git deborig || origtargz",
+            join(
+                " ",
+                qw(sudo
+                  sbuild-createchroot
+                  --command-prefix=eatmydata
+                  --include=eatmydata),
+                $dist,
+                "/srv/chroot/$chroot"
+            ),
+            "sudo sbuild-adduser \$USER"
+        ]
     },
-    { build   => "cd $source\ndgit --quilt=$quilt sbuild -d $dist\n" },
-    { lintian => "lintian $changes\n" },
     {
-        piuparts => "sudo piuparts --schroot $chroot foo $changes\n"
+        build => [
+            "cd $source",
+            "dgit --quilt=$quilt sbuild -d $dist --no-run-lintian"
+        ]
     },
+    { lintian => ["lintian $changes"] },
     {
-        autopkgtest => "sudo autopkgtest $changes -- schroot $chroot\n"
-    }];
+        piuparts =>
+          ["sudo piuparts --no-eatmydata --schroot $chroot foo $changes"]
+    },
+    {
+        autopkgtest => ["autopkgtest $changes -- schroot $chroot"] });
+foreach my $task (@tasks) {
+    my ($k, $v) = each %$task;
+    push $manifest->{tasks}->@*, { $k => join "\n", @$v, "" };
+}
 
 my $client = REST::Client->new;
 $client->setHost("https://builds.sr.ht");
-- 
cgit v1.2.3