diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2018-09-13 08:19:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-09-13 08:19:16 +0000 |
| commit | 5034513e415d08d92bd8645f7052545e74e98a26 (patch) | |
| tree | ab2b4525be6db25cb7f21dfc3a73e4447582af1d /docker | |
| parent | 2812b3902da7c041ef8f66a3595d6d85874b223b (diff) | |
| parent | 0712285f0d242eb9279e49a653f64f63842265c9 (diff) | |
Merge "Prepare Functest K8s hunter containers" into stable/hunter
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/core/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/features/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/healthcheck/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 5150c393..faf0aea0 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=stable/rocky ARG OPNFV_TAG=master RUN apk --no-cache add --update python py-pip bash git grep && \ diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index 9b626d3b..567e7978 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -1,6 +1,6 @@ -FROM opnfv/functest-kubernetes-core +FROM opnfv/functest-kubernetes-core:hunter -ARG OPENSTACK_TAG=stable/queens +ARG OPENSTACK_TAG=stable/rocky ARG OPNFV_TAG=master RUN apk --no-cache add --update make py-pip bash git go \ diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index 344ea7ff..ead750b1 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/functest-kubernetes-core +FROM opnfv/functest-kubernetes-core:hunter ARG K8S_TAG=v1.11.2 diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 137cc16b..6df75f75 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/functest-kubernetes-healthcheck +FROM opnfv/functest-kubernetes-healthcheck:hunter COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] |