Merge branch 'staging' of github.com:0chain/zwalletcli into sprint-ju…

…ly-2
0chain · Jul 10, 2023 · d11a58d · d11a58d
2 parents b572675 + 42925d7
commit d11a58d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 48 deletions.
diff --git a/.github/workflows/system_tests.yml b/.github/workflows/system_tests.yml
@@ -7,36 +7,16 @@ 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'
-        required: true
-      zblock_branch:
-        description: '0block 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_send_and_balance_test.go, zboxcli_file_delete_test.go). If supplied, the PR will NOT be notified of the test result'
+        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: ''
         required: false
       skip_tests:
@@ -47,15 +27,8 @@ jobs:
   system-tests:
     uses: 0chain/actions/.github/workflows/manual_system_tests.yml@master
     with:
-      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 }}
-      zdns_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 }}

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -5,10 +5,8 @@ concurrency:
   cancel-in-progress: true
 
 on:
-  push: 
-    branches:
-      - master
-      - staging
+  push:
+    branches: [ master, staging, sprint* ]
   pull_request:
 
 jobs:
@@ -87,31 +85,22 @@ 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)] }}
           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: ${{ env.CURRENT_BRANCH }}
           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 }}
+          svc_account_secret: ${{ secrets.SVC_ACCOUNT_SECRET }}
 
       - 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 }}
-          zbox_cli_branch: staging
           zwallet_cli_branch: ${{ env.CURRENT_BRANCH }}
           svc_account_secret: ${{ secrets.SVC_ACCOUNT_SECRET }}
           deploy_report_page: false