diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/components/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/features/Dockerfile | 9 | ||||
| -rw-r--r-- | docker/features/testcases.yaml | 9 | ||||
| -rw-r--r-- | docker/features/thirdparty-requirements.txt | 6 | ||||
| -rw-r--r-- | docker/parser/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 20 | ||||
| -rw-r--r-- | docker/smoke/testcases.yaml | 26 |
7 files changed, 26 insertions, 52 deletions
diff --git a/docker/components/Dockerfile b/docker/components/Dockerfile index 71a81541e..356c5d594 100644 --- a/docker/components/Dockerfile +++ b/docker/components/Dockerfile @@ -2,8 +2,8 @@ FROM opnfv/functest-core ARG BRANCH=master ARG OPENSTACK_TAG=stable/queens -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 RUN apk --no-cache add --virtual .build-deps --update \ python-dev build-base linux-headers libffi-dev \ @@ -20,7 +20,7 @@ RUN apk --no-cache add --virtual .build-deps --update \ update-requirements -s --source /src/openstack-requirements /src/rally/ && \ 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 && \ diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index c53099cce..e91155a38 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -3,8 +3,8 @@ FROM opnfv/functest-core ARG BRANCH=master ARG OPENSTACK_TAG=stable/queens ARG FDS_TAG=master -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 COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN apk --no-cache add --update python3 sshpass && \ @@ -17,16 +17,13 @@ RUN apk --no-cache add --update python3 sshpass && \ 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 && \ - 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 && \ 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 && \ update-requirements -s --source /src/openstack-requirements /src/rally/ && \ 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 -rthirdparty-requirements.txt && \ diff --git a/docker/features/testcases.yaml b/docker/features/testcases.yaml index fc9d81d0b..6cccf02f6 100644 --- a/docker/features/testcases.yaml +++ b/docker/features/testcases.yaml @@ -11,7 +11,6 @@ tiers: - case_name: doctor-notification project_name: doctor - enabled: false criteria: 100 blocking: false description: >- @@ -34,7 +33,7 @@ tiers: description: >- Test suite from SDNVPN project. dependencies: - installer: '(fuel)|(apex)' + installer: '' scenario: 'bgpvpn' run: module: 'sdnvpn.test.functest.run_sdnvpn_tests' @@ -43,7 +42,6 @@ tiers: - case_name: functest-odl-sfc project_name: sfc - enabled: false criteria: 100 blocking: false description: >- @@ -59,7 +57,6 @@ tiers: - case_name: barometercollectd project_name: barometer - enabled: false criteria: 100 blocking: false description: >- @@ -67,7 +64,7 @@ tiers: the proper configuration and basic functionality of all the collectd plugins as described in the Project Release Plan dependencies: - installer: '(apex)|(compass)' + installer: '' scenario: 'bar' run: module: 'baro_tests.barometer' @@ -83,7 +80,7 @@ tiers: features are installed. It integrates some test suites from upstream using Robot as the test framework. dependencies: - installer: 'apex' + installer: '' scenario: 'odl.*-fdio' run: module: 'functest.opnfv_tests.sdn.odl.odl' diff --git a/docker/features/thirdparty-requirements.txt b/docker/features/thirdparty-requirements.txt index 914d4eefc..910b514b5 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 +baro_tests # sdnvpn -# sfc -# doctor-tests;python_version>='3.0' +sfc +doctor-tests;python_version>='3.0' diff --git a/docker/parser/Dockerfile b/docker/parser/Dockerfile index a86716626..fe21bb54c 100644 --- a/docker/parser/Dockerfile +++ b/docker/parser/Dockerfile @@ -2,8 +2,6 @@ FROM opnfv/functest-core ARG BRANCH=master ARG OPENSTACK_TAG=stable/queens -ARG RALLY_TAG=stable/0.10 -ARG OS_FAULTS_TAG=0.1.16 COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN apk --no-cache add --virtual .build-deps --update \ 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 |