diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/parser/Dockerfile | 19 | ||||
| -rw-r--r-- | docker/parser/testcases.yaml | 25 | ||||
| -rw-r--r-- | docker/parser/thirdparty-requirements.txt | 3 | ||||
| -rw-r--r-- | docker/tempest/Dockerfile | 35 | ||||
| -rw-r--r-- | docker/tempest/hooks/post_checkout (renamed from docker/parser/hooks/post_checkout) | 0 |
5 files changed, 35 insertions, 47 deletions
diff --git a/docker/parser/Dockerfile b/docker/parser/Dockerfile deleted file mode 100644 index fe21bb54c..000000000 --- a/docker/parser/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM opnfv/functest-core - -ARG BRANCH=master -ARG OPENSTACK_TAG=stable/queens - -COPY thirdparty-requirements.txt thirdparty-requirements.txt -RUN apk --no-cache add --virtual .build-deps --update \ - python-dev build-base linux-headers libffi-dev \ - openssl-dev libjpeg-turbo-dev && \ - wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \ - sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \ - > upper-constraints.txt && \ - pip install --no-cache-dir --src /src -cupper-constraints.txt \ - -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ - -rthirdparty-requirements.txt && \ - rm upper-constraints.txt thirdparty-requirements.txt && \ - apk del .build-deps -COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml -CMD ["run_tests", "-t", "all"] diff --git a/docker/parser/testcases.yaml b/docker/parser/testcases.yaml deleted file mode 100644 index 2999aa565..000000000 --- a/docker/parser/testcases.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -tiers: - - - name: features - order: 2 - ci_loop: '(daily)|(weekly)' - description: >- - Test suites from feature projects - integrated in functest - testcases: - - - case_name: parser-basics - project_name: parser - criteria: 100 - blocking: false - description: >- - Test suite from Parser project. - dependencies: - installer: '' - scenario: '^((?!bgpvpn|nofeature).)*$' - run: - module: 'xtesting.core.feature' - class: 'BashFeature' - args: - cmd: '/src/nfv-parser/tests/functest_run.sh' diff --git a/docker/parser/thirdparty-requirements.txt b/docker/parser/thirdparty-requirements.txt deleted file mode 100644 index 9981404d6..000000000 --- a/docker/parser/thirdparty-requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -nfv-heattranslator -nfv-toscaparser -nfv-parser diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile new file mode 100644 index 000000000..7766f6c7f --- /dev/null +++ b/docker/tempest/Dockerfile @@ -0,0 +1,35 @@ +FROM opnfv/functest-core + +ARG BRANCH=master +ARG OPENSTACK_TAG=stable/queens +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 \ + openssl-dev libjpeg-turbo-dev && \ + wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \ + sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \ + > upper-constraints.txt && \ + 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 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 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 --depth 1 https://github.com/openstack/rally-openstack.git /src/rally-openstack && \ + update-requirements -s --source /src/openstack-requirements /src/rally-openstack && \ + pip install --no-cache-dir --src /src -cupper-constraints.txt \ + -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ + tempest /src/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 && \ + rm -r upper-constraints.txt /src/os-faults /src/rally /src/rally-openstack && \ + 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 && \ + apk del .build-deps diff --git a/docker/parser/hooks/post_checkout b/docker/tempest/hooks/post_checkout index 8d0e98124..8d0e98124 100644 --- a/docker/parser/hooks/post_checkout +++ b/docker/tempest/hooks/post_checkout |