Merge branch 'red-develop' into 'red-test-sit'

Red develop

See merge request red/red-ci-cd!14

.gitlab-ci.yml

@@ -59,6 +59,7 @@ clean_initial_repo:
         - chmod 700 ~/.ssh
         - echo "$CENTOS_SERVER" | ssh-add - > ~/.ssh/id_rsa
         - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
+        - ssh -tt centos@13.251.192.208 "cd $root_path/dev/$repo_folder && docker-compose -f docker-compose.yml -p xxx_rmsv2_api_container down"
         - ssh -tt centos@13.251.192.208 "sudo rm -rf $root_path/dev"
 
 rebuild_dev: 
@@ -97,7 +98,7 @@ clean_rebuild_dev:
     stage: clean_rebuild_dev
     image: ubuntu
     rules:
-    - if: '$CI_COMMIT_MESSAGE =~ /initial/ && $CI_COMMIT_BRANCH == "red-develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "red-develop"'
+    - if: '$CI_COMMIT_MESSAGE !~ /initial/ && $CI_COMMIT_BRANCH == "red-develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "red-develop"'
       when: on_failure    
     script:
         - echo "this is a clean up for clean_rebuild_dev"
@@ -107,6 +108,7 @@ clean_rebuild_dev:
         - chmod 700 ~/.ssh
         - echo "$CENTOS_SERVER" | ssh-add - > ~/.ssh/id_rsa
         - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
+        - ssh -tt centos@13.251.192.208 "cd $root_path/dev/$repo_folder && docker-compose -f docker-compose.yml -p xxx_rmsv2_api_container down"
         - ssh -tt centos@13.251.192.208 "sudo rm -rf $root_path/dev"
       
       
@@ -130,9 +132,8 @@ build_sit:
         - ssh -tt centos@13.251.192.208 "cd $root_path/sit/$repo_folder && $dockerfile_sit"
         - ssh -tt centos@13.251.192.208 "cd $root_path/sit/$repo_folder && $testenv"
         - ssh -tt centos@13.251.192.208 "cd $root_path/sit/$repo_folder && $TIRdevINI"
-        - ssh -tt centos@13.251.192.208 "docker-compose -f $root_path/sit/$repo_folder/docker-compose.yml down"
+        - ssh -tt centos@13.251.192.208 "docker-compose -f $root_path/sit/$repo_folder/docker-compose.yml -p xxx_sit_rmsv2_api_container down"
         - ssh -tt centos@13.251.192.208 "docker-compose -f $root_path/sit/$repo_folder/docker-compose.yml -p xxx_rmsv2_api_container up -d --build"
-        - ssh -tt centos@13.251.192.208 "cd $root_path/sit/$repo_folder && sudo docker-compose up --build -d"
         - echo "building sit environment for red test ci cd"
         
     variables:
@@ -158,6 +159,7 @@ clean_build_sit:
         - chmod 700 ~/.ssh
         - echo "$CENTOS_SERVER" | ssh-add - > ~/.ssh/id_rsa
         - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
+        - ssh -tt centos@13.251.192.208 "docker-compose -f $root_path/sit/$repo_folder/docker-compose.yml -p xxx_sit_rmsv2_api_container down"
         - ssh -tt centos@13.251.192.208 "sudo rm -rf $root_path/sit"
 
 
@@ -175,9 +177,9 @@ rebuild_sit:
         - echo "$CENTOS_SERVER" | ssh-add - > ~/.ssh/id_rsa
         - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
         - echo "pulling updates on $sit"
-        - ssh -tt centos@13.251.192.208 "cd $root_path/dev/$repo_folder && sudo git pull origin $sit"
-        - ssh -tt centos@13.251.192.208 "cd $root_path/dev/$repo_folder && docker-compose -f docker-compose.yml -p xxx_sit_rmsv2_api_container down"
-        - ssh -tt centos@13.251.192.208 "cd $root_path/dev/$repo_folder && docker-compose -f docker-compose.yml -p xxx_sit_rmsv2_api_container up -d --build"
+        - ssh -tt centos@13.251.192.208 "cd $root_path/sit/$repo_folder && sudo git pull origin $sit"
+        - ssh -tt centos@13.251.192.208 "cd $root_path/sit/$repo_folder && docker-compose -f docker-compose.yml -p xxx_sit_rmsv2_api_container down"
+        - ssh -tt centos@13.251.192.208 "cd $root_path/sit/$repo_folder && docker-compose -f docker-compose.yml -p xxx_sit_rmsv2_api_container up -d --build"
         - echo "the $dev branch is successfully updated"
         
     variables:
@@ -203,4 +205,5 @@ clean_rebuild_sit:
         - chmod 700 ~/.ssh
         - echo "$CENTOS_SERVER" | ssh-add - > ~/.ssh/id_rsa
         - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
+        - ssh -tt centos@13.251.192.208 "cd $root_path/sit/$repo_folder && docker-compose -f docker-compose.yml -p xxx_sit_rmsv2_api_container down"
         - ssh -tt centos@13.251.192.208 "sudo rm -rf $root_path/sit"
\ No newline at end of file

test2.txt

 this is a new file that test if the build job will work 
-xxxx
\ No newline at end of file
+xxxx
+
+asdasd
\ No newline at end of file