Merge pull request #21 from cloudfoundry/new-variables

New variables for PR cloudfoundry/bosh-aws-light-stemcell-builder/pull/35
cloudfoundry · Dec 8, 2023 · 83b1aad · 83b1aad
2 parents 3439afc + 50d5c90
commit 83b1aad
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/pipelines/publisher/pipeline.yml b/pipelines/publisher/pipeline.yml
@@ -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

diff --git a/tasks/light-aws/test-drivers.sh b/tasks/light-aws/test-drivers.sh
@@ -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}
 
@@ -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}

diff --git a/tasks/light-aws/test-drivers.yml b/tasks/light-aws/test-drivers.yml
@@ -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:            ""