Revert "Multiply updates"
This reverts commit e052fbe45f5814f6cf1bdca70e69bd90a7a99673.
Change-Id: I0e14869604529cabc9548bfbecc31b3159b35a9b
diff --git a/common/zerodisk.sh b/common/zerodisk.sh
index 03f9e35..9b20b18 100644
--- a/common/zerodisk.sh
+++ b/common/zerodisk.sh
@@ -1,9 +1,4 @@
dd if=/dev/zero of=/EMPTY bs=1M || true
rm -f /EMPTY
-
-for m in $(cat /proc/mounts |grep '/dev/mapper/vg0' | awk '{print $2}'); do
- dd if=/dev/zero of=${m}/EMPTY bs=1M || true
- rm -fv ${m}/EMPTY
-done
echo 3 > /proc/sys/vm/drop_caches
sync
diff --git a/day01-image/template.json b/day01-image/template.json
index 9c07cc3..485a4a9 100644
--- a/day01-image/template.json
+++ b/day01-image/template.json
@@ -102,16 +102,6 @@
"destination": "/etc"
}
],
- "post-processors": [
- {
- "keep_input_artifact": false,
- "output": "images/{{ user `image_name` }}.qcow2",
- "type": "vagrant",
- "only": [
- "qemu"
- ]
- }
- ],
"builders": [
{
"type": "qemu",
diff --git a/mirror-image/template.json b/mirror-image/template.json
index 0055b9c..778edef 100644
--- a/mirror-image/template.json
+++ b/mirror-image/template.json
@@ -107,16 +107,6 @@
"destination": "/etc/cloud/cloud.cfg"
}
],
- "post-processors": [
- {
- "keep_input_artifact": false,
- "output": "images/{{ user `image_name` }}.qcow2",
- "type": "vagrant",
- "only": [
- "qemu"
- ]
- }
- ],
"builders": [
{
"type": "openstack",
diff --git a/packer-image-buid.groovy b/packer-image-buid.groovy
index b3d1dad..a87918f 100644
--- a/packer-image-buid.groovy
+++ b/packer-image-buid.groovy
@@ -237,8 +237,8 @@
// collect artifacts
// TODO make it possible, process multiply artifacts by one run.
dir('images/') {
- sh(script: 'find .')
- def _files = findFiles(glob: "*${imageName}*.qcow2")
+ sh(script: 'find .', returnStdout: true)
+ def _files = findFiles(glob: "*qemu*/${imageName}*")
if (_files.size() > 1) {
common.warningMsg("Multiply artifacts detected!Only first one will be processed!")
} else if (_files.size() == 0) {
diff --git a/trymcp-day01-image/template.json b/trymcp-day01-image/template.json
index 1d99915..6660adb 100644
--- a/trymcp-day01-image/template.json
+++ b/trymcp-day01-image/template.json
@@ -85,16 +85,6 @@
"destination": "/etc"
}
],
- "post-processors": [
- {
- "keep_input_artifact": false,
- "output": "images/{{ user `image_name` }}.qcow2",
- "type": "vagrant",
- "only": [
- "qemu"
- ]
- }
- ],
"builders": [
{
"type": "qemu",
@@ -133,4 +123,4 @@
"ssh_wait_timeout": "360s"
}
]
-}
+}
\ No newline at end of file
diff --git a/ubuntu-16.04/http/preseed.cfg b/ubuntu-16.04/http/preseed.cfg
index a736274..ed89955 100644
--- a/ubuntu-16.04/http/preseed.cfg
+++ b/ubuntu-16.04/http/preseed.cfg
@@ -1,7 +1,6 @@
choose-mirror-bin mirror/http/proxy string
d-i mirror/country string manual
d-i apt-setup/use_mirror boolean false
-d-i base-installer/install-recommends boolean false
d-i debian-installer/locale string en_US
d-i debian-installer/language string en
diff --git a/ubuntu-16.04/run.example.sh b/ubuntu-16.04/run.example.sh
index 7341ce7..2ed17e0 100755
--- a/ubuntu-16.04/run.example.sh
+++ b/ubuntu-16.04/run.example.sh
@@ -25,6 +25,6 @@
[ -f config-drive/cloudata.iso ] && rm -v config-drive/cloudata.iso
mkisofs -o config-drive/cloudata.iso -V cidata -r -J --quiet config-drive
# For qemu test-build:
-packer build -machine-readable -only=qemu -parallel=false -on-error=ask template.json
+packer build -only=qemu -parallel=false -on-error=ask template.json
#rm -rf ~/.packer.d/
diff --git a/ubuntu-16.04/template.json b/ubuntu-16.04/template.json
index 71e67f3..7b87e75 100644
--- a/ubuntu-16.04/template.json
+++ b/ubuntu-16.04/template.json
@@ -132,14 +132,6 @@
"only": [
"docker"
]
- },
- {
- "keep_input_artifact": false,
- "output": "images/{{ user `image_name` }}.qcow2",
- "type": "vagrant",
- "only": [
- "qemu"
- ]
}
],
"builders": [