summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiam Young <liam.young@canonical.com>2018-10-10 12:36:37 +0000
committerLiam Young <liam.young@canonical.com>2018-10-10 12:39:20 +0000
commitd1aa418f13208e4d609c4774415929e5a5138e5d (patch)
treec184cb898d112e553cfcc7fc638cc90272d3ab4b
parent72b7a5b16f95ba872ba55fad476f4355c2c173c0 (diff)
Tests dir no longer need copy of charmhelpers
Charmhelpers is now installed via pip for unit tests so stop 'Make sync' from pulling it down. Change-Id: I88dabb654626570ea2c4f07b0799ef6717e6c0bd
Notes
Notes (review): Code-Review+2: Ryan Beisner <ryan.beisner@canonical.com> Workflow+1: Ryan Beisner <ryan.beisner@canonical.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 10 Oct 2018 14:44:07 +0000 Reviewed-on: https://review.openstack.org/609377 Project: openstack/charm-ceph-osd Branch: refs/heads/master
-rw-r--r--Makefile1
-rw-r--r--charm-helpers-tests.yaml7
2 files changed, 0 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 7609385..d80cc0b 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,6 @@ bin/git_sync.py:
23 23
24ch-sync: bin/charm_helpers_sync.py 24ch-sync: bin/charm_helpers_sync.py
25 $(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-hooks.yaml 25 $(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-hooks.yaml
26 $(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-tests.yaml
27 26
28ceph-sync: bin/git_sync.py 27ceph-sync: bin/git_sync.py
29 $(PYTHON) bin/git_sync.py -d lib -s https://github.com/openstack/charms.ceph.git 28 $(PYTHON) bin/git_sync.py -d lib -s https://github.com/openstack/charms.ceph.git
diff --git a/charm-helpers-tests.yaml b/charm-helpers-tests.yaml
deleted file mode 100644
index f64f0dd..0000000
--- a/charm-helpers-tests.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
1repo: https://github.com/juju/charm-helpers
2destination: tests/charmhelpers
3include:
4 - contrib.amulet
5 - contrib.openstack.amulet
6 - core
7 - osplatform