summaryrefslogtreecommitdiffstats
path: root/docker/smoke
diff options
context:
space:
mode:
Diffstat (limited to 'docker/smoke')
-rw-r--r--docker/smoke/Dockerfile20
-rw-r--r--docker/smoke/testcases.yaml26
2 files changed, 14 insertions, 32 deletions
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 7eb9eb292..d4415cedd 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -3,10 +3,10 @@ FROM opnfv/functest-core
ARG BRANCH=master
ARG OPENSTACK_TAG=stable/queens
ARG ODL_TAG=85448c9d97b89989488e675b29b38ac42d8674e4
-ARG RALLY_TAG=stable/0.10
-ARG OS_FAULTS_TAG=0.1.16
+ARG RALLY_TAG=0.11.2
+ARG OS_FAULTS_TAG=0.1.17
ARG REFSTACK_TARGET=2017.09
-ARG PATROLE_TAG=0.2.0
+ARG PATROLE_TAG=0.3.0
COPY thirdparty-requirements.txt thirdparty-requirements.txt
RUN apk --no-cache add --virtual .build-deps --update \
@@ -18,19 +18,23 @@ RUN apk --no-cache add --virtual .build-deps --update \
pip install --no-cache-dir --src /src -cupper-constraints.txt \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-e git+https://github.com/openstack/requirements@$OPENSTACK_TAG#egg=openstack_requirements && \
- git clone --depth 1 https://github.com/openstack/os-faults.git -b $OS_FAULTS_TAG /src/os-faults && \
+ git clone https://github.com/openstack/os-faults.git /src/os-faults && \
+ (cd /src/os-faults && git checkout $OS_FAULTS_TAG) && \
update-requirements -s --source /src/openstack-requirements /src/os-faults/ && \
- git clone --depth 1 https://github.com/openstack/rally.git -b $RALLY_TAG /src/rally && \
+ git clone https://github.com/openstack/rally.git /src/rally && \
+ (cd /src/rally && git checkout $RALLY_TAG) && \
update-requirements -s --source /src/openstack-requirements /src/rally/ && \
git clone https://github.com/openstack/patrole.git /src/patrole && \
(cd /src/patrole && git checkout $PATROLE_TAG) && \
update-requirements -s --source /src/openstack-requirements /src/patrole/ && \
+ git clone --depth 1 https://github.com/openstack/neutron-tempest-plugin.git /src/neutron-tempest-plugin && \
+ update-requirements -s --source /src/openstack-requirements /src/neutron-tempest-plugin && \
pip install --no-cache-dir --src /src -cupper-constraints.txt \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
- tempest /src/os-faults && \
+ tempest rally-openstack /src/os-faults && \
pip install --no-cache-dir --src /src -cupper-constraints.txt \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
- /src/rally /src/patrole -rthirdparty-requirements.txt && \
+ /src/rally /src/patrole /src/neutron-tempest-plugin -rthirdparty-requirements.txt && \
git clone https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \
(cd /src/odl_test && git checkout $ODL_TAG) && \
virtualenv --system-site-packages /src/tempest/.venv && \
@@ -41,7 +45,7 @@ RUN apk --no-cache add --virtual .build-deps --update \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-r /src/neutron/test-requirements.txt && \
rm -r upper-constraints.txt thirdparty-requirements.txt /src/odl_test/.git \
- /src/os-faults /src/rally && \
+ /src/os-faults /src/rally /src/neutron-tempest-plugin && \
mkdir -p /etc/rally && \
printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \
mkdir -p /var/lib/rally/database && rally db create && \
diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml
index 4f59828ef..e2a6237c3 100644
--- a/docker/smoke/testcases.yaml
+++ b/docker/smoke/testcases.yaml
@@ -18,7 +18,7 @@ tiers:
between 2 instances over a private network.
dependencies:
installer: ''
- scenario: '^((?!odl_l3|odl-bgpvpn|gluon).)*$'
+ scenario: '^((?!lxd).)*$'
run:
module: 'functest.opnfv_tests.openstack.vping.vping_ssh'
class: 'VPingSSH'
@@ -74,6 +74,7 @@ tiers:
-
case_name: refstack_defcore
project_name: functest
+ enabled: false
criteria: 100
blocking: false
description: >-
@@ -105,7 +106,6 @@ tiers:
services:
- 'image'
- 'network'
- - 'volume'
exclude:
- 'test_networks_multiprovider_rbac'
@@ -130,28 +130,6 @@ tiers:
- /src/odl_test/csit/suites/openstack/neutron
-
- case_name: odl_netvirt
- project_name: functest
- criteria: 100
- blocking: false
- description: >-
- Test Suite for the OpenDaylight SDN Controller when
- the NetVirt features are installed. It integrates
- some test suites from upstream using Robot as the
- test framework.
- dependencies:
- installer: 'apex'
- scenario: 'os-odl_l3-nofeature'
- run:
- module: 'functest.opnfv_tests.sdn.odl.odl'
- class: 'ODLTests'
- args:
- suites:
- - /src/odl_test/csit/suites/integration/basic
- - /src/odl_test/csit/suites/openstack/neutron
- - /src/odl_test/csit/suites/openstack/connectivity
-
- -
case_name: snaps_smoke
project_name: functest
criteria: 100