Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Switch the csit-verify-3node to use job prefix"
[releng/builder.git]
/
jjb
/
integration
/
integration-templates.yaml
diff --git
a/jjb/integration/integration-templates.yaml
b/jjb/integration/integration-templates.yaml
index 0dfaffd57c393e1058a7a01bb4c0af52c3d19e14..d651eef758b2c690fcb08508f75cc3e8c390e7ff 100644
(file)
--- a/
jjb/integration/integration-templates.yaml
+++ b/
jjb/integration/integration-templates.yaml
@@
-32,11
+32,12
@@
# New templates
- job-template:
# New templates
- job-template:
- name: '{project}-csit-verify-1node-{functionality}'
+ name: '{prefix}{project}-csit-verify-1node-{functionality}'
+ id: inttest-csit-verify-1node
disabled: false
project-type: freestyle
disabled: false
project-type: freestyle
- node: centos7-robot-
1c-4
g
+ node: centos7-robot-
2c-8
g
properties:
- opendaylight-infra-properties:
properties:
- opendaylight-infra-properties:
@@
-119,12
+120,13
@@
- lf-infra-publish
- job-template:
- lf-infra-publish
- job-template:
- name: '{project}-csit-1node-{functionality}-{install}-{stream}'
+ name: '{prefix}{project}-csit-1node-{functionality}-{install}-{stream}'
+ id: inttest-csit-1node
# Keep synchronized with *-csit4-*-carbon please.
disabled: false
project-type: freestyle
# Keep synchronized with *-csit4-*-carbon please.
disabled: false
project-type: freestyle
- node: centos7-robot-
1c-4
g
+ node: centos7-robot-
2c-8
g
properties:
- opendaylight-infra-properties:
properties:
- opendaylight-infra-properties:
@@
-153,6
+155,8
@@
stream-test-plan: '{project}-{functionality}-{stream}.txt'
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
stream-test-plan: '{project}-{functionality}-{stream}.txt'
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
+ - integration-test-suites:
+ test-suites: '{test-suites}'
- integration-patch-refspec:
branch: 'master'
- integration-jdk-version:
- integration-patch-refspec:
branch: 'master'
- integration-jdk-version:
@@
-237,11
+241,12
@@
- lf-infra-publish
- job-template:
- lf-infra-publish
- job-template:
- name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+ name: '{prefix}{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+ id: inttest-csit-1node-periodic
disabled: false
project-type: freestyle
disabled: false
project-type: freestyle
- node: centos7-robot-
1c-4
g
+ node: centos7-robot-
2c-8
g
properties:
- opendaylight-infra-properties:
properties:
- opendaylight-infra-properties:
@@
-270,6
+275,8
@@
stream-test-plan: '{project}-{functionality}-{stream}.txt'
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
stream-test-plan: '{project}-{functionality}-{stream}.txt'
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
+ - integration-test-suites:
+ test-suites: '{test-suites}'
- integration-patch-refspec:
branch: 'master'
- integration-jdk-version:
- integration-patch-refspec:
branch: 'master'
- integration-jdk-version:
@@
-461,11
+468,12
@@
- lf-infra-publish
- job-template:
- lf-infra-publish
- job-template:
- name: '{project}-csit-verify-3node-{functionality}'
+ name: '{prefix}{project}-csit-verify-3node-{functionality}'
+ id: inttest-csit-verify-3node
disabled: false
project-type: freestyle
disabled: false
project-type: freestyle
- node: centos7-robot-
1c-4
g
+ node: centos7-robot-
2c-8
g
properties:
- opendaylight-infra-properties:
properties:
- opendaylight-infra-properties:
@@
-494,6
+502,8
@@
stream-test-plan: '{project}-{functionality}-{verify-stream}.txt'
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
stream-test-plan: '{project}-{functionality}-{verify-stream}.txt'
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
+ - integration-test-suites:
+ test-suites: '{test-suites}'
- integration-jdk-version:
jdkversion: '{verify-jdkversion}'
- distribution-karaf-version:
- integration-jdk-version:
jdkversion: '{verify-jdkversion}'
- distribution-karaf-version:
@@
-554,7
+564,7
@@
disabled: false
project-type: freestyle
disabled: false
project-type: freestyle
- node: centos7-robot-
1c-4
g
+ node: centos7-robot-
2c-8
g
properties:
- opendaylight-infra-properties:
properties:
- opendaylight-infra-properties:
@@
-583,6
+593,8
@@
stream-test-plan: '{project}-{functionality}-{stream}.txt'
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
stream-test-plan: '{project}-{functionality}-{stream}.txt'
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
+ - integration-test-suites:
+ test-suites: '{test-suites}'
- integration-patch-refspec:
branch: 'master'
- integration-jdk-version:
- integration-patch-refspec:
branch: 'master'
- integration-jdk-version:
@@
-665,7
+677,7
@@
disabled: false
project-type: freestyle
disabled: false
project-type: freestyle
- node: centos7-robot-
1c-4
g
+ node: centos7-robot-
2c-8
g
properties:
- opendaylight-infra-properties:
properties:
- opendaylight-infra-properties:
@@
-778,7
+790,7
@@
disabled: false
project-type: freestyle
disabled: false
project-type: freestyle
- node: centos7-robot-
1c-4
g
+ node: centos7-robot-
2c-8
g
properties:
- opendaylight-infra-properties:
properties:
- opendaylight-infra-properties:
@@
-807,6
+819,8
@@
stream-test-plan: '{project}-{functionality}-{stream}.txt'
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
stream-test-plan: '{project}-{functionality}-{stream}.txt'
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
+ - integration-test-suites:
+ test-suites: '{test-suites}'
- integration-patch-refspec:
branch: 'master'
- integration-jdk-version:
- integration-patch-refspec:
branch: 'master'
- integration-jdk-version:
@@
-1404,10
+1418,11
@@
# triggers the project system test defined in {csit-list} when gerrit receives test-{project} keyword
- job-template:
# triggers the project system test defined in {csit-list} when gerrit receives test-{project} keyword
- job-template:
- name: '{project}-patch-test-{feature}-{stream}'
+ name: '{prefix}{project}-patch-test-{feature}-{stream}'
+ id: inttest-patch-test
project-type: freestyle
project-type: freestyle
- node: centos7-
java-
builder-2c-8g
+ node: centos7-builder-2c-8g
concurrent: true
jdk: '{jdk}'
concurrent: true
jdk: '{jdk}'