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
Fix indent for scm, triggers and publisher sub-sections
[releng/builder.git]
/
jjb
/
integration
/
integration-templates.yaml
diff --git
a/jjb/integration/integration-templates.yaml
b/jjb/integration/integration-templates.yaml
index 6779112128bd4516071a626c9260128980148056..ab8cf510ddee523b22dbb8f126eb93b0b76b8d0a 100644
(file)
--- a/
jjb/integration/integration-templates.yaml
+++ b/
jjb/integration/integration-templates.yaml
@@
-44,9
+44,9
@@
refspec: 'refs/heads/{branch}'
artifacts: '{archive-artifacts}'
- integration-branch:
refspec: 'refs/heads/{branch}'
artifacts: '{archive-artifacts}'
- integration-branch:
- branch: 'stable/b
eryllium
'
+ branch: 'stable/b
oron
'
- integration-distribution-stream:
- integration-distribution-stream:
- stream: 'b
eryllium
'
+ stream: 'b
oron
'
- integration-bundleurl:
bundleurl: 'last'
- integration-controller-scope:
- integration-bundleurl:
bundleurl: 'last'
- integration-controller-scope:
@@
-56,12
+56,11
@@
- integration-test-options:
test-options: '{robot-options}'
- integration-stream-test-plan:
- integration-test-options:
test-options: '{robot-options}'
- integration-stream-test-plan:
- stream-test-plan: '{project}-{functionality}-b
eryllium
.txt'
+ stream-test-plan: '{project}-{functionality}-b
oron
.txt'
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
- integration-jdk-version:
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
- integration-jdk-version:
- jdkversion: 'openjdk7'
- # TODO: Switch to openjdk8 from Boron on.
+ jdkversion: 'openjdk8'
scm:
- integration-gerrit-scm:
scm:
- integration-gerrit-scm:
@@
-106,7
+105,7
@@
- email-notification:
email-prefix: '[{project}]'
- integration-csit-archive-build
- email-notification:
email-prefix: '[{project}]'
- integration-csit-archive-build
- -
archive-build
:
+ -
opendaylight-infra-shiplogs
:
maven-version: '{mvn33}'
- job-template:
maven-version: '{mvn33}'
- job-template:
@@
-217,7
+216,7
@@
display-table: true
format: csv
- integration-csit-archive-build
display-table: true
format: csv
- integration-csit-archive-build
- -
archive-build
:
+ -
opendaylight-infra-shiplogs
:
maven-version: '{mvn33}'
- job-template:
maven-version: '{mvn33}'
- job-template:
@@
-327,7
+326,7
@@
display-table: true
format: csv
- integration-csit-archive-build
display-table: true
format: csv
- integration-csit-archive-build
- -
archive-build
:
+ -
opendaylight-infra-shiplogs
:
maven-version: '{mvn33}'
- job-template:
maven-version: '{mvn33}'
- job-template:
@@
-350,9
+349,9
@@
refspec: 'refs/heads/{branch}'
artifacts: '{archive-artifacts}'
- integration-branch:
refspec: 'refs/heads/{branch}'
artifacts: '{archive-artifacts}'
- integration-branch:
- branch: 'stable/b
eryllium
'
+ branch: 'stable/b
oron
'
- integration-distribution-stream:
- integration-distribution-stream:
- stream: 'b
eryllium
'
+ stream: 'b
oron
'
- integration-bundleurl:
bundleurl: 'last'
- integration-controller-scope:
- integration-bundleurl:
bundleurl: 'last'
- integration-controller-scope:
@@
-362,12
+361,11
@@
- integration-test-options:
test-options: '{robot-options}'
- integration-stream-test-plan:
- integration-test-options:
test-options: '{robot-options}'
- integration-stream-test-plan:
- stream-test-plan: '{project}-{functionality}-b
eryllium
.txt'
+ stream-test-plan: '{project}-{functionality}-b
oron
.txt'
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
- integration-jdk-version:
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
- integration-jdk-version:
- jdkversion: 'openjdk7'
- # TODO: Switch to openjdk8 from Boron on.
+ jdkversion: 'openjdk8'
scm:
- integration-gerrit-scm:
scm:
- integration-gerrit-scm:
@@
-413,7
+411,7
@@
- email-notification:
email-prefix: '[{project}]'
- integration-csit-archive-build
- email-notification:
email-prefix: '[{project}]'
- integration-csit-archive-build
- -
archive-build
:
+ -
opendaylight-infra-shiplogs
:
maven-version: '{mvn33}'
- job-template:
maven-version: '{mvn33}'
- job-template:
@@
-525,7
+523,7
@@
display-table: true
format: csv
- integration-csit-archive-build
display-table: true
format: csv
- integration-csit-archive-build
- -
archive-build
:
+ -
opendaylight-infra-shiplogs
:
maven-version: '{mvn33}'
- job-template:
maven-version: '{mvn33}'
- job-template:
@@
-637,7
+635,7
@@
display-table: true
format: csv
- integration-csit-archive-build
display-table: true
format: csv
- integration-csit-archive-build
- -
archive-build
:
+ -
opendaylight-infra-shiplogs
:
maven-version: '{mvn33}'
- job-template:
maven-version: '{mvn33}'
- job-template:
@@
-748,7
+746,7
@@
display-table: true
format: csv
- integration-csit-archive-build
display-table: true
format: csv
- integration-csit-archive-build
- -
archive-build
:
+ -
opendaylight-infra-shiplogs
:
maven-version: '{mvn33}'
- job-template:
maven-version: '{mvn33}'
- job-template:
@@
-816,6
+814,10
@@
name: TENANT_NETWORK_TYPE
default: '{tenant-network-type}'
description: 'Tenant Network Type supported by the implementation'
name: TENANT_NETWORK_TYPE
default: '{tenant-network-type}'
description: 'Tenant Network Type supported by the implementation'
+ - string:
+ name: SECURITY_GROUP_MODE
+ default: '{security-group-mode}'
+ description: 'Security Group Mode to be used in netvirt aclservice config'
scm:
- integration-gerrit-scm:
basedir: 'test'
scm:
- integration-gerrit-scm:
basedir: 'test'
@@
-857,7
+859,7
@@
- email-notification:
email-prefix: '[{project}]'
- integration-csit-archive-build
- email-notification:
email-prefix: '[{project}]'
- integration-csit-archive-build
- -
archive-build
:
+ -
opendaylight-infra-shiplogs
:
maven-version: '{mvn33}'
- job-template:
maven-version: '{mvn33}'
- job-template:
@@
-929,6
+931,11
@@
name: TENANT_NETWORK_TYPE
default: '{tenant-network-type}'
description: 'Tenant Network Type supported by the implementation'
name: TENANT_NETWORK_TYPE
default: '{tenant-network-type}'
description: 'Tenant Network Type supported by the implementation'
+ - string:
+ name: SECURITY_GROUP_MODE
+ default: '{security-group-mode}'
+ description: 'Security Group Mode to be used in netvirt aclservice config'
+
scm:
- integration-gerrit-scm:
basedir: 'test'
scm:
- integration-gerrit-scm:
basedir: 'test'
@@
-971,7
+978,7
@@
- email-notification:
email-prefix: '[{project}]'
- integration-csit-archive-build
- email-notification:
email-prefix: '[{project}]'
- integration-csit-archive-build
- -
archive-build
:
+ -
opendaylight-infra-shiplogs
:
maven-version: '{mvn33}'
# Template: {project}-patch-test-{stream}
maven-version: '{mvn33}'
# Template: {project}-patch-test-{stream}
@@
-980,7
+987,7
@@
# 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-{stream}'
+ name: '{project}-patch-test-{
feature}-{
stream}'
project-type: maven
node: centos7-java-builder-2c-8g
project-type: maven
node: centos7-java-builder-2c-8g
@@
-1001,6
+1008,10
@@
- integration-branch:
branch: '{branch}'
- integration-distribution-git-url
- integration-branch:
branch: '{branch}'
- integration-distribution-git-url
+ - string:
+ name: feature
+ default: 'all'
+ description: 'Specific feature test for patch'
scm:
- integration-gerrit-scm:
scm:
- integration-gerrit-scm:
@@
-1019,7
+1030,9
@@
server-name: 'OpenDaylight'
trigger-on:
- comment-added-contains-event:
server-name: 'OpenDaylight'
trigger-on:
- comment-added-contains-event:
- comment-contains-value: 'test-{project}'
+ comment-contains-value: 'test-{project}-all'
+ - comment-added-contains-event:
+ comment-contains-value: 'test-{project}-{feature}'
projects:
- project-compare-type: 'ANT'
project-pattern: '{project}'
projects:
- project-compare-type: 'ANT'
project-pattern: '{project}'