aboutsummaryrefslogtreecommitdiffstats
path: root/packer/templates/basebuild.json
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2017-01-25 23:11:24 +0100
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2017-01-25 23:17:11 +0100
commit0c95abf26a191a2980a9e023145c2736451e279c (patch)
treec00b68912d9f2d6a964b73b24217ef40b15cf489 /packer/templates/basebuild.json
parentf6d65d12644c9a9f28d3900400e482291e595730 (diff)
Properly name basebuild images after slave label
Change-Id: I283c08200ba3faf06752b4d4aecc099299be0ad2 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'packer/templates/basebuild.json')
-rw-r--r--packer/templates/basebuild.json9
1 files changed, 1 insertions, 8 deletions
diff --git a/packer/templates/basebuild.json b/packer/templates/basebuild.json
index 8e60b5f9..32fe67a4 100644
--- a/packer/templates/basebuild.json
+++ b/packer/templates/basebuild.json
@@ -41,16 +41,9 @@
},
{
"type": "shell",
- "environment_vars": [
- "LAVAHOST={{user `lavahost`}}",
- "LAVAUSER={{user `lavauser`}}",
- "LAVATOKEN={{user `lavatoken`}}"
- ],
"scripts": [
"provision/baseline.sh",
- "provision/basebuild.sh",
- "provision/agl_dependencies.sh",
- "provision/agl_mirror.sh",
+ "provision/basebuild-no-tmpfs.sh",
"provision/system_reseal.sh"
],
"execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"