Skip to content

[DevSetting] Add CincVersion override to version during imagebuilder #7420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
himani2411 merged 1 commit into from
Jun 4, 2026
Merged

[DevSetting] Add CincVersion override to version during imagebuilder #7420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions cli/src/pcluster/config/imagebuilder_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ def __init__(
terminate_instance_on_failure: bool = None,
disable_validate_and_test: bool = None,
cinc_installer_url: str = None,
cinc_version: str = None,
disable_kernel_update: bool = None,
slurm_patches_s3_archive: str = None,
**kwargs
Expand All @@ -251,6 +252,10 @@ def __init__(
self.terminate_instance_on_failure = Resource.init_param(terminate_instance_on_failure, default=True)
self.disable_validate_and_test = Resource.init_param(disable_validate_and_test, default=True)
self.cinc_installer_url = Resource.init_param(cinc_installer_url, default="")
# Optional override for the CINC client version baked into the AMI
# (CfnParamCincVersion -> ChefVersion in parallelcluster.yaml). When
# left empty the YAML-rendered default ChefVersion is used.
self.cinc_version = Resource.init_param(cinc_version, default="")
self.disable_kernel_update = Resource.init_param(disable_kernel_update, default=False)
self.slurm_patches_s3_archive = Resource.init_param(slurm_patches_s3_archive, default="")

Expand Down
1 change: 1 addition & 0 deletions cli/src/pcluster/resources/imagebuilder/parallelcluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ phases:

OS="{{ build.OperatingSystemName.outputs.stdout }}"
ChefVersion={{ ChefVersion }}
[ -n "${CfnParamCincVersion}" ] && ChefVersion="${CfnParamCincVersion}"

curl --retry 3 -L $CINC_URL | bash -s -- -v $ChefVersion

Expand Down
1 change: 1 addition & 0 deletions cli/src/pcluster/schemas/imagebuilder_schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ class ImagebuilderDevSettingsSchema(BaseDevSettingsSchema):
terminate_instance_on_failure = fields.Bool()
disable_validate_and_test = fields.Bool()
cinc_installer_url = fields.Str()
cinc_version = fields.Str()
disable_kernel_update = fields.Bool()

@post_load
Expand Down
7 changes: 7 additions & 0 deletions cli/src/pcluster/templates/imagebuilder_stack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,13 @@ def _add_cfn_parameters(self):
self, "CfnParamCincInstaller", type="String", default=custom_cinc_installer_url, description="CincInstaller"
)

custom_cinc_version = (
self.config.dev_settings.cinc_version
if self.config.dev_settings and self.config.dev_settings.cinc_version
else ""
)
CfnParameter(self, "CfnParamCincVersion", type="String", default=custom_cinc_version, description="CincVersion")

CfnParameter(
self,
"CfnParamChefDnaJson",
Expand Down
13 changes: 13 additions & 0 deletions cli/tests/pcluster/templates/test_imagebuilder_stack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
"CfnParamChefDnaJson": {},
"CfnParamChefCookbook": {},
"CfnParamCincInstaller": {},
"CfnParamCincVersion": {},
"CfnParamCookbookVersion": {},
"CfnParamUpdateOsAndReboot": {},
"CfnParamIsOfficialAmiBuild": {},
Expand Down Expand Up @@ -110,6 +111,7 @@
"CfnParamChefDnaJson": {},
"CfnParamChefCookbook": {},
"CfnParamCincInstaller": {},
"CfnParamCincVersion": {},
"CfnParamCookbookVersion": {},
"CfnParamUpdateOsAndReboot": {},
"CfnParamIsOfficialAmiBuild": {},
Expand Down Expand Up @@ -161,6 +163,7 @@
"CfnParamChefDnaJson": {},
"CfnParamChefCookbook": {},
"CfnParamCincInstaller": {},
"CfnParamCincVersion": {},
"CfnParamCookbookVersion": {},
"CfnParamUpdateOsAndReboot": {},
"CfnParamIsOfficialAmiBuild": {},
Expand Down Expand Up @@ -210,6 +213,7 @@
"CfnParamChefDnaJson": {},
"CfnParamChefCookbook": {},
"CfnParamCincInstaller": {},
"CfnParamCincVersion": {},
"CfnParamCookbookVersion": {},
"CfnParamUpdateOsAndReboot": {},
"CfnParamIsOfficialAmiBuild": {},
Expand Down Expand Up @@ -260,6 +264,7 @@
"CfnParamChefDnaJson": {},
"CfnParamChefCookbook": {},
"CfnParamCincInstaller": {},
"CfnParamCincVersion": {},
"CfnParamCookbookVersion": {},
"CfnParamUpdateOsAndReboot": {},
"CfnParamIsOfficialAmiBuild": {},
Expand Down Expand Up @@ -309,6 +314,7 @@
"CfnParamChefDnaJson": {},
"CfnParamChefCookbook": {},
"CfnParamCincInstaller": {},
"CfnParamCincVersion": {},
"CfnParamCookbookVersion": {},
"CfnParamUpdateOsAndReboot": {},
"CfnParamIsOfficialAmiBuild": {},
Expand Down Expand Up @@ -357,6 +363,7 @@
"CfnParamChefDnaJson": {},
"CfnParamChefCookbook": {},
"CfnParamCincInstaller": {},
"CfnParamCincVersion": {},
"CfnParamCookbookVersion": {},
"CfnParamUpdateOsAndReboot": {},
"CfnParamIsOfficialAmiBuild": {},
Expand Down Expand Up @@ -407,6 +414,7 @@
"CfnParamChefDnaJson": {},
"CfnParamChefCookbook": {},
"CfnParamCincInstaller": {},
"CfnParamCincVersion": {},
"CfnParamCookbookVersion": {},
"CfnParamUpdateOsAndReboot": {},
"CfnParamIsOfficialAmiBuild": {},
Expand Down Expand Up @@ -456,6 +464,7 @@
"CfnParamChefDnaJson": {},
"CfnParamChefCookbook": {},
"CfnParamCincInstaller": {},
"CfnParamCincVersion": {},
"CfnParamCookbookVersion": {},
"CfnParamUpdateOsAndReboot": {},
"CfnParamIsOfficialAmiBuild": {},
Expand Down Expand Up @@ -513,6 +522,7 @@
"CfnParamChefDnaJson": {},
"CfnParamChefCookbook": {},
"CfnParamCincInstaller": {},
"CfnParamCincVersion": {},
"CfnParamCookbookVersion": {},
"CfnParamUpdateOsAndReboot": {},
"CfnParamIsOfficialAmiBuild": {},
Expand Down Expand Up @@ -563,6 +573,7 @@
"CfnParamChefDnaJson": {},
"CfnParamChefCookbook": {},
"CfnParamCincInstaller": {},
"CfnParamCincVersion": {},
"CfnParamCookbookVersion": {},
"CfnParamUpdateOsAndReboot": {},
"CfnParamIsOfficialAmiBuild": {},
Expand Down Expand Up @@ -612,6 +623,7 @@
"CfnParamChefDnaJson": {},
"CfnParamChefCookbook": {"Default": "https://presigned.url"},
"CfnParamCincInstaller": {},
"CfnParamCincVersion": {},
"CfnParamCookbookVersion": {},
"CfnParamUpdateOsAndReboot": {},
"CfnParamIsOfficialAmiBuild": {},
Expand Down Expand Up @@ -661,6 +673,7 @@
"CfnParamChefDnaJson": {},
"CfnParamChefCookbook": {"Default": "https://custom.cookbook.url"},
"CfnParamCincInstaller": {},
"CfnParamCincVersion": {},
"CfnParamCookbookVersion": {},
"CfnParamUpdateOsAndReboot": {},
"CfnParamIsOfficialAmiBuild": {},
Expand Down
Loading