From 1ba34d7d32e7704362ddb6faf88816c1c371c937 Mon Sep 17 00:00:00 2001
From: Bo-Chun Louis Chen <louistw@uab.edu>
Date: Thu, 8 Sep 2022 10:23:21 -0500
Subject: [PATCH] Checkout integration branch in pipeline
---
.gitlab-ci.yml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 24e9420..239c654 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/
--
GitLab