Skip to content

Commit bb511ed

Browse files
hehe7318hehe7318
authored
Merge branch 'develop' into wip/improve-perf-test-24-nodes
2 parents d756150 + 35899aa commit bb511ed

File tree

116 files changed

+522
-124
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+522
-124
lines changed

‎.github/workflows/bump_version.yml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# Bump Version workflow that is triggered manually
2+
name: Bump Version
3+
4+
on:
5+
workflow_dispatch:
6+
# Inputs the workflow accepts.
7+
inputs:
8+
pcluster-version:
9+
description: 'The target version of ParallelCluster CLI'
10+
required: true
11+
type: string
12+
branch:
13+
description: 'The Github branch name'
14+
required: true
15+
type: string
16+
17+
jobs:
18+
create-pull-requests:
19+
runs-on: ubuntu-latest
20+
steps:
21+
- uses: actions/checkout@v2
22+
with:
23+
fetch-depth: 0
24+
ref: ${{ inputs.branch }}
25+
- uses: actions/setup-java@v1
26+
with:
27+
java-version: 11
28+
- run: |
29+
sudo npm install -g redoc-cli
30+
sudo snap install yq
31+
- name: Modifiy Code to Change version
32+
run: ./util/bump-version.sh --version ${{ inputs.pcluster-version }}
33+
34+
- name: Create a Pull Request
35+
uses: peter-evans/create-pull-request@v6
36+
with:
37+
commit-message: 'Bump version to ${{ inputs.pcluster-version }}'
38+
title: 'Bump version to ${{ inputs.pcluster-version }}'
39+
body: |
40+
This PR contains version bump.
41+
Auto-generated by Github Action
42+
branch: versionbump${{ inputs.branch }}${{ inputs.pcluster-version }}
43+
delete-branch: true
44+
labels: skip-changelog-update

‎.github/workflows/bump_version_awsbatch_cli.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Bump Version workflow that is triggered manually
2+
name: Bump Version for AWSBatch CLI
3+
4+
on:
5+
workflow_dispatch:
6+
# Inputs the workflow accepts.
7+
inputs:
8+
awsbatch-cli-version:
9+
description: 'The target version of AWSBatch CLI'
10+
required: true
11+
type: string
12+
branch:
13+
description: 'The Github branch name'
14+
required: true
15+
type: string
16+
17+
jobs:
18+
create-pull-requests:
19+
runs-on: ubuntu-latest
20+
steps:
21+
- uses: actions/checkout@v2
22+
with:
23+
fetch-depth: 0
24+
ref: ${{ inputs.branch }}
25+
- name: Modifiy Code to Change version
26+
run: ./util/bump-awsbatch-cli-version.sh ${{ inputs.awsbatch-cli-version }}
27+
28+
- name: Create a Pull Request
29+
uses: peter-evans/create-pull-request@v6
30+
with:
31+
commit-message: 'Bump version for awsbatch-cli to ${{ inputs.awsbatch-cli-version }}'
32+
title: 'Bump version for awsbatch-cli to ${{ inputs.awsbatch-cli-version }}'
33+
body: |
34+
This PR contains version bump for awsbatch-cli.
35+
Auto-generated by Github Action
36+
branch: versionbumpbatch${{ inputs.branch }}${{ inputs.awsbatch-cli-version }}
37+
delete-branch: true
38+
labels: skip-changelog-update

‎CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
11
CHANGELOG
22
=========
33

4+
3.11.0
5+
------
6+
7+
**ENHANCEMENTS**
8+
9+
- Add support for custom actions on login nodes.
10+
411
3.10.0
512
------
613

714
**ENHANCEMENTS**
815
- Add new configuration section `Scheduling/SlurmSettings/ExternalSlurmdbd` to connect the cluster to an external Slurmdbd.
916
- Add support for Amazon Linux 2023.
1017
- Add support for `price-capacity-optimized` as an `AllocationStrategy`.
18+
- Add validator to prevent the use of Placement Groups with Capacity Blocks.
1119

1220
**BUG FIXES**
1321
- Fix DRA configuration to make `AutoExportPolicy` and `AutoImportPolicy` optional.
@@ -17,6 +25,9 @@ CHANGELOG
1725
- Allow ParallelCluster Custom Resource to suppress validators using `PclusterCluster/SuppressValidators`.
1826
- Removing `/etc/profile.d/pcluster.sh` so that it's not executed at every user login and
1927
`cfn_bootstrap_virtualenv` is not added in PATH environment variable.
28+
- Fix ParallelCluster API spec by replacing in `DescribeCluster` response the field `failureReason` with `failures`.
29+
- Fix ParallelCluster API spec by adding the CloudFormation stack status that were missing:
30+
`IMPORT_*`, `REVIEW_IN_PROGRESS` and `UPDATE_FAILED`.
2031

2132
**CHANGES**
2233
- CentOS 7 is no longer supported.

‎api/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,6 @@ cdk.out
1818
build
1919
node_modules
2020
package.json
21+
22+
# Generated code
23+
generated

‎api/client/src/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ParallelCluster API
33

44
This Python package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
55

6-
- API version: 3.10.0
6+
- API version: 3.11.0
77
- Package version: 1.0.0
88
- Build package: org.openapitools.codegen.languages.PythonClientCodegen
99

‎api/client/src/docs/CloudFormationStackStatus.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
## Properties
55
Name | Type | Description | Notes
66
------------ | ------------- | ------------- | -------------
7-
**value** | **str** | | must be one of ["CREATE_IN_PROGRESS", "CREATE_FAILED", "CREATE_COMPLETE", "ROLLBACK_IN_PROGRESS", "ROLLBACK_FAILED", "ROLLBACK_COMPLETE", "DELETE_IN_PROGRESS", "DELETE_FAILED", "DELETE_COMPLETE", "UPDATE_IN_PROGRESS", "UPDATE_COMPLETE_CLEANUP_IN_PROGRESS", "UPDATE_COMPLETE", "UPDATE_ROLLBACK_IN_PROGRESS", "UPDATE_ROLLBACK_FAILED", "UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS", "UPDATE_ROLLBACK_COMPLETE", ]
7+
**value** | **str** | | must be one of ["CREATE_IN_PROGRESS", "CREATE_FAILED", "CREATE_COMPLETE", "IMPORT_IN_PROGRESS", "IMPORT_COMPLETE", "IMPORT_ROLLBACK_IN_PROGRESS", "IMPORT_ROLLBACK_FAILED", "IMPORT_ROLLBACK_COMPLETE", "ROLLBACK_IN_PROGRESS", "ROLLBACK_FAILED", "ROLLBACK_COMPLETE", "DELETE_IN_PROGRESS", "DELETE_FAILED", "DELETE_COMPLETE", "REVIEW_IN_PROGRESS", "UPDATE_IN_PROGRESS", "UPDATE_COMPLETE_CLEANUP_IN_PROGRESS", "UPDATE_COMPLETE", "UPDATE_FAILED", "UPDATE_ROLLBACK_IN_PROGRESS", "UPDATE_ROLLBACK_FAILED", "UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS", "UPDATE_ROLLBACK_COMPLETE", ]
88

99
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
1010

‎api/client/src/pcluster_client/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
ParallelCluster API # noqa: E501
77
8-
The version of the OpenAPI document: 3.10.0
8+
The version of the OpenAPI document: 3.11.0
99
Generated by: https://openapi-generator.tech
1010
"""
1111

‎api/client/src/pcluster_client/api/cluster_compute_fleet_api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
ParallelCluster API # noqa: E501
55
6-
The version of the OpenAPI document: 3.10.0
6+
The version of the OpenAPI document: 3.11.0
77
Generated by: https://openapi-generator.tech
88
"""
99

‎api/client/src/pcluster_client/api/cluster_instances_api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
ParallelCluster API # noqa: E501
55
6-
The version of the OpenAPI document: 3.10.0
6+
The version of the OpenAPI document: 3.11.0
77
Generated by: https://openapi-generator.tech
88
"""
99

‎api/client/src/pcluster_client/api/cluster_logs_api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
ParallelCluster API # noqa: E501
55
6-
The version of the OpenAPI document: 3.10.0
6+
The version of the OpenAPI document: 3.11.0
77
Generated by: https://openapi-generator.tech
88
"""
99

0 commit comments

Comments
 (0)