Skip to content

[build-image] Add internal parameter to distinguish official AMI build #6759

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
merged 1 commit into from
Mar 21, 2025
Merged

[build-image] Add internal parameter to distinguish official AMI build #6759

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
2 changes: 1 addition & 1 deletion cli/src/pcluster/resources/imagebuilder/parallelcluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ phases:
commands:
- |
set -v
/usr/local/sbin/ami_cleanup.sh
/usr/local/sbin/ami_cleanup.sh "${CfnParamIsOfficialAmiBuild}"
- name: validate
steps:
Expand Down
19 changes: 19 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 @@ -213,6 +213,25 @@ def _add_cfn_parameters(self):
),
description="UpdateOsAndReboot",
)
CfnParameter(
self,
"CfnParamIsOfficialAmiBuild",
type="String",
default=(
json.loads(self.config.dev_settings.cookbook.extra_chef_attributes)
.get("cluster")
.get("is_official_ami_build")
if self.config.dev_settings
and self.config.dev_settings.cookbook
and self.config.dev_settings.cookbook.extra_chef_attributes
and json.loads(self.config.dev_settings.cookbook.extra_chef_attributes).get("cluster")
and json.loads(self.config.dev_settings.cookbook.extra_chef_attributes)
.get("cluster")
.get("is_official_ami_build")
else "false"
),
description="IsOfficialAmiBuild",
)

# -- Resources --------------------------------------------------------------------------------------------------- #

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 @@ -61,6 +61,7 @@
"CfnParamCincInstaller": {},
"CfnParamCookbookVersion": {},
"CfnParamUpdateOsAndReboot": {},
"CfnParamIsOfficialAmiBuild": {},
},
"Resources": {
"InstanceRole": {},
Expand Down Expand Up @@ -112,6 +113,7 @@
"CfnParamCincInstaller": {},
"CfnParamCookbookVersion": {},
"CfnParamUpdateOsAndReboot": {},
"CfnParamIsOfficialAmiBuild": {},
},
"Resources": {
"InstanceRole": {},
Expand Down Expand Up @@ -162,6 +164,7 @@
"CfnParamCincInstaller": {},
"CfnParamCookbookVersion": {},
"CfnParamUpdateOsAndReboot": {},
"CfnParamIsOfficialAmiBuild": {},
},
"Resources": {
"InstanceRole": {},
Expand Down Expand Up @@ -210,6 +213,7 @@
"CfnParamCincInstaller": {},
"CfnParamCookbookVersion": {},
"CfnParamUpdateOsAndReboot": {},
"CfnParamIsOfficialAmiBuild": {},
},
"Resources": {
"InstanceProfile": {},
Expand Down Expand Up @@ -260,6 +264,7 @@
"CfnParamCincInstaller": {},
"CfnParamCookbookVersion": {},
"CfnParamUpdateOsAndReboot": {},
"CfnParamIsOfficialAmiBuild": {},
},
"Resources": {
"InfrastructureConfiguration": {},
Expand Down Expand Up @@ -309,6 +314,7 @@
"CfnParamCincInstaller": {},
"CfnParamCookbookVersion": {},
"CfnParamUpdateOsAndReboot": {},
"CfnParamIsOfficialAmiBuild": {},
},
"Resources": {
"InstanceRole": {},
Expand Down Expand Up @@ -357,6 +363,7 @@
"CfnParamCincInstaller": {},
"CfnParamCookbookVersion": {},
"CfnParamUpdateOsAndReboot": {},
"CfnParamIsOfficialAmiBuild": {},
},
"Resources": {
"InstanceRole": {},
Expand Down Expand Up @@ -407,6 +414,7 @@
"CfnParamCincInstaller": {},
"CfnParamCookbookVersion": {},
"CfnParamUpdateOsAndReboot": {},
"CfnParamIsOfficialAmiBuild": {},
},
"Resources": {
"InstanceRole": {},
Expand Down Expand Up @@ -456,6 +464,7 @@
"CfnParamCincInstaller": {},
"CfnParamCookbookVersion": {},
"CfnParamUpdateOsAndReboot": {},
"CfnParamIsOfficialAmiBuild": {},
},
"Resources": {
"InstanceRole": {},
Expand Down Expand Up @@ -513,6 +522,7 @@
"CfnParamCincInstaller": {},
"CfnParamCookbookVersion": {},
"CfnParamUpdateOsAndReboot": {},
"CfnParamIsOfficialAmiBuild": {},
},
"Resources": {
"InstanceRole": {},
Expand Down Expand Up @@ -563,6 +573,7 @@
"CfnParamCincInstaller": {},
"CfnParamCookbookVersion": {},
"CfnParamUpdateOsAndReboot": {},
"CfnParamIsOfficialAmiBuild": {},
},
"Resources": {
"InstanceRole": {},
Expand Down Expand Up @@ -612,6 +623,7 @@
"CfnParamCincInstaller": {},
"CfnParamCookbookVersion": {},
"CfnParamUpdateOsAndReboot": {},
"CfnParamIsOfficialAmiBuild": {},
},
"Resources": {
"InstanceRole": {},
Expand Down Expand Up @@ -661,6 +673,7 @@
"CfnParamCincInstaller": {},
"CfnParamCookbookVersion": {},
"CfnParamUpdateOsAndReboot": {},
"CfnParamIsOfficialAmiBuild": {},
},
"Resources": {
"InstanceRole": {},
Expand Down
Loading