diff options
author | Jake Buchholz <tomalok@gmail.com> | 2019-05-09 17:53:54 -0700 |
---|---|---|
committer | Jake Buchholz <tomalok@gmail.com> | 2019-05-09 17:53:54 -0700 |
commit | 6b71cf8a5fdc6fc41e8c618642e58f253b7e8e8e (patch) | |
tree | 3299f449886155c7a7fd6fbc2129c17cd4667571 | |
parent | 21246e3a524527eb7d053fe51f6a2c526b9f87f6 (diff) | |
download | alpine-ec2-ami-6b71cf8a5fdc6fc41e8c618642e58f253b7e8e8e.tar.bz2 alpine-ec2-ami-6b71cf8a5fdc6fc41e8c618642e58f253b7e8e8e.tar.xz alpine-ec2-ami-6b71cf8a5fdc6fc41e8c618642e58f253b7e8e8e.zip |
* test profile cleanup
* prep for new 'ami_architecture' directive coming with packer 1.4.1
-rw-r--r-- | packer.conf | 1 | ||||
-rw-r--r-- | profiles/test.conf | 11 |
2 files changed, 4 insertions, 8 deletions
diff --git a/packer.conf b/packer.conf index cd98c5e..685c9e1 100644 --- a/packer.conf +++ b/packer.conf | |||
@@ -41,6 +41,7 @@ builders = [ | |||
41 | Created = "{{isotime \"2006-01-02 03:04:05 MST\"}}" | 41 | Created = "{{isotime \"2006-01-02 03:04:05 MST\"}}" |
42 | } | 42 | } |
43 | ami_virtualization_type = "hvm" | 43 | ami_virtualization_type = "hvm" |
44 | # ami_architecture = "{{user `build_arch`}}" # need packer 1.4.1 | ||
44 | ami_root_device { | 45 | ami_root_device { |
45 | volume_type = "gp2" | 46 | volume_type = "gp2" |
46 | source_device_name = "/dev/xvdf" | 47 | source_device_name = "/dev/xvdf" |
diff --git a/profiles/test.conf b/profiles/test.conf index 6bf9fbe..61fc69e 100644 --- a/profiles/test.conf +++ b/profiles/test.conf | |||
@@ -7,21 +7,16 @@ arch-aarch64 { include "arch/aarch64" } | |||
7 | 7 | ||
8 | # specific to this profile's builds | 8 | # specific to this profile's builds |
9 | test { | 9 | test { |
10 | ami_name_prefix = "test" | 10 | ami_name_prefix = "test-" |
11 | ami_desc_prefix = "test" | 11 | ami_desc_prefix = "test " |
12 | build_region = "us-west-2" | 12 | build_region = "us-west-2" |
13 | build_subnet = "subnet-033a30d7b5220d177" | 13 | build_subnet = "subnet-033a30d7b5220d177" |
14 | ami_regions { | ||
15 | us-west-2 = true | ||
16 | } | ||
17 | } | 14 | } |
18 | 15 | ||
19 | # Build definitions | 16 | # Build definitions |
20 | builds { | 17 | builds { |
21 | # merge version, arch, profile, and build vars | 18 | # merge version, arch, profile, and build vars |
22 | current-x86_64 = ${version-current} ${arch-x86_64} ${test} { | 19 | current-x86_64 = ${version-current} ${arch-x86_64} ${test} |
23 | revision = "test" | ||
24 | } | ||
25 | 20 | ||
26 | # merge version, arch, and profile vars (no build-specific vars) | 21 | # merge version, arch, and profile vars (no build-specific vars) |
27 | edge-x86_64 = ${version-edge} ${arch-x86_64} ${test} | 22 | edge-x86_64 = ${version-edge} ${arch-x86_64} ${test} |