diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2022-04-25 10:40:27 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2022-04-25 10:42:37 +0200 |
| commit | b46ce91b5ca6db6c560b1cbeefde7c8af74a4578 (patch) | |
| tree | 23912eb89a942980d761976e1b47b87031ed73ca /docker | |
| parent | 98ecdd3a307387d2eb99cc6f51e3a1fc22f17f12 (diff) | |
Prepare docker builds for yoga
Change-Id: Ieecfc7a51f7440b2c6f576df38922144173062d3
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/benchmarking-cntt/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/benchmarking/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/core/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/healthcheck/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/smoke-cntt/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/vnf/Dockerfile | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/docker/benchmarking-cntt/Dockerfile b/docker/benchmarking-cntt/Dockerfile index 46acaa036..74ebd6027 100644 --- a/docker/benchmarking-cntt/Dockerfile +++ b/docker/benchmarking-cntt/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/functest-benchmarking +FROM opnfv/functest-benchmarking:yoga COPY testcases.yaml /etc/xtesting/testcases.yaml COPY blacklist.yaml /src/functest/functest/opnfv_tests/openstack/rally/blacklist.yaml diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile index d0957f6b8..9712ef117 100644 --- a/docker/benchmarking/Dockerfile +++ b/docker/benchmarking/Dockerfile @@ -1,7 +1,7 @@ -FROM opnfv/functest-core +FROM opnfv/functest-core:yoga ARG VMTP_TAG=34a82c9f3598ec7f5d8de0a6d5139b92931db4cc -ARG NEUTRON_TAG=master +ARG NEUTRON_TAG=stable/yoga RUN apk --no-cache add --update libxml2 libxslt && \ apk --no-cache add --virtual .build-deps --update \ diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 29723c709..e188b009d 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.14 -ARG BRANCH=master -ARG OPENSTACK_TAG=master +ARG BRANCH=stable/yoga +ARG OPENSTACK_TAG=stable/yoga COPY Switch-to-threading.Thread-for-Rally-tasks.patch /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch COPY Create-new-server-in-test_create_backup.patch /tmp/Create-new-server-in-test_create_backup.patch diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index 404ff2d58..1e3fab224 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/functest-core +FROM opnfv/functest-core:yoga ARG ODL_TAG=89b88a0a23561f0bda62338b394ec41655679b2d diff --git a/docker/smoke-cntt/Dockerfile b/docker/smoke-cntt/Dockerfile index a8e8a6f75..854293966 100644 --- a/docker/smoke-cntt/Dockerfile +++ b/docker/smoke-cntt/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/functest-smoke +FROM opnfv/functest-smoke:yoga COPY testcases.yaml /etc/xtesting/testcases.yaml COPY tempest_conf.yaml /src/functest/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index da42ef9b4..56933b1f7 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/functest-core +FROM opnfv/functest-core:yoga ARG PATROLE_TAG=master ARG NEUTRON_TEMPEST_TAG=master diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index 99f848fcd..e997c522a 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/functest-core +FROM opnfv/functest-core:yoga ARG VIMS_TEST_TAG=release-130 ARG QUAFF_TAG=59213d6d8ee29433552bb75f505cdc96b0b18909 |