Merge pull request #81 from 0chain/feature/repo-snapshots

integrate with repo snapshots
0chain · Jul 10, 2023 · 8fd5ad1 · 8fd5ad1
2 parents fcb5274 + 5d2b18f
commit 8fd5ad1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 52 deletions.
diff --git a/.github/workflows/build-s3-migration.yaml b/.github/workflows/build-s3-migration.yaml
@@ -6,10 +6,7 @@ concurrency:
 
 on:
   push:
-    branches:
-      - master
-      - staging
-      - test-s3mgrt
+    branches: [ master, staging, sprint* ]
     tags:
       - 'v*.*.*'
   pull_request:
@@ -221,43 +218,33 @@ jobs:
       - name: "Deploy 0Chain"
         uses: 0chain/actions/deploy-0chain@master
         with:
+          repo_snapshots_branch: "<CURRENT BRANCH WITH FALLBACK TO CURRENT_SPRINT>"
           kube_config: ${{ secrets[format('DEV{0}KC', env.RUNNER_NUMBER)] }}
+          svc_account_secret: ${{ secrets.SVC_ACCOUNT_SECRET }}
           teardown_condition: "TESTS_PASSED"
-          miner_image: staging
-          sharder_image: staging
-          blobber_image: staging
-          validator_image: staging
-          zbox_image: staging
-          zblock_image: staging
-          zdns_image: staging
-          explorer_image: latest
-          zsearch_image: staging
-          zbox_cli_branch: staging
-          zwallet_cli_branch: staging
           SUBGRAPH_API_URL: ${{ secrets.SUBGRAPH_API_URL }}
           TENDERLY_FORK_ID: ${{ secrets.TENDERLY_FORK_ID }}
+          graphnode_sc: ${{ secrets.GRAPHNODE_SC }}
           graphnode_network: ${{ secrets.GRAPHNODE_NETWORK }}
           graphnode_ethereum_node_url: https://rpc.tenderly.co/fork/${{ secrets.TENDERLY_FORK_ID }}
 
       - name: "Run System tests"
         uses: 0chain/actions/run-system-tests@master
         with:
-          system_tests_branch: master
+          repo_snapshots_branch: "<CURRENT BRANCH WITH FALLBACK TO CURRENT_SPRINT>"
           network: ${{ env.NETWORK_URL }}
-          s3_migration_cli_branch: ${{ env.CURRENT_BRANCH }}
-          zbox_cli_branch: staging
-          zwallet_cli_branch: staging
           svc_account_secret: ${{ secrets.SVC_ACCOUNT_SECRET }}
           deploy_report_page: false
           archive_results: true
           run_flaky_tests: false
+          run_smoke_tests: ${{ github.ref != 'refs/heads/staging' && github.base_ref != 'staging' && github.ref != 'refs/heads/master' && github.base_ref != 'master' }}
           retry_failures: true
-          run_api_tests: false
           TENDERLY_FORK_ID: ${{ secrets.TENDERLY_FORK_ID }}
           DEVOPS_CHANNEL_WEBHOOK_URL: ${{ secrets.DEVOPS_CHANNEL_WEBHOOK_URL }}
           S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }}
           S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }}
-          run_smoke_tests: ${{ github.ref != 'refs/heads/staging' && github.base_ref != 'staging' && github.ref != 'refs/heads/master' && github.base_ref != 'master' }}
+          s3_migration_cli_branch: ${{ env.CURRENT_BRANCH }}
+          run_api_tests: false
 
       - name: "Set PR status as ${{ job.status }}"
         if: ${{ (success() || failure()) && steps.findPr.outputs.number }}

diff --git a/.github/workflows/system_tests.yaml b/.github/workflows/system_tests.yaml
@@ -7,26 +7,14 @@ on:
         description: 'system_tests branch containing the tests you wish to run'
         default: 'master'
         required: true
-      zbox_cli_branch:
-        description: '0Box CLI branch which the tests will use'
-        default: 'staging'
-        required: true
-      miner_sharder_branch:
-        description: 'miner/sharder branch to deploy'
-        default: 'staging'
-        required: true
-      blobber_branch:
-        description: 'blobber branch to deploy'
-        default: 'staging'
-        required: true
-      validator_branch:
-        description: 'validator branch to deploy'
-        default: 'staging'
-        required: true
-      zbox_branch:
-        description: '0box branch to deploy'
-        default: 'staging'
+      repo_snapshots_branch:
+        description: 'branch of repo-snapshots to derive images and branches from.'
+        default: 'current-sprint'
         required: true
+      run_smoke_tests:
+        description: 'Run subset of system tests (smoke tests) for faster feedback (NOT FOR PRS POINTED TO STAGING)'
+        default: 'false'
+        required: false
       test_file_filter:
         description: 'Comma separated list of test files to run (eg. zwalletcli_register_wallet_test.go, zwalletcli_send_and_balance_test.go). If supplied, the PR will NOT be notified of the test result'
         default: ''
@@ -40,20 +28,10 @@ jobs:
     uses: 0chain/actions/.github/workflows/manual_system_tests.yml@add/s3-migrt
     with:
       s3_migration_cli_branch: ${{ github.ref_name }}
-      system_tests_branch: ${{ github.event.inputs.system_tests_branch }}
-      miner_branch: ${{ github.event.inputs.miner_sharder_branch }}
-      sharder_branch: ${{ github.event.inputs.miner_sharder_branch }}
-      zbox_cli_branch: ${{ github.event.inputs.zbox_cli_branch }}
-      zwallet_cli_branch: ${{ github.ref_name }}
-      blobber_branch: ${{ github.event.inputs.blobber_branch }}
-      validator_branch: ${{ github.event.inputs.validator_branch }}
-      zbox_branch: ${{ github.event.inputs.zbox_branch }}
-      zblock_branch: staging
-      zdns_branch: staging
-      explorer_branch: staging
-      zsearch_branch: staging
+      repo_snapshots_branch: ${{ github.event.inputs.repo_snapshots_branch }}
       test_file_filter: ${{ github.event.inputs.test_file_filter }}
       skip_tests: ${{ github.event.inputs.skip_tests }}
+      run_smoke_tests: ${{ github.event.inputs.run_smoke_tests }}
     secrets:
       SVC_ACCOUNT_SECRET: ${{ secrets.SVC_ACCOUNT_SECRET }}
       DEV1KC: ${{ secrets.DEV1KC }}
@@ -68,3 +46,8 @@ jobs:
       SUBGRAPH_API_URL: ${{ secrets.SUBGRAPH_API_URL }}
       TENDERLY_FORK_ID: ${{ secrets.TENDERLY_FORK_ID }}
       DEVOPS_CHANNEL_WEBHOOK_URL: ${{ secrets.DEVOPS_CHANNEL_WEBHOOK_URL }}
+      GRAPHNODE_SC: ${{ secrets.GRAPHNODE_SC }}
+      GRAPHNODE_NETWORK: ${{ secrets.GRAPHNODE_NETWORK }}
+      GRAPHNODE_ETHEREUM_NODE_URL: https://rpc.tenderly.co/fork/${{ secrets.TENDERLY_FORK_ID }}
+      S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }}
+      S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }}