summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2017-11-06 14:02:46 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-11-06 14:02:46 +0000
commit140e94331d1645921c5781bc04acdf7a55fd75a6 (patch)
treeaaf9eb3c3a11d744b172e96309b284a99894a337 /docker
parent806d9c521f9f1de9df3b9ad62002bb31e2b2a821 (diff)
parent84f82d02630c22e8054266c8c0a53ffb805c2071 (diff)
Merge "Allow building containers from a gerrit change"
Diffstat (limited to 'docker')
-rw-r--r--docker/core/Dockerfile6
1 files changed, 4 insertions, 2 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 91c0468cd..ffcbe3873 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -14,6 +14,8 @@ RUN apk --no-cache add --update \
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 && \
+ git clone https://gerrit.opnfv.org/gerrit/functest /src/functest && \
+ (cd /src/functest && git fetch origin $BRANCH && git checkout FETCH_HEAD) && \
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 && \
@@ -26,8 +28,8 @@ RUN apk --no-cache add --update \
/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 && \
- rm -r upper-constraints.txt /src/os-faults/.git /src/rally/.git && \
+ /src/functest && \
+ rm -r upper-constraints.txt /src/functest /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 && \