Skip to content
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.

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

New variables for PR cloudfoundry/bosh-aws-light-stemcell-builder/pull/35 #21

Merged
merged 1 commit into from
Dec 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion pipelines/publisher/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,8 @@ jobs:
existing_volume_id: ((aws_test_volume_fixture_id))
#! kms key id should be the one created in the region of "copy_region"
kms_key_id: ((aws_test_kms_key_id))
kms_multi_region_key_id: ((aws_test_kms_multi_region_key_id))
kms_multi_region_key: ((aws_test_kms_multi_region_key_id))
kms_multi_region_key_replication_test: ((aws_test_kms_multi_region_replication_test_key_id))

uploaded_machine_image_url: https://s3.amazonaws.com/bosh-cpi-light-stemcell-builder-ci-fixtures/root.img
task: test
Expand Down
6 changes: 4 additions & 2 deletions tasks/light-aws/test-drivers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ trap '{ rm -rf ${tmp_dir}; }' EXIT
: ${existing_snapshot_id:?must be set}
: ${uploaded_machine_image_url:?must be set}
: ${kms_key_id:?must be set}
: ${kms_multi_region_key_id:?must be set}
: ${kms_multi_region_key:?must be set}
: ${kms_multi_region_key_replication_test:?must be set}

: ${uploaded_machine_image_format:=RAW}

Expand All @@ -32,7 +33,8 @@ export AWS_BUCKET_NAME=$bucket_name
export AWS_REGION=$region
export AWS_DESTINATION_REGION=${copy_region}
export AWS_KMS_KEY_ID=${kms_key_id}
export MULTI_REGION_AWS_KMS_KEY_ID=${kms_multi_region_key_id}
export MULTI_REGION_KEY=${kms_multi_region_key}
export MULTI_REGION_KEY_REPLICATION_TEST=${kms_multi_region_key_replication_test}

# Fixtures
export S3_MACHINE_IMAGE_URL=${uploaded_machine_image_url}
Expand Down
27 changes: 14 additions & 13 deletions tasks/light-aws/test-drivers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,17 @@ inputs:
run:
path: bosh-stemcells-ci/tasks/light-aws/test-drivers.sh
params:
aws_account_id: ""
access_key: ""
secret_key: ""
bucket_name: ""
region: ""
copy_region: ""
ami_fixture_id: ""
private_ami_fixture_id: ""
kms_key_id: ""
kms_multi_region_key_id: ""
existing_volume_id: ""
existing_snapshot_id: ""
uploaded_machine_image_url: ""
aws_account_id: ""
access_key: ""
secret_key: ""
bucket_name: ""
region: ""
copy_region: ""
ami_fixture_id: ""
private_ami_fixture_id: ""
kms_key_id: ""
kms_multi_region_key: ""
kms_multi_region_key_replication_test: ""
existing_volume_id: ""
existing_snapshot_id: ""
uploaded_machine_image_url: ""