Skip to content

Commit 253b977

Browse files
author
Alexander Patrikalakis
committed
[skip ci] Use AL2 in CloudFormation script (fixes amazon-archives#279)
1 parent e7ba180 commit 253b977

File tree

2 files changed

+34
-44
lines changed

2 files changed

+34
-44
lines changed

dynamodb-janusgraph-storage-backend-cfn.yaml

+32-42
Original file line numberDiff line numberDiff line change
@@ -2,64 +2,55 @@
22
Description: This stack creates a VPC, an EC2 Amazon Linux host in the VPC with a
33
Public IP, and deploys Gremlin Server on it. **WARNING** This template creates
44
an Amazon EC2 instance. You will be billed for the AWS resources used if you
5-
create a stack from this template. Amazon Linux created on 2018-06-22.
5+
create a stack from this template. Uses AL2 created on 2018-06-22 and HVM virts only.
66
AWSTemplateFormatVersion: '2010-09-09'
77
Mappings:
88
AWSRegionArch2AMI:
99
ap-northeast-1:
10-
HVM64: ami-449f483b
11-
HVMG2: ami-9c9443e3
12-
PV64: ami-6593441a
10+
HVM64: ami-ef9e4990
11+
HVMG2: ami-e99f4896
1312
ap-northeast-2:
14-
HVM64: ami-5bd46135
15-
HVMG2: ami-ebc47185
13+
HVM64: ami-66c67308
14+
HVMG2: ami-afd86dc1
1615
ap-south-1:
17-
HVM64: ami-bc83a9d3
18-
HVMG2: ami-5a8da735
16+
HVM64: ami-cf82a8a0
17+
HVMG2: ami-d783a9b8
1918
ap-southeast-1:
20-
HVM64: ami-d6fdfeaa
21-
HVMG2: ami-ed838091
22-
PV64: ami-c8fcffb4
19+
HVM64: ami-838685ff
20+
HVMG2: ami-05868579
2321
ap-southeast-2:
24-
HVM64: ami-4ff8212d
25-
HVMG2: ami-33f92051
26-
PV64: ami-c4c71ea6
22+
HVM64: ami-7bf82119
23+
HVMG2: ami-39f8215b
2724
ca-central-1:
28-
HVM64: ami-49e86a2d
29-
HVMG2: ami-03e86a67
25+
HVM64: ami-72e96b16
26+
HVMG2: ami-0ee86a6a
3027
eu-central-1:
31-
HVM64: ami-e056690b
32-
HVMG2: ami-a058674b
33-
PV64: ami-1a744bf1
28+
HVM64: ami-e2526d09
29+
HVMG2: ami-7c4f7097
3430
eu-west-1:
35-
HVM64: ami-41505fab
36-
HVMG2: ami-e4515e0e
37-
PV64: ami-3c5758d6
31+
HVM64: ami-776a659d
32+
HVMG2: ami-466768ac
3833
eu-west-2:
39-
HVM64: ami-e2b35a85
40-
HVMG2: ami-b2b55cd5
34+
HVM64: ami-a4b950c3
35+
HVMG2: ami-b8b45ddf
4136
eu-west-3:
42-
HVM64: ami-78f24205
43-
HVMG2: ami-d50bbaa8
37+
HVM64: ami-2af54557
38+
HVMG2: ami-2cf54551
4439
sa-east-1:
45-
HVM64: ami-09d58f65
46-
HVMG2: ami-83d58fef
47-
PV64: ami-6dd58f01
40+
HVM64: ami-a3c892cf
41+
HVMG2: ami-6dca9001
4842
us-east-1:
49-
HVM64: ami-f316478c
50-
HVMG2: ami-cfe4b2b0
51-
PV64: ami-b41445cb
43+
HVM64: ami-7105540e
44+
HVMG2: ami-b70554c8
5245
us-east-2:
53-
HVM64: ami-ae0f36cb
54-
HVMG2: ami-40142d25
46+
HVM64: ami-d80c35bd
47+
HVMG2: ami-8c122be9
5548
us-west-1:
56-
HVM64: ami-25bf5946
57-
HVMG2: ami-0e86606d
58-
PV64: ami-1a876179
49+
HVM64: ami-57876134
50+
HVMG2: ami-e0ba5c83
5951
us-west-2:
60-
HVM64: ami-39d39d41
61-
HVMG2: ami-0ad99772
62-
PV64: ami-21d09e59
52+
HVM64: ami-bdd09ec5
53+
HVMG2: ami-a9d09ed1
6354
AWSInstanceType2Arch:
6455
t2.nano:
6556
Arch: HVM64
@@ -565,8 +556,7 @@ Resources:
565556
- - "#!/bin/bash\n"
566557
- "export SDKMAN_DIR=/usr/local/sdkman && curl -s https://get.sdkman.io | bash && source /usr/local/sdkman/bin/sdkman-init.sh\n"
567558
- "echo 'export SDKMAN_DIR=/usr/local/sdkman; source /usr/local/sdkman/bin/sdkman-init.sh' > /etc/profile.d/sdkman.sh\n"
568-
- "yum update -y -q -e 0 && yum upgrade -y -q -e 0 && yum install -y java-1.8.0-openjdk-devel > /home/ec2-user/yumupdates.log\n"
569-
- "yum remove -y java-1.7.0-openjdk > /home/ec2-user/yumremovejava7.log\n"
559+
- "yum update -y -q -e 0 && yum upgrade -y -q -e 0 && yum install -y -q java-1.8.0-openjdk-devel wget gpg zip unzip > /home/ec2-user/yumupdates.log\n"
570560
- "sdk install maven < /dev/null && set -x\n"
571561
- "mvn -version > /home/ec2-user/maven-installation-settings.log\n"
572562
- "export GREMLIN_SERVER_USERNAME='ec2-user'\n"

src/test/resources/get-recent-al-amis.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ aws ec2 describe-regions --query 'Regions[*].[RegionName]' | sed -e '/\[/d' -e '
2222
aws ec2 describe-images \
2323
--region ${region} \
2424
--owners amazon \
25-
--filters "Name=root-device-type,Values=ebs" "Name=name,Values=amzn-ami-*" \
26-
--query 'Images[? CreationDate > `'${LATER_THAN_DATE}'` && !contains(Name, `minimal`) && !contains(Name, `nat`)].[ImageId, ImageLocation]' |\
25+
--filters "Name=root-device-type,Values=ebs" "Name=name,Values=amzn2-ami*" \
26+
--query 'Images[? CreationDate > `'${LATER_THAN_DATE}'` && !contains(Name, `minimal`) && !contains(Name, `dotnetcore`) && !contains(Name, `nat`)].[ImageId, ImageLocation]' |\
2727
grep "\"" |\
2828
sed -e 's/^[ ]*\(.*\)[ ]*$/\1/' -e '/\"$/s/$/%/' |\
2929
tr "\n" "@" |\

0 commit comments

Comments
 (0)