From 7a5d6483138a1f6e5bb183d68689b42aa74209ba Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Tue, 22 Jun 2021 10:09:19 +0200
Subject: Update Functest Gates according to XtestingCI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I8b4ced496b2995dc32b6f3867c300e725315a78c
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 jjb/functest/xtesting.yaml | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

(limited to 'jjb/functest/xtesting.yaml')

diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index 1239ad0be..254ef7084 100644
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -59,7 +59,6 @@
       - random-string:
           name: build_tag
 
-
 - xtesting-run-containers: &xtesting-run-containers
     name: 'xtesting-run-containers'
     <<: *xtesting-containers
@@ -194,9 +193,12 @@
     privileged: 'false'
     network: bridge
     exclude:
-      - {'tag': 'leguer', 'test': 'eighth'}
-      - {'tag': 'kali', 'test': 'eighth'}
-      - {'tag': 'jerma', 'test': 'eighth'}
+      - tag: leguer
+        test: eighth
+      - tag: kali
+        test: eighth
+      - tag: jerma
+        test: eighth
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-{test}-run'
 
@@ -264,12 +266,14 @@
           slave: '{slave}'
       - xtesting-build_tag:
           build_tag: ''
+    # PyYAML and yamllint differ here
+    # see https://github.com/yaml/pyyaml/issues/234
+    # yamllint disable rule:indentation
     properties:
       - build-blocker:
-          use-build-blocker: true
-          blocking-level: 'NODE'
           blocking-jobs:
-            - '^xtesting-{tag}-(daily|docker|review)$'
+          - ^xtesting-(pi-)*{tag}-(daily|docker|review)$
+    # yamllint enable rule:indentation
     builders:
       - multijob:
           name: remove former images
@@ -508,7 +512,6 @@
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-gate'
 
-
 - trigger:
     name: xtesting-patchset-created
     triggers:
@@ -537,12 +540,14 @@
           slave: '{slave}'
       - xtesting-build_tag:
           build_tag: ''
+    # PyYAML and yamllint differ here
+    # see https://github.com/yaml/pyyaml/issues/234
+    # yamllint disable rule:indentation
     properties:
       - build-blocker:
-          use-build-blocker: true
-          blocking-level: 'NODE'
           blocking-jobs:
-            - '^xtesting-{tag}-(daily|docker|review)$'
+          - ^xtesting-(pi-)*{tag}-(daily|docker|review)$
+    # yamllint enable rule:indentation
     builders:
       - multijob:
           name: remove former images
@@ -679,7 +684,6 @@
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-build'
 
-
 - job-template:
     name: 'xtesting-{tag}-docker'
     project-type: multijob
@@ -691,12 +695,14 @@
     parameters:
       - xtesting-slave:
           slave: '{slave}'
+    # PyYAML and yamllint differ here
+    # see https://github.com/yaml/pyyaml/issues/234
+    # yamllint disable rule:indentation
     properties:
       - build-blocker:
-          use-build-blocker: true
-          blocking-level: 'NODE'
           blocking-jobs:
-            - '^xtesting-{tag}-(daily|docker|review)$'
+          - ^xtesting-(pi-)*{tag}-(daily|docker|review)$
+    # yamllint enable rule:indentation
     builders:
       - multijob:
           name: remove dependency
-- 
cgit 1.2.3-korg