Fix unit tests and add to changelog

Author: hgreebe

CHANGELOG.md

@@ -162,6 +162,7 @@ CHANGELOG
 - Add validator to prevent the use of Placement Groups with Capacity Blocks.
 
 **CHANGES**
+- Increase `HeadNodeBootstrapTimeout` by 5 minutes, making it 35 minutes in total.
 - CentOS 7 is no longer supported.
 - Upgrade Cinc Client to version to 18.4.12 from 18.2.7.
 - Upgrade munge to version 0.5.16 (from 0.5.15).

cli/tests/pcluster/templates/test_cluster_stack.py

@@ -952,9 +952,9 @@ def test_head_node_dna_json(mocker, test_datadir, config_file_name, expected_hea
 @pytest.mark.parametrize(
     "config_file_name, expected_head_node_bootstrap_timeout",
     [
-        ("slurm.required.yaml", "1800"),
+        ("slurm.required.yaml", "2100"),
         ("slurm.full.yaml", "1201"),
-        ("awsbatch.simple.yaml", "1800"),
+        ("awsbatch.simple.yaml", "2100"),
         ("awsbatch.full.yaml", "1000"),
     ],
 )

cli/tests/pcluster/templates/test_cluster_stack/test_head_node_dna_json/head_node_default.dna.json

@@ -6,7 +6,7 @@
     "cluster_config_version": "",
     "cluster_s3_bucket": "parallelcluster-a69601b5ee1fc2f2-v1-do-not-delete",
     "cluster_user": "ec2-user",
-    "compute_node_bootstrap_timeout": 1800,
+    "compute_node_bootstrap_timeout": 2100,
     "custom_awsbatchcli_package": "",
     "custom_node_package": "",
     "cw_logging_enabled": "true",