From: Adam Israel <adam.israel@canonical.com>
Date: Fri, 3 Aug 2018 19:16:37 +0000 (-0400)
Subject: Fix broken dependencies
X-Git-Tag: BUILD_v4.0.1_2^0
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F04%2F6404%2F3;p=osm%2FLCM.git

Fix broken dependencies

This is a quick fix to checkout the latest tag of N2VC (BUILD_v4.0.1_1).
Recent commits reveal that some Dockerfiles are using master, instead of
the most recent release, which has caused the install to fail due to
changes in master.

Change-Id: I31280a976d9be2acccca1c75e5b86afeac58e8ee
Signed-off-by: Adam Israel <adam.israel@canonical.com>
---

diff --git a/Dockerfile.local b/Dockerfile.local
index 5ff0fec..b93319b 100644
--- a/Dockerfile.local
+++ b/Dockerfile.local
@@ -16,6 +16,7 @@ RUN apt-get update && apt-get install -y git python3 \
 
 RUN git clone https://osm.etsi.org/gerrit/osm/N2VC.git \
     && cd N2VC \
+    && git checkout BUILD_v4.0.1_1 \
     && pip3 install websockets==4.0.1 \
     && pip3 install requests \
     && cd modules/libjuju && python3 setup.py develop && cd ../.. \
diff --git a/setup.py b/setup.py
index 0c7f055..45de1f8 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@ setup(
     name=_name,
     description='OSM North Bound Interface',
     long_description=README,
-    version_command=('git describe --tags --long --dirty', 'pep440-git'),
+    version_command=('git describe --match v* --tags --long --dirty', 'pep440-git'),
     # version=VERSION,
     # python_requires='>3.5.0',
     author='ETSI OSM',