Tweak fuse.conf after the fuse package is installed, not before.

[arvados-dev.git] / jenkins / packer-images / jenkins-image-provision.json

diff --git a/jenkins/packer-images/jenkins-image-provision.json b/jenkins/packer-images/jenkins-image-provision.json
index eed310119c9ab8e2520a225411de470dae37686b..0ff59ce74bc5216ad710bbcdb47a816c52d2dd2b 100644 (file)
--- a/jenkins/packer-images/jenkins-image-provision.json
+++ b/jenkins/packer-images/jenkins-image-provision.json
@@ -1,6 +1,7 @@
 {
   "variables": {
     "key_file": "{{env `packerbuildkey`}}",
+    "distro": "",
     "source_image": ""
   },
   "builders": [
@@ -11,7 +12,7 @@
       "source_image": "{{user `source_image`}}",
       "zone": "us-central1-b",
       "disk_size": "20",
-      "image_name": "jenkins-image-arvados-formula-tests-{{isotime \"20060102150405\"}}",
+      "image_name": "jenkins-image-provision-{{user `distro`}}-{{isotime \"20060102150405\"}}",
       "image_family": "jenkins",
       "ssh_username": "jenkins"
     }
@@ -25,5 +26,6 @@
     {
       "type": "shell",
       "script": "./jenkins-image-common.sh"
+    }
   ]
 }