diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-05-05 23:43:23 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-07-06 13:03:09 +0200 |
| commit | 32a63dddcc82695fd5e5f41351be0abeae10d77b (patch) | |
| tree | b7f4f3a7328fffd285aa2aa2f28990862b41b0a6 /docker | |
| parent | 75f224c850755f63700fbbc50784cdded0e1cf22 (diff) | |
Try a quick fix vs the race conditions in xrally
Change-Id: I57a4c317ba365586c10b13d425aac021dd030949
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 81139b1576981990f32df76719f179441e4d12ee)
(cherry picked from commit 2a2744f1e612a1ed0a38cadd2b49100613da70d6)
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/core/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/core/Try-a-quick-fix-vs-asynchronuous-issues.patch | 31 |
2 files changed, 35 insertions, 0 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 13447fed..23b74c3a 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -4,6 +4,7 @@ ARG BRANCH=stable/iruya ARG OPENSTACK_TAG=stable/stein ARG OPNFV_TAG=stable/iruya +COPY Try-a-quick-fix-vs-asynchronuous-issues.patch /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch RUN apk --no-cache add --update python3 py3-pip bash git grep libffi openssl mailcap && \ apk --no-cache add --virtual .build-deps --update \ python3-dev build-base libffi-dev openssl-dev && \ @@ -15,12 +16,15 @@ RUN apk --no-cache add --update python3 py3-pip bash git grep libffi openssl mai -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$OPNFV_TAG \ -chttps://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt \ /src/functest-kubernetes && \ + (cd /usr/lib/python3.6/site-packages/xrally_kubernetes/ && \ + patch -p2 < /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch) && \ rm -rf /src/functest-kubernetes && \ bash -c "mkdir -p /var/lib/xtesting /home/opnfv" && \ ln -s /var/lib/xtesting /home/opnfv/functest && \ mkdir -p /etc/rally && \ printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \ mkdir -p /var/lib/rally/database && rally db create && \ + rm /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch && \ apk del .build-deps COPY logging.ini /usr/lib/python3.6/site-packages/xtesting/ci/logging.ini CMD ["run_tests", "-t", "all"] diff --git a/docker/core/Try-a-quick-fix-vs-asynchronuous-issues.patch b/docker/core/Try-a-quick-fix-vs-asynchronuous-issues.patch new file mode 100644 index 00000000..67c850fa --- /dev/null +++ b/docker/core/Try-a-quick-fix-vs-asynchronuous-issues.patch @@ -0,0 +1,31 @@ +From 30fa786dd108ac5368da755c504ac20295eaf4e8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?C=C3=A9dric=20Ollivier?= <cedric.ollivier@orange.com> +Date: Tue, 5 May 2020 23:36:21 +0200 +Subject: [PATCH] Try a quick fix vs asynchronuous issues +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It will confirm the issues as seen in Functest gates. + +Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> +--- + xrally_kubernetes/service.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/xrally_kubernetes/service.py b/xrally_kubernetes/service.py +index c5f0b7d..a8ad25d 100644 +--- a/xrally_kubernetes/service.py ++++ b/xrally_kubernetes/service.py +@@ -308,6 +308,8 @@ class Kubernetes(service.Service): + } + self.v1_client.create_namespaced_service_account(namespace=namespace, + body=sa_manifest) ++ # it prevents from the asynchronuous issues as seen in gates ++ commonutils.interruptable_sleep(CONF.kubernetes.start_prepoll_delay) + + @atomic.action_timer("kubernetes.create_secret") + def create_secret(self, name, namespace): +-- +2.26.2 + |