Skip to content

Commit

Permalink
Deprecate Alinux1
Browse files Browse the repository at this point in the history
* packer_alinux.json
* amazon-2018/cgroup.conf.erb
* amazon-2018/slurm.sysconfig.erb

* metadata.rb
* build_ami.sh
* defaults
* helpers
* conditions
* comments
* kitchen tests

Signed-off-by: Enrico Usai <usai@amazon.com>
  • Loading branch information
enrico-usai authored and rexcsn committed Mar 22, 2021
1 parent 158411f commit a024e88
Show file tree
Hide file tree
Showing 19 changed files with 52 additions and 765 deletions.
61 changes: 0 additions & 61 deletions .kitchen.cloud.yml
Expand Up @@ -29,67 +29,6 @@ provisioner:
client_fork: false # Forked instances don't return the real exit code

platforms:
- name: amazon-linux-latest
driver_plugin: ec2
driver_config:
image_id: <%= ENV['ALINUX_IMAGE_ID'] %>
block_device_mappings:
- device_name: /dev/xvda
ebs:
volume_size: <%= ENV['VOLUME_SIZE'] || 35 %>
volume_type: gp2
delete_on_termination: true
- device_name: /dev/xvdba
virtual_name: ephemeral0
- device_name: /dev/xvdbb
virtual_name: ephemeral1
- device_name: /dev/xvdbc
virtual_name: ephemeral2
- device_name: /dev/xvdbd
virtual_name: ephemeral3
- device_name: /dev/xvdbe
virtual_name: ephemeral4
- device_name: /dev/xvdbf
virtual_name: ephemeral5
- device_name: /dev/xvdbg
virtual_name: ephemeral6
- device_name: /dev/xvdbh
virtual_name: ephemeral7
- device_name: /dev/xvdbi
virtual_name: ephemeral8
- device_name: /dev/xvdbj
virtual_name: ephemeral9
- device_name: /dev/xvdbk
virtual_name: ephemeral10
- device_name: /dev/xvdbl
virtual_name: ephemeral11
- device_name: /dev/xvdbm
virtual_name: ephemeral12
- device_name: /dev/xvdbn
virtual_name: ephemeral13
- device_name: /dev/xvdbo
virtual_name: ephemeral14
- device_name: /dev/xvdbp
virtual_name: ephemeral15
- device_name: /dev/xvdbq
virtual_name: ephemeral16
- device_name: /dev/xvdbr
virtual_name: ephemeral17
- device_name: /dev/xvdbs
virtual_name: ephemeral18
- device_name: /dev/xvdbt
virtual_name: ephemeral19
- device_name: /dev/xvdbu
virtual_name: ephemeral20
- device_name: /dev/xvdbv
virtual_name: ephemeral21
- device_name: /dev/xvdbw
virtual_name: ephemeral22
- device_name: /dev/xvdbx
virtual_name: ephemeral23
transport:
username: ec2-user
ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %>
- name: amazon-linux-2-latest
driver_plugin: ec2
driver_config:
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Expand Up @@ -11,6 +11,8 @@ This file is used to list changes made in each version of the AWS ParallelCluste
- Change to ssh_target_checker.sh syntax that makes the script compatible with pdsh

**CHANGES**
- Ubuntu 16.04 is no longer supported.
- Amazon Linux is no longer supported.
- Increase timeout when attaching EBS volumes from 3 to 5 minutes.
- Retry `berkshelf` installation up to 3 times.
- Root volume size increased to 35GB on all AMIs.
Expand Down
8 changes: 4 additions & 4 deletions amis/build_ami.sh
Expand Up @@ -16,7 +16,7 @@
#
# Usage: build_ami.sh --os <os> --region <region> --partition <partition> [--public] [--custom]
# [--build-date <build-date>] [--arch <arch>]
# os: the os to build (supported values: all|centos7|centos8|alinux|alinux2|ubuntu1804)
# os: the os to build (supported values: all|centos7|centos8|alinux2|ubuntu1804)
# partition: partition to build in (supported values: commercial|govcloud|china|region)
# region: region to copy ami too (supported values: all|us-east-1|us-gov-west-1|...)
# custom: specifies to create the AMI from a custom AMI-id, which must be specified by variable CUSTOM_AMI_ID in the environment (optional)
Expand Down Expand Up @@ -115,7 +115,7 @@ check_options() {
set -e

available_arm_os="ubuntu1804 alinux2 centos8" # subset of supported OSes for which ARM AMIs are available
available_os="centos7 alinux ${available_arm_os}"
available_os="centos7 ${available_arm_os}"
cwd="$(dirname $0)"
export COOKBOOK_PATH="$(cd ${cwd}/..; pwd)"
export SCRIPT_PATH="${cwd}/../../script"
Expand Down Expand Up @@ -184,7 +184,7 @@ check_options() {
esac

# Ensure the specified architecture-OS combination is valid
if [ "${_arch}" == "arm64" ] && [[ "${_os}" =~ ^(centos7|alinux)$ ]]; then
if [ "${_arch}" == "arm64" ] && [[ "${_os}" == "centos7" ]]; then
echo "Currently there are no arm64 AMIs available for ${_os}."
exit 1
elif [ "${_arch}" == "arm64" ] && [ "${_os}" == "all" ]; then
Expand Down Expand Up @@ -215,7 +215,7 @@ do_command() {
RC=$?
done
;;
centos7|centos8|alinux|ubuntu1804|alinux2)
centos7|centos8|ubuntu1804|alinux2)
packer build -color=false -var-file="${cwd}/packer_variables.json" -only=${only} "${cwd}/packer_${_os}.json"
RC=$?
;;
Expand Down

0 comments on commit a024e88

Please sign in to comment.