fix nightly - local vars (#1731)

* fix nightly - local vars * test out * fix test status notidication * back to main branch
0xPolygon · Jul 19, 2023 · 195b619 · 195b619
1 parent 04776a5
commit 195b619
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/deploy.nightly.devnet.yml b/.github/workflows/deploy.nightly.devnet.yml
@@ -17,10 +17,10 @@ on:  # yamllint disable-line rule:truthy
     outputs:
       workflow_output_loadtest1:
         description: "Loadtest output"
-        value: ${{ jobs.loadtest1.outputs.loadtest_output_failure }} 
+        value: ${{ jobs.loadtest1.outputs.loadtest_output_success }}
       workflow_output_loadtest2:
         description: "Loadtest output"
-        value: ${{ jobs.loadtest2.outputs.loadtest_output_failure }} 
+        value: ${{ jobs.loadtest2.outputs.loadtest_output_success }}
     secrets:
       AWS_ROLE_ARN:
         required: true
@@ -97,8 +97,8 @@ jobs:
         run: |
           echo "${{ secrets.VAULT_PASSWORD_FILE }}" > password.txt
           sed 's/devnet13/${{ secrets.TF_VAR_DEPLOYMENT_NAME }}/g' inventory/aws_ec2.yml > inventory/aws_ec2.yml.tmp && mv inventory/aws_ec2.yml.tmp inventory/aws_ec2.yml
-          sed 's/devnet13/${{ secrets.TF_VAR_DEPLOYMENT_NAME }}/g' local-extra-vars.yml > local-extra-vars.yml.tmp && mv local-extra-vars.yml.tmp local-extra-vars.yml
-          sed 's/edge_tag: .*/edge_tag: HEAD/g' local-extra-vars.yml > local-extra-vars.yml.tmp && mv local-extra-vars.yml.tmp local-extra-vars.yml
+          sed 's/devnet13/${{ secrets.TF_VAR_DEPLOYMENT_NAME }}/g' group_vars/all.yml > group_vars/all.yml.tmp && mv group_vars/all.yml.tmp group_vars/all.yml
+          sed 's/edge_tag: .*/edge_tag: HEAD/g' group_vars/all.yml > group_vars/all.yml.tmp && mv group_vars/all.yml.tmp group_vars/all.yml
       - name: Create script file
         working-directory: ansible
         run: |
@@ -203,7 +203,7 @@ jobs:
         run: |
           ansible-inventory --graph
           ansible-galaxy install -r requirements.yml
-          ansible-playbook --inventory inventory/aws_ec2.yml --vault-password-file=password.txt --extra-vars "@local-extra-vars.yml" site.yml
+          ansible-playbook site.yml
       - name: Set rpc url value
         id: url
         run: |

diff --git a/.github/workflows/loadtest.yml b/.github/workflows/loadtest.yml
@@ -58,7 +58,7 @@ jobs:
     environment: ${{ inputs.environment }}
     runs-on: ubuntu-latest
     outputs:
-      loadtest_output_failure: ${{ steps.run_k6_failure.outputs.test_output }}
+      loadtest_output_success: ${{ steps.run_k6_success.outputs.test_output }}
     steps:
       - name: Install Go
         uses: actions/setup-go@v3
@@ -118,10 +118,10 @@ jobs:
           LOADTEST_MNEMONIC: ${{ secrets.LOADTEST_MNEMONIC }}
           LOADTEST_DURATION: ${{ inputs.duration }}
 
-      - name: Run tests failed
-        if: failure()
-        id: run_k6_failure
-        run: echo "test_output=false" >> $GITHUB_OUTPUT
+      - name: Run tests success
+        if: success()
+        id: run_k6_success
+        run: echo "test_output=true" >> $GITHUB_OUTPUT
 
       - name: Notify Slack
         uses: slackapi/[email protected]

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -134,14 +134,14 @@ jobs:
                   "type": "section",
                   "text": {
                     "type": "mrkdwn",
-                    "text": "Load tests (multiple_EOA) ${{ needs.loadtest.outputs.workflow_output_loadtest1 == '' && ':white_check_mark:' || ':x: `failed`' }}"
+                    "text": "Load tests (multiple_EOA) ${{ needs.loadtest.outputs.workflow_output_loadtest1 == 'true' && ':white_check_mark:' || ':x: `failed`' }}"
                   }
                 },
                 {
                   "type": "section",
                   "text": {
                     "type": "mrkdwn",
-                    "text": "Load tests (multiple_ERC20) ${{ needs.loadtest.outputs.workflow_output_loadtest2 == '' && ':white_check_mark:' || ':x: `failed`' }}"
+                    "text": "Load tests (multiple_ERC20) ${{ needs.loadtest.outputs.workflow_output_loadtest2 == 'true' && ':white_check_mark:' || ':x: `failed`' }}"
                   }
                 },
                 {