summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-03-28 20:10:49 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2019-03-28 20:10:49 +0100
commit0a897d6edd561976552196572ee843f9fdae4f31 (patch)
treeebde287b4f0333f9e79b2a39262048dbc6eff14f /docker
parent1cdfea73e35500fb0f949a548344363a6f709a66 (diff)
Prepare Functest Iruya Containers
It takes into account the new branch stable/iruya. Change-Id: I802a42b07ceae2328a812a99a99057beb1b94e5b Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker')
-rw-r--r--docker/benchmarking/Dockerfile6
-rw-r--r--docker/core/Dockerfile4
-rw-r--r--docker/features/Dockerfile6
-rw-r--r--docker/healthcheck/Dockerfile6
-rw-r--r--docker/smoke/Dockerfile6
-rw-r--r--docker/tempest/Dockerfile6
-rw-r--r--docker/vnf/Dockerfile6
7 files changed, 20 insertions, 20 deletions
diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile
index cf13da815..f86e6725c 100644
--- a/docker/benchmarking/Dockerfile
+++ b/docker/benchmarking/Dockerfile
@@ -1,7 +1,7 @@
-FROM opnfv/functest-tempest
+FROM opnfv/functest-tempest:iruya
-ARG BRANCH=master
-ARG OPENSTACK_TAG=master
+ARG BRANCH=stable/iruya
+ARG OPENSTACK_TAG=stable/stein
ARG VMTP_TAG=99b261ccccc2f8a08ee2d8fca9f54ef9d69899d7
RUN apk --no-cache add --update libxml2 libxslt && \
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 127907c35..b86759fa5 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,7 +1,7 @@
FROM alpine:3.9
-ARG BRANCH=master
-ARG OPENSTACK_TAG=master
+ARG BRANCH=stable/iruya
+ARG OPENSTACK_TAG=stable/stein
ARG PIP_TAG=18.0
RUN apk --no-cache add --update \
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index 10cc733dd..5b03961b5 100644
--- a/docker/features/Dockerfile
+++ b/docker/features/Dockerfile
@@ -1,7 +1,7 @@
-FROM opnfv/functest-tempest
+FROM opnfv/functest-tempest:iruya
-ARG BRANCH=master
-ARG OPENSTACK_TAG=master
+ARG BRANCH=stable/iruya
+ARG OPENSTACK_TAG=stable/stein
COPY thirdparty-requirements.txt thirdparty-requirements.txt
RUN apk --no-cache add --update python3 sshpass && \
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index 3a854bfb1..4268fc811 100644
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -1,7 +1,7 @@
-FROM opnfv/functest-tempest
+FROM opnfv/functest-tempest:iruya
-ARG BRANCH=master
-ARG OPENSTACK_TAG=master
+ARG BRANCH=stable/iruya
+ARG OPENSTACK_TAG=stable/stein
ARG ODL_TAG=85448c9d97b89989488e675b29b38ac42d8674e4
COPY thirdparty-requirements.txt thirdparty-requirements.txt
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 6162397a9..c9ecbd9cf 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -1,7 +1,7 @@
-FROM opnfv/functest-tempest
+FROM opnfv/functest-tempest:iruya
-ARG BRANCH=master
-ARG OPENSTACK_TAG=master
+ARG BRANCH=stable/iruya
+ARG OPENSTACK_TAG=stable/stein
ARG REFSTACK_TARGET=2018.11
ARG PATROLE_TAG=master
ARG BARBICAN_TAG=master
diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile
index a58730bed..2716b2db3 100644
--- a/docker/tempest/Dockerfile
+++ b/docker/tempest/Dockerfile
@@ -1,7 +1,7 @@
-FROM opnfv/functest-core
+FROM opnfv/functest-core:iruya
-ARG BRANCH=master
-ARG OPENSTACK_TAG=master
+ARG BRANCH=stable/iruya
+ARG OPENSTACK_TAG=stable/stein
ARG RALLY_TAG=master
ARG RALLY_OPENSTACK_TAG=master
ARG OS_FAULTS_TAG=0.1.18
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index 08aa76496..a76ce1554 100644
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -1,7 +1,7 @@
-FROM opnfv/functest-core
+FROM opnfv/functest-core:iruya
-ARG BRANCH=master
-ARG OPENSTACK_TAG=master
+ARG BRANCH=stable/iruya
+ARG OPENSTACK_TAG=stable/stein
ARG VIMS_TEST_TAG=release-130
ARG QUAFF_TAG=59213d6d8ee29433552bb75f505cdc96b0b18909
ARG CLOUDIFY_VIMS_TAG=gambia