From fdab8f189dd70b979bd1622004f852854c235ce5 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Fri, 26 Jun 2020 14:25:46 -0500 Subject: [PATCH] Revert "buildkite: Add some debug for looking into rebase issue" This reverts commit 3b5a43e031014d5f9bbda965605f75eb6d74567d. Signed-off-by: Kumar Gala --- .buildkite/hooks/pre-command | 3 --- .buildkite/pipeline.yml | 2 -- .buildkite/run.sh | 1 - 3 files changed, 6 deletions(-) diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command index 281605d4948..04ea9a06b01 100755 --- a/.buildkite/hooks/pre-command +++ b/.buildkite/hooks/pre-command @@ -6,8 +6,6 @@ # Save off where we started so we can go back there WORKDIR=${PWD} -ls -lsa .git - if [ -n "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}" ]; then git fetch -v origin ${BUILDKITE_PULL_REQUEST_BASE_BRANCH} git checkout FETCH_HEAD @@ -19,7 +17,6 @@ if [ -n "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}" ]; then git merge --abort exit $merge_result } - ls -lsa .git fi mkdir -p /var/lib/buildkite-agent/zephyr-ccache/ diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index bfe0dd11b15..ffe699e514a 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,8 +1,6 @@ steps: - command: - - ls -lsa .git - .buildkite/run.sh - - ls -lsa .git env: ZEPHYR_TOOLCHAIN_VARIANT: "zephyr" ZEPHYR_SDK_INSTALL_DIR: "/opt/sdk/zephyr-sdk-0.11.3" diff --git a/.buildkite/run.sh b/.buildkite/run.sh index ba9ccaefb83..0603771ca36 100755 --- a/.buildkite/run.sh +++ b/.buildkite/run.sh @@ -21,7 +21,6 @@ echo "" echo "--- ccache stats at start" ccache -s -ls -lsa .git if [ -n "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}" ]; then ./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}