Enable 4 CI jobs, add TODO comments to disabled tests

awslabs · Jan 20, 2024 · 0854726 · 0854726
1 parent 3871a1e
commit 0854726
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 30 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -9,7 +9,6 @@ env:
 
 jobs:
   apple:
-    if: false
     runs-on: ${{ matrix.runner }}
     env:
       DEVELOPER_DIR: /Applications/${{ matrix.xcode }}.app/Contents/Developer
@@ -102,7 +101,6 @@ jobs:
             | xcpretty
 
   linux:
-    if: false
     runs-on: ubuntu-latest
     container: swift:${{ matrix.version }}-${{ matrix.os }}
     strategy:

diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -19,36 +19,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # This matrix runs tests on iOS sim & Mac, on oldest & newest supported Xcodes
+        # This matrix runs tests on Mac, on oldest & newest supported Xcodes
         runner:
-          #- macos-12
+          - macos-12
           - macos-13
         xcode:
-          #- Xcode_14.0.1
-          - Xcode_15.1
-        destination:
-          #- 'platform=iOS Simulator,OS=16.0,name=iPhone 14'
-          #- 'platform=iOS Simulator,OS=17.2,name=iPhone 15'
-          #- 'platform=tvOS Simulator,OS=16.0,name=Apple TV 4K (at 1080p) (2nd generation)'
-          #- 'platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)'
-          - 'platform=OS X'
-        #exclude:
+          - Xcode_14.0.1
+          - Xcode_15.2
+        exclude:
           # Don't run old macOS with new Xcode
-          #- runner: macos-12
-          #  xcode: Xcode_15.1
+          - runner: macos-12
+            xcode: Xcode_15.2
           # Don't run new macOS with old Xcode
-          #- runner: macos-13
-          #  xcode: Xcode_14.0.1
-          # Don't run old simulators with new Xcode
-          #- destination: 'platform=tvOS Simulator,OS=16.0,name=Apple TV 4K (at 1080p) (2nd generation)'
-          #  xcode: Xcode_15.1
-          #- destination: 'platform=iOS Simulator,OS=16.0,name=iPhone 14'
-          #  xcode: Xcode_15.1
-          # Don't run new simulators with old Xcode
-          #- destination: 'platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)'
-          #  xcode: Xcode_14.0.1
-          #- destination: 'platform=iOS Simulator,OS=17.2,name=iPhone 15'
-          #  xcode: Xcode_14.0.1
+          - runner: macos-13
+            xcode: Xcode_14.0.1
     steps:
       - name: Configure AWS Credentials for Integration Tests
         uses: aws-actions/configure-aws-credentials@v4
@@ -112,10 +96,9 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - focal
-          #- amazonlinux2
+          - amazonlinux2
         version:
-          #- 5.7
+          - 5.7
           - 5.9
     steps:
       - name: Configure AWS Credentials for Integration Tests

diff --git a/IntegrationTests/Services/AWSECSIntegrationTests/ECSCredentialsProviderTests.swift b/IntegrationTests/Services/AWSECSIntegrationTests/ECSCredentialsProviderTests.swift
@@ -37,6 +37,7 @@ class ECSCredentialsProviderTests: XCTestCase {
         )
     }
 
+    // TODO: Re-enable this test once CI is configured to run it. See https://github.com/awslabs/aws-sdk-swift/issues/1310
     func xtest_ecsCredentialsProvider() async throws {
         let ecsClient = try await ECSClient()
 

diff --git a/IntegrationTests/Services/AWSS3IntegrationTests/ProcessCredentialsProviderTests.swift b/IntegrationTests/Services/AWSS3IntegrationTests/ProcessCredentialsProviderTests.swift
@@ -31,6 +31,7 @@ class ProcessCredentialProviderTests: XCTestCase {
     }
 
     // This test calls listBuckets() and forces S3Client to use ProcessCredentialsProvider
+    // TODO: Re-enable this test once CI is configured to run it.  See https://github.com/awslabs/aws-sdk-swift/issues/1309
     func xtest_listBuckets() async throws {
         _ = try await client.listBuckets(input: ListBucketsInput())
     }

diff --git a/IntegrationTests/Services/AWSS3IntegrationTests/SSOCredentialsProviderTests.swift b/IntegrationTests/Services/AWSS3IntegrationTests/SSOCredentialsProviderTests.swift
@@ -54,6 +54,7 @@ class SSOCredentialsProviderTests : XCTestCase {
     }
 
     // The test calls listBuckets() and forces S3Client to use SSOCredentialsProvider
+    // TODO: Re-enable this test once CI is configured to run it. See https://github.com/awslabs/aws-sdk-swift/issues/1311
     func xtest_listBuckets() async throws {
         _ = try await client.listBuckets(input: ListBucketsInput())
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,6 +37,7 @@ class ECSCredentialsProviderTests: XCTestCase { @@
             )
         }
+        // TODO: Re-enable this test once CI is configured to run it. See https://github.com/awslabs/aws-sdk-swift/issues/1310
         func xtest_ecsCredentialsProvider() async throws {
             let ecsClient = try await ECSClient()
@@ Expand Down @@