Skip to content

Commit 9c0ab64

Browse files
Rexrexcsn
authored andcommitted
Use createami_custom_node_package in runtime_bake tests
Signed-off-by: Rex <[email protected]>
1 parent 2ebc9cd commit 9c0ab64

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

tests/integration-tests/tests/runtime_bake/test_runtime_bake.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,9 @@ def test_runtime_bake(
4949
else:
5050
custom_ami = retrieve_latest_ami(region, os, architecture=architecture)
5151

52-
# Custom Cookbook
52+
# Custom Cookbook and Node
5353
custom_cookbook = request.config.getoption("createami_custom_chef_cookbook")
54+
custom_node = request.config.getoption("createami_custom_node_package")
5455

5556
# Create S3 bucket for pre install scripts, to remove epel package if it is installed
5657
bucket_name = s3_bucket_factory()
@@ -61,6 +62,7 @@ def test_runtime_bake(
6162
bucket_name=bucket_name,
6263
custom_ami=custom_ami,
6364
custom_cookbook=custom_cookbook if custom_cookbook else "",
65+
custom_node=custom_node if custom_node else "",
6466
)
6567
cluster = clusters_factory(cluster_config)
6668
remote_command_executor = RemoteCommandExecutor(cluster)

tests/integration-tests/tests/runtime_bake/test_runtime_bake/test_runtime_bake/pcluster.config.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ s3_read_resource = arn:aws-us-gov:s3:::{{ bucket_name }}/scripts/*
2424
s3_read_resource = arn:aws:s3:::{{ bucket_name }}/scripts/*
2525
{% endif %}
2626
pre_install = s3://{{ bucket_name }}/scripts/pre-install.sh
27+
{% if custom_node %}
28+
extra_json = { "cluster" : { "skip_install_recipes" : "no", "custom_node_package" : "{{ custom_node }}" } }
29+
{% else %}
2730
extra_json = { "cluster" : { "skip_install_recipes" : "no" } }
31+
{% endif %}
2832
{% if custom_cookbook %}
2933
custom_chef_cookbook = {{ custom_cookbook }}
3034
{% endif %}

0 commit comments

Comments
 (0)