summaryrefslogtreecommitdiffstats
path: root/jjb/functest/xtesting.yaml
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2021-06-22 10:09:19 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2021-06-25 09:47:03 +0200
commit7a5d6483138a1f6e5bb183d68689b42aa74209ba (patch)
tree97e9e759bbf6efa3b08664d4534af4ebc4e958c9 /jjb/functest/xtesting.yaml
parent4e9d49d672614f68177b1ab3299ec2292ef476ec (diff)
Update Functest Gates according to XtestingCI
Change-Id: I8b4ced496b2995dc32b6f3867c300e725315a78c Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'jjb/functest/xtesting.yaml')
-rw-r--r--jjb/functest/xtesting.yaml36
1 files changed, 21 insertions, 15 deletions
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