summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-11-05 15:13:35 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2017-11-05 16:30:32 +0100
commit79978853fea1eef900db1fe873d77636882183be (patch)
treed96b3df9ff73ed86bc9c53af977cdc85ba29672b /docker
parentabd7a52b2d8764b074f68e026c4a66191e32b35e (diff)
Allow building containers from a gerrit change
It leverages on git command instead of pip git support [1]. Otherwise it forces pip master which raises side effects in rally [2] It is mandatory for implementing Functional testing gating [3] [1] https://pip.pypa.io/en/stable/reference/pip_install/#git [2] https://gerrit.opnfv.org/gerrit/#/c/40909/ [3] https://wiki.opnfv.org/display/functest/Functional+testing+gating Conflicts: docker/core/Dockerfile Change-Id: Ia18fee3e60fc08da9b96730ce85d5b7c866144aa Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 84f82d02630c22e8054266c8c0a53ffb805c2071)
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 316e4e2d2..a729a978d 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -14,6 +14,8 @@ RUN apk --no-cache add --update \
sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ | \
sed s/^requests===.*$/requests===2.13.0/ \
> 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 && \
@@ -23,8 +25,8 @@ RUN apk --no-cache add --update \
-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 && \
- rm -r upper-constraints.txt /src/rally/.git && \
+ /src/functest && \
+ rm -r upper-constraints.txt /src/functest /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 && \