Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update Xtesting Gates
[releng.git]
/
jjb
/
functest
/
xtesting.yaml
diff --git
a/jjb/functest/xtesting.yaml
b/jjb/functest/xtesting.yaml
index
94e00d1
..
e3fe56b
100644
(file)
--- a/
jjb/functest/xtesting.yaml
+++ b/
jjb/functest/xtesting.yaml
@@
-10,17
+10,20
@@
tag:
- latest:
branch: master
tag:
- latest:
branch: master
+ slave: lf-virtual1
- iruya:
branch: stable/iruya
- iruya:
branch: stable/iruya
+ slave: lf-virtual1
- hunter:
branch: stable/hunter
- hunter:
branch: stable/hunter
+ slave: lf-virtual1
- parameter:
name: xtesting-slave
parameters:
- label:
name: slave
- parameter:
name: xtesting-slave
parameters:
- label:
name: slave
- default:
lf-build2
+ default:
'{slave}'
- parameter:
name: xtesting-branch
- parameter:
name: xtesting-branch
@@
-98,6
+101,7
@@
fi
sudo docker run --rm \
-v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
fi
sudo docker run --rm \
-v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
+ -e DEBUG=true \
$image run_tests -t {test}
res=$?
gsutil -m cp -r $WORKSPACE/ \
$image run_tests -t {test}
res=$?
gsutil -m cp -r $WORKSPACE/ \
@@
-133,7
+137,8
@@
- job-template:
name: 'xtesting-{repo}-{container}-{tag}-pull'
parameters:
- job-template:
name: 'xtesting-{repo}-{container}-{tag}-pull'
parameters:
- - xtesting-slave
+ - xtesting-slave:
+ slave: '{slave}'
builders:
- xtesting-pull-containers:
<<: *xtesting-containers
builders:
- xtesting-pull-containers:
<<: *xtesting-containers
@@
-148,7
+153,8
@@
- job-template:
name: 'xtesting-{repo}-{container}-{tag}-rmi'
parameters:
- job-template:
name: 'xtesting-{repo}-{container}-{tag}-rmi'
parameters:
- - xtesting-slave
+ - xtesting-slave:
+ slave: '{slave}'
builders:
- xtesting-remove-images:
<<: *xtesting-containers
builders:
- xtesting-remove-images:
<<: *xtesting-containers
@@
-163,7
+169,8
@@
- job-template:
name: 'xtesting-{repo}-{container}-{tag}-{test}-run'
parameters:
- job-template:
name: 'xtesting-{repo}-{container}-{tag}-{test}-run'
parameters:
- - xtesting-slave
+ - xtesting-slave:
+ slave: '{slave}'
builders:
- xtesting-run-containers:
<<: *xtesting-run-containers
builders:
- xtesting-run-containers:
<<: *xtesting-run-containers
@@
-178,6
+185,12
@@
- third
- fourth
- fifth
- third
- fourth
- fifth
+ - sixth
+ exclude:
+ - tag: hunter
+ test: sixth
+ - tag: iruya
+ test: sixth
jobs:
- 'xtesting-{repo}-{container}-{tag}-{test}-run'
jobs:
- 'xtesting-{repo}-{container}-{tag}-{test}-run'
@@
-187,13
+200,14
@@
triggers:
- timed: '@daily'
parameters:
triggers:
- timed: '@daily'
parameters:
- - xtesting-slave
+ - xtesting-slave:
+ slave: '{slave}'
properties:
- build-blocker:
use-build-blocker: true
blocking-level: 'NODE'
blocking-jobs:
properties:
- build-blocker:
use-build-blocker: true
blocking-level: 'NODE'
blocking-jobs:
- - '^xtesting-
[a-z]+
-(daily|check|gate)$'
+ - '^xtesting-
{tag}
-(daily|check|gate)$'
builders:
- multijob:
name: remove former images
builders:
- multijob:
name: remove former images
@@
-218,11
+232,14
@@
<<: *xtesting-jobs
- name: 'xtesting-opnfv-xtesting-{tag}-fifth-run'
<<: *xtesting-jobs
<<: *xtesting-jobs
- name: 'xtesting-opnfv-xtesting-{tag}-fifth-run'
<<: *xtesting-jobs
+ - name: 'xtesting-opnfv-xtesting-{tag}-sixth-run'
+ <<: *xtesting-jobs
- job-template:
name: 'xtesting-{repo}-{container}-{tag}-gate'
parameters:
- job-template:
name: 'xtesting-{repo}-{container}-{tag}-gate'
parameters:
- - xtesting-slave
+ - xtesting-slave:
+ slave: '{slave}'
scm:
- xtesting-scm:
ref: $GERRIT_REFSPEC
scm:
- xtesting-scm:
ref: $GERRIT_REFSPEC
@@
-234,7
+251,8
@@
- job-template:
name: 'xtesting-{repo}-{container}-{tag}-check'
parameters:
- job-template:
name: 'xtesting-{repo}-{container}-{tag}-check'
parameters:
- - xtesting-slave
+ - xtesting-slave:
+ slave: '{slave}'
- xtesting-branch:
branch: '{branch}'
scm:
- xtesting-branch:
branch: '{branch}'
scm:
@@
-246,20
+264,22
@@
ref: $branch
- project:
ref: $branch
- project:
- name: 'xtesting-_-alpine-3.
9
-rmi'
+ name: 'xtesting-_-alpine-3.
10
-rmi'
repo: _
port:
container: alpine
repo: _
port:
container: alpine
- tag: 3.9
+ tag: '3.10'
+ slave: master
jobs:
- 'xtesting-{repo}-{container}-{tag}-rmi'
- project:
jobs:
- 'xtesting-{repo}-{container}-{tag}-rmi'
- project:
- name: 'xtesting-_-alpine-3.
9
-pull'
+ name: 'xtesting-_-alpine-3.
10
-pull'
repo: _
port:
container: alpine
repo: _
port:
container: alpine
- tag: 3.9
+ tag: '3.10'
+ slave: master
jobs:
- 'xtesting-{repo}-{container}-{tag}-pull'
jobs:
- 'xtesting-{repo}-{container}-{tag}-pull'
@@
-277,7
+297,8
@@
name: 'xtesting-{tag}-check'
project-type: multijob
parameters:
name: 'xtesting-{tag}-check'
project-type: multijob
parameters:
- - xtesting-slave
+ - xtesting-slave:
+ slave: '{slave}'
- xtesting-branch:
branch: '{branch}'
properties:
- xtesting-branch:
branch: '{branch}'
properties:
@@
-285,7
+306,7
@@
use-build-blocker: true
blocking-level: 'NODE'
blocking-jobs:
use-build-blocker: true
blocking-level: 'NODE'
blocking-jobs:
- - '^xtesting-
[a-z]+
-(daily|check|gate)$'
+ - '^xtesting-
{tag}
-(daily|check|gate)$'
builders:
- multijob:
name: remove former images
builders:
- multijob:
name: remove former images
@@
-295,15
+316,15
@@
- multijob:
name: remove dependencies
projects:
- multijob:
name: remove dependencies
projects:
- - name: 'xtesting-_-alpine-3.
9
-rmi'
+ - name: 'xtesting-_-alpine-3.
10
-rmi'
<<: *xtesting-jobs
- multijob:
name: pull dependencies
projects:
<<: *xtesting-jobs
- multijob:
name: pull dependencies
projects:
- - name: 'xtesting-_-alpine-3.
9
-pull'
+ - name: 'xtesting-_-alpine-3.
10
-pull'
<<: *xtesting-jobs
- multijob:
<<: *xtesting-jobs
- multijob:
- name: opnfv/
functest-
xtesting
+ name: opnfv/xtesting
projects:
- name: 'xtesting-opnfv-xtesting-{tag}-check'
<<: *xtesting-jobs
projects:
- name: 'xtesting-opnfv-xtesting-{tag}-check'
<<: *xtesting-jobs
@@
-320,6
+341,8
@@
<<: *xtesting-jobs
- name: 'xtesting-opnfv-xtesting-{tag}-fifth-run'
<<: *xtesting-jobs
<<: *xtesting-jobs
- name: 'xtesting-opnfv-xtesting-{tag}-fifth-run'
<<: *xtesting-jobs
+ - name: 'xtesting-opnfv-xtesting-{tag}-sixth-run'
+ <<: *xtesting-jobs
- trigger:
name: xtesting-patchset-created
- trigger:
name: xtesting-patchset-created
@@
-351,13
+374,14
@@
- xtesting-patchset-created:
branch: '{branch}'
parameters:
- xtesting-patchset-created:
branch: '{branch}'
parameters:
- - xtesting-slave
+ - xtesting-slave:
+ slave: '{slave}'
properties:
- build-blocker:
use-build-blocker: true
blocking-level: 'NODE'
blocking-jobs:
properties:
- build-blocker:
use-build-blocker: true
blocking-level: 'NODE'
blocking-jobs:
- - '^xtesting-
[a-z]+
-(daily|check|gate)$'
+ - '^xtesting-
{tag}
-(daily|check|gate)$'
builders:
- multijob:
name: remove former images
builders:
- multijob:
name: remove former images
@@
-367,15
+391,15
@@
- multijob:
name: remove dependencies
projects:
- multijob:
name: remove dependencies
projects:
- - name: 'xtesting-_-alpine-3.
9
-rmi'
+ - name: 'xtesting-_-alpine-3.
10
-rmi'
<<: *xtesting-jobs
- multijob:
name: pull dependencies
projects:
<<: *xtesting-jobs
- multijob:
name: pull dependencies
projects:
- - name: 'xtesting-_-alpine-3.
9
-pull'
+ - name: 'xtesting-_-alpine-3.
10
-pull'
<<: *xtesting-jobs
- multijob:
<<: *xtesting-jobs
- multijob:
- name: opnfv/
functest-
xtesting
+ name: opnfv/xtesting
projects:
- name: 'xtesting-opnfv-xtesting-{tag}-gate'
<<: *xtesting-jobs
projects:
- name: 'xtesting-opnfv-xtesting-{tag}-gate'
<<: *xtesting-jobs
@@
-392,6
+416,8
@@
<<: *xtesting-jobs
- name: 'xtesting-opnfv-xtesting-{tag}-fifth-run'
<<: *xtesting-jobs
<<: *xtesting-jobs
- name: 'xtesting-opnfv-xtesting-{tag}-fifth-run'
<<: *xtesting-jobs
+ - name: 'xtesting-opnfv-xtesting-{tag}-sixth-run'
+ <<: *xtesting-jobs
- project:
name: 'xtesting'
- project:
name: 'xtesting'