diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d5a4b3e0804a4a80b4982272c3f74fea3236111b..10c64ca813b1f52f819c7e045273006221db822c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,15 +52,15 @@ workflow: - cd CRI_XCBC - git config user.name "${GIT_AUTHOR_NAME}" - git config user.email "${GIT_AUTHOR_EMAIL}" - - git fetch origin uab-prod - - git fetch upstream dev - - git checkout uab-prod - - git merge origin/uab-prod + - git checkout ${EXT_PR_TARGET_BRANCH} + - git fetch origin ${EXT_PR_TARGET_BRANCH} + - git merge origin/${EXT_PR_TARGET_BRANCH} - git checkout -b integration - - git merge upstream/dev - export CRI_XCBC_HEAD=$(git rev-parse --short HEAD) - export CRI_XCBC_dev=$(git rev-parse --short upstream/dev) - export CRI_XCBC_prod=$(git rev-parse --short origin/uab-prod) + - git fetch upstream ${EXT_PR_SRC_BRANCH} + - git merge upstream/${EXT_PR_SRC_BRANCH} - cd .. - export PACKER_IMAGE_HEAD=$(git rev-parse --short HEAD) - echo CRI_XCBC_HEAD=${CRI_XCBC_HEAD} | tee -a $CI_PROJECT_DIR/image.env