Update changelog (#6290)

CHANGELOG.md

@@ -19,6 +19,7 @@ CHANGELOG
 
 **CHANGES**
 - Upgrade Cinc Client to version to 18.4.12 from 18.2.7.
+- Allow build-image to be run in an isolated network.
 
 3.9.3
 ------

cli/src/pcluster/constants.py

@@ -294,16 +294,7 @@ class Operation(Enum):
     VERSION = "version"
 
 
-UNSUPPORTED_OPERATIONS_MAP = {
-    Operation.BUILD_IMAGE: ["us-iso"],
-    Operation.DELETE_IMAGE: ["us-iso"],
-    Operation.DESCRIBE_IMAGE: ["us-iso"],
-    Operation.LIST_IMAGES: ["us-iso"],
-    Operation.EXPORT_IMAGE_LOGS: ["us-iso"],
-    Operation.GET_IMAGE_LOG_EVENTS: ["us-iso"],
-    Operation.GET_IMAGE_STACK_EVENTS: ["us-iso"],
-    Operation.LIST_IMAGE_LOG_STREAMS: ["us-iso"],
-}
+UNSUPPORTED_OPERATIONS_MAP = {}
 
 MAX_TAGS_COUNT = 40  # Tags are limited to 50, reserve some tags for parallelcluster specified tags
 

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

@@ -53,7 +53,7 @@ phases:
           commands:
             - |
               set -v
-              CINC_URL="https:https://${AWS::Region}-aws-parallelcluster.s3.${AWS::Region}.${AWS::URLSuffix}/archives/cinc/cinc-install-1.3.0.sh"
+              CINC_URL="s3:https://${AWS::Region}-aws-parallelcluster/archives/cinc/cinc-install-1.3.0.sh"
               [ -n "${CfnParamCincInstaller}" ] && CINC_URL="${CfnParamCincInstaller}"
               echo "${!CINC_URL}"
 
@@ -219,13 +219,19 @@ phases:
                 apt-get -y --only-upgrade install ca-certificates
               fi
 
-              curl --retry 3 -L {{ build.CincUrl.outputs.stdout }} | bash -s -- -v {{ ChefVersion }}
+              aws s3 --region ${AWS::Region} cp {{ build.CincUrl.outputs.stdout }} - | bash -s -- -v {{ ChefVersion }}
 
               if [[ -e ${!CA_CERTS_FILE} ]]; then
+                mkdir -p /opt/cinc/embedded/ssl/certs
                 ln -sf ${!CA_CERTS_FILE} /opt/cinc/embedded/ssl/certs/cacert.pem
               fi
+              
+              aws s3 cp s3:https://${AWS::Region}-aws-parallelcluster/archives/dependencies/ruby/gems.tgz gems.tgz --region ${AWS::Region}
+              tar -xf gems.tgz
+              
+              cd vendor/cache
 
-              /opt/cinc/embedded/bin/gem install --no-document berkshelf:{{ BerkshelfVersion }}
+              /opt/cinc/embedded/bin/gem install --local --no-document berkshelf:{{ BerkshelfVersion }}
 
       # Download and vendor Cookbook
       - name: DownloadCookbook
@@ -235,9 +241,14 @@ phases:
             - |
               set -v
               mkdir -p /etc/chef && sudo chown -R root:root /etc/chef
-              curl --retry 3 -L -o /etc/chef/aws-parallelcluster-cookbook.tgz "{{ build.CookbookUrl.outputs.stdout }}"
+              
+              if [[ "{{ build.CookbookUrl.outputs.stdout }}" =~ "s3:https://" ]]; then
+                aws s3 cp "{{ build.CookbookUrl.outputs.stdout }}" /etc/chef/aws-parallelcluster-cookbook.tgz --region ${AWS::Region}
+              else
+                curl --retry 3 -L -o /etc/chef/aws-parallelcluster-cookbook.tgz "{{ build.CookbookUrl.outputs.stdout }}"
+              fi
 
-              mkdir /tmp/cookbooks
+              mkdir -p /tmp/cookbooks
               cd /tmp/cookbooks
               tar -xzf /etc/chef/aws-parallelcluster-cookbook.tgz
 

tests/integration-tests/configs/build_image_iso.yaml

@@ -0,0 +1,22 @@
+{%- import 'common.jinja2' as common with context -%}
+{% if REGIONS  %}
+{%- set REGIONS = [ REGIONS ] -%}
+{% else %}
+{%- set REGIONS = ["us-isob-east-1","us-iso-east-1"] -%}
+{% endif %}
+{%- set INSTANCES = ["c5.xlarge"] -%}
+{% if OSS  %}
+{%- set OSS = [ OSS ] -%}
+{% else %}
+{%- set OSS = ["alinux2"] -%}
+{% endif %}
+{%- set SCHEDULERS = ["slurm"] -%}
+---
+test-suites:
+  createami:
+    test_createami.py::test_build_image:
+      dimensions:
+        - regions: {{ REGIONS }}
+          instances: {{ INSTANCES }}
+          schedulers: {{ SCHEDULERS }}
+          oss: {{ OSS }}