aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker/components/Dockerfile2
-rw-r--r--docker/core/Dockerfile2
-rw-r--r--docker/features/Dockerfile2
-rw-r--r--docker/features/testcases.yaml4
-rw-r--r--docker/features/thirdparty-requirements.txt8
-rw-r--r--docker/parser/Dockerfile2
-rw-r--r--docker/smoke/Dockerfile2
-rw-r--r--docker/vnf/Dockerfile2
-rw-r--r--functest/ci/testcases.yaml4
-rw-r--r--tox.ini2
-rw-r--r--upper-constraints.txt4
11 files changed, 21 insertions, 13 deletions
diff --git a/docker/components/Dockerfile b/docker/components/Dockerfile
index a4561f6af..71a81541e 100644
--- a/docker/components/Dockerfile
+++ b/docker/components/Dockerfile
@@ -1,7 +1,7 @@
FROM opnfv/functest-core
ARG BRANCH=master
-ARG OPENSTACK_TAG=stable/pike
+ARG OPENSTACK_TAG=stable/queens
ARG RALLY_TAG=stable/0.10
ARG OS_FAULTS_TAG=0.1.16
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index a66993e2a..cb44105af 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,7 +1,7 @@
FROM alpine:3.7
ARG BRANCH=master
-ARG OPENSTACK_TAG=stable/pike
+ARG OPENSTACK_TAG=stable/queens
RUN apk --no-cache add --update \
python libffi libssl1.0 libjpeg-turbo py-pip bash \
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index 1a409b051..c53099cce 100644
--- a/docker/features/Dockerfile
+++ b/docker/features/Dockerfile
@@ -1,7 +1,7 @@
FROM opnfv/functest-core
ARG BRANCH=master
-ARG OPENSTACK_TAG=stable/pike
+ARG OPENSTACK_TAG=stable/queens
ARG FDS_TAG=master
ARG RALLY_TAG=stable/0.10
ARG OS_FAULTS_TAG=0.1.16
diff --git a/docker/features/testcases.yaml b/docker/features/testcases.yaml
index 2081e2515..fc9d81d0b 100644
--- a/docker/features/testcases.yaml
+++ b/docker/features/testcases.yaml
@@ -11,6 +11,7 @@ tiers:
-
case_name: doctor-notification
project_name: doctor
+ enabled: false
criteria: 100
blocking: false
description: >-
@@ -27,6 +28,7 @@ tiers:
-
case_name: bgpvpn
project_name: sdnvpn
+ enabled: false
criteria: 100
blocking: false
description: >-
@@ -41,6 +43,7 @@ tiers:
-
case_name: functest-odl-sfc
project_name: sfc
+ enabled: false
criteria: 100
blocking: false
description: >-
@@ -56,6 +59,7 @@ tiers:
-
case_name: barometercollectd
project_name: barometer
+ enabled: false
criteria: 100
blocking: false
description: >-
diff --git a/docker/features/thirdparty-requirements.txt b/docker/features/thirdparty-requirements.txt
index 73c11b447..914d4eefc 100644
--- a/docker/features/thirdparty-requirements.txt
+++ b/docker/features/thirdparty-requirements.txt
@@ -1,7 +1,7 @@
robotframework-httplibrary
robotframework-requests
robotframework-sshlibrary;python_version=='2.7'
-baro_tests
-sdnvpn
-sfc
-doctor-tests;python_version>='3.0'
+# baro_tests
+# sdnvpn
+# sfc
+# doctor-tests;python_version>='3.0'
diff --git a/docker/parser/Dockerfile b/docker/parser/Dockerfile
index bbc0a0760..a86716626 100644
--- a/docker/parser/Dockerfile
+++ b/docker/parser/Dockerfile
@@ -1,7 +1,7 @@
FROM opnfv/functest-core
ARG BRANCH=master
-ARG OPENSTACK_TAG=stable/pike
+ARG OPENSTACK_TAG=stable/queens
ARG RALLY_TAG=stable/0.10
ARG OS_FAULTS_TAG=0.1.16
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index e09ea1c2c..7eb9eb292 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -1,7 +1,7 @@
FROM opnfv/functest-core
ARG BRANCH=master
-ARG OPENSTACK_TAG=stable/pike
+ARG OPENSTACK_TAG=stable/queens
ARG ODL_TAG=85448c9d97b89989488e675b29b38ac42d8674e4
ARG RALLY_TAG=stable/0.10
ARG OS_FAULTS_TAG=0.1.16
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index e65c0c484..afaec2320 100644
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -1,7 +1,7 @@
FROM opnfv/functest-core
ARG BRANCH=master
-ARG OPENSTACK_TAG=stable/pike
+ARG OPENSTACK_TAG=stable/queens
ARG VIMS_TAG=stable
ARG JUJU_TAG=tags/juju-2.2.5
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index f4631f094..778025905 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -262,6 +262,7 @@ tiers:
-
case_name: doctor-notification
project_name: doctor
+ enabled: false
criteria: 100
blocking: false
description: >-
@@ -278,6 +279,7 @@ tiers:
-
case_name: bgpvpn
project_name: sdnvpn
+ enabled: false
criteria: 100
blocking: false
description: >-
@@ -292,6 +294,7 @@ tiers:
-
case_name: functest-odl-sfc
project_name: sfc
+ enabled: false
criteria: 100
blocking: false
description: >-
@@ -307,6 +310,7 @@ tiers:
-
case_name: barometercollectd
project_name: barometer
+ enabled: false
criteria: 100
blocking: false
description: >-
diff --git a/tox.ini b/tox.ini
index aa3087ae2..9fb5a416c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@ envlist = docs,pep8,pylint,yamllint,py35,py27,perm,cover
usedevelop = True
deps =
-c{toxinidir}/upper-constraints.txt
- -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike
+ -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/queens
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
install_command = pip install {opts} {packages}
diff --git a/upper-constraints.txt b/upper-constraints.txt
index 7e02ba8c4..48a4e22f5 100644
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -19,6 +19,6 @@ robotframework-sshlibrary===2.1.3;python_version=='2.7'
IPy===0.83
ansible===2.3.2.0
flasgger===0.6.6
-xtesting===0.31.0
-networking-bgpvpn===7.0.0
+xtesting===0.40.0
+networking-bgpvpn===8.0.0
sphinx-opnfv-theme===0.1.1