aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-03-28 22:34:42 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2019-03-30 14:00:16 +0100
commit49f7d350cddee35807524f65b0699122fabf0e47 (patch)
tree843688b6058606c8a0efe0e242f0b49c9e08aeff
parent801d3da26f3de1ccc0b3807110c8b797fcfb678c (diff)
Set package versions instead of master
It leverages on few beta releases as the official packages are being published. Tempest 20.0.0 is forced to conform with Release Plan [1]. (upper-constraints still offer 19.0.0 [2]) [1] https://releases.openstack.org/stein/ [2] https://github.com/openstack/requirements/blob/stable/stein/upper-constraints.txt#L391 Change-Id: Iaadf5bbc3b984e95cd018ac69bb9efb4eb111df9 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--docker/benchmarking/Dockerfile3
-rw-r--r--docker/features/Dockerfile3
-rw-r--r--docker/smoke/Dockerfile7
-rw-r--r--docker/tempest/Dockerfile7
-rw-r--r--docker/vnf/Dockerfile3
-rw-r--r--upper-constraints.txt4
6 files changed, 16 insertions, 11 deletions
diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile
index 07b9b2a2c..e850d9c1f 100644
--- a/docker/benchmarking/Dockerfile
+++ b/docker/benchmarking/Dockerfile
@@ -2,6 +2,7 @@ FROM opnfv/functest-tempest:iruya
ARG BRANCH=stable/iruya
ARG OPENSTACK_TAG=stable/stein
+ARG TEMPEST_TAG=20.0.0
ARG VMTP_TAG=99b261ccccc2f8a08ee2d8fca9f54ef9d69899d7
RUN apk --no-cache add --update libxml2 libxslt && \
@@ -9,7 +10,7 @@ RUN apk --no-cache add --update libxml2 libxslt && \
python-dev build-base linux-headers libffi-dev \
openssl-dev libjpeg-turbo-dev libxml2-dev libxslt-dev && \
wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG > upper-constraints.txt && \
- sed -i -E s/^tempest==+.*$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest#egg=tempest/ upper-constraints.txt && \
+ sed -i -E s/^tempest==+.*$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest@$TEMPEST_TAG#egg=tempest/ upper-constraints.txt && \
wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH > upper-constraints.opnfv.txt && \
sed -i -E /#egg=functest/d upper-constraints.opnfv.txt && \
git init /src/vmtp && \
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index 5b03961b5..edaa1344c 100644
--- a/docker/features/Dockerfile
+++ b/docker/features/Dockerfile
@@ -2,6 +2,7 @@ FROM opnfv/functest-tempest:iruya
ARG BRANCH=stable/iruya
ARG OPENSTACK_TAG=stable/stein
+ARG TEMPEST_TAG=20.0.0
COPY thirdparty-requirements.txt thirdparty-requirements.txt
RUN apk --no-cache add --update python3 sshpass && \
@@ -9,7 +10,7 @@ RUN apk --no-cache add --update python3 sshpass && \
python-dev python3-dev build-base linux-headers libffi-dev \
openssl-dev libjpeg-turbo-dev file && \
wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG > upper-constraints.txt && \
- sed -i -E s/^tempest==+.*$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest#egg=tempest/ upper-constraints.txt && \
+ sed -i -E s/^tempest==+.*$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest@$TEMPEST_TAG#egg=tempest/ upper-constraints.txt && \
wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH > upper-constraints.opnfv.txt && \
sed -i -E /#egg=functest/d upper-constraints.opnfv.txt && \
pip install --no-cache-dir --src /src -cupper-constraints.txt \
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index c9ecbd9cf..ef49c4f4f 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -2,15 +2,16 @@ FROM opnfv/functest-tempest:iruya
ARG BRANCH=stable/iruya
ARG OPENSTACK_TAG=stable/stein
+ARG TEMPEST_TAG=20.0.0
ARG REFSTACK_TARGET=2018.11
-ARG PATROLE_TAG=master
-ARG BARBICAN_TAG=master
+ARG PATROLE_TAG=0.5.0
+ARG BARBICAN_TAG=0.1.0
RUN apk --no-cache add --virtual .build-deps --update \
python-dev build-base linux-headers libffi-dev \
openssl-dev libjpeg-turbo-dev libxml2-dev libxslt-dev && \
wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG > upper-constraints.txt && \
- sed -i -E s/^tempest==+.*$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest#egg=tempest/ upper-constraints.txt && \
+ sed -i -E s/^tempest==+.*$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest@$TEMPEST_TAG#egg=tempest/ upper-constraints.txt && \
wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH > upper-constraints.opnfv.txt && \
sed -i -E /#egg=functest/d upper-constraints.opnfv.txt && \
git init /src/patrole && \
diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile
index 2716b2db3..b25b6b9ea 100644
--- a/docker/tempest/Dockerfile
+++ b/docker/tempest/Dockerfile
@@ -2,8 +2,9 @@ FROM opnfv/functest-core:iruya
ARG BRANCH=stable/iruya
ARG OPENSTACK_TAG=stable/stein
-ARG RALLY_TAG=master
-ARG RALLY_OPENSTACK_TAG=master
+ARG TEMPEST_TAG=20.0.0
+ARG RALLY_TAG=1.4.1
+ARG RALLY_OPENSTACK_TAG=1.4.0
ARG OS_FAULTS_TAG=0.1.18
ARG UJSON_TAG=d25e024f481c5571d15f3c0c406a498ca0467cfd
@@ -11,7 +12,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 > upper-constraints.txt && \
- sed -i -E s/^tempest==+.*$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest#egg=tempest/ upper-constraints.txt && \
+ sed -i -E s/^tempest==+.*$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest@$TEMPEST_TAG#egg=tempest/ upper-constraints.txt && \
sed -i -E s/^ujson==+.*$/-e\ git+https:\\/\\/github.com\\/esnme\\/ultrajson@$UJSON_TAG#egg=ujson/ upper-constraints.txt && \
wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH > upper-constraints.opnfv.txt && \
sed -i -E /#egg=functest/d upper-constraints.opnfv.txt && \
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index a76ce1554..3e44ca143 100644
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -2,6 +2,7 @@ FROM opnfv/functest-core:iruya
ARG BRANCH=stable/iruya
ARG OPENSTACK_TAG=stable/stein
+ARG TEMPEST_TAG=20.0.0
ARG VIMS_TEST_TAG=release-130
ARG QUAFF_TAG=59213d6d8ee29433552bb75f505cdc96b0b18909
ARG CLOUDIFY_VIMS_TAG=gambia
@@ -24,7 +25,7 @@ RUN apk --no-cache add --update \
apk --no-cache add --virtual .build-deps --update \
ruby-dev g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev g++ make && \
wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG > upper-constraints.txt && \
- sed -i -E s/^tempest==+.*$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest#egg=tempest/ upper-constraints.txt && \
+ sed -i -E s/^tempest==+.*$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest@$TEMPEST_TAG#egg=tempest/ upper-constraints.txt && \
wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH > upper-constraints.opnfv.txt && \
sed -i -E /#egg=functest/d upper-constraints.opnfv.txt && \
git clone --depth 1 -b $VIMS_TEST_TAG https://github.com/Metaswitch/clearwater-live-test /src/vims-test && \
diff --git a/upper-constraints.txt b/upper-constraints.txt
index fd46255e3..b0c61ffab 100644
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -16,5 +16,5 @@ robotframework-requests===0.4.7
robotframework-sshlibrary===2.1.3;python_version=='2.7'
ansible===2.3.2.0
xtesting===0.61.0
-git+https://git.openstack.org/openstack/networking-bgpvpn#egg=networking_bgpvpn
-git+https://git.openstack.org/openstack/networking-sfc#egg=networking_sfc
+git+https://git.openstack.org/openstack/networking-bgpvpn@10.0.0.0rc1#egg=networking_bgpvpn
+git+https://git.openstack.org/openstack/networking-sfc@8.0.0.0rc1#egg=networking_sfc