Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Nomad
Commits
3c335961
Commit
3c335961
authored
4 years ago
by
Mahmood Ali
Browse files
Options
Download
Email Patches
Plain Diff
change ami naming
parent
fa43fc68
Branches unavailable
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
e2e/terraform/compute.tf
+6
-2
e2e/terraform/compute.tf
e2e/terraform/packer/ubuntu-bionic-amd64.pkr.hcl
+2
-1
e2e/terraform/packer/ubuntu-bionic-amd64.pkr.hcl
e2e/terraform/packer/windows-2016-amd64.pkr.hcl
+5
-2
e2e/terraform/packer/windows-2016-amd64.pkr.hcl
with
13 additions
and
5 deletions
+13
-5
e2e/terraform/compute.tf
+
6
-
2
View file @
3c335961
locals
{
ami_prefix
=
"nomad-e2e-v2"
}
resource
"aws_instance"
"server"
{
ami
=
data
.
aws_ami
.
ubuntu_bionic_amd64
.
image_id
instance_type
=
var
.
instance_type
...
...
@@ -60,7 +64,7 @@ data "aws_ami" "ubuntu_bionic_amd64" {
filter
{
name
=
"name"
values
=
[
"
nomad-e2e
-ubuntu-bionic-amd64-*"
]
values
=
[
"
${
local
.
ami_prefix
}
-ubuntu-bionic-amd64-*"
]
}
filter
{
...
...
@@ -75,7 +79,7 @@ data "aws_ami" "windows_2016_amd64" {
filter
{
name
=
"name"
values
=
[
"
nomad-e2e
-windows-2016-amd64-*"
]
values
=
[
"
${
local
.
ami_prefix
}
-windows-2016-amd64-*"
]
}
filter
{
...
...
This diff is collapsed.
Click to expand it.
e2e/terraform/packer/ubuntu-bionic-amd64.pkr.hcl
+
2
-
1
View file @
3c335961
locals
{
timestamp
=
regex_replace
(
timestamp
(),
"[- TZ:]"
,
""
)
distro
=
"ubuntu-bionic-18.04-amd64-server-*"
version
=
"v2"
}
source
"amazon-ebs"
"latest_ubuntu_bionic"
{
ami_name
=
"nomad-e2e-ubuntu-bionic-amd64-${local.timestamp}"
ami_name
=
"nomad-e2e-
${local.version}-
ubuntu-bionic-amd64-${local.timestamp}"
iam_instance_profile
=
"packer_build"
// defined in nomad-e2e repo
instance_type
=
"t2.medium"
region
=
"us-east-1"
...
...
This diff is collapsed.
Click to expand it.
e2e/terraform/packer/windows-2016-amd64.pkr.hcl
+
5
-
2
View file @
3c335961
locals
{
timestamp
=
regex_replace
(
timestamp
(),
"[- TZ:]"
,
""
)
}
locals
{
timestamp
=
regex_replace
(
timestamp
(),
"[- TZ:]"
,
""
)
version
=
"v2"
}
source
"amazon-ebs"
"latest_windows_2016"
{
ami_name
=
"nomad-e2e-windows-2016-amd64-${local.timestamp}"
ami_name
=
"nomad-e2e-
${local.version}-
windows-2016-amd64-${local.timestamp}"
communicator
=
"ssh"
instance_type
=
"t2.medium"
region
=
"us-east-1"
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help