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

# Conflicts:
#   .gitlab-ci.yml
2 jobs for !18 with red-test-sit in 41 seconds (queued for 49 seconds)
detached
Status Job ID Name Coverage
  Rebuild Staging
failed #538
rebuild_staging

00:00:25

 
  Clean Rebuild Staging
passed #539
clean_rebuild_staging

00:00:15

 
Name Stage Failure
failed
rebuild_staging Rebuild Staging
$ [[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
$ echo "pulling updates on $staging"
pulling updates on red-test-staging
$ ssh -tt centos@13.251.192.208 "cd $root_path/sit/$repo_folder && sudo git pull origin $staging"
Warning: Permanently added '13.251.192.208' (ECDSA) to the list of known hosts.
You have not concluded your merge (MERGE_HEAD exists).
Please, commit your changes before you can merge.
Connection to 13.251.192.208 closed.
ERROR: Job failed: exit code 1