Skip to content
Snippets Groups Projects
Commit eb0776b1 authored by MJB's avatar MJB
Browse files

naming packages

parent 081c912f
No related branches found
No related tags found
No related merge requests found
#!/bin/bash #!/bin/bash
mkdir -p .build-config
CI_COMMIT_REF_NAME=`git rev-parse --abbrev-ref HEAD` CI_COMMIT_REF_NAME=`git rev-parse --abbrev-ref HEAD`
CI_COMMIT_SHA=`git rev-parse 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
...@@ -3,4 +3,5 @@ ...@@ -3,4 +3,5 @@
*__pycache__* *__pycache__*
*__init__.pyc *__init__.pyc
*egg-info* *egg-info*
*git-commit-ref*
ubuntu-xenial-16.04-cloudimg-console.log ubuntu-xenial-16.04-cloudimg-console.log
...@@ -8,8 +8,7 @@ stages: ...@@ -8,8 +8,7 @@ stages:
build:tests: build:tests:
stage: build stage: build
script: script:
- mkdir -p .build-config - echo "$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA" > clmctest/git-commit-ref
- echo "$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA" > .build-config/git-commit-ref
- python setup.py sdist --dist-dir=build - python setup.py sdist --dist-dir=build
artifacts: artifacts:
paths: paths:
...@@ -30,7 +29,7 @@ test: ...@@ -30,7 +29,7 @@ test:
- vagrant --fixture=inputs -- destroy --force - vagrant --fixture=inputs -- destroy --force
- vagrant --fixture=monitoring -- destroy --force - vagrant --fixture=monitoring -- destroy --force
- vagrant --fixture=scripts -- 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 when: on_success
\ No newline at end of file
include MANIFEST.in include MANIFEST.in
recursive-include clmctest *.yml *.sh recursive-include clmctest *.yml *.sh git-commit-ref
\ No newline at end of file \ No newline at end of file
...@@ -6,7 +6,7 @@ def read(fname): ...@@ -6,7 +6,7 @@ def read(fname):
setup( setup(
name = "clmctest", name = "clmctest",
version = read('.build-config/git-commit-ref'), version = read('clmctest/git-commit-ref'),
author = "Michael Boniface", author = "Michael Boniface",
author_email = "mjb@it-innovation.soton.ac.uk", author_email = "mjb@it-innovation.soton.ac.uk",
description = "FLAME CLMC Testing Module", description = "FLAME CLMC Testing Module",
...@@ -14,7 +14,7 @@ setup( ...@@ -14,7 +14,7 @@ setup(
keywords = "FLAME CLMC test", keywords = "FLAME CLMC test",
packages=find_packages(exclude=["services"]), packages=find_packages(exclude=["services"]),
include_package_data=True, include_package_data=True,
package_data={'': ['*.yml', '*.sh']}, package_data={'': ['git-commit-ref', '*.yml', '*.sh']},
long_description="long description", long_description="long description",
classifiers=[ classifiers=[
"Development Status :: Alpha", "Development Status :: Alpha",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment