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

This allows more complete AMI cleanup when build official AMIs

Signed-off-by: Hanwen <[email protected]>

Author: hanwen-cluster

cli/src/pcluster/resources/imagebuilder/parallelcluster.yaml

@@ -329,7 +329,7 @@ phases:
           commands:
             - |
               set -v
-              /usr/local/sbin/ami_cleanup.sh
+              /usr/local/sbin/ami_cleanup.sh "${CfnParamIsOfficialAmiBuild}"
 
   - name: validate
     steps:

cli/src/pcluster/templates/imagebuilder_stack.py

@@ -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 --------------------------------------------------------------------------------------------------- #
 

cli/tests/pcluster/templates/test_imagebuilder_stack.py

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