Merge "Update for OpenStack Train"

bindep.txt

@@ -1,2 +1 @@
-snapcraft [platform:dpkg]
 snapd [platform:dpkg]

snapcraft.yaml

@@ -1,5 +1,5 @@
 name: openstackclients
-version: rocky
+version: train
 summary: OpenStack Client tools
 description: |
   OpenStackClient (aka OSC) is a command-line client for OpenStack
@@ -14,6 +14,7 @@ description: |
   project specific command-line clients.
 confinement: classic
 grade: stable
+base: core18
 
 apps:
   openstack:
@@ -36,16 +37,12 @@ apps:
     command: bin/ceilometer
   cloudkitty:
     command: bin/cloudkitty
-  designate:
-    command: bin/designate
   freezer:
     command: bin/freezer
   glance:
     command: bin/glance
   heat:
     command: bin/heat
-  ironic:
-    command: bin/ironic
   magnum:
     command: bin/magnum
   manila:
@@ -101,7 +98,8 @@ parts:
       - python-openstackclient
       - gnocchiclient
       - python-octaviaclient
-    constraints: https://raw.githubusercontent.com/openstack/requirements/stable/rocky/upper-constraints.txt
+    constraints:
+      - https://raw.githubusercontent.com/openstack/requirements/stable/train/upper-constraints.txt
     build-packages:
       - libffi-dev
       - libssl-dev
@@ -113,6 +111,6 @@ parts:
       snapcraftctl prime
       # Now that everything is built, let's disable user site-packages
       # as stated in PEP-0370
-      sed -i usr/lib/python3.5/site.py -e 's/^ENABLE_USER_SITE = None$/ENABLE_USER_SITE = False/'
+      sed -i usr/lib/python3.6/site.py -e 's/^ENABLE_USER_SITE = None$/ENABLE_USER_SITE = False/'
       # This is the last step, let's now compile all our pyc files.
       ./usr/bin/python3 -m compileall .

tools/lxd_build.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -ex
+
+sudo apt update
+
+export PATH=/snap/bin:$PATH
+
+# Setup snapd and snapcraft
+sudo apt install -y snapd
+sudo snap install --classic snapcraft
+sudo snap install --classic lxd
+sudo lxd init --auto
+
+# Build our snap!
+sudo snapcraft --use-lxd

tox.ini

@@ -3,16 +3,16 @@ envlist = snap
 skipsdist = True
 
 [testenv]
-basepython = python3.5
+basepython = python3
 install_command = pip install {opts} {packages}
+setenv =
+    PATH = /snap/bin:{env:PATH}
 passenv = HOME TERM
 whitelist_externals =
     sudo
-    snapcraft
+    /snap/bin/snapcraft
 
 [testenv:snap]
 deps = -r{toxinidir}/requirements.txt
 commands =
-    sudo snap install core
+    {toxinidir}/tools/lxd_build.sh
-    snapcraft clean
-    snapcraft snap