Sync with xrally_kubernetes

As upstream is fixed [1][2], it can partially revert
- Force Kubernetes 11.0 to please xrall_kubernetes
- Allow offline testing via xrally_kubernetes

[1] https://github.com/xrally/xrally-kubernetes/commit/2ffa85af2bff3438b6b23034b6ec6ee1de481090
[2] https://github.com/xrally/xrally-kubernetes/commit/8caf16cd017d475360b2345b3091a9881cd884d0

Change-Id: I43ca1966dcf61e55c45f13adf27ba5b0035d8fda
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/docker/core/Allow-offline-testing-in-PodWithClusterIPSvc.patch b/docker/core/Allow-offline-testing-in-PodWithClusterIPSvc.patch
deleted file mode 100644 (file)
index 6eca17f..0000000
--- a/docker/core/Allow-offline-testing-in-PodWithClusterIPSvc.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 220ee016272f7760fffb9df3213ed93ec77e7948 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Ollivier?= <cedric.ollivier@orange.com>
-Date: Sun, 22 Nov 2020 11:54:05 +0100
-Subject: [PATCH] Allow offline testing in PodWithClusterIPSvc
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It sets edge as image tag for appropriate/curl not to force a download.
-
-Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
----
- xrally_kubernetes/tasks/scenarios/services.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xrally_kubernetes/tasks/scenarios/services.py b/xrally_kubernetes/tasks/scenarios/services.py
-index f1b4fa0..05db477 100644
---- a/xrally_kubernetes/tasks/scenarios/services.py
-+++ b/xrally_kubernetes/tasks/scenarios/services.py
-@@ -93,7 +93,7 @@ class PodWithClusterIPSvc(common_scenario.BaseKubernetesScenario):
-         self.client.create_job(
-             name=name,
-             namespace=namespace,
--            image="appropriate/curl",
-+            image="appropriate/curl:edge",
-             command=command,
-             status_wait=True
-         )
--- 
-2.29.2
-

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 84358b4..fd7a40b 100644 (file)
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -6,7 +6,6 @@ ARG OPNFV_TAG=master
 
 COPY Try-a-quick-fix-vs-asynchronuous-issues.patch /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch
 COPY Switch-to-threading.Thread-for-Rally-tasks.patch /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch
-COPY Allow-offline-testing-in-PodWithClusterIPSvc.patch /tmp/Allow-offline-testing-in-PodWithClusterIPSvc.patch
 RUN apk --no-cache add --update python3 py3-pip py3-wheel bash git grep libffi openssl mailcap && \
     apk --no-cache add --virtual .build-deps --update \
         python3-dev build-base libffi-dev openssl-dev && \
@@ -14,7 +13,6 @@ RUN apk --no-cache add --update python3 py3-pip py3-wheel bash git grep libffi o
     (cd /src/requirements && \
         git fetch --tags https://review.opendev.org/openstack/requirements $OPENSTACK_TAG && \
         git checkout FETCH_HEAD) && \
-    sed -i -E /^kubernetes==+.*$/d /src/requirements/upper-constraints.txt && \
     case $(uname -m) in aarch*|arm*) \
         sed -i -E /^PyNaCl=/d /src/requirements/upper-constraints.txt && \
         apk add --no-cache py3-pynacl ;; esac && \
@@ -30,16 +28,14 @@ RUN apk --no-cache add --update python3 py3-pip py3-wheel bash git grep libffi o
         /src/functest-kubernetes && \
     (cd /src/rally && patch -p1 < /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch) && \
     (cd /usr/lib/python3.8/site-packages/xrally_kubernetes/ && \
-        patch -p2 < /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch && \
-        patch -p2 < /tmp/Allow-offline-testing-in-PodWithClusterIPSvc.patch) && \
+        patch -p2 < /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch) && \
     rm -rf /src/functest-kubernetes /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch && \
     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 -r /src/requirements/.git /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch \
-        /tmp/Allow-offline-testing-in-PodWithClusterIPSvc.patch && \
+    rm -r /src/requirements/.git /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch && \
     apk del .build-deps
 COPY logging.ini /usr/lib/python3.8/site-packages/xtesting/ci/logging.ini
 COPY logging.debug.ini /usr/lib/python3.8/site-packages/xtesting/ci/logging.debug.ini