aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2017-11-07 08:23:56 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-11-07 08:23:56 +0000
commit5d60559a1d22a027b1f9b0e5f2494415dca19784 (patch)
tree4e5f64f843a6c106ae1916045c202717e629d252 /docker
parentfb3ffed7e8128416094e80ecf126c9ca51933c69 (diff)
parent9ca52cc93dbc869c214f47c38697e61adda03b8b (diff)
Merge "Fix the format of getting upper-constraints"
Diffstat (limited to 'docker')
-rw-r--r--docker/core/Dockerfile2
-rw-r--r--docker/features/Dockerfile2
-rw-r--r--docker/parser/Dockerfile2
-rw-r--r--docker/restapi/Dockerfile2
-rw-r--r--docker/smoke/Dockerfile2
5 files changed, 5 insertions, 5 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index ffcbe387..165c8a7b 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -12,7 +12,7 @@ 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 -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ | \
+ 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) && \
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index 6d590bd0..adcb5454 100644
--- a/docker/features/Dockerfile
+++ b/docker/features/Dockerfile
@@ -10,7 +10,7 @@ RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass && \
python-dev python3-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 -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ | \
+ sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \
> upper-constraints.txt && \
pip install --no-cache-dir --src /src -cupper-constraints.txt \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
diff --git a/docker/parser/Dockerfile b/docker/parser/Dockerfile
index c906ad9f..043f214a 100644
--- a/docker/parser/Dockerfile
+++ b/docker/parser/Dockerfile
@@ -10,7 +10,7 @@ RUN apk --no-cache add --virtual .build-deps --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 -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ | \
+ sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \
> upper-constraints.txt && \
pip install --no-cache-dir --src /src -cupper-constraints.txt \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
diff --git a/docker/restapi/Dockerfile b/docker/restapi/Dockerfile
index a74e8a88..f2810e19 100644
--- a/docker/restapi/Dockerfile
+++ b/docker/restapi/Dockerfile
@@ -16,7 +16,7 @@ RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass \
openssl-dev libjpeg-turbo-dev \
ruby-dev g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev && \
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/ | \
+ sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \
> upper-constraints.txt && \
git clone https://github.com/openstack/refstack-client.git /src/refstack-client && \
(cd src/refstack-client && git checkout $REFSTACK_TAG) && \
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 6ece363a..db02104f 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -9,7 +9,7 @@ RUN apk --no-cache add --virtual .build-deps --update \
python-dev build-base linux-headers libffi-dev \
openssl-dev libjpeg-turbo-dev git && \
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/ | \
+ sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \
> upper-constraints.txt && \
git clone https://github.com/openstack/refstack-client.git /src/refstack-client && \
(cd src/refstack-client && git checkout $REFSTACK_TAG) && \