diff options
Diffstat (limited to 'docker/features')
| -rw-r--r-- | docker/features/Dockerfile | 9 | ||||
| -rw-r--r-- | docker/features/testcases.yaml | 9 | ||||
| -rw-r--r-- | docker/features/thirdparty-requirements.txt | 6 |
3 files changed, 9 insertions, 15 deletions
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' |