From 4ef1169759eaeb39144ac7e2a3f814ea86af7a67 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sat, 31 Aug 2019 10:56:23 +0200 Subject: Remove Features containers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Most the features are stopped and Functest shouldn't host dead code. Functest is a framework (Docker and Python modules) which can be still reused by any third-party (OPNFV Feature or anything else) in its tree and CI. Change-Id: Ia8475ce295b2cdcddbfcfc5b17ea2ab9e51a8afb Signed-off-by: Cédric Ollivier --- docker/features/Dockerfile | 22 -------- docker/features/hooks/post_checkout | 6 --- docker/features/testcases.yaml | 78 ----------------------------- docker/features/thirdparty-requirements.txt | 7 --- 4 files changed, 113 deletions(-) delete mode 100644 docker/features/Dockerfile delete mode 100644 docker/features/hooks/post_checkout delete mode 100644 docker/features/testcases.yaml delete mode 100644 docker/features/thirdparty-requirements.txt (limited to 'docker') diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile deleted file mode 100644 index 3fc6f1d7e..000000000 --- a/docker/features/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM opnfv/functest-core - -ARG BRANCH=master -ARG OPENSTACK_TAG=master - -COPY thirdparty-requirements.txt thirdparty-requirements.txt -RUN apk --no-cache add --update sshpass && \ - apk --no-cache add --virtual .build-deps --update \ - python3-dev build-base linux-headers libffi-dev \ - openssl-dev libjpeg-turbo-dev file && \ - wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \ - sed -i -E /^tempest==+.*$/d upper-constraints.txt && \ - case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt ;; esac && \ - wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH > upper-constraints.opnfv.txt && \ - sed -i -E /#egg=functest/d upper-constraints.opnfv.txt && \ - pip3 install --no-cache-dir --src /src -cupper-constraints.txt \ - -cupper-constraints.opnfv.txt \ - -rthirdparty-requirements.txt && \ - rm -r upper-constraints.txt upper-constraints.opnfv.txt thirdparty-requirements.txt && \ - apk del .build-deps -COPY testcases.yaml /usr/lib/python3.7/site-packages/xtesting/ci/testcases.yaml -CMD ["run_tests", "-t", "all"] diff --git a/docker/features/hooks/post_checkout b/docker/features/hooks/post_checkout deleted file mode 100644 index 3e5670b4a..000000000 --- a/docker/features/hooks/post_checkout +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -from="${DOCKER_REPO%/*}/functest-tempest:${DOCKER_TAG}" -sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile - -exit $? diff --git a/docker/features/testcases.yaml b/docker/features/testcases.yaml deleted file mode 100644 index 327ceafd3..000000000 --- a/docker/features/testcases.yaml +++ /dev/null @@ -1,78 +0,0 @@ ---- -tiers: - - - name: features - order: 3 - description: >- - Test suites from feature projects - integrated in functest - testcases: - - - case_name: doctor-notification - project_name: doctor - enabled: false - criteria: 100 - blocking: false - description: >- - Test suite from Doctor project. - dependencies: - - INSTALLER_TYPE: '(apex)|(fuel)|(daisy)' - - DEPLOY_SCENARIO: '^((?!fdio|nofeature).)*$' - run: - name: bashfeature - args: - cmd: 'doctor-test' - - - - case_name: functest-odl-sfc - project_name: sfc - criteria: 100 - blocking: false - description: >- - Test suite for odl-sfc to test two chains with one SF and - one chain with two SFs - dependencies: - - DEPLOY_SCENARIO: 'odl.*sfc' - run: - name: functest-odl-sfc - - - - case_name: barometercollectd - project_name: barometer - enabled: false - criteria: 100 - blocking: false - description: >- - Test suite for the Barometer project. Separate tests verify - the proper configuration and basic functionality of all the - collectd plugins as described in the Project Release Plan - dependencies: - - DEPLOY_SCENARIO: 'bar' - run: - name: barometercollectd - - - - case_name: vgpu - project_name: functest - criteria: 100 - blocking: false - description: >- - Test suite for the OpenStack vGPU feature - dependencies: - - DEPLOY_SCENARIO: 'vgpu' - run: - name: vgpu - - - - case_name: stor4nfv_os - project_name: stor4nfv - enabled: false - criteria: 100 - blocking: false - description: >- - This tests are necessary demonstrate conformance - of the OpenStack+Stor4NFV deployment. - dependencies: - - DEPLOY_SCENARIO: 'stor4nfv' - run: - name: stor4nfv_os diff --git a/docker/features/thirdparty-requirements.txt b/docker/features/thirdparty-requirements.txt deleted file mode 100644 index dd01480fd..000000000 --- a/docker/features/thirdparty-requirements.txt +++ /dev/null @@ -1,7 +0,0 @@ -robotframework-httplibrary -robotframework-requests -robotframework-sshlibrary -# baro_tests -# sfc -# stor4nfv_tests -# doctor-tests -- cgit 1.2.3-korg