diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4bd23182d0c5d76c662b6d205153600ae40548d1..0a57bd9b47618929adfaf06302a4b96490630635 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,10 +48,12 @@ setup_environment: else git clone https://github.com/uabrc/CRI_XCBC.git; cd CRI_XCBC; + git remote add upstream https://github.com/jprorama/CRI_XCBC.git fi - > + git fetch upstream; git checkout -b integration; - git merge origin/uab-dev; + git merge upstream/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/