From 03e1b1373b07a8617d20fac3c29852e7a10e8d34 Mon Sep 17 00:00:00 2001 From: Ian Saultz <52051793+atierian@users.noreply.github.com> Date: Wed, 18 Oct 2023 19:14:36 -0400 Subject: [PATCH] test: use macos-13 runners for stress tests and use explicit iOS version (#3310) --- .github/workflows/integ_test.yml | 2 +- .../workflows/integ_test_api_functional.yml | 2 +- .../integ_test_api_graphql_auth_directive.yml | 2 +- .../workflows/integ_test_api_graphql_iam.yml | 2 +- .../integ_test_api_graphql_lambda_auth.yml | 2 +- .../integ_test_api_graphql_lazy_load.yml | 2 +- .../integ_test_api_graphql_user_pool.yml | 2 +- .github/workflows/integ_test_api_rest_iam.yml | 2 +- .../integ_test_api_rest_user_pool.yml | 2 +- .github/workflows/integ_test_auth.yml | 2 +- .github/workflows/integ_test_datastore.yml | 2 +- .../integ_test_datastore_auth_cognito.yml | 2 +- .../integ_test_datastore_auth_iam.yml | 2 +- .../workflows/integ_test_datastore_base.yml | 2 +- .../workflows/integ_test_datastore_cpk.yml | 2 +- .../integ_test_datastore_lazy_load.yml | 2 +- .../integ_test_datastore_multi_auth.yml | 2 +- .github/workflows/integ_test_datastore_v2.yml | 2 +- .github/workflows/integ_test_geo.yml | 2 +- .github/workflows/integ_test_logging.yml | 2 +- .github/workflows/integ_test_predictions.yml | 2 +- .github/workflows/integ_test_storage.yml | 2 +- .github/workflows/stress_test.yml | 25 +++++++++++++------ .../StorageStressTests.swift | 2 +- 24 files changed, 40 insertions(+), 31 deletions(-) diff --git a/.github/workflows/integ_test.yml b/.github/workflows/integ_test.yml index daf6be7467..e1e08c6b41 100644 --- a/.github/workflows/integ_test.yml +++ b/.github/workflows/integ_test.yml @@ -20,7 +20,7 @@ concurrency: jobs: prepare-for-test: - runs-on: macos-12 + runs-on: macos-13 environment: IntegrationTest steps: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b diff --git a/.github/workflows/integ_test_api_functional.yml b/.github/workflows/integ_test_api_functional.yml index f68ef49b94..20485cfeda 100644 --- a/.github/workflows/integ_test_api_functional.yml +++ b/.github/workflows/integ_test_api_functional.yml @@ -32,7 +32,7 @@ jobs: with: project_path: ./AmplifyPlugins/API/Tests/APIHostApp scheme: AWSAPIPluginFunctionalTests - destination: 'platform=iOS Simulator,name=iPhone 14,OS=latest' + destination: 'platform=iOS Simulator,name=iPhone 14,OS=16.4' xcode_path: '/Applications/Xcode_14.3.app' api-functional-test-tvOS: diff --git a/.github/workflows/integ_test_api_graphql_auth_directive.yml b/.github/workflows/integ_test_api_graphql_auth_directive.yml index 0581ab1d7a..9fe9adf6e9 100644 --- a/.github/workflows/integ_test_api_graphql_auth_directive.yml +++ b/.github/workflows/integ_test_api_graphql_auth_directive.yml @@ -32,7 +32,7 @@ jobs: with: project_path: ./AmplifyPlugins/API/Tests/APIHostApp scheme: AWSAPIPluginGraphQLAuthDirectiveTests - destination: 'platform=iOS Simulator,name=iPhone 14,OS=latest' + destination: 'platform=iOS Simulator,name=iPhone 14,OS=16.4' xcode_path: '/Applications/Xcode_14.3.app' api-graphql-auth-directive-test-tvOS: diff --git a/.github/workflows/integ_test_api_graphql_iam.yml b/.github/workflows/integ_test_api_graphql_iam.yml index 1831e6398e..c394239186 100644 --- a/.github/workflows/integ_test_api_graphql_iam.yml +++ b/.github/workflows/integ_test_api_graphql_iam.yml @@ -32,7 +32,7 @@ jobs: with: project_path: ./AmplifyPlugins/API/Tests/APIHostApp scheme: AWSAPIPluginGraphQLIAMTests - destination: 'platform=iOS Simulator,name=iPhone 14,OS=latest' + destination: 'platform=iOS Simulator,name=iPhone 14,OS=16.4' xcode_path: '/Applications/Xcode_14.3.app' api-graphql-iam-test-tvOS: diff --git a/.github/workflows/integ_test_api_graphql_lambda_auth.yml b/.github/workflows/integ_test_api_graphql_lambda_auth.yml index c0fecd1ee7..01cf9ba807 100644 --- a/.github/workflows/integ_test_api_graphql_lambda_auth.yml +++ b/.github/workflows/integ_test_api_graphql_lambda_auth.yml @@ -32,7 +32,7 @@ jobs: with: project_path: ./AmplifyPlugins/API/Tests/APIHostApp scheme: AWSAPIPluginGraphQLLambdaAuthTests - destination: 'platform=iOS Simulator,name=iPhone 14,OS=latest' + destination: 'platform=iOS Simulator,name=iPhone 14,OS=16.4' xcode_path: '/Applications/Xcode_14.3.app' api-graphql-lambda-auth-test-tvOS: diff --git a/.github/workflows/integ_test_api_graphql_lazy_load.yml b/.github/workflows/integ_test_api_graphql_lazy_load.yml index 3c922c583b..171dfb0812 100644 --- a/.github/workflows/integ_test_api_graphql_lazy_load.yml +++ b/.github/workflows/integ_test_api_graphql_lazy_load.yml @@ -32,7 +32,7 @@ jobs: with: project_path: ./AmplifyPlugins/API/Tests/APIHostApp scheme: AWSAPIPluginLazyLoadTests - destination: 'platform=iOS Simulator,name=iPhone 14,OS=latest' + destination: 'platform=iOS Simulator,name=iPhone 14,OS=16.4' xcode_path: '/Applications/Xcode_14.3.app' api-lazy-load-test-tvOS: diff --git a/.github/workflows/integ_test_api_graphql_user_pool.yml b/.github/workflows/integ_test_api_graphql_user_pool.yml index d3f5ac4e72..8f06939378 100644 --- a/.github/workflows/integ_test_api_graphql_user_pool.yml +++ b/.github/workflows/integ_test_api_graphql_user_pool.yml @@ -32,7 +32,7 @@ jobs: with: project_path: ./AmplifyPlugins/API/Tests/APIHostApp scheme: AWSAPIPluginGraphQLUserPoolTests - destination: 'platform=iOS Simulator,name=iPhone 14,OS=latest' + destination: 'platform=iOS Simulator,name=iPhone 14,OS=16.4' xcode_path: '/Applications/Xcode_14.3.app' api-graphql-user-pool-test-tvOS: diff --git a/.github/workflows/integ_test_api_rest_iam.yml b/.github/workflows/integ_test_api_rest_iam.yml index 23d8765970..6b38cbc49d 100644 --- a/.github/workflows/integ_test_api_rest_iam.yml +++ b/.github/workflows/integ_test_api_rest_iam.yml @@ -32,7 +32,7 @@ jobs: with: project_path: ./AmplifyPlugins/API/Tests/APIHostApp scheme: AWSAPIPluginRESTIAMTests - destination: 'platform=iOS Simulator,name=iPhone 14,OS=latest' + destination: 'platform=iOS Simulator,name=iPhone 14,OS=16.4' xcode_path: '/Applications/Xcode_14.3.app' api-rest-iam-test-tvOS: diff --git a/.github/workflows/integ_test_api_rest_user_pool.yml b/.github/workflows/integ_test_api_rest_user_pool.yml index f8dc7d4fdc..8026949e30 100644 --- a/.github/workflows/integ_test_api_rest_user_pool.yml +++ b/.github/workflows/integ_test_api_rest_user_pool.yml @@ -32,7 +32,7 @@ jobs: with: project_path: ./AmplifyPlugins/API/Tests/APIHostApp scheme: AWSAPIPluginRESTUserPoolTests - destination: 'platform=iOS Simulator,name=iPhone 14,OS=latest' + destination: 'platform=iOS Simulator,name=iPhone 14,OS=16.4' xcode_path: '/Applications/Xcode_14.3.app' api-rest-user-pool-test-tvOS: diff --git a/.github/workflows/integ_test_auth.yml b/.github/workflows/integ_test_auth.yml index 70ef1dfec8..2ed5fff4ee 100644 --- a/.github/workflows/integ_test_auth.yml +++ b/.github/workflows/integ_test_auth.yml @@ -32,7 +32,7 @@ jobs: with: project_path: ./AmplifyPlugins/Auth/Tests/AuthHostApp/ scheme: AuthIntegrationTests - destination: 'platform=iOS Simulator,name=iPhone 14,OS=latest' + destination: 'platform=iOS Simulator,name=iPhone 14,OS=16.4' xcode_path: '/Applications/Xcode_14.3.app' auth-integration-test-tvOS: diff --git a/.github/workflows/integ_test_datastore.yml b/.github/workflows/integ_test_datastore.yml index 40c3584f4f..462f28e700 100644 --- a/.github/workflows/integ_test_datastore.yml +++ b/.github/workflows/integ_test_datastore.yml @@ -14,7 +14,7 @@ concurrency: jobs: prepare-for-test: - runs-on: macos-12 + runs-on: macos-13 environment: IntegrationTest steps: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b diff --git a/.github/workflows/integ_test_datastore_auth_cognito.yml b/.github/workflows/integ_test_datastore_auth_cognito.yml index b776f69e5d..2bcabe1f1e 100644 --- a/.github/workflows/integ_test_datastore_auth_cognito.yml +++ b/.github/workflows/integ_test_datastore_auth_cognito.yml @@ -33,7 +33,7 @@ jobs: with: project_path: ./AmplifyPlugins/DataStore/Tests/DataStoreHostApp scheme: AWSDataStorePluginAuthCognitoTests - destination: 'platform=iOS Simulator,name=iPhone 14,OS=latest' + destination: 'platform=iOS Simulator,name=iPhone 14,OS=16.4' xcode_path: '/Applications/Xcode_14.3.app' datastore-integration-auth-cognito-test-tvOS: diff --git a/.github/workflows/integ_test_datastore_auth_iam.yml b/.github/workflows/integ_test_datastore_auth_iam.yml index b3dad109b2..25e7600163 100644 --- a/.github/workflows/integ_test_datastore_auth_iam.yml +++ b/.github/workflows/integ_test_datastore_auth_iam.yml @@ -33,7 +33,7 @@ jobs: with: project_path: ./AmplifyPlugins/DataStore/Tests/DataStoreHostApp scheme: AWSDataStorePluginAuthIAMTests - destination: 'platform=iOS Simulator,name=iPhone 14,OS=latest' + destination: 'platform=iOS Simulator,name=iPhone 14,OS=16.4' xcode_path: '/Applications/Xcode_14.3.app' datastore-integration-auth-iam-test-tvOS: diff --git a/.github/workflows/integ_test_datastore_base.yml b/.github/workflows/integ_test_datastore_base.yml index 7310532203..7b42357b6f 100644 --- a/.github/workflows/integ_test_datastore_base.yml +++ b/.github/workflows/integ_test_datastore_base.yml @@ -33,7 +33,7 @@ jobs: with: project_path: ./AmplifyPlugins/DataStore/Tests/DataStoreHostApp scheme: AWSDataStorePluginIntegrationTests - destination: 'platform=iOS Simulator,name=iPhone 14,OS=latest' + destination: 'platform=iOS Simulator,name=iPhone 14,OS=16.4' xcode_path: '/Applications/Xcode_14.3.app' datastore-integration-test-base-tvOS: diff --git a/.github/workflows/integ_test_datastore_cpk.yml b/.github/workflows/integ_test_datastore_cpk.yml index 41eb3051c1..9032d7dd86 100644 --- a/.github/workflows/integ_test_datastore_cpk.yml +++ b/.github/workflows/integ_test_datastore_cpk.yml @@ -33,7 +33,7 @@ jobs: with: project_path: ./AmplifyPlugins/DataStore/Tests/DataStoreHostApp scheme: AWSDataStorePluginCPKTests - destination: 'platform=iOS Simulator,name=iPhone 14,OS=latest' + destination: 'platform=iOS Simulator,name=iPhone 14,OS=16.4' xcode_path: '/Applications/Xcode_14.3.app' datastore-integration-cpk-test-tvOS: diff --git a/.github/workflows/integ_test_datastore_lazy_load.yml b/.github/workflows/integ_test_datastore_lazy_load.yml index bad115fd20..cc1481b00b 100644 --- a/.github/workflows/integ_test_datastore_lazy_load.yml +++ b/.github/workflows/integ_test_datastore_lazy_load.yml @@ -33,7 +33,7 @@ jobs: with: project_path: ./AmplifyPlugins/DataStore/Tests/DataStoreHostApp scheme: AWSDataStorePluginLazyLoadTests - destination: 'platform=iOS Simulator,name=iPhone 14,OS=latest' + destination: 'platform=iOS Simulator,name=iPhone 14,OS=16.4' xcode_path: '/Applications/Xcode_14.3.app' datastore-integration-lazy-load-test-tvOS: diff --git a/.github/workflows/integ_test_datastore_multi_auth.yml b/.github/workflows/integ_test_datastore_multi_auth.yml index bb9f03f275..232ba5a5a6 100644 --- a/.github/workflows/integ_test_datastore_multi_auth.yml +++ b/.github/workflows/integ_test_datastore_multi_auth.yml @@ -33,7 +33,7 @@ jobs: with: project_path: ./AmplifyPlugins/DataStore/Tests/DataStoreHostApp scheme: AWSDataStorePluginMultiAuthTests - destination: 'platform=iOS Simulator,name=iPhone 14,OS=latest' + destination: 'platform=iOS Simulator,name=iPhone 14,OS=16.4' xcode_path: '/Applications/Xcode_14.3.app' datastore-integration-multi-auth-test-tvOS: diff --git a/.github/workflows/integ_test_datastore_v2.yml b/.github/workflows/integ_test_datastore_v2.yml index 7c9fdd20eb..e24c75f9d4 100644 --- a/.github/workflows/integ_test_datastore_v2.yml +++ b/.github/workflows/integ_test_datastore_v2.yml @@ -33,7 +33,7 @@ jobs: with: project_path: ./AmplifyPlugins/DataStore/Tests/DataStoreHostApp scheme: AWSDataStorePluginV2Tests - destination: 'platform=iOS Simulator,name=iPhone 14,OS=latest' + destination: 'platform=iOS Simulator,name=iPhone 14,OS=16.4' xcode_path: '/Applications/Xcode_14.3.app' datastore-integration-v2-test-tvOS: diff --git a/.github/workflows/integ_test_geo.yml b/.github/workflows/integ_test_geo.yml index 14a84b9180..0debbec997 100644 --- a/.github/workflows/integ_test_geo.yml +++ b/.github/workflows/integ_test_geo.yml @@ -32,7 +32,7 @@ jobs: with: project_path: ./AmplifyPlugins/Geo/Tests/GeoHostApp/ scheme: AWSLocationGeoPluginIntegrationTests - destination: 'platform=iOS Simulator,name=iPhone 14,OS=latest' + destination: 'platform=iOS Simulator,name=iPhone 14,OS=16.4' xcode_path: '/Applications/Xcode_14.3.app' geo-integration-test-tvOS: diff --git a/.github/workflows/integ_test_logging.yml b/.github/workflows/integ_test_logging.yml index e02e4abfde..4084c4bbff 100644 --- a/.github/workflows/integ_test_logging.yml +++ b/.github/workflows/integ_test_logging.yml @@ -32,7 +32,7 @@ jobs: with: project_path: ./AmplifyPlugins/Logging/Tests/AWSCloudWatchLoggingPluginHostApp scheme: AWSCloudWatchLoggingPluginIntegrationTests - destination: 'platform=iOS Simulator,name=iPhone 14,OS=latest' + destination: 'platform=iOS Simulator,name=iPhone 14,OS=16.4' xcode_path: '/Applications/Xcode_14.3.app' logging-integration-test-tvOS: diff --git a/.github/workflows/integ_test_predictions.yml b/.github/workflows/integ_test_predictions.yml index 58be80d7e8..149648670b 100644 --- a/.github/workflows/integ_test_predictions.yml +++ b/.github/workflows/integ_test_predictions.yml @@ -37,7 +37,7 @@ jobs: with: project_path: ./AmplifyPlugins/Predictions/Tests/PredictionsHostApp scheme: AWSPredictionsPluginIntegrationTests - destination: 'platform=iOS Simulator,name=iPhone 14,OS=latest' + destination: 'platform=iOS Simulator,name=iPhone 14,OS=16.4' xcode_path: '/Applications/Xcode_14.3.app' predictions-integration-test-tvOS: diff --git a/.github/workflows/integ_test_storage.yml b/.github/workflows/integ_test_storage.yml index ba971a0b05..e190989139 100644 --- a/.github/workflows/integ_test_storage.yml +++ b/.github/workflows/integ_test_storage.yml @@ -32,7 +32,7 @@ jobs: with: project_path: ./AmplifyPlugins/Storage/Tests/StorageHostApp/ scheme: AWSS3StoragePluginIntegrationTests - destination: 'platform=iOS Simulator,name=iPhone 14,OS=latest' + destination: 'platform=iOS Simulator,name=iPhone 14,OS=16.4' xcode_path: '/Applications/Xcode_14.3.app' storage-integration-test-tvOS: diff --git a/.github/workflows/stress_test.yml b/.github/workflows/stress_test.yml index 39d6a0bc68..7988fb7123 100644 --- a/.github/workflows/stress_test.yml +++ b/.github/workflows/stress_test.yml @@ -14,7 +14,7 @@ concurrency: jobs: prepare-for-test: - runs-on: macos-12 + runs-on: macos-13 environment: IntegrationTest steps: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b @@ -31,7 +31,7 @@ jobs: auth-stress-test: needs: prepare-for-test - runs-on: macos-12 + runs-on: macos-13 environment: IntegrationTest steps: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b @@ -54,10 +54,12 @@ jobs: with: project_path: ./AmplifyPlugins/Auth/Tests/AuthHostApp/ scheme: AuthStressTests + destination: 'platform=iOS Simulator,name=iPhone 14,OS=16.4' + xcode_path: '/Applications/Xcode_14.3.app' geo-stress-test: needs: prepare-for-test - runs-on: macos-12 + runs-on: macos-13 environment: IntegrationTest steps: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b @@ -80,11 +82,12 @@ jobs: with: project_path: ./AmplifyPlugins/Geo/Tests/GeoHostApp/ scheme: GeoStressTests - + destination: 'platform=iOS Simulator,name=iPhone 14,OS=16.4' + xcode_path: '/Applications/Xcode_14.3.app' storage-stress-test: needs: prepare-for-test - runs-on: macos-12 + runs-on: macos-13 environment: IntegrationTest steps: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b @@ -107,10 +110,12 @@ jobs: with: project_path: ./AmplifyPlugins/Storage/Tests/StorageHostApp/ scheme: StorageStressTests + destination: 'platform=iOS Simulator,name=iPhone 14,OS=16.4' + xcode_path: '/Applications/Xcode_14.3.app' datastore-stress-test: needs: prepare-for-test - runs-on: macos-12 + runs-on: macos-13 environment: IntegrationTest steps: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b @@ -133,10 +138,12 @@ jobs: with: project_path: ./AmplifyPlugins/DataStore/Tests/DataStoreHostApp scheme: DatastoreStressTests + destination: 'platform=iOS Simulator,name=iPhone 14,OS=16.4' + xcode_path: '/Applications/Xcode_14.3.app' graphql-api-stress-test: needs: prepare-for-test - runs-on: macos-12 + runs-on: macos-13 environment: IntegrationTest steps: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b @@ -158,4 +165,6 @@ jobs: uses: ./.github/composite_actions/run_xcodebuild_test with: project_path: ./AmplifyPlugins/API/Tests/APIHostApp - scheme: GraphQLAPIStressTests \ No newline at end of file + scheme: GraphQLAPIStressTests + destination: 'platform=iOS Simulator,name=iPhone 14,OS=16.4' + xcode_path: '/Applications/Xcode_14.3.app' \ No newline at end of file diff --git a/AmplifyPlugins/Storage/Tests/StorageHostApp/StorageStressTests/StorageStressTests.swift b/AmplifyPlugins/Storage/Tests/StorageHostApp/StorageStressTests/StorageStressTests.swift index 74404ca437..ffc25e3d2c 100644 --- a/AmplifyPlugins/Storage/Tests/StorageHostApp/StorageStressTests/StorageStressTests.swift +++ b/AmplifyPlugins/Storage/Tests/StorageHostApp/StorageStressTests/StorageStressTests.swift @@ -173,7 +173,7 @@ final class StorageStressTests: XCTestCase { } catch { XCTFail("Error: \(error)") } - await fulfillment(of: [uploadExpectation, removeExpectation], timeout: 180) + await fulfillment(of: [downloadExpectation, uploadExpectation, removeExpectation], timeout: 180) }