summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile2
-rw-r--r--docker/core/Dockerfile2
-rw-r--r--docker/features/Dockerfile4
-rw-r--r--docker/parser/Dockerfile17
-rw-r--r--docker/parser/hooks/post_checkout6
-rw-r--r--docker/restapi/Dockerfile38
-rw-r--r--docker/restapi/hooks/post_checkout6
-rw-r--r--docker/restapi/thirdparty-requirements.txt6
-rw-r--r--docker/smoke/Dockerfile8
-rw-r--r--docker/smoke/thirdparty-requirements.txt1
-rw-r--r--docker/vnf/Dockerfile9
-rw-r--r--docker/vnf/testcases.yaml2
12 files changed, 75 insertions, 26 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 6e5161c34..218d74417 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -79,7 +79,7 @@ RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/uppe
> upper-constraints.txt && \
pip install --src /src -cupper-constraints.txt \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
- -e git+https://github.com/openstack/requirements@stable/ocata#egg=openstack_requirements && \
+ -e git+https://github.com/openstack/requirements@$OPENSTACK_TAG#egg=openstack_requirements && \
git clone --depth 1 https://github.com/openstack/rally.git -b $RALLY_TAG /src/rally && \
update-requirements -s --source /src/openstack-requirements /src/rally && \
git clone --depth 1 https://github.com/openstack/refstack-client.git /src/refstack-client && \
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index c5766da30..04e32598e 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -15,7 +15,7 @@ RUN apk --no-cache add --update \
> 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@stable/ocata#egg=openstack_requirements && \
+ -e git+https://github.com/openstack/requirements@$OPENSTACK_TAG#egg=openstack_requirements && \
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 \
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index c3b1b041d..8b0a2f60c 100644
--- a/docker/features/Dockerfile
+++ b/docker/features/Dockerfile
@@ -4,10 +4,10 @@ ARG BRANCH=master
ARG OPENSTACK_TAG=stable/ocata
COPY thirdparty-requirements.txt thirdparty-requirements.txt
-RUN apk --no-cache add --update nodejs nodejs-npm python3 && \
+RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass && \
apk --no-cache add --virtual .build-deps --update \
python-dev build-base linux-headers libffi-dev \
- openssl-dev libjpeg-turbo-dev git && \
+ openssl-dev libjpeg-turbo-dev && \
pip install --no-cache-dir --src /src \
-chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
diff --git a/docker/parser/Dockerfile b/docker/parser/Dockerfile
index e0dc0d5cd..a28a1f5b0 100644
--- a/docker/parser/Dockerfile
+++ b/docker/parser/Dockerfile
@@ -11,18 +11,17 @@ 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 /^heat-translator=/d | sed /^tosca-parser=/d | \
+ sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \
> upper-constraints.txt && \
- pip install --src /src -cupper-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@stable/ocata#egg=openstack_requirements && \
+ -e git+https://github.com/openstack/requirements@$OPENSTACK_TAG#egg=openstack_requirements && \
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 --src /src -cupper-constraints.txt \
- -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
- /src/rally && \
- pip install --no-cache-dir --src /src \
- -cupper-constraints.txt \
+ 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/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=heat-translator\&subdirectory=tosca2heat/heat-translator \
diff --git a/docker/parser/hooks/post_checkout b/docker/parser/hooks/post_checkout
new file mode 100644
index 000000000..20a6d4b95
--- /dev/null
+++ b/docker/parser/hooks/post_checkout
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+from="${DOCKER_REPO%/*}/functest-core"
+sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile
+
+exit $?
diff --git a/docker/restapi/Dockerfile b/docker/restapi/Dockerfile
new file mode 100644
index 000000000..2c7560286
--- /dev/null
+++ b/docker/restapi/Dockerfile
@@ -0,0 +1,38 @@
+FROM opnfv/functest-core
+
+ARG BRANCH=master
+ARG OPENSTACK_TAG=stable/ocata
+ARG ODL_TAG=35e415b6873b39d72775c88a337e92dac26012e2
+ARG FDS_TAG=master
+ARG REFSTACK_TAG=4e187b07672dd1c41cb7c94658f1c91edebf53a2
+ARG VIMS_TAG=stable
+
+COPY thirdparty-requirements.txt thirdparty-requirements.txt
+RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass \
+ ruby ruby-bundler ruby-irb ruby-rdoc dnsmasq \
+ procps libxslt libxml2 zlib libffi && \
+ apk --no-cache add --virtual .build-deps --update \
+ python-dev build-base linux-headers libffi-dev \
+ openssl-dev libjpeg-turbo-dev \
+ ruby-dev g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev && \
+ git clone --depth 1 https://github.com/openstack/refstack-client.git /src/refstack-client && \
+ (cd src/refstack-client && git checkout -b $REFSTACK_TAG) && \
+ update-requirements -s --source /src/openstack-requirements /src/refstack-client/ && \
+ pip install --no-cache-dir --src /src \
+ -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \
+ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
+ -e/src/refstack-client -rthirdparty-requirements.txt && \
+ git clone --depth 1 https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \
+ (cd src/odl_test && git checkout -b $ODL_TAG) && \
+ git clone --depth 1 -b $FDS_TAG https://gerrit.opnfv.org/gerrit/fds /src/fds && \
+ git clone --depth 1 -b $VIMS_TAG https://github.com/boucherv-orange/clearwater-live-test /src/vims-test && \
+ ln -s /src/tempest /src/refstack-client/.tempest && \
+ virtualenv --system-site-packages /src/tempest/.venv && \
+ (cd /src/promise/source && npm install) && \
+ (cd /src/vims-test && bundle config build.nokogiri --use-system-libraries && bundle install --system) && \
+ npm -g install npm@latest && \
+ rm -r thirdparty-requirements.txt /src/refstack-client/.git /src/odl_test/.git \
+ /src/fds/.git /src/vims-test/.git && \
+ apk del .build-deps
+EXPOSE 5000
+CMD ["functest_restapi"]
diff --git a/docker/restapi/hooks/post_checkout b/docker/restapi/hooks/post_checkout
new file mode 100644
index 000000000..20a6d4b95
--- /dev/null
+++ b/docker/restapi/hooks/post_checkout
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+from="${DOCKER_REPO%/*}/functest-core"
+sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile
+
+exit $?
diff --git a/docker/restapi/thirdparty-requirements.txt b/docker/restapi/thirdparty-requirements.txt
new file mode 100644
index 000000000..4a0b6ff88
--- /dev/null
+++ b/docker/restapi/thirdparty-requirements.txt
@@ -0,0 +1,6 @@
+baro_tests
+sdnvpn
+securityscanning
+sfc
+promise
+domino
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index abf1714b4..fe2f91917 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -6,7 +6,6 @@ ARG ODL_TAG=35e415b6873b39d72775c88a337e92dac26012e2
ARG FDS_TAG=master
ARG REFSTACK_TAG=4e187b07672dd1c41cb7c94658f1c91edebf53a2
-COPY thirdparty-requirements.txt thirdparty-requirements.txt
RUN apk --no-cache add --virtual .build-deps --update \
python-dev build-base linux-headers libffi-dev \
openssl-dev libjpeg-turbo-dev git && \
@@ -17,17 +16,12 @@ RUN apk --no-cache add --virtual .build-deps --update \
-chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-e/src/refstack-client && \
- pip install --no-cache-dir --src /src \
- -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \
- -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
- -rthirdparty-requirements.txt && \
git clone --depth 1 https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \
(cd src/odl_test && git checkout -b $ODL_TAG) && \
git clone --depth 1 -b $FDS_TAG https://gerrit.opnfv.org/gerrit/fds /src/fds && \
ln -s /src/tempest /src/refstack-client/.tempest && \
virtualenv --system-site-packages /src/tempest/.venv && \
- rm -r thirdparty-requirements.txt /src/refstack-client/.git /src/odl_test/.git \
- /src/fds/.git && \
+ rm -r /src/refstack-client/.git /src/odl_test/.git /src/fds/.git && \
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/smoke/thirdparty-requirements.txt b/docker/smoke/thirdparty-requirements.txt
deleted file mode 100644
index b298601b7..000000000
--- a/docker/smoke/thirdparty-requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
-refstack-client
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index d4f18c476..36e80d7e2 100644
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -3,10 +3,13 @@ FROM opnfv/functest-core
ARG VIMS_TAG=stable
RUN apk --no-cache add --update \
- ruby ruby-dev ruby-bundler ruby-irb ruby-rdoc dnsmasq \
- procps git g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev && \
+ ruby ruby-bundler ruby-irb ruby-rdoc dnsmasq \
+ procps libxslt libxml2 zlib libffi && \
+ apk --no-cache add --virtual .build-deps --update \
+ ruby-dev g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev && \
git clone --depth 1 -b $VIMS_TAG https://github.com/boucherv-orange/clearwater-live-test /src/vims-test && \
rm -r /src/vims-test/.git && \
- cd /src/vims-test && bundle config build.nokogiri --use-system-libraries && bundle install --system
+ cd /src/vims-test && bundle config build.nokogiri --use-system-libraries && bundle install --system && \
+ 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/vnf/testcases.yaml b/docker/vnf/testcases.yaml
index dea4a1eaf..c0eba8225 100644
--- a/docker/vnf/testcases.yaml
+++ b/docker/vnf/testcases.yaml
@@ -23,7 +23,6 @@ tiers:
-
case_name: orchestra_openims
project_name: functest
- enabled: false
criteria: 100
blocking: false
description: >-
@@ -38,7 +37,6 @@ tiers:
-
case_name: orchestra_clearwaterims
project_name: functest
- enabled: false
criteria: 100
blocking: false
description: >-