From b9232dd34a7a905fae586780bb0bbd141edf6775 Mon Sep 17 00:00:00 2001
From: Toni Nurmi <tonurmi@csc.fi>
Date: Wed, 30 Mar 2022 13:54:20 +0000
Subject: [PATCH] CSCFAIRADM-1271: Fix deployment step

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4cae1f0e..adb2390b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,8 +5,8 @@ workflow:
 
 stages:
   - clean_build
-  - test
   - deploy
+  - test
   - update
   - clean_env
 
@@ -74,7 +74,7 @@ deploy:
   script:
     - ansible-playbook -i $ANSIBLE_INVENTORY $DEPLOY_PLAYBOOK --vault-id $ANSIBLE_VAULT_FILE -e "build_id=$CI_COMMIT_REF_SLUG repo_version=$CI_COMMIT_REF_NAME"
   rules:
-    - if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^(demo|master|stable|staging|test)$/
+    - if: $CI_COMMIT_BRANCH =~ /^(demo|master|stable|staging|test)$/
       when: always
 
 update_metax: