summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-06-17 09:18:13 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-06-17 09:52:38 +0200
commit1004a0475154b9198a02fa246417ed1fbb947ded (patch)
tree54bf5bb63cc0c3888746ba47f036431bd790b368
parent1734755754867dc81938c8d6ca878e12ada36990 (diff)
Add functest-tempest container
It avoids duplicating operations between functest-smoke, functest-components, functest-vnf... It eases building new containers for new tempest-based testcases. Change-Id: I73b973588f4eb70d1e5874d06d030c5a5d729e95 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--.travis.yml12
-rw-r--r--build.sh4
-rw-r--r--docker/tempest/Dockerfile35
-rw-r--r--docker/tempest/hooks/post_checkout6
4 files changed, 55 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 548a37711..16cc81798 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,6 +23,18 @@ jobs:
--platforms linux/amd64 \
--template ${DOCKER_USERNAME}/functest-core:ARCH-latest \
--target ${DOCKER_USERNAME}/functest-core:latest
+ - stage: build functest-tempest images
+ script: sudo -E bash build.sh
+ env:
+ - REPO="${DOCKER_USERNAME}"
+ - amd64_dirs="docker/tempest"
+ - arm64_dirs=""
+ - stage: publish functest-tempest manifests
+ script: >
+ sudo manifest-tool push from-args \
+ --platforms linux/amd64 \
+ --template ${DOCKER_USERNAME}/functest-tempest:ARCH-latest \
+ --target ${DOCKER_USERNAME}/functest-tempest:latest
- stage: build all functest images
script: sudo -E bash build.sh
env:
diff --git a/build.sh b/build.sh
index 9f0542b1a..4337e0a10 100644
--- a/build.sh
+++ b/build.sh
@@ -5,12 +5,12 @@ set -e
repo=${REPO:-opnfv}
amd64_dirs=${amd64_dirs-"\
docker/core \
+docker/tempest \
docker/healthcheck \
docker/smoke \
docker/features \
docker/components \
-docker/vnf \
-docker/parser"}
+docker/vnf"}
arm64_dirs=${arm64_dirs-${amd64_dirs}}
build_opts=(--pull=true --no-cache --force-rm=true)
diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile
new file mode 100644
index 000000000..7766f6c7f
--- /dev/null
+++ b/docker/tempest/Dockerfile
@@ -0,0 +1,35 @@
+FROM opnfv/functest-core
+
+ARG BRANCH=master
+ARG OPENSTACK_TAG=stable/queens
+ARG RALLY_TAG=0.11.2
+ARG OS_FAULTS_TAG=0.1.17
+
+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 \
+ -e git+https://github.com/openstack/requirements@$OPENSTACK_TAG#egg=openstack_requirements && \
+ git clone https://github.com/openstack/os-faults.git /src/os-faults && \
+ (cd /src/os-faults && git checkout $OS_FAULTS_TAG) && \
+ update-requirements -s --source /src/openstack-requirements /src/os-faults/ && \
+ git clone https://github.com/openstack/rally.git /src/rally && \
+ (cd /src/rally && git checkout $RALLY_TAG) && \
+ update-requirements -s --source /src/openstack-requirements /src/rally/ && \
+ git clone --depth 1 https://github.com/openstack/rally-openstack.git /src/rally-openstack && \
+ update-requirements -s --source /src/openstack-requirements /src/rally-openstack && \
+ pip install --no-cache-dir --src /src -cupper-constraints.txt \
+ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
+ tempest /src/rally-openstack /src/os-faults && \
+ pip install --no-cache-dir --src /src -cupper-constraints.txt \
+ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
+ /src/rally && \
+ rm -r upper-constraints.txt /src/os-faults /src/rally /src/rally-openstack && \
+ mkdir -p /etc/rally && \
+ printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \
+ mkdir -p /var/lib/rally/database && rally db create && \
+ apk del .build-deps
diff --git a/docker/tempest/hooks/post_checkout b/docker/tempest/hooks/post_checkout
new file mode 100644
index 000000000..8d0e98124
--- /dev/null
+++ b/docker/tempest/hooks/post_checkout
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+from="${DOCKER_REPO%/*}/functest-core:${DOCKER_TAG}"
+sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile
+
+exit $?