From 3fda2ab49d8d4c702ae0fdd09ec0b1f35202873c Mon Sep 17 00:00:00 2001
From: Ryan Beisner <ryan.beisner@canonical.com>
Date: Wed, 14 Nov 2018 13:41:07 +0100
Subject: [PATCH] Update tests, tox, series and readme for 18.11 release

Change-Id: I32640c1eff5445d2fe80fbd03bdbf3765da37f95
---
 src/README.md     |  2 ++
 src/metadata.yaml |  2 ++
 src/tox.ini       |  4 ++--
 tox.ini           | 13 +++++++++----
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/README.md b/src/README.md
index 4d750fb1..07cb7389 100644
--- a/src/README.md
+++ b/src/README.md
@@ -2,6 +2,8 @@
 
 This charm provides the Octavia load balancer service for an OpenStack Cloud.
 
+OpenStack Rocky or later is required.
+
 # Usage
 
 Octavia relies on services from a fully functional OpenStack Cloud and expects
diff --git a/src/metadata.yaml b/src/metadata.yaml
index 6eac20ee..efc88d77 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -14,6 +14,8 @@ description: |
   known as amphorae which it spins up on demand. This on-demand, horizontal
   scaling feature differentiates Octavia from other load balancing solutions,
   thereby making Octavia truly suited "for the cloud."
+  .
+  OpenStack Rocky or later is required.
 tags:
   - openstack
 series:
diff --git a/src/tox.ini b/src/tox.ini
index ba390f0f..ce451062 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -6,13 +6,13 @@ skipsdist = True
 setenv = VIRTUAL_ENV={envdir}
          PYTHONHASHSEED=0
 whitelist_externals = juju
-passenv = HOME TERM CS_API_* OS_*
+passenv = HOME TERM CS_API_* OS_* AMULET_*
 deps = -r{toxinidir}/test-requirements.txt
 install_command =
   pip install {opts} {packages}
 
 [testenv:pep8]
-basepython = python2.7
+basepython = python3
 deps=charm-tools
 commands = charm-proof
 
diff --git a/tox.ini b/tox.ini
index d3ce3359..266fb541 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,9 +10,8 @@ setenv = VIRTUAL_ENV={envdir}
          PYTHONHASHSEED=0
          TERM=linux
          LAYER_PATH={toxinidir}/layers
-         INTERFACE_PATH={toxinidir}/interfaces
          JUJU_REPOSITORY={toxinidir}/build
-passenv = http_proxy https_proxy
+passenv = http_proxy https_proxy INTERFACE_PATH
 install_command =
   pip install {opts} {packages}
 deps =
@@ -23,13 +22,18 @@ basepython = python3
 commands =
     charm-build --log-level DEBUG -o {toxinidir}/build src {posargs}
 
+[testenv:py3]
+basepython = python3
+deps = -r{toxinidir}/test-requirements.txt
+commands = ostestr {posargs}
+
 [testenv:py35]
 basepython = python3.5
 deps = -r{toxinidir}/test-requirements.txt
 commands = ostestr {posargs}
 
-[testenv:py3]
-basepython = python3
+[testenv:py36]
+basepython = python3.6
 deps = -r{toxinidir}/test-requirements.txt
 commands = ostestr {posargs}
 
@@ -39,6 +43,7 @@ deps = -r{toxinidir}/test-requirements.txt
 commands = flake8 {posargs} src unit_tests
 
 [testenv:venv]
+basepython = python3
 commands = {posargs}
 
 [flake8]