Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Create Stable Branch Jobs for doctor"
[releng.git]
/
jjb
/
functest
/
functest-kubernetes.yaml
diff --git
a/jjb/functest/functest-kubernetes.yaml
b/jjb/functest/functest-kubernetes.yaml
index
24efc2c
..
9f8f22d
100644
(file)
--- a/
jjb/functest/functest-kubernetes.yaml
+++ b/
jjb/functest/functest-kubernetes.yaml
@@
-8,17
+8,22
@@
repo: 'opnfv'
port:
tag:
repo: 'opnfv'
port:
tag:
+ - latest:
+ branch: master
+ slave: lf-virtual8
- iruya:
branch: stable/iruya
- iruya:
branch: stable/iruya
+ slave: lf-virtual7
- hunter:
branch: stable/hunter
- hunter:
branch: stable/hunter
+ slave: lf-virtual5
- parameter:
name: functest-kubernetes-slave
parameters:
- label:
name: slave
- parameter:
name: functest-kubernetes-slave
parameters:
- label:
name: slave
- default:
functest-virtual
+ default:
'{slave}'
- parameter:
name: functest-kubernetes-branch
- parameter:
name: functest-kubernetes-branch
@@
-87,7
+92,6
@@
- shell: |
set +e
set -x
- shell: |
set +e
set -x
- echo $WORKSPACE
[ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true
if [ "{repo}" = "_" ]; then
image={container}:{tag}
[ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true
if [ "{repo}" = "_" ]; then
image={container}:{tag}
@@
-135,7
+139,8
@@
- job-template:
name: 'functest-kubernetes-{repo}-{container}-{tag}-pull'
parameters:
- job-template:
name: 'functest-kubernetes-{repo}-{container}-{tag}-pull'
parameters:
- - functest-kubernetes-slave
+ - functest-kubernetes-slave:
+ slave: '{slave}'
builders:
- functest-kubernetes-pull-containers:
<<: *functest-kubernetes-containers
builders:
- functest-kubernetes-pull-containers:
<<: *functest-kubernetes-containers
@@
-164,7
+169,8
@@
- job-template:
name: 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
parameters:
- job-template:
name: 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
parameters:
- - functest-kubernetes-slave
+ - functest-kubernetes-slave:
+ slave: '{slave}'
builders:
- functest-kubernetes-remove-images:
<<: *functest-kubernetes-containers
builders:
- functest-kubernetes-remove-images:
<<: *functest-kubernetes-containers
@@
-193,7
+199,8
@@
- job-template:
name: 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
parameters:
- job-template:
name: 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
parameters:
- - functest-kubernetes-slave
+ - functest-kubernetes-slave:
+ slave: '{slave}'
builders:
- functest-kubernetes-run-containers:
<<: *functest-kubernetes-run-containers
builders:
- functest-kubernetes-run-containers:
<<: *functest-kubernetes-run-containers
@@
-232,13
+239,14
@@
triggers:
- timed: '@daily'
parameters:
triggers:
- timed: '@daily'
parameters:
- - functest-kubernetes-slave
+ - functest-kubernetes-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:
- - '^
(functest|functest-kubernetes)-[a-z]+
-(daily|check|gate)$'
+ - '^
functest-kubernetes-{tag}
-(daily|check|gate)$'
builders:
- multijob:
name: remove former images
builders:
- multijob:
name: remove former images
@@
-279,7
+287,8
@@
- job-template:
name: 'functest-kubernetes-{repo}-{container}-{tag}-gate'
parameters:
- job-template:
name: 'functest-kubernetes-{repo}-{container}-{tag}-gate'
parameters:
- - functest-kubernetes-slave
+ - functest-kubernetes-slave:
+ slave: '{slave}'
scm:
- functest-kubernetes-scm:
ref: $GERRIT_REFSPEC
scm:
- functest-kubernetes-scm:
ref: $GERRIT_REFSPEC
@@
-291,7
+300,8
@@
- job-template:
name: 'functest-kubernetes-{repo}-{container}-{tag}-check'
parameters:
- job-template:
name: 'functest-kubernetes-{repo}-{container}-{tag}-check'
parameters:
- - functest-kubernetes-slave
+ - functest-kubernetes-slave:
+ slave: '{slave}'
- functest-kubernetes-branch:
branch: '{branch}'
scm:
- functest-kubernetes-branch:
branch: '{branch}'
scm:
@@
-308,6
+318,7
@@
port:
container: golang
tag: alpine3.9
port:
container: golang
tag: alpine3.9
+ slave: master
jobs:
- 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
jobs:
- 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
@@
-317,6
+328,7
@@
port:
container: golang
tag: alpine3.9
port:
container: golang
tag: alpine3.9
+ slave: master
jobs:
- 'functest-kubernetes-{repo}-{container}-{tag}-pull'
jobs:
- 'functest-kubernetes-{repo}-{container}-{tag}-pull'
@@
-364,7
+376,8
@@
name: 'functest-kubernetes-{tag}-check'
project-type: multijob
parameters:
name: 'functest-kubernetes-{tag}-check'
project-type: multijob
parameters:
- - functest-kubernetes-slave
+ - functest-kubernetes-slave:
+ slave: '{slave}'
- functest-kubernetes-branch:
branch: '{branch}'
properties:
- functest-kubernetes-branch:
branch: '{branch}'
properties:
@@
-372,7
+385,7
@@
use-build-blocker: true
blocking-level: 'NODE'
blocking-jobs:
use-build-blocker: true
blocking-level: 'NODE'
blocking-jobs:
- - '^
(functest|functest-kubernetes)-[a-z]+
-(daily|check|gate)$'
+ - '^
functest-kubernetes-{tag}
-(daily|check|gate)$'
builders:
- multijob:
name: remove former images
builders:
- multijob:
name: remove former images
@@
-458,13
+471,14
@@
- functest-kubernetes-patchset-created:
branch: '{branch}'
parameters:
- functest-kubernetes-patchset-created:
branch: '{branch}'
parameters:
- - functest-kubernetes-slave
+ - functest-kubernetes-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:
- - '^
(functest|functest-kubernetes)-[a-z]+
-(daily|check|gate)$'
+ - '^
functest-kubernetes-{tag}
-(daily|check|gate)$'
builders:
- multijob:
name: remove former images
builders:
- multijob:
name: remove former images