.gitlab-ci.yml

@@ -119,6 +119,12 @@ gilab-ci.yml Lint (python 3.11):
   image: python:3.11-slim
 
 
+Ansible_docker_os.Submodule.Deploy:
+  extends: .submodule_update_trigger
+  variables:
+    SUBMODULE_UPDATE_TRIGGER_PROJECT: nofusscomputing/projects/ansible/ansible_docker_os
+
+
 Ansible_playbooks.Submodule.Deploy:
   extends: .submodule_update_trigger
   variables:

automation/.gitlab-ci-ansible.yaml

@@ -93,8 +93,10 @@ include:
       when: always
 
     - if: # condition_dev_branch_push
+        $CI_COMMIT_TAG == null &&
         $CI_COMMIT_BRANCH == "development" && 
-        $CI_PIPELINE_SOURCE == "push"
+        $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "development" && 
+        $CI_PIPELINE_SOURCE != "push"
       exists:
         - ".nfc_automation.yaml"
       when: always
@@ -159,7 +161,8 @@ include:
       when: never
     - if: 
         $CI_COMMIT_TAG == null &&
-        $CI_PIPELINE_SOURCE == "push" && 
+        $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "development" && 
+        $CI_PIPELINE_SOURCE != "push" &&
         $CI_COMMIT_BRANCH != 'master' &&
         $CI_COMMIT_BRANCH != 'automated-tasks' &&
         $CI_COMMIT_BRANCH == 'development'