aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-09-13 11:20:02 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-09-13 11:20:02 +0200
commit6baf1feacf19538482bec9bf70b0d0f0cf26971f (patch)
tree0ae2128fe787917ff913e3f8134ac7c4126b2ce5 /docker
parent4800ec18618799cacf8c3c93c9afa0acc8cf102d (diff)
Prepare gambia Docker tags
Change-Id: I409975acd1493e2f5a6bdcb3a4bd6ff6e383e02e Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker')
-rw-r--r--docker/benchmarking/Dockerfile4
-rw-r--r--docker/components/Dockerfile2
-rw-r--r--docker/core/Dockerfile2
-rw-r--r--docker/features/Dockerfile4
-rw-r--r--docker/healthcheck/Dockerfile4
-rw-r--r--docker/smoke/Dockerfile4
-rw-r--r--docker/tempest/Dockerfile4
-rw-r--r--docker/vnf/Dockerfile4
8 files changed, 14 insertions, 14 deletions
diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile
index 7b98eade9..718c92e26 100644
--- a/docker/benchmarking/Dockerfile
+++ b/docker/benchmarking/Dockerfile
@@ -1,6 +1,6 @@
-FROM opnfv/functest-core
+FROM opnfv/functest-core:gambia
-ARG BRANCH=master
+ARG BRANCH=stable/gambia
ARG OPENSTACK_TAG=stable/queens
ARG VMTP_TAG=99b261ccccc2f8a08ee2d8fca9f54ef9d69899d7
diff --git a/docker/components/Dockerfile b/docker/components/Dockerfile
index 1153e9d1a..b4f9da83b 100644
--- a/docker/components/Dockerfile
+++ b/docker/components/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-tempest
+FROM opnfv/functest-tempest:gambia
COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml
CMD ["run_tests", "-t", "all"]
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index c1e7ede03..2c2e288c2 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,6 +1,6 @@
FROM alpine:3.8
-ARG BRANCH=master
+ARG BRANCH=stable/gambia
ARG OPENSTACK_TAG=stable/queens
ARG PIP_TAG=18.0
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index 99de1eda5..aaa7ee836 100644
--- a/docker/features/Dockerfile
+++ b/docker/features/Dockerfile
@@ -1,6 +1,6 @@
-FROM opnfv/functest-tempest
+FROM opnfv/functest-tempest:gambia
-ARG BRANCH=master
+ARG BRANCH=stable/gambia
ARG OPENSTACK_TAG=stable/queens
ARG FDS_TAG=master
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index 4a1c255b3..c30c4cca0 100644
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -1,6 +1,6 @@
-FROM opnfv/functest-core
+FROM opnfv/functest-core:gambia
-ARG BRANCH=master
+ARG BRANCH=stable/gambia
ARG OPENSTACK_TAG=stable/queens
ARG ODL_TAG=85448c9d97b89989488e675b29b38ac42d8674e4
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index c405330a6..d60816834 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -1,6 +1,6 @@
-FROM opnfv/functest-tempest
+FROM opnfv/functest-tempest:gambia
-ARG BRANCH=master
+ARG BRANCH=stable/gambia
ARG OPENSTACK_TAG=stable/queens
ARG REFSTACK_TARGET=2018.02
ARG PATROLE_TAG=0.3.0
diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile
index 0cc947939..7abfa844f 100644
--- a/docker/tempest/Dockerfile
+++ b/docker/tempest/Dockerfile
@@ -1,6 +1,6 @@
-FROM opnfv/functest-core
+FROM opnfv/functest-core:gambia
-ARG BRANCH=master
+ARG BRANCH=stable/gambia
ARG OPENSTACK_TAG=stable/queens
ARG RALLY_TAG=1.1.0
ARG RALLY_OPENSTACK_TAG=1.2.0
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index 7f7275894..29ff6848e 100644
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -1,6 +1,6 @@
-FROM opnfv/functest-core
+FROM opnfv/functest-core:gambia
-ARG BRANCH=master
+ARG BRANCH=stable/gambia
ARG OPENSTACK_TAG=stable/queens
ARG VIMS_TEST_TAG=release-129
ARG QUAFF_TAG=59213d6d8ee29433552bb75f505cdc96b0b18909