diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-04-14 11:34:01 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-04-14 13:04:25 +0200 |
| commit | 043ed3744cd9f40e0ec62386fc82990dcd9a0786 (patch) | |
| tree | 6d1348c3c22aa0067cf225414448e28ac25ef52e /docker/tempest/Dockerfile | |
| parent | 649a71f17688326ca2b1315336fd4b8e6ae50256 (diff) | |
Backport Fixes-race-condition-in-test_add_remove_fixed_ip
It has sometimes failed in gates and Orange reported the issue.
Backporting is the best approach as for swift testing.
Change-Id: I7c66faf77cdee3f52a2299d64dc4140de22f4cad
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit ab26ce1cc28c590115ac07ea4a51b9f75f902c9a)
(cherry picked from commit a710d74306c0a49c19c63676e0aab2f4e093aa26)
Diffstat (limited to 'docker/tempest/Dockerfile')
| -rw-r--r-- | docker/tempest/Dockerfile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile index 0f7822726..134a7f15d 100644 --- a/docker/tempest/Dockerfile +++ b/docker/tempest/Dockerfile @@ -8,6 +8,7 @@ ARG RALLY_OPENSTACK_TAG=1.5.0 ARG UJSON_TAG=d25e024f481c5571d15f3c0c406a498ca0467cfd COPY Accept-custom-registered-endpoints.patch /tmp/Accept-custom-registered-endpoints.patch +COPY Fixes-race-condition-in-test_add_remove_fixed_ip.patch /tmp/Fixes-race-condition-in-test_add_remove_fixed_ip.patch RUN apk --no-cache add --virtual .build-deps --update \ python-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev && \ @@ -39,7 +40,9 @@ RUN apk --no-cache add --virtual .build-deps --update \ git config --global user.email "opnfv-tech-discuss@lists.opnfv.org" && \ git config --global user.name "Functest" && \ patch -p1 < /tmp/Accept-custom-registered-endpoints.patch && \ - git commit -a -m "Apply Accept-custom-registered-endpoints" && \ + patch -p1 < /tmp/Fixes-race-condition-in-test_add_remove_fixed_ip.patch && \ + git commit -a -m "Backport critical bugfixes" && \ rm ~/.gitconfig) && \ rm /tmp/Accept-custom-registered-endpoints.patch && \ + rm /tmp/Fixes-race-condition-in-test_add_remove_fixed_ip.patch && \ apk del .build-deps |