gitlab-ci: allow specifying base and tip in build test

We will soon provide this new capability to humans and automated
systems.

The default behaviour is retained: tip and base are passed by Gitlab
CI.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Doug Goldstein <cardoe@cardoe.com>
This commit is contained in:
Wei Liu committed 2019-05-15 11:01:06 +01:00
1 parent 8845155c83
commit 1d1f161153
2 files changed
+6 -6

No files matched your search

+5 -5
View File
@@ -1,18 +1,18 @@
#!/bin/bash
# For a newly pushed branch the BEFORE_SHA will be all 0s
if [[ ${CI_COMMIT_BEFORE_SHA} == 0000000000000000000000000000000000000000 ]]; then
if [[ ${BASE} == 0000000000000000000000000000000000000000 ]]; then
echo "Newly pushed branch, skipped"
exit 0
fi
git merge-base --is-ancestor ${CI_COMMIT_BEFORE_SHA} ${CI_COMMIT_SHA}
git merge-base --is-ancestor ${BASE} ${TIP}
if [[ $? -ne 0 ]]; then
echo "${CI_COMMIT_SHA} is not a descendent of ${CI_COMMIT_BEFORE_SHA}, skipped"
echo "${TIP} is not a descendent of ${BASE}, skipped"
exit 0
fi
echo "Building ${CI_COMMIT_BEFORE_SHA}..${CI_COMMIT_SHA}"
echo "Building ${BASE}..${TIP}"
NON_SYMBOLIC_REF=1 ./automation/scripts/build-test.sh ${CI_COMMIT_BEFORE_SHA} ${CI_COMMIT_SHA} \
NON_SYMBOLIC_REF=1 ./automation/scripts/build-test.sh ${BASE} ${TIP} \
bash -c "git clean -ffdx && ./automation/scripts/build"
+1 -1
View File
@@ -7,7 +7,7 @@ build-each-commit-gcc:
XEN_TARGET_ARCH: x86_64
CC: gcc
script:
- ./automation/gitlab-ci/build-each-commit.sh 2>&1 | tee ../build-each-commit-gcc.log
- BASE=${BASE_SHA:-${CI_COMMIT_BEFORE_SHA}} TIP=${TIP_SHA:-${CI_COMMIT_SHA}} ./automation/gitlab-ci/build-each-commit.sh 2>&1 | tee ../build-each-commit-gcc.log
- mv ../build-each-commit-gcc.log .
artifacts:
paths:
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.