aboutsummaryrefslogtreecommitdiffstats
path: root/docker/parser
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-11-05 13:51:56 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2017-11-05 14:02:55 +0100
commit57970bac489b114ab0483580fef683ea99fe62f1 (patch)
tree56aa27f4935c7e11809e92891e5a7129f0bf2097 /docker/parser
parent4d95f152cda9c7a44df13025341d3d7d472d57c6 (diff)
Update Functest to OpenStack stable/pike
It updates setup.py, (test-)requirement.txt and upper-constraints.txt according to OpenStack requirements [1]. It disables all Features testcases as they are not synchronized with OpenStack stable/pike yet [2]. The docker functest-parser is simplified as it can be based on functest-core as both Functest and Parser leverage on OpenStack stable/pike. ODL_TAG and REFSTACK_TAG variables are set to master again. [1] http://git.openstack.org/cgit/openstack/requirements/log/?h=stable/pike [2] https://wiki.opnfv.org/display/functest/Requirements+management Change-Id: I23fa84f35244c1f4026abd89414b99576f042ee4 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/parser')
-rw-r--r--docker/parser/Dockerfile21
-rw-r--r--docker/parser/hooks/post_checkout6
2 files changed, 8 insertions, 19 deletions
diff --git a/docker/parser/Dockerfile b/docker/parser/Dockerfile
index 6ab0d872..c98850c2 100644
--- a/docker/parser/Dockerfile
+++ b/docker/parser/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.6
+FROM opnfv/functest-core
ARG BRANCH=master
ARG OPENSTACK_TAG=stable/pike
@@ -12,31 +12,14 @@ RUN apk --no-cache add --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 /^heat-translator=/d | sed /^tosca-parser=/d | \
sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ | \
- sed s/^requests===.*$/requests===2.13.0/ \
> 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 --depth 1 https://github.com/openstack/os-faults.git -b $OS_FAULTS_TAG /src/os-faults && \
- update-requirements -s --source /src/openstack-requirements /src/os-faults/ && \
- git clone --depth 1 https://github.com/openstack/rally.git -b $RALLY_TAG /src/rally && \
- update-requirements -s --source /src/openstack-requirements /src/rally/ && \
- pip install --no-cache-dir --src /src -cupper-constraints.txt \
- -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
- /src/os-faults /src/rally && \
- pip install --no-cache-dir --src /src -cupper-constraints.txt \
- -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
- git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest \
git+https://gerrit.opnfv.org/gerrit/parser#egg=nfv-heattranslator\&subdirectory=tosca2heat/heat-translator \
git+https://gerrit.opnfv.org/gerrit/parser#egg=nfv-toscaparser\&subdirectory=tosca2heat/tosca-parser \
-e git+https://gerrit.opnfv.org/gerrit/parser#egg=nfv-parser && \
- rm -r upper-constraints.txt /src/os-faults/.git /src/rally/.git && \
- 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-manage db create && \
- bash -c "mkdir -p /home/opnfv/functest{/conf,/data,/images,/results} /home/opnfv/repos/vnfs" && \
+ rm upper-constraints.txt && \
apk del .build-deps
COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml
CMD ["bash","-c","prepare_env start && run_tests -t all"]
diff --git a/docker/parser/hooks/post_checkout b/docker/parser/hooks/post_checkout
new file mode 100644
index 00000000..8d0e9812
--- /dev/null
+++ b/docker/parser/hooks/post_checkout
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+from="${DOCKER_REPO%/*}/functest-core:${DOCKER_TAG}"
+sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile
+
+exit $?