Skip to content
Snippets Groups Projects
Commit 2279ee7d authored by Bo-Chun Chen's avatar Bo-Chun Chen
Browse files

Add git remote upstream

parent 52cecd55
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 1 deletion
.gitlab-ci.yml
+ 3
− 1
View file @ 2279ee7d
...@@ -48,10 +48,12 @@ setup_environment: ...@@ -48,10 +48,12 @@ setup_environment:
else else
git clone https://github.com/uabrc/CRI_XCBC.git; git clone https://github.com/uabrc/CRI_XCBC.git;
cd CRI_XCBC; cd CRI_XCBC;
git remote add upstream https://github.com/jprorama/CRI_XCBC.git
fi fi
- > - >
git fetch upstream;
git checkout -b integration; git checkout -b integration;
git merge origin/uab-dev; git merge upstream/uab-dev;
cd ..; 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 --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/ - s3cmd get --force -r --host=$AWS_HOST --host-bucket=$AWS_HOST s3://cheaha-cloud-ansible-files/ ansible/files/
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment