diff options
| author | Jerome Forissier <jerome.forissier@linaro.org> | 2017-10-10 18:15:01 +0200 |
|---|---|---|
| committer | Jérôme Forissier <jerome.forissier@linaro.org> | 2017-10-10 19:13:34 +0200 |
| commit | ba70cc90464d6b40baf322a4842cca101e7c377f (patch) | |
| tree | 6065dcb2416a343fe144b96f16a4893afd110a5c /.shippable.yml | |
| parent | b4121bfb3b1873f77e878f99437f1a5269c43f10 (diff) | |
ci: shippable: make sure QEMU test runs on the proper commit
There is a bug in the step that prepares a source tree to build and run
OP-TEE with QEMU, at the end of the CI script. The idea is, clone the
current project forest using the repo tool, then remove optee_os and
replace it with a symbolic link to the one that has been checked out in
the CI infrastructure. So that, we are effectively testing the desired
pull request or branch.
The problem is, the symlink is not removed at the end of the script, so
it ends up being cached and restored with the next build. The repo sync
command follows the symlink and overwrites the "good" optee_os with the
current master branch and at this point we're doomed.
Fix that by making sure there is no optee_os symlink leftover from the
cache.
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
Diffstat (limited to '.shippable.yml')
| -rw-r--r-- | .shippable.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.shippable.yml b/.shippable.yml index dc6796fc..44e25701 100644 --- a/.shippable.yml +++ b/.shippable.yml @@ -165,6 +165,7 @@ build: # Use repo to clone the OP-TEE CI environment for QEMU and link optee_os to the current checkout - > mkdir -p ${SHIPPABLE_BUILD_DIR}/optee_repo_qemu && + rm -rf ${SHIPPABLE_BUILD_DIR}/optee_repo_qemu/optee_os && cd ${SHIPPABLE_BUILD_DIR}/optee_repo_qemu && repo init -u https://github.com/OP-TEE/manifest.git -m travis.xml </dev/null && repo sync -d --force-sync --no-clone-bundle --no-tags --quiet -j 2 && |