michaelh/zephyr
1
0
Fork 0
Code Releases Activity

buildkite: Add some debug for looking into rebase issue

Browse source 
Add debug ls of .git dir to see at what point we have a
.git/rebase-merge dir around

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2020-06-09 16:45:39 -05:00 • committed by Kumar Gala
commit 3b5a43e031
3 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.buildkite/hooks/pre-command
View file

@ -6,6 +6,8 @@
# Save off where we started so we can go back there # Save off where we started so we can go back there
WORKDIR=${PWD} WORKDIR=${PWD}
ls -lsa .git
if [ -n "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}" ]; then if [ -n "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}" ]; then
git fetch -v origin ${BUILDKITE_PULL_REQUEST_BASE_BRANCH} git fetch -v origin ${BUILDKITE_PULL_REQUEST_BASE_BRANCH}
git checkout FETCH_HEAD git checkout FETCH_HEAD
@ -17,6 +19,7 @@ if [ -n "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}" ]; then
git merge --abort git merge --abort
exit $merge_result exit $merge_result
} }
ls -lsa .git
fi fi
mkdir -p /var/lib/buildkite-agent/zephyr-ccache/ mkdir -p /var/lib/buildkite-agent/zephyr-ccache/

2
.buildkite/pipeline.yml
View file

@ -1,6 +1,8 @@
steps: steps:
- command: - command:
- ls -lsa .git
- .buildkite/run.sh - .buildkite/run.sh
- ls -lsa .git
env: env:
ZEPHYR_TOOLCHAIN_VARIANT: "zephyr" ZEPHYR_TOOLCHAIN_VARIANT: "zephyr"
ZEPHYR_SDK_INSTALL_DIR: "/opt/sdk/zephyr-sdk-0.11.3" ZEPHYR_SDK_INSTALL_DIR: "/opt/sdk/zephyr-sdk-0.11.3"

1
.buildkite/run.sh
View file

@ -21,6 +21,7 @@ echo ""
echo "--- ccache stats at start" echo "--- ccache stats at start"
ccache -s ccache -s
ls -lsa .git
if [ -n "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}" ]; then if [ -n "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}" ]; then
./scripts/ci/run_ci.sh -c -b ${BUILDKITE_PULL_REQUEST_BASE_BRANCH} -r origin \ ./scripts/ci/run_ci.sh -c -b ${BUILDKITE_PULL_REQUEST_BASE_BRANCH} -r origin \
-m ${JOB_NUM} -M ${BUILDKITE_PARALLEL_JOB_COUNT} -p ${BUILDKITE_PULL_REQUEST} -m ${JOB_NUM} -M ${BUILDKITE_PARALLEL_JOB_COUNT} -p ${BUILDKITE_PULL_REQUEST}