From 3c733be60361b7206bbd1977c04c19e9baa4575c Mon Sep 17 00:00:00 2001 From: Hanwen Date: Mon, 27 Jun 2022 06:20:28 -0700 Subject: [PATCH 1/3] Integ-tests: Fix test_scheduler_plugin The test failed because of https://github.com/aws/aws-parallelcluster/commit/fbb995d4221b56b62cb8d7edd5ffa91ee643f002. The test checks the cluster configuration file with default values on the head node is as expected. Because the root volume configuration was added to the default in the previous commit. The expected outputs have to be changed accordingly. Adding the default root volume configuration makes sense, because those values are used to configure the root volume. test_scheduler_plugin was successful after this commit. Signed-off-by: Hanwen --- .../scheduler_queues.before_update_arm64.yaml | 7 ++++++- .../scheduler_queues.before_update_x86_64.yaml | 7 ++++++- .../scheduler_queues_arm64.yaml | 14 ++++++++++++-- .../scheduler_queues_x86_64.yaml | 14 ++++++++++++-- 4 files changed, 36 insertions(+), 6 deletions(-) diff --git a/tests/integration-tests/tests/scheduler_plugin/test_scheduler_plugin/test_scheduler_plugin_integration/scheduler_queues.before_update_arm64.yaml b/tests/integration-tests/tests/scheduler_plugin/test_scheduler_plugin/test_scheduler_plugin_integration/scheduler_queues.before_update_arm64.yaml index 7a49e72c3e..39e90d74db 100644 --- a/tests/integration-tests/tests/scheduler_plugin/test_scheduler_plugin/test_scheduler_plugin_integration/scheduler_queues.before_update_arm64.yaml +++ b/tests/integration-tests/tests/scheduler_plugin/test_scheduler_plugin/test_scheduler_plugin_integration/scheduler_queues.before_update_arm64.yaml @@ -14,7 +14,12 @@ ComputeSettings: LocalStorage: EphemeralVolume: null - RootVolume: null + RootVolume: + Encrypted: true + Iops: 3000 + Size: null + Throughput: 125 + VolumeType: gp3 CustomActions: null CustomSettings: null Iam: diff --git a/tests/integration-tests/tests/scheduler_plugin/test_scheduler_plugin/test_scheduler_plugin_integration/scheduler_queues.before_update_x86_64.yaml b/tests/integration-tests/tests/scheduler_plugin/test_scheduler_plugin/test_scheduler_plugin_integration/scheduler_queues.before_update_x86_64.yaml index 9fff5b25eb..c4bda04dc5 100644 --- a/tests/integration-tests/tests/scheduler_plugin/test_scheduler_plugin/test_scheduler_plugin_integration/scheduler_queues.before_update_x86_64.yaml +++ b/tests/integration-tests/tests/scheduler_plugin/test_scheduler_plugin/test_scheduler_plugin_integration/scheduler_queues.before_update_x86_64.yaml @@ -14,7 +14,12 @@ ComputeSettings: LocalStorage: EphemeralVolume: null - RootVolume: null + RootVolume: + Encrypted: true + Iops: 3000 + Size: null + Throughput: 125 + VolumeType: gp3 CustomActions: null CustomSettings: null Iam: diff --git a/tests/integration-tests/tests/scheduler_plugin/test_scheduler_plugin/test_scheduler_plugin_integration/scheduler_queues_arm64.yaml b/tests/integration-tests/tests/scheduler_plugin/test_scheduler_plugin/test_scheduler_plugin_integration/scheduler_queues_arm64.yaml index 85f52dcffa..3893db4d16 100644 --- a/tests/integration-tests/tests/scheduler_plugin/test_scheduler_plugin/test_scheduler_plugin_integration/scheduler_queues_arm64.yaml +++ b/tests/integration-tests/tests/scheduler_plugin/test_scheduler_plugin/test_scheduler_plugin_integration/scheduler_queues_arm64.yaml @@ -25,7 +25,12 @@ ComputeSettings: LocalStorage: EphemeralVolume: null - RootVolume: null + RootVolume: + Encrypted: true + Iops: 3000 + Size: null + Throughput: 125 + VolumeType: gp3 CustomActions: null CustomSettings: null Iam: @@ -59,7 +64,12 @@ ComputeSettings: LocalStorage: EphemeralVolume: null - RootVolume: null + RootVolume: + Encrypted: true + Iops: 3000 + Size: null + Throughput: 125 + VolumeType: gp3 CustomActions: null CustomSettings: null Iam: diff --git a/tests/integration-tests/tests/scheduler_plugin/test_scheduler_plugin/test_scheduler_plugin_integration/scheduler_queues_x86_64.yaml b/tests/integration-tests/tests/scheduler_plugin/test_scheduler_plugin/test_scheduler_plugin_integration/scheduler_queues_x86_64.yaml index a7a4b3ec95..92ae865c44 100644 --- a/tests/integration-tests/tests/scheduler_plugin/test_scheduler_plugin/test_scheduler_plugin_integration/scheduler_queues_x86_64.yaml +++ b/tests/integration-tests/tests/scheduler_plugin/test_scheduler_plugin/test_scheduler_plugin_integration/scheduler_queues_x86_64.yaml @@ -25,7 +25,12 @@ ComputeSettings: LocalStorage: EphemeralVolume: null - RootVolume: null + RootVolume: + Encrypted: true + Iops: 3000 + Size: null + Throughput: 125 + VolumeType: gp3 CustomActions: null CustomSettings: null Iam: @@ -59,7 +64,12 @@ ComputeSettings: LocalStorage: EphemeralVolume: null - RootVolume: null + RootVolume: + Encrypted: true + Iops: 3000 + Size: null + Throughput: 125 + VolumeType: gp3 CustomActions: null CustomSettings: null Iam: From a26a22bc7ff3e569212f7f2b8492a3d23c0ee205 Mon Sep 17 00:00:00 2001 From: Hanwen <68928867+hanwen-pcluste@users.noreply.github.com> Date: Thu, 30 Jun 2022 12:50:44 -0700 Subject: [PATCH 2/3] Create dependency-review.yml --- .github/workflows/dependency-review.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/dependency-review.yml diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml new file mode 100644 index 0000000000..8966511e05 --- /dev/null +++ b/.github/workflows/dependency-review.yml @@ -0,0 +1,20 @@ +# Dependency Review Action +# +# This Action will scan dependency manifest files that change as part of a Pull Request, surfacing known-vulnerable versions of the packages declared or updated in the PR. Once installed, if the workflow run is marked as required, PRs introducing known-vulnerable packages will be blocked from merging. +# +# Source repository: https://github.com/actions/dependency-review-action +# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement +name: 'Dependency Review' +on: [pull_request] + +permissions: + contents: read + +jobs: + dependency-review: + runs-on: ubuntu-latest + steps: + - name: 'Checkout Repository' + uses: actions/checkout@v3 + - name: 'Dependency Review' + uses: actions/dependency-review-action@v1 From 32ea6c75b821e845050e34d2d238974fa2dbbd82 Mon Sep 17 00:00:00 2001 From: Hanwen <68928867+hanwen-pcluste@users.noreply.github.com> Date: Thu, 30 Jun 2022 12:52:12 -0700 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d45a74f33..f7edeefd10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ CHANGELOG ========= x.x.x ------- +------- **ENHANCEMENTS** - Add new configuration parameter `Scheduling/SlurmSettings/QueueUpdateStrategy` to allow cluster update when