Skip to content
Snippets Groups Projects
Commit 02586d38 authored by Eesaan Atluri's avatar Eesaan Atluri
Browse files

feat: Define src and target branch using vars

This will let you define the branch name for the PR you want to test
from the src repo and target branch to merge into, in the target repo
parent 2a014fd0
No related branches found
No related tags found
2 merge requests!3Change compute reference to login,!2feat(ssh_host_keys): add role for managing SSH host keys
...@@ -52,15 +52,15 @@ workflow: ...@@ -52,15 +52,15 @@ workflow:
- cd CRI_XCBC - cd CRI_XCBC
- git config user.name "${GIT_AUTHOR_NAME}" - git config user.name "${GIT_AUTHOR_NAME}"
- git config user.email "${GIT_AUTHOR_EMAIL}" - git config user.email "${GIT_AUTHOR_EMAIL}"
- git fetch origin uab-prod - git checkout ${EXT_PR_TARGET_BRANCH}
- git fetch upstream dev - git fetch origin ${EXT_PR_TARGET_BRANCH}
- git checkout uab-prod - git merge origin/${EXT_PR_TARGET_BRANCH}
- git merge origin/uab-prod
- git checkout -b integration - git checkout -b integration
- git merge upstream/dev
- export CRI_XCBC_HEAD=$(git rev-parse --short HEAD) - export CRI_XCBC_HEAD=$(git rev-parse --short HEAD)
- export CRI_XCBC_dev=$(git rev-parse --short upstream/dev) - export CRI_XCBC_dev=$(git rev-parse --short upstream/dev)
- export CRI_XCBC_prod=$(git rev-parse --short origin/uab-prod) - 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 .. - cd ..
- export PACKER_IMAGE_HEAD=$(git rev-parse --short HEAD) - export PACKER_IMAGE_HEAD=$(git rev-parse --short HEAD)
- echo CRI_XCBC_HEAD=${CRI_XCBC_HEAD} | tee -a $CI_PROJECT_DIR/image.env - echo CRI_XCBC_HEAD=${CRI_XCBC_HEAD} | tee -a $CI_PROJECT_DIR/image.env
......
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