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

Move CRI_XCBC clone to before script

parent 5134942d
No related branches found
No related tags found
1 merge request!10Add gitlab ci into project
......@@ -35,6 +35,24 @@ before_script:
- source venv/bin/activate
- pip install --upgrade pip
- pip install s3cmd ansible python-openstackclient
- |
if [ ! -d $CI_PROJECT_DIR/CRI_XCBC ]; then
git clone https://github.com/uabrc/CRI_XCBC.git
cd CRI_XCBC
git remote add upstream https://github.com/jprorama/CRI_XCBC.git
cd ..
fi
- cd CRI_XCBC
- git config user.name "${GIT_AUTHOR_NAME}"
- git config user.email "${GIT_AUTHOR_EMAIL}"
- git fetch --all
- git fetch origin '+refs/pull/*/head:refs/remotes/origin/pr/*'
- git fetch upstream '+refs/pull/*/head:refs/remotes/upstream/pr/*'
- git checkout uab-prod
- git merge origin/uab-prod
- git checkout -b integration
- git merge upstream/dev
- cd ..
stages:
- build
......@@ -46,26 +64,8 @@ setup_environment:
tags:
- build
script:
- |
if [ ! -d $CI_PROJECT_DIR/CRI_XCBC ]; then
git clone https://github.com/uabrc/CRI_XCBC.git
cd CRI_XCBC
git remote add upstream https://github.com/jprorama/CRI_XCBC.git
cd ..
fi
- cd CRI_XCBC
- git config user.name "${GIT_AUTHOR_NAME}"
- git config user.email "${GIT_AUTHOR_EMAIL}"
- git fetch --all
- git fetch origin '+refs/pull/*/head:refs/remotes/origin/pr/*'
- git fetch upstream '+refs/pull/*/head:refs/remotes/upstream/pr/*'
- git checkout uab-prod
- git merge origin/uab-prod
- git checkout -b integration
- git merge upstream/dev
- echo "CRI_XCBC_HEAD=$(git rev-parse --short HEAD)" | tee $CI_PROJECT_DIR/build.env
- echo "CRI_XCBC_HEAD=$(cd CRI_XCBC; git rev-parse --short HEAD)" | tee $CI_PROJECT_DIR/build.env
- echo "BUILD_DATE=$(TZ=America/Chicago date +%Y%m%d)" | tee $CI_PROJECT_DIR/build.env
- 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/
artifacts:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment