diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | build.sh | 2 | ||||
| -rw-r--r-- | docker/Dockerfile | 31 | ||||
| -rw-r--r-- | docker/features/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/features/testcases.yaml | 24 | ||||
| -rw-r--r-- | docker/healthcheck/testcases.yaml | 2 | ||||
| -rw-r--r-- | docker/logging.ini | 70 | ||||
| -rw-r--r-- | docker/smoke/testcases.yaml | 4 | ||||
| -rw-r--r-- | docker/testcases.yaml | 69 |
9 files changed, 29 insertions, 177 deletions
diff --git a/.travis.yml b/.travis.yml index fc181042..75557e02 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ jobs: env: - REPO="${DOCKER_USERNAME}" - amd64_dirs="docker/features" - - stage: build functest-kubernetes-smoke + - stage: build functest-kubernetes-smoke image script: sudo -E bash build.sh env: - REPO="${DOCKER_USERNAME}" @@ -17,7 +17,7 @@ for dir in ${amd64_dirs}; do docker push "${repo}/functest-kubernetes-${dir##**/}" [ "${dir}" != "docker/core" ] && (docker rmi "${repo}/functest-kubernetes-${dir##**/}" || true) done -[ ! -z "${amd64_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:latest" alpine:3.7 || true) +[ ! -z "${amd64_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-healthcheck" "${repo}/functest-kubernetes-core" alpine:3.7 || true) find . -name Dockerfile -exec git checkout {} + exit $? diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index 18365a39..00000000 --- a/docker/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -FROM alpine:3.7 - -ARG BRANCH=master -ARG K8S_TAG=v1.9.4 -ARG OPENSTACK_TAG=stable/pike -ARG OPNFV_TAG=master - -RUN apk --no-cache add --update make py-pip bash git go \ - grep rsync linux-headers musl-dev findutils \ - libffi libssl1.0 libjpeg-turbo && \ - apk --no-cache add --virtual .build-deps --update \ - python-dev libffi-dev openssl-dev libjpeg-turbo-dev && \ - git clone https://github.com/kubernetes/kubernetes /src/k8s.io/kubernetes && \ - (cd /src/k8s.io/kubernetes && git checkout $K8S_TAG) && \ - (cd /src/k8s.io/kubernetes && \ - make kubectl ginkgo && \ - make WHAT=test/e2e/e2e.test && \ - mv _output/bin/kubectl /usr/local/bin) && \ - git clone https://gerrit.opnfv.org/gerrit/functest-kubernetes /src/functest-kubernetes && \ - (cd /src/functest-kubernetes && git fetch origin $BRANCH && git checkout FETCH_HEAD) && \ - pip install \ - -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$OPNFV_TAG \ - -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \ - /src/functest-kubernetes stor4nfv-tests && \ - rm -rf /src/k8s.io/kubernetes/.git /src/functest-kubernetes && \ - bash -c "mkdir -p /var/lib/xtesting /home/opnfv" && \ - ln -s /var/lib/xtesting /home/opnfv/functest && \ - apk del .build-deps -COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml -COPY logging.ini /usr/lib/python2.7/site-packages/xtesting/ci/logging.ini -CMD ["run_tests", "-t", "all"] diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index 03e285c0..e1c82e4c 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -11,7 +11,7 @@ RUN apk --no-cache add --update make py-pip bash git go \ pip install \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$OPNFV_TAG \ -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \ - stor4nfv-tests && \ + stor4nfv-tests clover && \ 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/testcases.yaml b/docker/features/testcases.yaml index 7ea601dc..08d43662 100644 --- a/docker/features/testcases.yaml +++ b/docker/features/testcases.yaml @@ -2,7 +2,7 @@ tiers: - name: stor4nfv - order: 3 + order: 1 ci_loop: '(daily)|(weekly)' description: >- Test suite from Stor4NFV project. @@ -21,3 +21,25 @@ tiers: run: module: 'stor4nfv_tests.stor4nfv_k8s' class: 'K8sStor4nfvTest' + + - + name: clover + order: 2 + ci_loop: '(daily)|(weekly)' + description: >- + Test suite from Clover project. + testcases: + - + case_name: clover_k8s + project_name: clover + criteria: 100 + blocking: false + description: >- + This tests are necessary demonstrate features + of K8s+Istio+Clover deployment. + dependencies: + installer: 'container4nfv' + scenario: 'clover' + run: + module: 'clover.functest.clover_k8s' + class: 'K8sCloverTest' diff --git a/docker/healthcheck/testcases.yaml b/docker/healthcheck/testcases.yaml index 5864755e..a5da95ad 100644 --- a/docker/healthcheck/testcases.yaml +++ b/docker/healthcheck/testcases.yaml @@ -17,7 +17,7 @@ tiers: validates the deployed cluster is accessible, and at least satisfies minimal functional requirements. dependencies: - installer: '(compass)|(joid)|(kubespray)' + installer: '(compass)|(joid)|(kubespray)|(container4nfv)' scenario: 'k8-*' run: module: 'functest_kubernetes.k8stest' diff --git a/docker/logging.ini b/docker/logging.ini deleted file mode 100644 index 579f1a48..00000000 --- a/docker/logging.ini +++ /dev/null @@ -1,70 +0,0 @@ -[loggers] -keys=root,xtesting,xci,xcore,energy,xutils,functest_kubernetes - -[handlers] -keys=console,wconsole,file,null - -[formatters] -keys=standard - -[logger_root] -level=NOTSET -handlers=null - -[logger_xtesting] -level=NOTSET -handlers=file -qualname=xtesting - -[logger_xci] -level=NOTSET -handlers=console -qualname=xtesting.ci - -[logger_xcore] -level=NOTSET -handlers=console -qualname=xtesting.core - -[logger_energy] -level=NOTSET -handlers=wconsole -qualname=xtesting.energy - -[logger_xutils] -level=NOTSET -handlers=wconsole -qualname=xtesting.utils - -[logger_functest_kubernetes] -level=NOTSET -handlers=wconsole,file -qualname=functest_kubernetes - -[handler_null] -class=NullHandler -level=NOTSET -formatter=standard -args=() - -[handler_console] -class=StreamHandler -level=INFO -formatter=standard -args=(sys.stdout,) - -[handler_wconsole] -class=StreamHandler -level=WARN -formatter=standard -args=(sys.stdout,) - -[handler_file] -class=FileHandler -level=DEBUG -formatter=standard -args=("/home/opnfv/functest/results/functest-kubernetes.log",) - -[formatter_standard] -format=%(asctime)s - %(name)s - %(levelname)s - %(message)s -datefmt= diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml index 04a9104b..79508a5b 100644 --- a/docker/smoke/testcases.yaml +++ b/docker/smoke/testcases.yaml @@ -2,7 +2,7 @@ tiers: - name: smoke - order: 2 + order: 1 ci_loop: '(merge)|(verify)|(daily)|(weekly)' description: >- A set of conformance tests integrated from kubernetes project. @@ -17,7 +17,7 @@ tiers: cluster, this tests are necessary demonstrate conformance of the Kubernetes deployment. dependencies: - installer: '(compass)|(joid)|(kubespray)' + installer: '(compass)|(joid)|(kubespray)|(container4nfv)' scenario: 'k8-*' run: module: 'functest_kubernetes.k8stest' diff --git a/docker/testcases.yaml b/docker/testcases.yaml deleted file mode 100644 index fc7f9395..00000000 --- a/docker/testcases.yaml +++ /dev/null @@ -1,69 +0,0 @@ ---- -tiers: - - - name: healthcheck - order: 1 - ci_loop: '(merge)|(verify)|(daily)|(weekly)' - description: >- - A set of e2e tests integrated from kubernetes project. - testcases: - - - case_name: k8s_smoke - project_name: functest - criteria: 100 - blocking: false - description: >- - Smoke Tests a running Kubernetes cluster, which - validates the deployed cluster is accessible, and - at least satisfies minimal functional requirements. - dependencies: - installer: '(compass)|(joid)|(kubespray)' - scenario: 'k8-*' - run: - module: 'functest_kubernetes.k8stest' - class: 'K8sSmokeTest' - - - - name: smoke - order: 2 - ci_loop: '(merge)|(verify)|(daily)|(weekly)' - description: >- - A set of conformance tests integrated from kubernetes project. - testcases: - - - case_name: k8s_conformance - project_name: functest - criteria: 100 - blocking: false - description: >- - Conformance Tests are expect to pass on any Kubernetes - cluster, this tests are necessary demonstrate conformance - of the Kubernetes deployment. - dependencies: - installer: '(compass)|(joid)|(kubespray)' - scenario: 'k8-*' - run: - module: 'functest_kubernetes.k8stest' - class: 'K8sConformanceTest' - - - - name: stor4nfv - order: 3 - ci_loop: '(daily)|(weekly)' - description: >- - Test suite from Stor4NFV project. - testcases: - - - case_name: stor4nfv_k8s - project_name: stor4nfv - criteria: 100 - blocking: false - description: >- - This tests are necessary demonstrate conformance - of the K8s+Stor4NFV deployment. - dependencies: - installer: 'compass' - scenario: 'stor4nfv' - run: - module: 'stor4nfv_tests.stor4nfv_k8s' - class: 'K8sStor4nfvTest' |