summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2023-07-04 18:34:43 +0000
committerLars Wirzenius <liw@liw.fi>2023-07-04 18:34:43 +0000
commit45cb23d704812cc2d1077b0d6cd1a8e04805722f (patch)
treea064716df1694d294638a0606ec37a2cd67b19d7
parent4d0e933d0f243f771958ad3e590d69bbf304b5ac (diff)
parentbe7929a3fb455343ea5545de42dbe7f2c2df1b2c (diff)
downloadambient-ci-45cb23d704812cc2d1077b0d6cd1a8e04805722f.tar.gz
Merge branch 'liw/fixes' into 'main'
feat: make ambient-run-script log exit code See merge request larswirzenius/ambient-ci!24
-rw-r--r--ambient-build.service6
-rwxr-xr-xambient-run-script1
2 files changed, 5 insertions, 2 deletions
diff --git a/ambient-build.service b/ambient-build.service
index 8ea4592..2099835 100644
--- a/ambient-build.service
+++ b/ambient-build.service
@@ -1,10 +1,12 @@
[Unit]
Description=Run build job for Ambient CI
+Before=serial-getty@ttyS0.service
[Install]
-WantedBy=multi-user.target
+WantedBy=serial-getty@ttyS0.service
[Service]
Type=oneshot
+ExitType=cgroup
ExecStart=/bin/bash -c '/bin/ambient-run-script -t /dev/ttyS0 -s /dev/vdb -a /dev/vdc -c /dev/vdd -d /dev/vde >/dev/ttyS0 2>&1 || true'
-ExecStart=/sbin/poweroff
+ExecStartPost=/sbin/poweroff
diff --git a/ambient-run-script b/ambient-run-script
index a4483f1..b905609 100755
--- a/ambient-run-script
+++ b/ambient-run-script
@@ -85,6 +85,7 @@ class RunScript:
stderr=subprocess.STDOUT,
cwd=src,
)
+ self.msg(f"\nEXIT CODE: {p.returncode}\n")
def save_cache(self):
self.msg(f"save /workspace/cache to {self.args.cache}")