From 20a10fda0c2442d3764ce4bacff33ba23f53d0c2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?C=C3=A9dric=20Ollivier?= <cedric.ollivier@orange.com>
Date: Tue, 6 Apr 2021 12:26:23 +0200
Subject: [PATCH] Blacklist k8s_io if K8s v1.21 and newer
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Change-Id: If3d6daa66804f3d2962a8fb3c07e65789d3af002
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 jjb/functest/functest-kubernetes-pi.yaml | 3 +++
 jjb/functest/functest-kubernetes.yaml    | 1 +
 2 files changed, 4 insertions(+)

diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index 8c80db297..9549e92e3 100644
--- a/jjb/functest/functest-kubernetes-pi.yaml
+++ b/jjb/functest/functest-kubernetes-pi.yaml
@@ -277,6 +277,7 @@
     privileged: 'false'
     network: bridge
     exclude:
+      - {'tag': 'latest', 'test': 'k8s_io'}
       - {'tag': 'jerma', 'test': 'k8s_io'}
       - {'tag': 'jerma', 'test': 'k8s_conformance_serial'}
       - {'tag': 'jerma', 'test': 'sig_api_machinery'}
@@ -331,6 +332,7 @@
       - {'tag': 'hunter', 'test': 'sig_scheduling_serial'}
       - {'tag': 'hunter', 'test': 'sig_storage'}
       - {'tag': 'hunter', 'test': 'sig_storage_serial'}
+      - {'tag': 'arm-latest', 'test': 'k8s_io'}
       - {'tag': 'arm-jerma', 'test': 'k8s_io'}
       - {'tag': 'arm-jerma', 'test': 'k8s_conformance_serial'}
       - {'tag': 'arm-jerma', 'test': 'sig_api_machinery'}
@@ -385,6 +387,7 @@
       - {'tag': 'arm-hunter', 'test': 'sig_scheduling_serial'}
       - {'tag': 'arm-hunter', 'test': 'sig_storage'}
       - {'tag': 'arm-hunter', 'test': 'sig_storage_serial'}
+      - {'tag': 'arm64-latest', 'test': 'k8s_io'}
       - {'tag': 'arm64-jerma', 'test': 'k8s_io'}
       - {'tag': 'arm64-jerma', 'test': 'k8s_conformance_serial'}
       - {'tag': 'arm64-jerma', 'test': 'sig_api_machinery'}
diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 2d62c51fe..5de13d9bf 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -277,6 +277,7 @@
     privileged: 'false'
     network: bridge
     exclude:
+      - {'tag': 'latest', 'test': 'k8s_io'}
       - {'tag': 'jerma', 'test': 'k8s_io'}
       - {'tag': 'jerma', 'test': 'k8s_conformance_serial'}
       - {'tag': 'jerma', 'test': 'sig_api_machinery'}
-- 
2.16.6