diff --git a/.githooks/post-commit b/.githooks/post-commit index cbe785243a890c3ff11b7d1926246a9aff08a01e..764243ecb5b496fe1946c2d181c5920413e8a46c 100644 --- a/.githooks/post-commit +++ b/.githooks/post-commit @@ -1,8 +1,6 @@ #!/bin/bash -mkdir -p .build-config - CI_COMMIT_REF_NAME=`git rev-parse --abbrev-ref HEAD` CI_COMMIT_SHA=`git rev-parse HEAD` -echo $CI_COMMIT_REF_NAME"-"$CI_COMMIT_SHA > .build-config/git-commit-ref +echo $CI_COMMIT_REF_NAME"-"$CI_COMMIT_SHA > clmctest/git-commit-ref diff --git a/.gitignore b/.gitignore index fd9498c4d662b8aba007bb4e1c0cb884eeb9ad12..03f004a3b864ac817f2befe33248e8a69d763227 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ *__pycache__* *__init__.pyc *egg-info* +*git-commit-ref* ubuntu-xenial-16.04-cloudimg-console.log diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f2c3e60fe5f9a1a2857fa8eb9dc0bf26e7cdee23..df1b1ebee321cf6d8fe9a6755cd3cdf80f3d579d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,8 +8,7 @@ stages: build:tests: stage: build script: - - mkdir -p .build-config - - echo "$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA" > .build-config/git-commit-ref + - echo "$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA" > clmctest/git-commit-ref - python setup.py sdist --dist-dir=build artifacts: paths: @@ -30,7 +29,7 @@ test: - vagrant --fixture=inputs -- destroy --force - vagrant --fixture=monitoring -- destroy --force - vagrant --fixture=scripts -- destroy --force - - vagrant --fixture=scripts -- ssh test-runner -- -tt "pip3 -y uninstall clmctest" + - vagrant --fixture=scripts -- ssh test-runner -- -tt "pip3 uninstall -y clmctest" when: on_success \ No newline at end of file diff --git a/MANIFEST.in b/MANIFEST.in index 993dbd0acf646a37d2568ce5ab0b8dad4df6ba40..921b54b34ceb90615a2a295cb1fd2cb1f463c96c 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +1,2 @@ include MANIFEST.in -recursive-include clmctest *.yml *.sh \ No newline at end of file +recursive-include clmctest *.yml *.sh git-commit-ref \ No newline at end of file diff --git a/setup.py b/setup.py index ebec626a88ba245d8dc1ad422763bd93fab9102c..966eca28a7b0a7dc1acf594ff31423b2b64dd417 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ def read(fname): setup( name = "clmctest", - version = read('.build-config/git-commit-ref'), + version = read('clmctest/git-commit-ref'), author = "Michael Boniface", author_email = "mjb@it-innovation.soton.ac.uk", description = "FLAME CLMC Testing Module", @@ -14,7 +14,7 @@ setup( keywords = "FLAME CLMC test", packages=find_packages(exclude=["services"]), include_package_data=True, - package_data={'': ['*.yml', '*.sh']}, + package_data={'': ['git-commit-ref', '*.yml', '*.sh']}, long_description="long description", classifiers=[ "Development Status :: Alpha",