Merge pull request #398 from canonical/update-oem-autoinstall

update: resolve issues while provisioning noble oem machine using oem_autoinstall
canonical · Nov 19, 2024 · 539d441 · 539d441
2 parents 89f3c07 + cd0f1f1
commit 539d441
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/device-connectors/src/testflinger_device_connectors/data/oem_autoinstall/provision-image.sh b/device-connectors/src/testflinger_device_connectors/data/oem_autoinstall/provision-image.sh
@@ -122,7 +122,7 @@ wget_iso_on_dut() {
             exit 4
         fi
     else
-        WGET_OPTS="--tries=3"
+        WGET_OPTS="--tries=3 --progress=bar:force"
         # Optional URL credentials
         if [ -r "$URL_TOKEN" ]; then
             username=$(awk -F':' '/^username:/ {print $2}' "$URL_TOKEN" | xargs)
@@ -301,4 +301,4 @@ done
 
 echo "Deployment will start after reboot"
 exit 0
-# Let device connector to poll the status
+# Let device connector to poll the status
diff --git a/...e-connectors/src/testflinger_device_connectors/devices/oem_autoinstall/oem_autoinstall.py b/...e-connectors/src/testflinger_device_connectors/devices/oem_autoinstall/oem_autoinstall.py
@@ -26,6 +26,7 @@
 import yaml
 import shutil
 import time
+import os
 
 from testflinger_device_connectors.devices import (
     ProvisioningError,
@@ -76,6 +77,7 @@ def provision(self):
 
             if not default_user_data.exists():
                 raise ProvisioningError("Default user-data file not found")
+            os.makedirs(ATTACHMENTS_PROV_DIR, exist_ok=True)
             shutil.copy(default_user_data, ATTACHMENTS_PROV_DIR)
             user_data = "default-user-data"