Merge "Update rally (3.0.0) and rally-openstack" into stable/jerma

7 files changed, 9 insertions, 3 deletions

diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile
index e9b2cd954..af900086a 100644
--- a/docker/benchmarking/Dockerfile
+++ b/docker/benchmarking/Dockerfile
@@ -10,6 +10,7 @@ RUN apk --no-cache add --update libxml2 libxslt && \
         openssl-dev libjpeg-turbo-dev libxml2-dev libxslt-dev && \
     wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \
     sed -i -E /^tempest==+.*$/d upper-constraints.txt && \
+    sed -i -E /^kubernetes==+.*$/d upper-constraints.txt && \
     case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt ;; esac && \
     wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH > upper-constraints.opnfv.txt && \
     sed -i -E /#egg=functest/d upper-constraints.opnfv.txt && \
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 5359ca021..9415c1270 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -15,6 +15,7 @@ RUN apk --no-cache add --update \
     wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH > upper-constraints.opnfv.txt  && \
     sed -i -E /#egg=functest/d upper-constraints.opnfv.txt && \
     sed -i -E /^tempest==+.*$/d upper-constraints.txt && \
+    sed -i -E /^kubernetes==+.*$/d upper-constraints.txt && \
     sed -i -E s/^ujson==+.*$/-e\ git+https:\\/\\/github.com\\/esnme\\/ultrajson@$UJSON_TAG#egg=ujson/ upper-constraints.txt && \
     pip3 install --no-cache-dir --src /src -cupper-constraints.opnfv.txt -cupper-constraints.txt \
         -e git+https://opendev.org/openstack/requirements@$OPENSTACK_TAG#egg=openstack_requirements && \
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index 77ba3f7b0..c52e2fd69 100644
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -10,6 +10,7 @@ RUN apk --no-cache add --virtual .build-deps --update \
         python3-dev build-base linux-headers libffi-dev openssl-dev && \
     wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \
     sed -i -E /^tempest==+.*$/d upper-constraints.txt && \
+    sed -i -E /^kubernetes==+.*$/d upper-constraints.txt && \
     case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt ;; esac && \
     wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH > upper-constraints.opnfv.txt && \
     sed -i -E /#egg=functest/d upper-constraints.opnfv.txt && \
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 23af2d896..f8f0c41b2 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -16,6 +16,7 @@ RUN apk --no-cache add --update libxml2 libxslt && \
         openssl-dev libjpeg-turbo-dev libxml2-dev libxslt-dev && \
     wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \
     sed -i -E /^tempest==+.*$/d upper-constraints.txt && \
+    sed -i -E /^kubernetes==+.*$/d upper-constraints.txt && \
     sed -i -E /^neutron==+.*$/d upper-constraints.txt && \
     case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt ;; esac && \
     wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH > upper-constraints.opnfv.txt && \
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index ee8660fbf..29dd41ed1 100644
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -25,6 +25,7 @@ RUN apk --no-cache add --update \
         ruby-dev g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev && \
     wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \
     sed -i -E /^tempest==+.*$/d upper-constraints.txt && \
+    sed -i -E /^kubernetes==+.*$/d upper-constraints.txt && \
     case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt ;; esac && \
     wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH > upper-constraints.opnfv.txt && \
     sed -i -E /#egg=functest/d upper-constraints.opnfv.txt && \
diff --git a/tox.ini b/tox.ini
index e535571ab..ddd02318d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = docs,pep8,pylint,yamllint,ansiblelint,bashate,bandit,py27,py37,cover,perm
+envlist = docs,pep8,pylint,yamllint,ansiblelint,bashate,bandit,py37,cover,perm
 
 [testenv]
 usedevelop = True
diff --git a/upper-constraints.txt b/upper-constraints.txt
index 97ea24b49..d4a584bab 100644
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -19,11 +19,12 @@ xtesting===0.87.0
 bandit===1.1.0
 ruamel.yaml.jinja2==0.2.2
 -e git+https://opendev.org/openstack/tempest@22.0.0#egg=tempest
-rally.git===2.0.0
-git+https://opendev.org/openstack/rally-openstack.git@49dbdffd4106a2a44daaeee94378c5c0138765ba#egg=rally-openstack
+rally.git===3.0.0
+git+https://opendev.org/openstack/rally-openstack.git@83eae7f02ac1e15c0e2a6a35978abeb1f8b2cd3f#egg=rally-openstack
 git+https://github.com/xrally/xrally-kubernetes.git@e4c605fa0ae0cae63ce5ac19ce8516f0bdd5e868#egg=xrally-kubernetes
 git+https://github.com/esnme/ultrajson@d25e024f481c5571d15f3c0c406a498ca0467cfd#egg=ujson
 pylint===1.9.5;python_version=='2.7'
 pylint===2.3.1;python_version=='3.7'
 ruamel.yaml===0.15.100
 sphinxcontrib-spelling===4.3.0
+kubernetes===11.0.0