NDEV-2106 ci: fix selecting of the evm and faucet images

neonevm · Nov 28, 2023 · 29b2bf3 · 29b2bf3
1 parent 2faa16d
commit 29b2bf3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/deploy.py b/.github/workflows/deploy.py
@@ -187,7 +187,8 @@ def finalize_image(head_ref_branch, github_ref, proxy_tag):
 def terraform_build_infrastructure(dockerhub_org_name, head_ref_branch, github_ref_name, proxy_tag, neon_evm_tag, faucet_tag, run_number):
     branch = head_ref_branch if head_ref_branch != "" else github_ref_name
     neon_evm_tag = update_neon_evm_tag_if_same_branch_exists(head_ref_branch, neon_evm_tag)
-    faucet_tag = update_faucet_tag_if_same_branch_exists(branch, faucet_tag)
+    if branch not in ['master', 'develop']:
+        faucet_tag = update_faucet_tag_if_same_branch_exists(branch, faucet_tag)
     os.environ["TF_VAR_branch"] = branch.replace('_', '-')
     os.environ["TF_VAR_proxy_image_tag"] = proxy_tag
     os.environ["TF_VAR_neon_evm_commit"] = neon_evm_tag
@@ -313,7 +314,8 @@ def upload_remote_logs(ssh_client, service, artifact_logs):
 def deploy_check(proxy_tag, neon_evm_tag, faucet_tag, head_ref_branch, github_ref_name, skip_uniswap, test_files, skip_pull):
     feature_branch = head_ref_branch if head_ref_branch != "" else github_ref_name
     neon_evm_tag = update_neon_evm_tag_if_same_branch_exists(head_ref_branch, neon_evm_tag)
-    faucet_tag = update_faucet_tag_if_same_branch_exists(feature_branch, faucet_tag)
+    if feature_branch not in ['master', 'develop']:
+        faucet_tag = update_faucet_tag_if_same_branch_exists(feature_branch, faucet_tag)
 
     os.environ["REVISION"] = proxy_tag
     os.environ["NEON_EVM_COMMIT"] = neon_evm_tag

diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
@@ -21,8 +21,8 @@ on:
     tags:
       - "*"
 env:
-  NEON_EVM_TAG: "multiple_tokens"
-  FAUCET_TAG: "multiple_tokens"
+  NEON_EVM_TAG: "latest"
+  FAUCET_TAG: "latest"
   AWS_ACCESS_KEY_ID: ${{secrets.AWS_ACCESS_KEY_ID}}
   AWS_DEFAULT_REGION: ${{secrets.AWS_DEFAULT_REGION}}
   AWS_SECRET_ACCESS_KEY: ${{secrets.AWS_SECRET_ACCESS_KEY}}
@@ -149,7 +149,7 @@ jobs:
       - name: Set latest tag for test image if feature/version branch doesn't exist
         id: neon_test_final_tag
         run: |
-          if [[ "${{ steps.test_image_exists.conclusion }}" == "success" ]]; then
+          if [[ "${{ steps.test_image_exists.outcome }}" == "success" && "${{ github.ref_name }}" != "develop" ]]; then
             tag=${{ steps.neon_test_tag.outputs.value}}
           else
             tag='latest'