Update CI actions

awslabs · Dec 7, 2023 · 2883276 · 2883276
1 parent 967eb41
commit 2883276
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 24 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,7 +2,7 @@ name: Tests
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "dnanuti:fix/tests-stability" ]
   pull_request:
     branches: [ "main" ]
   merge_group:

diff --git a/.github/workflows/python-integration.yml b/.github/workflows/python-integration.yml
@@ -19,6 +19,7 @@ env:
   S3_EXPRESS_REGION: ${{ vars.S3_EXPRESS_REGION }}
   S3_EXPRESS_BUCKET: ${{ vars.S3_EXPRESS_BUCKET }}
   CI_PREFIX: ${{ vars.S3_PREFIX }}
+  CI_STORAGE_CLASS: ""
 
 jobs:
   integration-test:
@@ -29,10 +30,12 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.8", "3.9", "3.10", "3.11"]
+        ci-storage-class: ["", "EXPRESS_ONEZONE"]
+        bucket: [S3_BUCKET, S3_EXPRESS_BUCKET]
+        region: [S3_REGION, S3_EXPRESS_REGION]
     permissions:
       id-token: write
       contents: read
-
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -79,32 +82,18 @@ jobs:
           python -m pip install -e "s3torchconnectorclient[test,e2e]"
           python -m pip install -e "s3torchconnector[test,e2e]"
 
-      - name: s3torchconnector S3 integration tests
-        run: |
-          CI_REGION=${{ S3_REGION }} \
-          CI_BUCKET=${{ S3_BUCKET }} \
-          CI_STORAGE_CLASS=\
-          pytest s3torchconnector/tst/e2e -n auto
-
-      - name: s3torchconnector S3 Express integration tests
+      - name: s3torchconnector integration tests
         run: |
-          CI_REGION=${{ S3_EXPRESS_REGION }} \
-          CI_BUCKET=${{ S3_EXPRESS_BUCKET }} \
-          CI_STORAGE_CLASS=EXPRESS_ONEZONE \
+          CI_REGION=${{ matrix.region }} \
+          CI_BUCKET=${{ matrix.bucket }} \
+          CI_STORAGE_CLASS=${{ matrix.ci-storage-class }} \
           pytest s3torchconnector/tst/e2e -n auto
 
-      - name: s3torchconnectorclient S3 integration tests
-        run: |
-          CI_REGION=${{ S3_REGION }} \
-          CI_BUCKET=${{ S3_BUCKET }} \
-          CI_STORAGE_CLASS=\
-          pytest s3torchconnectorclient/python/tst/integration -n auto
-
-      - name: s3torchconnectorclient S3 Express integration tests
+      - name: s3torchconnectorclient integration tests
         run: |
-          CI_REGION=${{ S3_EXPRESS_REGION }} \
-          CI_BUCKET=${{ S3_EXPRESS_BUCKET }} \
-          CI_STORAGE_CLASS=EXPRESS_ONEZONE \ 
+          CI_REGION=${{ matrix.region }} \
+          CI_BUCKET=${{ matrix.bucket }} \
+          CI_STORAGE_CLASS=${{ matrix.ci-storage-class }} \
           pytest s3torchconnectorclient/python/tst/integration -n auto
 
       - name: Save Cargo cache