diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8c90044c04603e8fa01cede06639fe6816791ab5..4bd23182d0c5d76c662b6d205153600ae40548d1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,7 +51,7 @@ setup_environment: fi - > git checkout -b integration; - git merge uab-dev; + git merge origin/uab-dev; cd ..; - s3cmd get --force --host=$AWS_HOST --host-bucket=$AWS_HOST s3://ood-config/group_vars/all CRI_XCBC/group_vars/all - s3cmd get --force -r --host=$AWS_HOST --host-bucket=$AWS_HOST s3://cheaha-cloud-ansible-files/ ansible/files/