aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-09-16 09:09:43 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2017-09-19 10:30:08 +0200
commit28a8e9c5a1e442c866947455dfe8cbe47b66a0c7 (patch)
treec7ab718a81cba42b1391d6a193e992bf8677131d /docker
parent381153525278c1ede168471385d3cd3b1c5be11e (diff)
Prepare Functest euphrates containers
They depend on git commit ids for the next OPNFV projects: - releng [1] - securityscanning Securityscanning should be first removed in master and then the patch will be cherry-picked in stable/euphrates. A temporarily git commit id is used here to allow building the containers before that changes. [1] https://lists.opnfv.org/pipermail/opnfv-tech-discuss/2017-September/017865.html Change-Id: Ib7bd4206a6ef7f5bb8cd58f324d3e437a3b704a1 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile2
-rw-r--r--docker/components/Dockerfile2
-rw-r--r--docker/core/Dockerfile2
-rw-r--r--docker/features/Dockerfile4
-rw-r--r--docker/healthcheck/Dockerfile2
-rw-r--r--docker/parser/Dockerfile2
-rw-r--r--docker/restapi/Dockerfile6
-rw-r--r--docker/smoke/Dockerfile6
-rw-r--r--docker/vnf/Dockerfile2
9 files changed, 14 insertions, 14 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 218d74417..5d934dfe9 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -12,7 +12,7 @@ MAINTAINER Jose Lausuch <jose.lausuch@ericsson.com>
LABEL version="0.1" description="OPNFV Functest Docker container"
# Environment variables
-ARG BRANCH=master
+ARG BRANCH=stable/euphrates
ARG RALLY_TAG=stable/0.9
ARG ODL_TAG=35e415b6873b39d72775c88a337e92dac26012e2
ARG OPENSTACK_TAG=stable/ocata
diff --git a/docker/components/Dockerfile b/docker/components/Dockerfile
index 8923e4cd7..8794f78de 100644
--- a/docker/components/Dockerfile
+++ b/docker/components/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-core
+FROM opnfv/functest-core:euphrates
COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml
CMD ["bash","-c","prepare_env start && run_tests -t all"]
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 04e32598e..75180f99b 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,6 +1,6 @@
FROM alpine:3.6
-ARG BRANCH=master
+ARG BRANCH=stable/euphrates
ARG OPENSTACK_TAG=stable/ocata
ARG RALLY_TAG=stable/0.9
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index 8b0a2f60c..f20c58619 100644
--- a/docker/features/Dockerfile
+++ b/docker/features/Dockerfile
@@ -1,6 +1,6 @@
-FROM opnfv/functest-core
+FROM opnfv/functest-core:euphrates
-ARG BRANCH=master
+ARG BRANCH=stable/euphrates
ARG OPENSTACK_TAG=stable/ocata
COPY thirdparty-requirements.txt thirdparty-requirements.txt
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index 8923e4cd7..8794f78de 100644
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-core
+FROM opnfv/functest-core:euphrates
COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml
CMD ["bash","-c","prepare_env start && run_tests -t all"]
diff --git a/docker/parser/Dockerfile b/docker/parser/Dockerfile
index a28a1f5b0..43bd0adc1 100644
--- a/docker/parser/Dockerfile
+++ b/docker/parser/Dockerfile
@@ -1,6 +1,6 @@
FROM alpine:3.6
-ARG BRANCH=master
+ARG BRANCH=stable/euphrates
ARG OPENSTACK_TAG=stable/pike
ARG RALLY_TAG=stable/0.9
diff --git a/docker/restapi/Dockerfile b/docker/restapi/Dockerfile
index 2c7560286..23adcc852 100644
--- a/docker/restapi/Dockerfile
+++ b/docker/restapi/Dockerfile
@@ -1,9 +1,9 @@
-FROM opnfv/functest-core
+FROM opnfv/functest-core:euphrates
-ARG BRANCH=master
+ARG BRANCH=stable/euphrates
ARG OPENSTACK_TAG=stable/ocata
ARG ODL_TAG=35e415b6873b39d72775c88a337e92dac26012e2
-ARG FDS_TAG=master
+ARG FDS_TAG=stable/euphrates
ARG REFSTACK_TAG=4e187b07672dd1c41cb7c94658f1c91edebf53a2
ARG VIMS_TAG=stable
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index fe2f91917..82043840a 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -1,9 +1,9 @@
-FROM opnfv/functest-core
+FROM opnfv/functest-core:euphrates
-ARG BRANCH=master
+ARG BRANCH=stable/euphrates
ARG OPENSTACK_TAG=stable/ocata
ARG ODL_TAG=35e415b6873b39d72775c88a337e92dac26012e2
-ARG FDS_TAG=master
+ARG FDS_TAG=stable/euphrates
ARG REFSTACK_TAG=4e187b07672dd1c41cb7c94658f1c91edebf53a2
RUN apk --no-cache add --virtual .build-deps --update \
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index 36e80d7e2..520385585 100644
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-core
+FROM opnfv/functest-core:euphrates
ARG VIMS_TAG=stable