diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-09-13 11:34:41 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-09-13 11:34:41 +0200 |
| commit | 1106c213ac1aa9fbbf731f5e619d295943d8c3e1 (patch) | |
| tree | f93bad1bac727200c68caac1e9a088096c5062b3 /docker | |
| parent | 8d5ff2546daf62ab201adfe2b9096ab4c0a950cd (diff) | |
Update constraints to OpenStack master
Change-Id: I77765db676e06fef5ccb9ae73a9c995ad4fb76d2
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/benchmarking/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/core/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/features/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/healthcheck/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/tempest/Dockerfile | 14 | ||||
| -rw-r--r-- | docker/vnf/Dockerfile | 2 |
7 files changed, 10 insertions, 16 deletions
diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile index 7b98eade9..ff87f56d6 100644 --- a/docker/benchmarking/Dockerfile +++ b/docker/benchmarking/Dockerfile @@ -1,7 +1,7 @@ FROM opnfv/functest-core ARG BRANCH=master -ARG OPENSTACK_TAG=stable/queens +ARG OPENSTACK_TAG=master ARG VMTP_TAG=99b261ccccc2f8a08ee2d8fca9f54ef9d69899d7 RUN apk --no-cache add --update libxml2 libxslt && \ diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index c1e7ede03..eaedf2a29 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.8 ARG BRANCH=master -ARG OPENSTACK_TAG=stable/queens +ARG OPENSTACK_TAG=master ARG PIP_TAG=18.0 RUN apk --no-cache add --update \ diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index 99de1eda5..3f6356c39 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -1,7 +1,7 @@ FROM opnfv/functest-tempest ARG BRANCH=master -ARG OPENSTACK_TAG=stable/queens +ARG OPENSTACK_TAG=master ARG FDS_TAG=master COPY thirdparty-requirements.txt thirdparty-requirements.txt diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index 4a1c255b3..aba2bbdee 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -1,7 +1,7 @@ FROM opnfv/functest-core ARG BRANCH=master -ARG OPENSTACK_TAG=stable/queens +ARG OPENSTACK_TAG=master ARG ODL_TAG=85448c9d97b89989488e675b29b38ac42d8674e4 COPY thirdparty-requirements.txt thirdparty-requirements.txt diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index c405330a6..3aafdbbcb 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -1,7 +1,7 @@ FROM opnfv/functest-tempest ARG BRANCH=master -ARG OPENSTACK_TAG=stable/queens +ARG OPENSTACK_TAG=master ARG REFSTACK_TARGET=2018.02 ARG PATROLE_TAG=0.3.0 ARG NEUTRON_TAG=0.2.0 diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile index 0cc947939..5f001a2ae 100644 --- a/docker/tempest/Dockerfile +++ b/docker/tempest/Dockerfile @@ -1,7 +1,7 @@ FROM opnfv/functest-core ARG BRANCH=master -ARG OPENSTACK_TAG=stable/queens +ARG OPENSTACK_TAG=master ARG RALLY_TAG=1.1.0 ARG RALLY_OPENSTACK_TAG=1.2.0 ARG OS_FAULTS_TAG=0.1.17 @@ -10,15 +10,9 @@ RUN apk --no-cache add --virtual .build-deps --update \ python-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev && \ case $OPENSTACK_TAG in \ - master) \ - wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \ - sed -E s/^tempest==+.*$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest#egg=tempest/ \ - > upper-constraints.txt ;; \ - *) \ - wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \ - sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest@\\1#egg=tempest/ \ - > upper-constraints.txt ;; \ - esac && \ + wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \ + sed -E s/^tempest==+.*$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest#egg=tempest/ \ + > upper-constraints.txt && \ wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH | \ sed -E /#egg=functest/d > upper-constraints.opnfv.txt && \ git init /src/os-faults && \ diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index 7f7275894..836760547 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -1,7 +1,7 @@ FROM opnfv/functest-core ARG BRANCH=master -ARG OPENSTACK_TAG=stable/queens +ARG OPENSTACK_TAG=master ARG VIMS_TEST_TAG=release-129 ARG QUAFF_TAG=59213d6d8ee29433552bb75f505cdc96b0b18909 ARG CLOUDIFY_VIMS_TAG=fraser |