aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-08-31 11:20:46 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2019-08-31 11:23:48 +0200
commita9faa59024b8fa8ae48baae109a0f4478a70297b (patch)
treeabc4148537da516e0bc3ace5e850a8b0138ef2e0
parentc01c2773e79cc8f483b28f64750226f90cbaf2d2 (diff)
Remove Features containers
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: Ie2f5beddd21b09aabfbdf2bb2f3366e652d43b3a Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 5149d87c348555184e2ecc48e57697531c5ff38b)
-rw-r--r--.travis.yml15
-rw-r--r--ansible/site.yml8
-rw-r--r--build.sh3
-rw-r--r--docker/features/Dockerfile19
-rw-r--r--docker/features/hooks/post_checkout6
-rw-r--r--docker/features/testcases.yaml41
-rw-r--r--docker/features/thirdparty-requirements.txt2
7 files changed, 3 insertions, 91 deletions
diff --git a/.travis.yml b/.travis.yml
index efe5fd00..82843ad8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,30 +34,19 @@ jobs:
--platforms linux/amd64 \
--template ${DOCKER_USERNAME}/functest-kubernetes-core:ARCH-iruya \
--target ${DOCKER_USERNAME}/functest-kubernetes-core:iruya
- - stage: build functest-kubernetes-[healthcheck,features] image
+ - stage: build functest-kubernetes-healthcheck image
script: sudo -E bash build.sh
env:
- REPO="${DOCKER_USERNAME}"
- amd64_dirs="docker/healthcheck"
- arm64_dirs=""
- - script: sudo -E bash build.sh
- env:
- - REPO="${DOCKER_USERNAME}"
- - amd64_dirs="docker/features"
- - arm64_dirs=""
- - stage: publish functest-kubernetes-[healthcheck,features] manifests
+ - stage: publish functest-kubernetes-healthcheck manifests
script: >
sudo manifest-tool push from-args \
--platforms linux/amd64 \
--template \
${DOCKER_USERNAME}/functest-kubernetes-healthcheck:ARCH-iruya \
--target ${DOCKER_USERNAME}/functest-kubernetes-healthcheck:iruya
- - script: >
- sudo manifest-tool push from-args \
- --platforms linux/amd64 \
- --template \
- ${DOCKER_USERNAME}/functest-kubernetes-features:ARCH-iruya \
- --target ${DOCKER_USERNAME}/functest-kubernetes-features:iruya
- stage: build functest-kubernetes-smoke image
script: sudo -E bash build.sh
env:
diff --git a/ansible/site.yml b/ansible/site.yml
index 3fde7eb6..8e4706ac 100644
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -30,9 +30,6 @@
- name: functest-kubernetes-smoke
ref_arg:
path: docker/smoke
- - name: functest-kubernetes-features
- ref_arg:
- path: docker/features
suites:
- repo: opnfv
container: functest-kubernetes-healthcheck
@@ -42,8 +39,3 @@
container: functest-kubernetes-smoke
tests:
- k8s_conformance
- - repo: opnfv
- container: functest-kubernetes-features
- tests:
- - stor4nfv_k8s
- - clover_k8s
diff --git a/build.sh b/build.sh
index 6f0ab5e7..2a1cf2d5 100644
--- a/build.sh
+++ b/build.sh
@@ -6,8 +6,7 @@ repo=${REPO:-opnfv}
amd64_dirs=${amd64_dirs-"\
docker/core \
docker/healthcheck \
-docker/smoke \
-docker/features"}
+docker/smoke"}
arm64_dirs=${arm64_dirs-${amd64_dirs}}
build_opts=(--pull=true --no-cache --force-rm=true)
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
deleted file mode 100644
index ca2de072..00000000
--- a/docker/features/Dockerfile
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM opnfv/functest-kubernetes-core:iruya
-
-ARG OPENSTACK_TAG=stable/stein
-ARG OPNFV_TAG=stable/iruya
-
-COPY thirdparty-requirements.txt thirdparty-requirements.txt
-RUN apk --no-cache add --update make py-pip bash git go \
- grep rsync linux-headers musl-dev findutils \
- libffi openssl libjpeg-turbo && \
- apk --no-cache add --virtual .build-deps --update \
- python-dev libffi-dev openssl-dev libjpeg-turbo-dev && \
- pip install \
- -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$OPNFV_TAG \
- -chttps://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt \
- -rthirdparty-requirements.txt && \
- rm -f 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/features/hooks/post_checkout b/docker/features/hooks/post_checkout
deleted file mode 100644
index 20f69500..00000000
--- a/docker/features/hooks/post_checkout
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-from="${DOCKER_REPO%/*}/functest-kubernetes-core:${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 2b66dbb3..00000000
--- a/docker/features/testcases.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
----
-tiers:
- -
- name: stor4nfv
- order: 2
- description: >-
- Test suite from Stor4NFV project.
- testcases:
- -
- case_name: stor4nfv_k8s
- project_name: stor4nfv
- enabled: false
- criteria: 100
- blocking: false
- description: >-
- This tests are necessary to demonstrate conformance
- of the K8s+Stor4NFV deployment.
- dependencies:
- - DEPLOY_SCENARIO: 'stor4nfv'
- run:
- name: stor4nfv_k8s
-
- -
- name: clover
- order: 3
- description: >-
- Test suite from Clover project.
- testcases:
- -
- case_name: clover_k8s
- project_name: clover
- enabled: false
- criteria: 100
- blocking: false
- description: >-
- This tests are necessary to demonstrate features
- of K8s+Istio+Clover deployment.
- dependencies:
- - DEPLOY_SCENARIO: 'clover'
- run:
- name: clover_k8s
diff --git a/docker/features/thirdparty-requirements.txt b/docker/features/thirdparty-requirements.txt
deleted file mode 100644
index d557b533..00000000
--- a/docker/features/thirdparty-requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# stor4nfv-tests
-# clover