Verified Commit cc03d02f authored by Sven-Hendrik Haase's avatar Sven-Hendrik Haase
Browse files

Set fixed cpus and memory

parent 307e698a
......@@ -3,8 +3,6 @@
"iso_url": "https://mirror.pkgbuild.com/iso/latest/archlinux-{{isotime \"2006.01\"}}.01-x86_64.iso",
"iso_checksum_url": "https://mirror.pkgbuild.com/iso/latest/sha1sums.txt",
"disk_size": "20480",
"memory": "1024",
"cpus": "2",
"headless": "true",
"write_zeroes": "",
"boot_wait": "60s",
......@@ -15,6 +13,8 @@
{
"name": "Arch-Linux-x86_64-cloudimg-{{isotime \"2006-01-02\"}}.img",
"type": "qemu",
"cpus": 2,
"memory": 1024,
"output_directory": "release",
"boot_wait": "{{user `boot_wait`}}",
"http_directory": "http",
......@@ -24,21 +24,11 @@
"ssh_username": "arch",
"ssh_password": "arch",
"ssh_port": 22,
"ssh_timeout": "10000s",
"ssh_timeout": "2000s",
"shutdown_command": "sudo systemctl poweroff",
"headless": "{{user `headless`}}",
"accelerator": "{{user `accelerator`}}",
"disk_compression": true,
"qemuargs": [
[
"-m",
"{{user `memory`}}"
],
[
"-smp",
"{{user `cpus`}}"
]
],
"boot_command": [
"<enter><wait10><wait10><wait10><wait10><wait10><enter><enter>",
"curl -O 'http://{{.HTTPIP}}:{{.HTTPPort}}/install{,-common,-cloud}.sh'<enter><wait>",
......
......@@ -4,8 +4,6 @@
"iso_url": "https://mirror.pkgbuild.com/iso/latest/archlinux-{{isotime \"2006.01\"}}.01-x86_64.iso",
"iso_checksum_url": "https://mirror.pkgbuild.com/iso/latest/sha1sums.txt",
"disk_size": "20480",
"memory": "1024",
"cpus": "2",
"headless": "true",
"write_zeroes": "",
"boot_wait": "60s",
......@@ -15,6 +13,8 @@
"builders": [
{
"type": "virtualbox-iso",
"cpus": 2,
"memory": 1024,
"boot_wait": "{{user `boot_wait`}}",
"http_directory": "http",
"disk_size": "{{user `disk_size`}}",
......@@ -50,6 +50,8 @@
},
{
"type": "qemu",
"cpus": 2,
"memory": 1024,
"boot_wait": "{{user `boot_wait`}}",
"http_directory": "http",
"disk_size": "{{user `disk_size`}}",
......@@ -63,16 +65,6 @@
"headless": "{{user `headless`}}",
"accelerator": "{{user `accelerator`}}",
"disk_compression": true,
"qemuargs": [
[
"-m",
"{{user `memory`}}"
],
[
"-smp",
"{{user `cpus`}}"
]
],
"boot_command": [
"<enter><wait10><wait10><wait10><wait10><wait10><enter><enter>",
"curl -O 'http://{{.HTTPIP}}:{{.HTTPPort}}/install{,-common,-chroot}.sh'<enter><wait>",
......
......@@ -3,8 +3,6 @@
"iso_url": "https://mirror.pkgbuild.com/iso/latest/archlinux-{{isotime \"2006.01\"}}.01-x86_64.iso",
"iso_checksum_url": "https://mirror.pkgbuild.com/iso/latest/sha1sums.txt",
"disk_size": "20480",
"memory": "1024",
"cpus": "2",
"headless": "true",
"vagrant_cloud_token": "PLACEHOLDER",
"write_zeroes": "",
......@@ -14,6 +12,8 @@
"builders": [
{
"type": "virtualbox-iso",
"cpus": 2,
"memory": 1024,
"boot_wait": "{{user `boot_wait`}}",
"http_directory": "http",
"disk_size": "{{user `disk_size`}}",
......@@ -27,20 +27,6 @@
"shutdown_command": "sudo systemctl poweroff",
"guest_additions_mode": "disable",
"headless": "{{user `headless`}}",
"vboxmanage": [
[
"modifyvm",
"{{.Name}}",
"--memory",
"{{user `memory`}}"
],
[
"modifyvm",
"{{.Name}}",
"--cpus",
"{{user `cpus`}}"
]
],
"boot_command": [
"<enter><wait10><wait10><wait10><wait10><wait10><enter><enter>",
"curl -O 'http://{{.HTTPIP}}:{{.HTTPPort}}/install{,-common,-chroot}.sh'<enter><wait>",
......@@ -49,6 +35,8 @@
},
{
"type": "qemu",
"cpus": 2,
"memory": 1024,
"boot_wait": "{{user `boot_wait`}}",
"http_directory": "http",
"disk_size": "{{user `disk_size`}}",
......@@ -62,16 +50,6 @@
"headless": "{{user `headless`}}",
"accelerator": "{{user `accelerator`}}",
"disk_compression": true,
"qemuargs": [
[
"-m",
"{{user `memory`}}"
],
[
"-smp",
"{{user `cpus`}}"
]
],
"boot_command": [
"<enter><wait10><wait10><wait10><wait10><wait10><enter><enter>",
"curl -O 'http://{{.HTTPIP}}:{{.HTTPPort}}/install{,-common,-chroot}.sh'<enter><wait>",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment