Merge pull request #12 from wolverineav/master

update build scripts to use python3 for tox
bigswitch · Nov 28, 2018 · 3eb7a4b · 3eb7a4b
2 parents 29c3ab2 + 1b73034
commit 3eb7a4b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/build_scripts/openstack_python_bsn_neutronclient_pull_req.build b/build_scripts/openstack_python_bsn_neutronclient_pull_req.build
@@ -1 +1,7 @@
-./build_scripts/precheckin.sh
+git clean -fxd
+GIT_REPO=`pwd`
+
+DOCKER_IMAGE=$DOCKER_REGISTRY'/bosi-builder-py3:latest'
+docker pull $DOCKER_IMAGE
+
+docker run -e GIT_COMMIT=$GIT_COMMIT -v $GIT_REPO:/python-bsn-neutronclient $DOCKER_IMAGE /python-bsn-neutronclient/build_scripts/precheckin.sh
diff --git a/build_scripts/precheckin.sh b/build_scripts/precheckin.sh
@@ -1,4 +1,8 @@
 #!/bin/bash -eux
+
+# switch to git repo directory inside container
+cd /python-bsn-neutronclient
+
 pwd
 echo 'git commit is' ${GIT_COMMIT}
 
@@ -11,4 +15,4 @@ else
   echo "setup.cfg updated"; fi
 # check the new_version > old_version
 echo 'checking if version bump is correct'
-git log -m -1 ${GIT_COMMIT} --pretty="format:" -p setup.cfg | grep version | python build_scripts/is_version_bumped.py
+git log -m -1 ${GIT_COMMIT} --pretty="format:" -p setup.cfg | grep version | python3 build_scripts/is_version_bumped.py