From a170c4a04bf2c663f65b9a796c76ff67f838c42e Mon Sep 17 00:00:00 2001 From: Zhihui Xia Date: Tue, 30 Apr 2024 09:13:47 -0700 Subject: [PATCH] strip off TEST_RUNNER --- Test/AwsCommonRuntimeKitTests/mqtt/Mqtt5ClientTests.swift | 7 ++++--- codebuild/linux-integration-tests.yml | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Test/AwsCommonRuntimeKitTests/mqtt/Mqtt5ClientTests.swift b/Test/AwsCommonRuntimeKitTests/mqtt/Mqtt5ClientTests.swift index b61eca2e..6fafe7f6 100644 --- a/Test/AwsCommonRuntimeKitTests/mqtt/Mqtt5ClientTests.swift +++ b/Test/AwsCommonRuntimeKitTests/mqtt/Mqtt5ClientTests.swift @@ -605,6 +605,7 @@ class Mqtt5ClientTests: XCBaseTestCase { let inputHost = try getEnvironmentVarOrSkipTest(environmentVarName: "AWS_TEST_MQTT5_WS_MQTT_TLS_HOST") let inputPort = try getEnvironmentVarOrSkipTest(environmentVarName: "AWS_TEST_MQTT5_WS_MQTT_TLS_PORT") + // XCode could only take terminal environment variable let tlsOptions = try TLSContextOptions.makeDefault() let tlsContext = try TLSContext(options: tlsOptions, mode: .client) @@ -651,10 +652,10 @@ class Mqtt5ClientTests: XCBaseTestCase { let testContext = MqttTestContext() - - let provider = try CredentialsProvider(source: .static(accessKey: getEnvironmentVarOrSkipTest(environmentVarName: "TEST_RUNNER_AWS_ACCESS_KEY_ID"), secret: getEnvironmentVarOrSkipTest(environmentVarName: "TEST_RUNNER_AWS_SECRET_ACCESS_KEY"))) + + let provider = try CredentialsProvider(source: .static(accessKey: getEnvironmentVarOrSkipTest(environmentVarName: "AWS_ACCESS_KEY_ID"), secret: getEnvironmentVarOrSkipTest(environmentVarName: "AWS_SECRET_ACCESS_KEY"))) testContext.withIoTSigv4WebsocketTransform(region: region, provider: provider) - + let client = try createClient(clientOptions: clientOptions, testContext: testContext) testContext.onWebSocketHandshake = nil try connectClient(client: client, testContext: testContext) diff --git a/codebuild/linux-integration-tests.yml b/codebuild/linux-integration-tests.yml index 854af1a3..a400611e 100644 --- a/codebuild/linux-integration-tests.yml +++ b/codebuild/linux-integration-tests.yml @@ -6,6 +6,8 @@ env: BUILDER_SOURCE: releases BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net PACKAGE_NAME: aws-crt-swift + TEST_RUNNER_AWS_ACCESS_KEY_ID: $AWS_ACCESS_KEY_ID + TEST_RUNNER_AWS_SECRET_ACCESS_KEY: $AWS_SECRET_ACCESS_KEY phases: build: