uncomment tests

olisystems · Aug 3, 2024 · 2dd4d08 · 2dd4d08
1 parent d816ba0
commit 2dd4d08
Showing 1 changed file with 40 additions and 40 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -107,7 +107,7 @@ jobs:
           echo "$mrenclave_hex" > mrenclave-${{ env.IMAGE_SUFFIX }}.hex
 
       - name: Upload Enclave Digest File
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: mrenclave-${{ env.IMAGE_SUFFIX }}.hex
           path: mrenclave-${{ env.IMAGE_SUFFIX }}.hex
@@ -255,7 +255,7 @@ jobs:
         uses: andymckay/cancel-action@0.3
 
   integration-tests:
-    runs-on: self-hosted
+    runs-on: ${{ matrix.host }}
     if: ${{ always() }}
     needs: [ build-test, build-client ]
     env:
@@ -273,48 +273,48 @@ jobs:
           - test: M6
             flavor_id: offchain-worker
             demo_name: demo-shielding-unshielding-multiworker
+            host: ubuntu-latest
+            sgx_mode: HW
+          - test: BestEnergy
+            flavor_id: sidechain
+            demo_name: demo-energy-market
             host: self-hosted
             sgx_mode: HW
-          # - test: BestEnergy
-          #   flavor_id: sidechain
-          #   demo_name: demo-energy-market
-          #   host: self-hosted
-          #   sgx_mode: HW
-          # - test: M8
-          #   flavor_id: sidechain
-          #   demo_name: demo-direct-call
-          #   host: ubuntu-latest
-          #   sgx_mode: HW
-          # - test: Sidechain
-          #   flavor_id: sidechain
-          #   demo_name: demo-sidechain
-          #   host: ubuntu-latest
-          #   sgx_mode: SW
-          # - test: M6
-          #   flavor_id: offchain-worker
-          #   demo_name: demo-shielding-unshielding-multiworker
-          #   host: ubuntu-latest
-          #   sgx_mode: HW
+          - test: M8
+            flavor_id: sidechain
+            demo_name: demo-direct-call
+            host: ubuntu-latest
+            sgx_mode: HW
+          - test: Sidechain
+            flavor_id: sidechain
+            demo_name: demo-sidechain
+            host: ubuntu-latest
+            sgx_mode: SW
+          - test: M6
+            flavor_id: offchain-worker
+            demo_name: demo-shielding-unshielding-multiworker
+            host: ubuntu-latest
+            sgx_mode: HW
 #          - test: Teeracle
 #            flavor_id: teeracle
 #            demo_name: demo-teeracle
 #            host: test-runner-sgx
 #            sgx_mode: HW
-          # - test: Teeracle
-          #   flavor_id: teeracle
-          #   demo_name: demo-teeracle-generic
-          #   host: ubuntu-latest
-          #   sgx_mode: HW
-          # - test: Benchmark
-          #   flavor_id: sidechain
-          #   demo_name: sidechain-benchmark
-          #   host: ubuntu-latest
-          #   sgx_mode: HW
-          # - test: EVM
-          #   flavor_id: sidechain-evm
-          #   demo_name: demo-smart-contract
-          #   host: ubuntu-latest
-          #   sgx_mode: HW
+          - test: Teeracle
+            flavor_id: teeracle
+            demo_name: demo-teeracle-generic
+            host: ubuntu-latest
+            sgx_mode: HW
+          - test: Benchmark
+            flavor_id: sidechain
+            demo_name: sidechain-benchmark
+            host: ubuntu-latest
+            sgx_mode: HW
+          - test: EVM
+            flavor_id: sidechain-evm
+            demo_name: demo-smart-contract
+            host: ubuntu-latest
+            sgx_mode: HW
 
     steps:
       - uses: actions/checkout@v3
@@ -403,7 +403,7 @@ jobs:
 
       - name: Upload logs
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: logs-${{ matrix.test }}-${{ matrix.flavor_id }}
           path: ${{ env.LOG_DIR }}
@@ -532,13 +532,13 @@ jobs:
           docker images --all
 
       - name: Upload image
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: integritee-worker-${{ matrix.flavor_id }}-${{ github.ref_name }}.tar.gz
           path: integritee-worker-${{ matrix.flavor_id }}-${{ github.ref_name }}.tar.gz
 
       - name: Upload cli image
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.flavor_id }}-cli-${{ github.ref_name }}.tar.gz
           path: ${{ matrix.flavor_id }}-cli-${{ github.ref_name }}.tar.gz