From eb0776b1578b72471a2e05d95cc007eaa6d70247 Mon Sep 17 00:00:00 2001
From: MJB <mjb@it-innovation.soton.ac.uk>
Date: Mon, 26 Mar 2018 23:48:55 +0100
Subject: [PATCH] naming packages
---
.githooks/post-commit | 4 +---
.gitignore | 1 +
.gitlab-ci.yml | 5 ++---
MANIFEST.in | 2 +-
setup.py | 4 ++--
5 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/.githooks/post-commit b/.githooks/post-commit
index cbe7852..764243e 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 fd9498c..03f004a 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 f2c3e60..df1b1eb 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 993dbd0..921b54b 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 ebec626..966eca2 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",
--
GitLab