Merge branch 'liw/fixes' into 'main'

variouis fixes

See merge request larswirzenius/ambient-ci!16

3 files changed, 27 insertions, 4 deletions

diff --git a/ambient-build-debian-image b/ambient-build-debian-image
index 892d006..f3d1dfe 100755
--- a/ambient-build-debian-image
+++ b/ambient-build-debian-image
@@ -4,6 +4,7 @@ import argparse
 import os
 import shutil
 import subprocess
+import sys
 import tempfile
 import yaml
 
@@ -90,7 +91,7 @@ def build_image(tmp, vmdb, tarball, image):
     if p.returncode != 0:
         with open(log, "r") as f:
             log = f.read()
-        sys.stderr.write(f"{log}\nERROR: failed to build image")
+        sys.stderr.write(f"{log}\nERROR: failed to build image\n")
         sys.exit(1)
 
     # Convert built image from raw to QCOW2 format.
@@ -99,7 +100,7 @@ def build_image(tmp, vmdb, tarball, image):
         capture_output=True,
     )
     if p.returncode != 0:
-        sys.stderr.write(f"{p.stderr}\nERROR: failed to convert image to QCOW2")
+        sys.stderr.write(f"{p.stderr}\nERROR: failed to convert image to QCOW2\n")
         sys.exit(1)
 
 
@@ -118,7 +119,7 @@ def main():
     try:
         build_image(tmp, vmdb, tarball, args.image)
     except Exception as e:
-        sys.stderr.write(f"ERROR: failed to create build files: {e}\n")
+        sys.stderr.write(f"ERROR: failed to build image: {e}\n")
         shutil.rmtree(tmp)
         sys.exit(1)
 
diff --git a/ambient.vmdb b/ambient.vmdb
index 3cd7067..adc34bb 100644
--- a/ambient.vmdb
+++ b/ambient.vmdb
@@ -61,4 +61,4 @@ steps:
     efi: efi
 
   - ansible: /
-    playbook: runner.yml
+    playbook: ambient-playbook-base.yml
diff --git a/subplot.yml b/subplot.yml
new file mode 100644
index 0000000..a1455e9
--- /dev/null
+++ b/subplot.yml
@@ -0,0 +1,22 @@
+- hosts: image
+  tasks:
+
+    - name: "install tools for Rust and Subplot"
+      apt:
+        name:
+          - build-essential
+          - cmake
+          - curl
+          - graphviz
+          - librsvg2-bin
+          - plantuml
+          - daemonize
+          - procps
+
+    - name: "install rustup"
+      shell: |
+        curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /tmp/rustup.sh
+        sh /tmp/rustup.sh -y --no-modify-path        
+
+  vars:
+    ansible_python_interpreter: /usr/bin/python3