Merge remote-tracking branch 'origin/main' into algebra.move

aptos-labs · Apr 5, 2023 · 9674c40 · 9674c40
2 parents db98190 + 28df4c1
commit 9674c40
Show file tree

Hide file tree

Showing 138 changed files with 10,527 additions and 5,558 deletions.
diff --git a/.github/actions/run-faucet-tests/action.yaml b/.github/actions/run-faucet-tests/action.yaml
@@ -5,6 +5,9 @@ inputs:
   NETWORK:
     description: "The network branch for running the local testnet: devnet or testnet."
     required: true
+  GCP_DOCKER_ARTIFACT_REPO:
+    description: "The GCP Docker artifact repository."
+    required: true
 
 runs:
   using: composite
@@ -39,7 +42,7 @@ runs:
     # testnet, moving the mint key where the tests expect it to be, and running the
     # integration tests.
     - name: Run integration tests
-      run: poetry run python main.py --base-network ${{ inputs.NETWORK }} --external-test-dir ${{ runner.temp }}/testnet
+      run: poetry run python main.py --base-network ${{ inputs.NETWORK }} --external-test-dir ${{ runner.temp }}/testnet --image-repo-with-project ${{ inputs.GCP_DOCKER_ARTIFACT_REPO }}
       working-directory: crates/aptos-faucet/integration-tests
       shell: bash
 

diff --git a/.github/workflows/experimental-docker-build-test.yaml b/.github/workflows/experimental-docker-build-test.yaml
diff --git a/.github/workflows/experimental-docker-rust-build.yaml b/.github/workflows/experimental-docker-rust-build.yaml
diff --git a/.github/workflows/faucet-tests.yaml b/.github/workflows/faucet-tests.yaml
@@ -7,17 +7,42 @@ on:
 
 jobs:
   run-tests-devnet:
-    runs-on: ubuntu-latest
+    runs-on: high-perf-docker
+    permissions:
+      contents: read
+      id-token: write
     steps:
       - uses: actions/checkout@v3
-      # - uses: aptos-labs/aptos-core/.github/actions/run-faucet-tests@main
+      - uses: aptos-labs/aptos-core/.github/actions/docker-setup@main
+        with:
+          GCP_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}
+          GCP_SERVICE_ACCOUNT_EMAIL: ${{ secrets.GCP_SERVICE_ACCOUNT_EMAIL }}
+          GCP_DOCKER_ARTIFACT_REPO: ${{ secrets.GCP_DOCKER_ARTIFACT_REPO }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_DOCKER_ARTIFACT_REPO: ${{ secrets.AWS_DOCKER_ARTIFACT_REPO }}
+          GIT_CREDENTIALS: ${{ secrets.GIT_CREDENTIALS }}
       - uses: ./.github/actions/run-faucet-tests
         with:
           NETWORK: devnet
+          GCP_DOCKER_ARTIFACT_REPO: ${{ secrets.GCP_DOCKER_ARTIFACT_REPO }}
   run-tests-testnet:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
     steps:
       - uses: actions/checkout@v3
+      - uses: aptos-labs/aptos-core/.github/actions/docker-setup@main
+        with:
+          GCP_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}
+          GCP_SERVICE_ACCOUNT_EMAIL: ${{ secrets.GCP_SERVICE_ACCOUNT_EMAIL }}
+          GCP_DOCKER_ARTIFACT_REPO: ${{ secrets.GCP_DOCKER_ARTIFACT_REPO }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_DOCKER_ARTIFACT_REPO: ${{ secrets.AWS_DOCKER_ARTIFACT_REPO }}
+          GIT_CREDENTIALS: ${{ secrets.GIT_CREDENTIALS }}
       - uses: ./.github/actions/run-faucet-tests
         with:
           NETWORK: testnet
+          GCP_DOCKER_ARTIFACT_REPO: ${{ secrets.GCP_DOCKER_ARTIFACT_REPO }}
diff --git a/.github/workflows/module-verify.yaml b/.github/workflows/module-verify.yaml
@@ -40,7 +40,7 @@ jobs:
       BACKUP_CONFIG_TEMPLATE_PATH: terraform/helm/fullnode/files/backup/s3-public.yaml
       # workflow config
       RUNS_ON: high-perf-docker-with-local-ssd
-      TIMEOUT_MINUTES: 10
+      TIMEOUT_MINUTES: 20
 
   verify-modules-mainnet:
     if: ${{ github.event_name == 'workflow_dispatch' && (inputs.CHAIN_NAME == 'mainnet' || inputs.CHAIN_NAME == 'all') }}
@@ -53,7 +53,7 @@ jobs:
       BACKUP_CONFIG_TEMPLATE_PATH: terraform/helm/fullnode/files/backup/s3-public.yaml
       # workflow config
       RUNS_ON: high-perf-docker-with-local-ssd
-      TIMEOUT_MINUTES: 720
+      TIMEOUT_MINUTES: 20
 
   test-verify-modules:
     if: ${{ github.event_name == 'pull_request' }}