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 11:44:12 +0200 |
| commit | ab26ce1cc28c590115ac07ea4a51b9f75f902c9a (patch) | |
| tree | 73e523734418fd9e397eda1f28f07adcf5e73f1b /docker/core/Dockerfile | |
| parent | dee95f68ec2bc85dec269fc07b791a6d252dd441 (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>
Diffstat (limited to 'docker/core/Dockerfile')
| -rw-r--r-- | docker/core/Dockerfile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 9415c1270..6c8165a74 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -4,6 +4,7 @@ ARG BRANCH=stable/jerma ARG OPENSTACK_TAG=stable/train 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 --update \ python3 libffi openssl libjpeg-turbo py3-pip bash \ grep sed wget ca-certificates git openssh-client qemu-img iputils coreutils mailcap && \ @@ -40,7 +41,9 @@ RUN apk --no-cache add --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 |