summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker/Dockerfile5
-rw-r--r--docker/parser/hooks/post_checkout6
-rw-r--r--docker/vnf/testcases.yaml2
3 files changed, 5 insertions, 8 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 1a8089b81..2e59adad6 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -52,6 +52,8 @@ python-dev \
python-mock \
python-pip \
python3 \
+python3-dev \
+python3-pip \
postgresql \
ruby \
ruby-dev \
@@ -62,6 +64,7 @@ wget \
--no-install-recommends
RUN pip install --upgrade pip && easy_install -U setuptools==30.0.0
+RUN python3 -m pip install --upgrade pip setuptools==30.0.0
RUN mkdir -p ${REPOS_VNFS_DIR} \
&& mkdir -p ${FUNCTEST_BASE_DIR}/results \
@@ -92,7 +95,7 @@ RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/uppe
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest \
-rthirdparty-requirements.txt && \
- python3 -m pip install --no-cache-dir --src /src \
+ python3 -m pip install --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 \
doctor-tests && \
diff --git a/docker/parser/hooks/post_checkout b/docker/parser/hooks/post_checkout
deleted file mode 100644
index 8f5e4337a..000000000
--- a/docker/parser/hooks/post_checkout
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-from="${DOCKER_REPO%/*}/functest-core:euphrates"
-sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile
-
-exit $?
diff --git a/docker/vnf/testcases.yaml b/docker/vnf/testcases.yaml
index c0eba8225..64c0024ef 100644
--- a/docker/vnf/testcases.yaml
+++ b/docker/vnf/testcases.yaml
@@ -56,7 +56,7 @@ tiers:
description: >-
This test case is vRouter testing.
dependencies:
- installer: 'fuel'
+ installer: ''
scenario: 'nosdn-nofeature'
run:
module: 'functest.opnfv_tests.vnf.router.cloudify_vrouter'