diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 24e9420cc22f06973576369c0ae680c218f2bf75..239c654616a3a6275ef77e6c722f5ed7149c9b8f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,10 +44,14 @@ setup_environment: if cd CRI_XCBC; then git checkout uab-prod; git pull; git fetch origin '+refs/pull/*/head:refs/remotes/origin/pr/*'; - cd ..; else git clone https://github.com/uabrc/CRI_XCBC.git; + cd CRI_XCBC; fi + - > + git checkout integration; + git merge 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/