From 80bf0e074e806f03f4d2cd09959f5fb9188df482 Mon Sep 17 00:00:00 2001 From: Nader Ziada Date: Tue, 19 Nov 2024 11:28:12 -0500 Subject: [PATCH] wip --- ci/tasks/run-integration.yml | 3 ++- src/bosh_aws_cpi/spec/integration/spec_helper.rb | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ci/tasks/run-integration.yml b/ci/tasks/run-integration.yml index 22b7e6b5..ee60ba68 100644 --- a/ci/tasks/run-integration.yml +++ b/ci/tasks/run-integration.yml @@ -5,10 +5,11 @@ image_resource: source: {repository: bosh/integration} inputs: - name: bosh-cpi-src + - name: bosh-cpi-src-test - name: environment - name: stemcell run: - path: bosh-cpi-src/ci/tasks/run-integration.sh + path: bosh-cpi-src-test/ci/tasks/run-integration.sh params: AWS_ACCESS_KEY_ID: "" AWS_SECRET_ACCESS_KEY: "" diff --git a/src/bosh_aws_cpi/spec/integration/spec_helper.rb b/src/bosh_aws_cpi/spec/integration/spec_helper.rb index 5283a7d1..c440f8e7 100644 --- a/src/bosh_aws_cpi/spec/integration/spec_helper.rb +++ b/src/bosh_aws_cpi/spec/integration/spec_helper.rb @@ -102,9 +102,9 @@ def set_assume_role_permissions rspec_config.before(:all) do #set_assume_role_permissions - access_key_id: ENV.fetch('BOSH_AWS_ACCESS_KEY_ID'), - secret_access_key: ENV.fetch('BOSH_AWS_SECRET_ACCESS_KEY'), - session_token: ENV.fetch('BOSH_AWS_SESSION_TOKEN', nil) + @access_key_id = ENV.fetch('BOSH_AWS_ACCESS_KEY_ID') + @secret_access_key = ENV.fetch('BOSH_AWS_SECRET_ACCESS_KEY') + @session_token = ENV.fetch('BOSH_AWS_SESSION_TOKEN', nil) @subnet_id = ENV.fetch('BOSH_AWS_SUBNET_ID') @subnet_zone = ENV.fetch('BOSH_AWS_SUBNET_ZONE') @kms_key_arn = ENV.fetch('BOSH_AWS_KMS_KEY_ARN') @@ -112,8 +112,8 @@ def set_assume_role_permissions @region = ENV.fetch('BOSH_AWS_REGION', 'us-west-1') @default_key_name = ENV.fetch('BOSH_AWS_DEFAULT_KEY_NAME', 'bosh') @ami = ENV.fetch('BOSH_AWS_IMAGE_ID', 'ami-866d3ee6') - access_key_id: ENV.fetch('BOSH_AWS_PERMISSIONS_AUDITOR_KEY_ID'), - secret_access_key: ENV.fetch('BOSH_AWS_PERMISSIONS_AUDITOR_SECRET_KEY'), + @permissions_auditor_key_id = ENV.fetch('BOSH_AWS_PERMISSIONS_AUDITOR_KEY_ID', nil) + @permissions_auditor_secret_key = ENV.fetch('BOSH_AWS_PERMISSIONS_AUDITOR_SECRET_KEY', nil) @cpi_api_version = ENV.fetch('BOSH_AWS_CPI_API_VERSION', 1).to_i