From 5c8e134c88dc158ad3a151da04485cd57168611c Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Fri, 15 Jun 2018 08:22:38 +0200 Subject: Remove parser container MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Parser conflicts with OpenStack project namespaces due to bad fork conception. Functest should stop maintaining containers to bypass issues created by Parser (2 releases). Change-Id: If52084dc9cb7165a6f53051ad84604bc999dd69c Signed-off-by: Cédric Ollivier --- .travis.yml | 10 ---------- docker/parser/Dockerfile | 19 ------------------- docker/parser/hooks/post_checkout | 6 ------ docker/parser/testcases.yaml | 25 ------------------------- docker/parser/thirdparty-requirements.txt | 3 --- docs/release/release-notes/functest-release.rst | 2 -- docs/testing/developer/devguide/index.rst | 2 -- docs/testing/user/configguide/configguide.rst | 1 - 8 files changed, 68 deletions(-) delete mode 100644 docker/parser/Dockerfile delete mode 100644 docker/parser/hooks/post_checkout delete mode 100644 docker/parser/testcases.yaml delete mode 100644 docker/parser/thirdparty-requirements.txt diff --git a/.travis.yml b/.travis.yml index fae6e73b6..cff4f3bb5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,11 +44,6 @@ jobs: - REPO="${DOCKER_USERNAME}" - amd64_dirs="" - arm64_dirs="docker/components" - - script: sudo -E bash build.sh - env: - - REPO="${DOCKER_USERNAME}" - - amd64_dirs="" - - arm64_dirs="docker/parser" - script: sudo -E bash build.sh env: - REPO="${DOCKER_USERNAME}" @@ -74,11 +69,6 @@ jobs: - REPO="${DOCKER_USERNAME}" - amd64_dirs="docker/vnf" - arm64_dirs="" - - script: sudo -E bash build.sh - env: - - REPO="${DOCKER_USERNAME}" - - amd64_dirs="docker/parser" - - arm64_dirs="" - stage: publish all manifests script: > sudo manifest-tool push from-args \ 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/hooks/post_checkout b/docker/parser/hooks/post_checkout deleted file mode 100644 index 8d0e98124..000000000 --- a/docker/parser/hooks/post_checkout +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -from="${DOCKER_REPO%/*}/functest-core:${DOCKER_TAG}" -sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile - -exit $? 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/docs/release/release-notes/functest-release.rst b/docs/release/release-notes/functest-release.rst index 7e0bc7851..1c6ef227c 100644 --- a/docs/release/release-notes/functest-release.rst +++ b/docs/release/release-notes/functest-release.rst @@ -47,7 +47,6 @@ The OPNFV projects integrated into Functest framework for automation are: * odl-sfc * barometer * fds - * parser Kubernetes ---------- @@ -84,7 +83,6 @@ Software * https://hub.docker.com/r/opnfv/functest-features * https://hub.docker.com/r/opnfv/functest-components * https://hub.docker.com/r/opnfv/functest-vnf - * https://hub.docker.com/r/opnfv/functest-parser Functest Docker images (Kubernetes): diff --git a/docs/testing/developer/devguide/index.rst b/docs/testing/developer/devguide/index.rst index d700ac1fe..aabd72d4c 100644 --- a/docs/testing/developer/devguide/index.rst +++ b/docs/testing/developer/devguide/index.rst @@ -56,7 +56,6 @@ to the different tiers: * functest-features: https://hub.docker.com/r/opnfv/functest-features/ * functest-components: https://hub.docker.com/r/opnfv/functest-components/ * functest-vnf: https://hub.docker.com/r/opnfv/functest-vnf/ - * functest-parser: https://hub.docker.com/r/opnfv/functest-parser/ * functest-restapi: https://hub.docker.com/r/opnfv/functest-restapi/ Standalone functest dockers are maintained for Euphrates but Alpine containers @@ -126,7 +125,6 @@ The external test cases are: * doctor * domino * fds - * parser * promise * refstack_defcore * snaps_smoke diff --git a/docs/testing/user/configguide/configguide.rst b/docs/testing/user/configguide/configguide.rst index 378aa2ee9..c04689191 100644 --- a/docs/testing/user/configguide/configguide.rst +++ b/docs/testing/user/configguide/configguide.rst @@ -19,7 +19,6 @@ Docker images are available on the dockerhub: * opnfv/functest-features * opnfv/functest-components * opnfv/functest-vnf - * opnfv/functest-parser The tag "opnfv-6.0.0" is the official release image in Fraser, but you can also pull "fraser" tag as it is being maintained by Functest team and might -- cgit 1.2.3-korg