Skip to content

Commit be9bda1

Browse files
authored
Merge 1.5.1 Release into master
2 parents 25973c5 + 6f93a38 commit be9bda1

31 files changed

+385
-137
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
*Issue #, if available:*
2+
3+
*Description of changes:*
4+
5+
6+
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

.kitchen.cloud.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,13 @@ driver_config:
1616
provisioner:
1717
name: chef_zero
1818
require_chef_omnibus: 12.19.36
19+
retry_on_exit_code:
20+
- 35 # 35 is the exit code signaling that the node is rebooting
21+
max_retries: 1
22+
wait_for_retry: 120
23+
client_rb:
24+
exit_status: :enabled # Opt-in to the standardized exit codes
25+
client_fork: false # Forked instances don't return the real exit code
1926

2027
platforms:
2128
- name: amazon-linux-latest

.kitchen.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ platforms:
1313
suites:
1414
- name: default
1515
run_list:
16-
- recipe[cfncluster::_update_packages]
16+
- recipe[cfncluster::_default_pre]
1717
- recipe[cfncluster::default]
1818
attributes:
1919

2020
- name: default_gpu
2121
run_list:
22-
- recipe[cfncluster::_update_packages]
22+
- recipe[cfncluster::_default_pre]
2323
- recipe[cfncluster::default]
2424
attributes:
2525
cfncluster:

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,20 @@ cfncluster-cookbook CHANGELOG
33

44
This file is used to list changes made in each version of the cfncluster cookbook.
55

6+
1.5.1
7+
-----
8+
9+
Major new features/updates:
10+
11+
- Added parameter to specify custom cfncluster-node package
12+
13+
Bug fixes/minor improvements:
14+
15+
- Fixed poise-python dependecy issue
16+
- Poll on EBS Volume attachment status
17+
- Added more info on failure of pre and post install files
18+
- Fixed SLURM cron job to publish pending metric
19+
620
1.4.1
721
-----
822

CODE_OF_CONDUCT.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
## Code of Conduct
2+
This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct).
3+
For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact
4+
[email protected] with any additional questions or comments.

CONTRIBUTING.md

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
# Contributing Guidelines
2+
3+
Thank you for your interest in contributing to our project. Whether it's a bug report, new feature, correction, or additional
4+
documentation, we greatly value feedback and contributions from our community.
5+
6+
Please read through this document before submitting any issues or pull requests to ensure we have all the necessary
7+
information to effectively respond to your bug report or contribution.
8+
9+
10+
## Reporting Bugs/Feature Requests
11+
12+
We welcome you to use the GitHub issue tracker to report bugs or suggest features.
13+
14+
When filing an issue, please check [existing open](https://github.com/awslabs/cfncluster-cookbook/issues), or [recently closed](https://github.com/awslabs/cfncluster-cookbook/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), issues to make sure somebody else hasn't already
15+
reported the issue. Please try to include as much information as you can. Details like these are incredibly useful:
16+
17+
* A reproducible test case or series of steps
18+
* The version of our code being used
19+
* Any modifications you've made relevant to the bug
20+
* Anything unusual about your environment or deployment
21+
22+
23+
## Contributing via Pull Requests
24+
Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that:
25+
26+
1. You are working against the latest source on the *develop* branch.
27+
2. You check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
28+
3. You open an issue to discuss any significant work - we would hate for your time to be wasted.
29+
30+
To send us a pull request, please:
31+
32+
1. Fork the repository.
33+
2. Modify the source; please focus on the specific change you are contributing. If you also reformat all the code, it will be hard for us to focus on your change.
34+
3. Ensure local tests pass.
35+
4. Commit to your fork using clear commit messages.
36+
5. Send us a pull request, answering any default questions in the pull request interface.
37+
6. Pay attention to any automated CI failures reported in the pull request, and stay involved in the conversation.
38+
39+
GitHub provides additional document on [forking a repository](https://help.github.com/articles/fork-a-repo/) and
40+
[creating a pull request](https://help.github.com/articles/creating-a-pull-request/).
41+
42+
43+
## Finding contributions to work on
44+
Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels ((enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any ['help wanted'](https://github.com/awslabs/cfncluster-cookbook/labels/help%20wanted) issues is a great place to start.
45+
46+
47+
## Code of Conduct
48+
This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct).
49+
For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact
50+
[email protected] with any additional questions or comments.
51+
52+
53+
## Security issue notifications
54+
If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public github issue.
55+
56+
57+
## Licensing
58+
59+
See the [LICENSE](https://github.com/awslabs/cfncluster-cookbook/blob/develop/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
60+
61+
We may ask you to sign a [Contributor License Agreement (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes.

amis/build_ami.sh

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
#!/bin/bash -x
2+
3+
# This script creates a set of CfnCluster AMIs.
4+
#
5+
# The following variables must be exported in the environment:
6+
# AWS_FLAVOR_ID=<instance-type>
7+
# AWS_VPC_ID=<us-east-1-vpc-id>
8+
# AWS_SUBNET_ID=<us-east-1-subnet-id>
9+
# NVIDIA_ENABLED=<no|yes>
10+
#
11+
# NOTE: The VPC and the Subnet must be in the us-east-1 region, because the packer templates refer to
12+
# AMI IDs from this region. Moreover, the CentOs AMIs are private to the CfnCluster AWS account.
13+
#
14+
# Usage: build_ami.sh <os> <region> [private|public] [<build-date>]
15+
# os: the os to build (supported values: all|centos6|centos7|alinux|ubuntu1404|ubuntu1604)
16+
# region: region to build (supported values: all|us-east-1|...)
17+
# private|public: specifies AMIs visibility (optional, default is private)
18+
# build-date: timestamp to append to the AMIs names (optional)
19+
20+
set -e
21+
22+
os=$1
23+
region=$2
24+
public=$3
25+
build_date=$4
26+
27+
available_os="centos6 centos7 alinux ubuntu1404 ubuntu1604"
28+
available_regions="eu-west-1,eu-west-2,eu-west-3,ap-southeast-1,ap-southeast-2,eu-central-1,ap-northeast-1,ap-northeast-2,ap-northeast-3,us-west-2,sa-east-1,us-west-1,us-east-2,ap-south-1,ca-central-1"
29+
cwd="$(dirname $0)"
30+
export VENDOR_PATH="${cwd}/../../vendor/cookbooks"
31+
32+
if [ "x${os}" == "x" ]; then
33+
echo "Must provide OS to build."
34+
echo "Options: all ${available_os}"
35+
exit 1
36+
fi
37+
38+
if [ "x${region}" == "x" ]; then
39+
echo "Must provide AWS region to build for."
40+
echo "Options: us-east-1 all"
41+
exit 1
42+
fi
43+
44+
if [ "${public}" == "public" ]; then
45+
export AMI_PERMS="all"
46+
fi
47+
48+
# NOTE: the AMI is always built in us-east-1 and then copied to the specified regions
49+
if [ "${region}" == "all" ]; then
50+
export BUILD_FOR=${available_regions}
51+
else
52+
export BUILD_FOR=${region}
53+
fi
54+
55+
RC=0
56+
57+
rm -rf "${VENDOR_PATH}" || RC=1
58+
berks vendor "${VENDOR_PATH}" --berksfile "${cwd}/../Berksfile" || RC=1
59+
if [ "x${build_date}" == "x" ]; then
60+
export BUILD_DATE=$(date +%Y%m%d%H%M)
61+
else
62+
export BUILD_DATE=${build_date}
63+
fi
64+
65+
66+
case ${os} in
67+
all)
68+
for x in ${available_os}; do
69+
packer build -machine-readable -var-file="${cwd}/packer_variables.json" "${cwd}/packer_${x}.json"
70+
RC=$?
71+
done
72+
;;
73+
centos6|centos7|alinux|ubuntu1404|ubuntu1604)
74+
packer build -machine-readable -var-file="${cwd}/packer_variables.json" "${cwd}/packer_${os}.json"
75+
RC=$?
76+
;;
77+
*)
78+
echo "Unknown OS: ${os}"
79+
RC=1
80+
;;
81+
esac
82+
83+
echo "RC: ${RC}"
84+
exit ${RC}
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)