diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f2cfe1e8b796982759b464c5688a52fe4ce8f141..431071ae10ea8de021ce3315a1f5d3777f5d08b7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,7 +60,7 @@ setup_environment: - git checkout uab-prod - git merge origin/uab-prod - git checkout -b integration - - git merge upstream/uab-dev + - git merge upstream/dev - cd .. - s3cmd get --force --host=$AWS_HOST --host-bucket=$AWS_HOST s3://ood-config/group_vars/all CRI_XCBC/group_vars/prod - s3cmd get --force -r --host=$AWS_HOST --host-bucket=$AWS_HOST s3://cheaha-cloud-ansible-files/ ansible/files/