summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2018-09-02 07:25:00 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-09-02 07:25:00 +0000
commitcdeeacd093740b87865dfbffb92c6c6d5b917d3b (patch)
treef3e1c2ab942338d2c50f8237a96f028b31795462
parent1b299d38acb223caa21d0c3eeb32c9d2ae348a1c (diff)
parent01a46e85a0e1eca03f2adf7b0f479d79e71fd786 (diff)
Merge changes Ib7384772,I94e94c21
* changes: Update to Alpine 3.8 Publish unit test report
-rw-r--r--build.sh6
-rw-r--r--docker/core/Dockerfile2
-rw-r--r--test-requirements.txt1
-rw-r--r--tox.ini1
4 files changed, 6 insertions, 4 deletions
diff --git a/build.sh b/build.sh
index 8610330f6..74f67dada 100644
--- a/build.sh
+++ b/build.sh
@@ -29,11 +29,11 @@ for dir in ${amd64_dirs}; do
(docker rmi "${repo}/functest-${dir##**/}:amd64-latest" || true)
done
[ ! -z "${amd64_dirs}" ] &&
- (docker rmi "${repo}/functest-core:amd64-latest" alpine:3.7 || true)
+ (docker rmi "${repo}/functest-core:amd64-latest" alpine:3.8 || true)
find . -name Dockerfile -exec git checkout {} +
find . -name Dockerfile -exec sed -i \
- -e "s|alpine:3.7|multiarch/alpine:arm64-v3.7|g" {} +
+ -e "s|alpine:3.8|multiarch/alpine:arm64-v3.8|g" {} +
find . -name Dockerfile -exec sed -i \
-e "s|opnfv/functest-core|${repo}/functest-core:arm64-latest|g" {} +
find . -name Dockerfile -exec sed -i \
@@ -47,7 +47,7 @@ for dir in ${arm64_dirs}; do
done
[ ! -z "${arm64_dirs}" ] &&
(docker rmi "${repo}/functest-core:arm64-latest" \
- multiarch/alpine:arm64-v3.7 || true)
+ multiarch/alpine:arm64-v3.8 || true)
find . -name Dockerfile -exec git checkout {} +
exit $?
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index af01347f1..ef4eb4413 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.7
+FROM alpine:3.8
ARG BRANCH=master
ARG OPENSTACK_TAG=stable/queens
diff --git a/test-requirements.txt b/test-requirements.txt
index 34288a752..ae4cfac37 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -11,3 +11,4 @@ sphinx-rtd-theme
yamllint
doc8>=0.6.0 # Apache-2.0
bashate>=0.5.1 # Apache-2.0
+nosehtmloutput # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 44e81abcc..92a027104 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,6 +15,7 @@ commands = nosetests --with-xunit \
--cover-package=functest \
--cover-xml \
--cover-html \
+ --with-html-output \
functest/tests/unit
[testenv:docs]