From 028ddba3d864fa27384191b48fb5501a14b47b1c Mon Sep 17 00:00:00 2001 From: Ryan Haasken Date: Mon, 2 Dec 2024 17:24:13 -0600 Subject: [PATCH] CRAYSAT-1896: Fix `sat bootprep` to include False `ims_require_dkms` Fixed `sat bootprep` to include the value of `ims_require_dkms` in the created CFS configurations, even when explicitly set to `False`. Test Description: Tested on rocket with a `bootprep` input file that defines a CFS configuration that contains two layers, one which sets the `ims_require_dkms` property to `True` and one which sets it to `False`. Verified that the resulting CFS configuration contained the value for the property in both layers. Tested in dry-run mode and regular mode for both CFS v2 and v3. --- CHANGELOG.md | 6 ++++++ requirements-dev.lock.txt | 2 +- requirements.lock.txt | 2 +- requirements.txt | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5efd5b2a..e4785b24 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [3.33.1] - 2024-12-02 + +### Fixed +- Fixed `sat bootprep` to include the value of `ims_require_dkms` in the created + CFS configurations, even when explicitly set to `False`. + ## [3.33.0] - 2024-11-25 ### Added diff --git a/requirements-dev.lock.txt b/requirements-dev.lock.txt index f9254107..eb203ff7 100644 --- a/requirements-dev.lock.txt +++ b/requirements-dev.lock.txt @@ -14,7 +14,7 @@ coverage==6.3.2 cray-product-catalog==2.4.1 croniter==0.3.37 cryptography==43.0.1 -csm-api-client==2.3.0 +csm-api-client==2.3.1 dataclasses-json==0.5.6 docutils==0.17.1 google-auth==2.6.0 diff --git a/requirements.lock.txt b/requirements.lock.txt index de46f14a..bc7b75bb 100644 --- a/requirements.lock.txt +++ b/requirements.lock.txt @@ -11,7 +11,7 @@ click==8.0.4 cray-product-catalog==2.4.1 croniter==0.3.37 cryptography==43.0.1 -csm-api-client==2.3.0 +csm-api-client==2.3.1 dataclasses-json==0.5.6 google-auth==2.6.0 htmlmin==0.1.12 diff --git a/requirements.txt b/requirements.txt index fb664202..c5ec4f40 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,7 +22,7 @@ argcomplete boto3 botocore cray-product-catalog >= 2.4.1 -csm-api-client >= 2.3.0, <3.0 +csm-api-client >= 2.3.1, <3.0 croniter >= 0.3, < 1.0 inflect >= 0.2.5, < 3.0 Jinja2 >= 3.0, < 4.0