From 99d1e82200e9621b16b52d93bed30f9f7be179c3 Mon Sep 17 00:00:00 2001 From: Sebastian Villena <97059974+ruisebas@users.noreply.github.com> Date: Wed, 1 Nov 2023 11:01:48 -0400 Subject: [PATCH] Fixing timeouts and inputs --- .github/workflows/integ_test_api_functional.yml | 2 +- .../integ_test_api_graphql_auth_directive.yml | 2 +- .github/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 +- .../workflows/integ_test_api_rest_user_pool.yml | 2 +- .../integ_test_datastore_auth_cognito.yml | 3 +-- .../workflows/integ_test_datastore_auth_iam.yml | 3 +-- .github/workflows/integ_test_datastore_base.yml | 3 +-- .github/workflows/integ_test_datastore_cpk.yml | 3 +-- .../workflows/integ_test_datastore_lazy_load.yml | 3 +-- .../integ_test_datastore_multi_auth.yml | 3 +-- .github/workflows/integ_test_datastore_v2.yml | 3 +-- .../workflows/integ_test_push_notifications.yml | 2 +- .github/workflows/run_integration_tests.yml | 16 +++------------- 17 files changed, 19 insertions(+), 36 deletions(-) diff --git a/.github/workflows/integ_test_api_functional.yml b/.github/workflows/integ_test_api_functional.yml index f7c2d0be00..c8874243fe 100644 --- a/.github/workflows/integ_test_api_functional.yml +++ b/.github/workflows/integ_test_api_functional.yml @@ -42,5 +42,5 @@ jobs: project_path: ./AmplifyPlugins/API/Tests/APIHostApp xcode_version: '14.3' resource_subfolder: api - timeout-minutes: 30 + timeout-minutes: 45 secrets: inherit diff --git a/.github/workflows/integ_test_api_graphql_auth_directive.yml b/.github/workflows/integ_test_api_graphql_auth_directive.yml index ecb99a42d6..46ff30d925 100644 --- a/.github/workflows/integ_test_api_graphql_auth_directive.yml +++ b/.github/workflows/integ_test_api_graphql_auth_directive.yml @@ -36,5 +36,5 @@ jobs: project_path: ./AmplifyPlugins/API/Tests/APIHostApp xcode_version: '14.3' resource_subfolder: api - timeout-minutes: 30 + timeout-minutes: 45 secrets: inherit diff --git a/.github/workflows/integ_test_api_graphql_iam.yml b/.github/workflows/integ_test_api_graphql_iam.yml index ce8e639e3e..94dccec965 100644 --- a/.github/workflows/integ_test_api_graphql_iam.yml +++ b/.github/workflows/integ_test_api_graphql_iam.yml @@ -36,5 +36,5 @@ jobs: project_path: ./AmplifyPlugins/API/Tests/APIHostApp xcode_version: '14.3' resource_subfolder: api - timeout-minutes: 30 + timeout-minutes: 45 secrets: inherit diff --git a/.github/workflows/integ_test_api_graphql_lambda_auth.yml b/.github/workflows/integ_test_api_graphql_lambda_auth.yml index f5914ee4f8..f1f699f851 100644 --- a/.github/workflows/integ_test_api_graphql_lambda_auth.yml +++ b/.github/workflows/integ_test_api_graphql_lambda_auth.yml @@ -42,5 +42,5 @@ jobs: project_path: ./AmplifyPlugins/API/Tests/APIHostApp xcode_version: '14.3' resource_subfolder: api - timeout-minutes: 30 + timeout-minutes: 45 secrets: inherit diff --git a/.github/workflows/integ_test_api_graphql_lazy_load.yml b/.github/workflows/integ_test_api_graphql_lazy_load.yml index 4cef818944..332e71eec5 100644 --- a/.github/workflows/integ_test_api_graphql_lazy_load.yml +++ b/.github/workflows/integ_test_api_graphql_lazy_load.yml @@ -36,5 +36,5 @@ jobs: project_path: ./AmplifyPlugins/API/Tests/APIHostApp xcode_version: '14.3' resource_subfolder: api - timeout-minutes: 30 + timeout-minutes: 45 secrets: inherit diff --git a/.github/workflows/integ_test_api_graphql_user_pool.yml b/.github/workflows/integ_test_api_graphql_user_pool.yml index d9a22483ef..e3f10fd1eb 100644 --- a/.github/workflows/integ_test_api_graphql_user_pool.yml +++ b/.github/workflows/integ_test_api_graphql_user_pool.yml @@ -36,5 +36,5 @@ jobs: project_path: ./AmplifyPlugins/API/Tests/APIHostApp xcode_version: '14.3' resource_subfolder: api - timeout-minutes: 30 + timeout-minutes: 45 secrets: inherit \ No newline at end of file diff --git a/.github/workflows/integ_test_api_rest_iam.yml b/.github/workflows/integ_test_api_rest_iam.yml index 51829d4225..aa3b203b3f 100644 --- a/.github/workflows/integ_test_api_rest_iam.yml +++ b/.github/workflows/integ_test_api_rest_iam.yml @@ -42,5 +42,5 @@ jobs: project_path: ./AmplifyPlugins/API/Tests/APIHostApp xcode_version: '14.3' resource_subfolder: api - timeout-minutes: 30 + timeout-minutes: 45 secrets: inherit diff --git a/.github/workflows/integ_test_api_rest_user_pool.yml b/.github/workflows/integ_test_api_rest_user_pool.yml index 9b11fb568f..c88f87099b 100644 --- a/.github/workflows/integ_test_api_rest_user_pool.yml +++ b/.github/workflows/integ_test_api_rest_user_pool.yml @@ -36,5 +36,5 @@ jobs: project_path: ./AmplifyPlugins/API/Tests/APIHostApp xcode_version: '14.3' resource_subfolder: api - timeout-minutes: 30 + timeout-minutes: 45 secrets: inherit diff --git a/.github/workflows/integ_test_datastore_auth_cognito.yml b/.github/workflows/integ_test_datastore_auth_cognito.yml index c9fa4a39a3..7ed891f883 100644 --- a/.github/workflows/integ_test_datastore_auth_cognito.yml +++ b/.github/workflows/integ_test_datastore_auth_cognito.yml @@ -42,6 +42,5 @@ jobs: project_path: ./AmplifyPlugins/DataStore/Tests/DataStoreHostApp xcode_version: '14.3' resource_subfolder: datastore - timeout-minutes: 60 - other_flags: '-test-iterations 3 -retry-tests-on-failure' + timeout-minutes: 120 secrets: inherit diff --git a/.github/workflows/integ_test_datastore_auth_iam.yml b/.github/workflows/integ_test_datastore_auth_iam.yml index 8f7ce190e0..3b2f4af585 100644 --- a/.github/workflows/integ_test_datastore_auth_iam.yml +++ b/.github/workflows/integ_test_datastore_auth_iam.yml @@ -42,6 +42,5 @@ jobs: project_path: ./AmplifyPlugins/DataStore/Tests/DataStoreHostApp xcode_version: '14.3' resource_subfolder: datastore - timeout-minutes: 60 - other_flags: '-test-iterations 3 -retry-tests-on-failure' + timeout-minutes: 120 secrets: inherit diff --git a/.github/workflows/integ_test_datastore_base.yml b/.github/workflows/integ_test_datastore_base.yml index 62ed2d23a0..06c51f8785 100644 --- a/.github/workflows/integ_test_datastore_base.yml +++ b/.github/workflows/integ_test_datastore_base.yml @@ -42,6 +42,5 @@ jobs: project_path: ./AmplifyPlugins/DataStore/Tests/DataStoreHostApp xcode_version: '14.3' resource_subfolder: datastore - timeout-minutes: 60 - other_flags: '-test-iterations 3 -retry-tests-on-failure' + timeout-minutes: 120 secrets: inherit diff --git a/.github/workflows/integ_test_datastore_cpk.yml b/.github/workflows/integ_test_datastore_cpk.yml index 088fa84eca..8e97bb1e07 100644 --- a/.github/workflows/integ_test_datastore_cpk.yml +++ b/.github/workflows/integ_test_datastore_cpk.yml @@ -42,6 +42,5 @@ jobs: project_path: ./AmplifyPlugins/DataStore/Tests/DataStoreHostApp xcode_version: '14.3' resource_subfolder: datastore - timeout-minutes: 60 - other_flags: '-test-iterations 3 -retry-tests-on-failure' + timeout-minutes: 120 secrets: inherit diff --git a/.github/workflows/integ_test_datastore_lazy_load.yml b/.github/workflows/integ_test_datastore_lazy_load.yml index 6f00d1f383..388d28f1d2 100644 --- a/.github/workflows/integ_test_datastore_lazy_load.yml +++ b/.github/workflows/integ_test_datastore_lazy_load.yml @@ -42,6 +42,5 @@ jobs: project_path: ./AmplifyPlugins/DataStore/Tests/DataStoreHostApp xcode_version: '14.3' resource_subfolder: datastore - timeout-minutes: 60 - other_flags: '-test-iterations 3 -retry-tests-on-failure' + timeout-minutes: 120 secrets: inherit diff --git a/.github/workflows/integ_test_datastore_multi_auth.yml b/.github/workflows/integ_test_datastore_multi_auth.yml index af703f8bdf..e8900c4f24 100644 --- a/.github/workflows/integ_test_datastore_multi_auth.yml +++ b/.github/workflows/integ_test_datastore_multi_auth.yml @@ -42,6 +42,5 @@ jobs: project_path: ./AmplifyPlugins/DataStore/Tests/DataStoreHostApp xcode_version: '14.3' resource_subfolder: datastore - timeout-minutes: 60 - other_flags: '-test-iterations 3 -retry-tests-on-failure' + timeout-minutes: 120 secrets: inherit diff --git a/.github/workflows/integ_test_datastore_v2.yml b/.github/workflows/integ_test_datastore_v2.yml index 6b1f70d6a3..f842b38c13 100644 --- a/.github/workflows/integ_test_datastore_v2.yml +++ b/.github/workflows/integ_test_datastore_v2.yml @@ -42,6 +42,5 @@ jobs: project_path: ./AmplifyPlugins/DataStore/Tests/DataStoreHostApp xcode_version: '14.3' resource_subfolder: datastore - timeout-minutes: 60 - other_flags: '-test-iterations 3 -retry-tests-on-failure' + timeout-minutes: 120 secrets: inherit diff --git a/.github/workflows/integ_test_push_notifications.yml b/.github/workflows/integ_test_push_notifications.yml index 455cdc6ae8..0cbc663f54 100644 --- a/.github/workflows/integ_test_push_notifications.yml +++ b/.github/workflows/integ_test_push_notifications.yml @@ -27,7 +27,7 @@ jobs: push-notification-integration-tests: name: ${{ matrix.platform }} Tests | PushNotificationHostApp runs-on: macos-13 - timeout-minutes: 45 + timeout-minutes: 30 environment: IntegrationTest strategy: fail-fast: false diff --git a/.github/workflows/run_integration_tests.yml b/.github/workflows/run_integration_tests.yml index 751eeeb8f4..a96200bc3b 100644 --- a/.github/workflows/run_integration_tests.yml +++ b/.github/workflows/run_integration_tests.yml @@ -29,15 +29,6 @@ on: description: 'The key used to retrieve the build cache' required: true type: string - if: - description: 'Whether to run this job' - required: false - default: true - type: boolean - other_flags: - required: false - type: string - default: '' permissions: id-token: write @@ -47,7 +38,7 @@ jobs: integration-tests: name: ${{ inputs.platform }} Tests | ${{ inputs.scheme }} runs-on: macos-13 - if: inputs.if && inputs.platform != 'macOS' # macOS is not supported for Integration Tests + if: inputs.platform != 'macOS' # macOS is not supported for Integration Tests timeout-minutes: ${{ inputs.timeout-minutes }} environment: IntegrationTest steps: @@ -110,7 +101,7 @@ jobs: derived_data_path: ${{ github.workspace }}/Build disable_package_resolution: ${{ steps.dependencies-cache.outputs.cache-hit }} test_without_building: false - other_flags: ${{ inputs.other_flags }} + other_flags: -test-iterations 3 -retry-tests-on-failure - name: Retry ${{ inputs.platform }} Integration Tests if: steps.run-tests.outcome=='failure' @@ -128,5 +119,4 @@ jobs: disable_package_resolution: true # Only attempt to test without building when we are not using any cache. test_without_building: ${{ !steps.build-cache.outputs.cache-hit }} - other_flags: ${{ inputs.other_flags }} - + other_flags: -test-iterations 3 -retry-tests-on-failure