summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2017-07-27 14:18:46 -0700
committerMicah Anderson <micah@riseup.net>2017-07-27 14:18:46 -0700
commit33b56edf683b82acb3f3d077c1b2e907a1dc02dd (patch)
treee7d7158363251d9851d646de876818de13da077f /tests
parent55b784f2ccd6336db4bab9157a8498cb87c562ff (diff)
CI: fix provider checkout
Provider checkout was being done to a pre-existing directory, which resulted in an error about the directory already existing (see https://0xacab.org/leap/platform/-/jobs/15730), this should fix that problem.
Diffstat (limited to 'tests')
-rwxr-xr-xtests/platform-ci/ci-build.sh19
1 files changed, 11 insertions, 8 deletions
diff --git a/tests/platform-ci/ci-build.sh b/tests/platform-ci/ci-build.sh
index 57b874f9..459264d5 100755
--- a/tests/platform-ci/ci-build.sh
+++ b/tests/platform-ci/ci-build.sh
@@ -132,6 +132,16 @@ run() {
provider_URI=$2
platform_branch=$3
+ # Setup the provider repository
+ echo "Setting up the provider repository: $provider_name by cloning $provider_URI"
+ git clone -q --depth 1 "$provider_URI"
+ cd "$provider_name"
+ echo -n "$provider_name repo at revision: "
+ git rev-parse HEAD
+ echo -n "Operating in the $provider_name directory: "
+ pwd
+
+
# If the third argument is set make sure we are on that platform branch
if [[ -n $platform_branch ]]
then
@@ -140,14 +150,7 @@ run() {
git checkout -B "$platform_branch"
fi
- # Setup the provider repository
- echo "Setting up the provider repository: $provider_name by cloning $provider_URI"
- git clone -q --depth 1 "$provider_URI" "$ROOTDIR"
- cd "$provider_name"
- echo -n "$provider_name repo at revision: "
- git rev-parse HEAD
- echo -n "Operating in the $provider_name directory: "
- pwd
+ cd "${ROOTDIR}/${provider_name}"
echo "Listing current node information..."
LEAP_CMD list