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
Make Java version for CSIT jobs configurable
[releng/builder.git]
/
jjb
/
integration
/
integration-templates.yaml
diff --git
a/jjb/integration/integration-templates.yaml
b/jjb/integration/integration-templates.yaml
index dae67aca90f5316c8fd5a9e718d95bfab5333ec5..4426e6b290a010111ec728bfb608a535aee807a6 100644
(file)
--- a/
jjb/integration/integration-templates.yaml
+++ b/
jjb/integration/integration-templates.yaml
@@
-29,6
+29,7
@@
- job-template:
name: '{project}-csit-verify-1node-{functionality}-{stream}'
- job-template:
name: '{project}-csit-verify-1node-{functionality}-{stream}'
+ disabled: false
project-type: freestyle
node: dynamic_robot
project-type: freestyle
node: dynamic_robot
@@
-55,7
+56,7
@@
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
- integration-jdk-version:
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
- integration-jdk-version:
- jdkversion: '
openjdk7
'
+ jdkversion: '
{jdk}
'
scm:
- integration-gerrit-scm:
scm:
- integration-gerrit-scm:
@@
-106,6
+107,7
@@
- job-template:
name: '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
- job-template:
name: '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
+ disabled: false
project-type: freestyle
node: dynamic_robot
project-type: freestyle
node: dynamic_robot
@@
-134,7
+136,7
@@
- integration-patch-refspec:
branch: 'stable/helium'
- integration-jdk-version:
- integration-patch-refspec:
branch: 'stable/helium'
- integration-jdk-version:
- jdkversion: '
openjdk7
'
+ jdkversion: '
{jdk}
'
scm:
- integration-gerrit-scm:
scm:
- integration-gerrit-scm:
@@
-154,10
+156,10
@@
users:
- '{ssh-credentials}'
users:
- '{ssh-credentials}'
+
triggers:
triggers:
- -
reverse
:
+ -
integration-csit-{install}
:
jobs: '{trigger-jobs}'
jobs: '{trigger-jobs}'
- result: 'success'
builders:
- integration-cleanup-workspace
builders:
- integration-cleanup-workspace
@@
-213,6
+215,7
@@
- job-template:
name: '{project}-csit-verify-1node-{functionality}'
- job-template:
name: '{project}-csit-verify-1node-{functionality}'
+ disabled: false
project-type: freestyle
node: dynamic_robot
project-type: freestyle
node: dynamic_robot
@@
-227,7
+230,7
@@
- project-parameter:
project: 'integration/test'
- integration-branch:
- project-parameter:
project: 'integration/test'
- integration-branch:
- branch: '
master
'
+ branch: '
stable/beryllium
'
- integration-bundleurl:
bundleurl: 'last'
- integration-controller-scope:
- integration-bundleurl:
bundleurl: 'last'
- integration-controller-scope:
@@
-239,7
+242,8
@@
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
- integration-jdk-version:
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
- integration-jdk-version:
- jdkversion: 'openjdk7'
+ # Here {jdk} is taken from releng-defaults.yaml
+ jdkversion: '{jdk}'
scm:
- integration-gerrit-scm:
scm:
- integration-gerrit-scm:
@@
-290,6
+294,7
@@
- job-template:
name: '{project}-csit-1node-{functionality}-{install}-{stream}'
- job-template:
name: '{project}-csit-1node-{functionality}-{install}-{stream}'
+ disabled: false
project-type: freestyle
node: dynamic_robot
project-type: freestyle
node: dynamic_robot
@@
-318,7
+323,7
@@
- integration-patch-refspec:
branch: 'master'
- integration-jdk-version:
- integration-patch-refspec:
branch: 'master'
- integration-jdk-version:
- jdkversion: '
openjdk7
'
+ jdkversion: '
{jdk}
'
scm:
- integration-gerrit-scm:
scm:
- integration-gerrit-scm:
@@
-339,9
+344,8
@@
- '{ssh-credentials}'
triggers:
- '{ssh-credentials}'
triggers:
- -
reverse
:
+ -
integration-csit-{install}
:
jobs: '{trigger-jobs}'
jobs: '{trigger-jobs}'
- result: 'success'
builders:
- integration-cleanup-workspace
builders:
- integration-cleanup-workspace
@@
-393,6
+397,7
@@
- job-template:
name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
- job-template:
name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+ disabled: false
project-type: freestyle
node: dynamic_robot
project-type: freestyle
node: dynamic_robot
@@
-421,7
+426,7
@@
- integration-patch-refspec:
branch: 'master'
- integration-jdk-version:
- integration-patch-refspec:
branch: 'master'
- integration-jdk-version:
- jdkversion: '
openjdk7
'
+ jdkversion: '
{jdk}
'
scm:
- integration-gerrit-scm:
scm:
- integration-gerrit-scm:
@@
-493,6
+498,7
@@
- job-template:
name: '{project}-csit-verify-3node-{functionality}'
- job-template:
name: '{project}-csit-verify-3node-{functionality}'
+ disabled: false
project-type: freestyle
node: dynamic_robot
project-type: freestyle
node: dynamic_robot
@@
-507,7
+513,7
@@
- project-parameter:
project: 'integration/test'
- integration-branch:
- project-parameter:
project: 'integration/test'
- integration-branch:
- branch: '
master
'
+ branch: '
stable/beryllium
'
- integration-bundleurl:
bundleurl: 'last'
- integration-controller-scope:
- integration-bundleurl:
bundleurl: 'last'
- integration-controller-scope:
@@
-519,7
+525,7
@@
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
- integration-jdk-version:
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
- integration-jdk-version:
- jdkversion: '
openjdk7
'
+ jdkversion: '
{jdk}
'
scm:
- integration-gerrit-scm:
scm:
- integration-gerrit-scm:
@@
-572,6
+578,7
@@
- job-template:
name: '{project}-csit-3node-{functionality}-{install}-{stream}'
- job-template:
name: '{project}-csit-3node-{functionality}-{install}-{stream}'
+ disabled: false
project-type: freestyle
node: dynamic_robot
project-type: freestyle
node: dynamic_robot
@@
-600,7
+607,7
@@
- integration-patch-refspec:
branch: 'master'
- integration-jdk-version:
- integration-patch-refspec:
branch: 'master'
- integration-jdk-version:
- jdkversion: '
openjdk7
'
+ jdkversion: '
{jdk}
'
scm:
- integration-gerrit-scm:
scm:
- integration-gerrit-scm:
@@
-621,9
+628,8
@@
- '{ssh-credentials}'
triggers:
- '{ssh-credentials}'
triggers:
- -
reverse
:
+ -
integration-csit-{install}
:
jobs: '{trigger-jobs}'
jobs: '{trigger-jobs}'
- result: 'success'
builders:
- integration-cleanup-workspace
builders:
- integration-cleanup-workspace
@@
-677,6
+683,7
@@
- job-template:
name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
- job-template:
name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+ disabled: false
project-type: freestyle
node: dynamic_robot
project-type: freestyle
node: dynamic_robot
@@
-705,7
+712,7
@@
- integration-patch-refspec:
branch: 'master'
- integration-jdk-version:
- integration-patch-refspec:
branch: 'master'
- integration-jdk-version:
- jdkversion: '
openjdk7
'
+ jdkversion: '
{jdk}
'
scm:
- integration-gerrit-scm:
scm:
- integration-gerrit-scm: