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 f95b775e8ddfa64c25f0ee2079bfb5b05f590bda..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
@@
-54,6
+55,8
@@
test-options: '{robot-options}'
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
test-options: '{robot-options}'
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
+ - integration-jdk-version:
+ jdkversion: '{jdk}'
scm:
- integration-gerrit-scm:
scm:
- integration-gerrit-scm:
@@
-80,7
+83,10
@@
pattern: 'csit/suites/{project}/**'
builders:
pattern: 'csit/suites/{project}/**'
builders:
+ - integration-cleanup-workspace
- integration-install-robotframework
- integration-install-robotframework
+ - inject:
+ properties-file: 'env.properties'
- integration-get-slave-addresses
- inject:
properties-file: 'slave_addresses.txt'
- integration-get-slave-addresses
- inject:
properties-file: 'slave_addresses.txt'
@@
-88,18
+94,20
@@
- inject:
properties-file: 'bundle_vars.txt'
- integration-deploy-controller-run-test
- inject:
properties-file: 'bundle_vars.txt'
- integration-deploy-controller-run-test
+ - integration-cleanup-tmp
publishers:
- integration-robot:
unstable-if: 0.0
publishers:
- integration-robot:
unstable-if: 0.0
- pass-if: 0.0
+ pass-if:
10
0.0
- archive:
- archive:
- artifacts: 'karaf.log'
+ artifacts: 'karaf.log
*
'
- email-notification:
email-prefix: '[{project}]'
- job-template:
name: '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
- email-notification:
email-prefix: '[{project}]'
- job-template:
name: '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
+ disabled: false
project-type: freestyle
node: dynamic_robot
project-type: freestyle
node: dynamic_robot
@@
-127,6
+135,8
@@
test-plan: '{project}-{functionality}.txt'
- integration-patch-refspec:
branch: 'stable/helium'
test-plan: '{project}-{functionality}.txt'
- integration-patch-refspec:
branch: 'stable/helium'
+ - integration-jdk-version:
+ jdkversion: '{jdk}'
scm:
- integration-gerrit-scm:
scm:
- integration-gerrit-scm:
@@
-146,13
+156,16
@@
users:
- '{ssh-credentials}'
users:
- '{ssh-credentials}'
+
triggers:
triggers:
- -
reverse
:
+ -
integration-csit-{install}
:
jobs: '{trigger-jobs}'
jobs: '{trigger-jobs}'
- result: 'success'
builders:
builders:
+ - integration-cleanup-workspace
- integration-install-robotframework
- integration-install-robotframework
+ - inject:
+ properties-file: 'env.properties'
- integration-get-slave-addresses
- inject:
properties-file: 'slave_addresses.txt'
- integration-get-slave-addresses
- inject:
properties-file: 'slave_addresses.txt'
@@
-160,13
+173,14
@@
- inject:
properties-file: 'bundle_vars.txt'
- integration-deploy-controller-run-test
- inject:
properties-file: 'bundle_vars.txt'
- integration-deploy-controller-run-test
+ - integration-cleanup-tmp
publishers:
- integration-robot:
unstable-if: 0.0
pass-if: 100.0
- archive:
publishers:
- integration-robot:
unstable-if: 0.0
pass-if: 100.0
- archive:
- artifacts: 'karaf.log'
+ artifacts: 'karaf.log
*
'
- email-notification:
email-prefix: '[{project}]'
- plot:
- email-notification:
email-prefix: '[{project}]'
- plot:
@@
-201,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
@@
-215,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:
@@
-226,6
+241,9
@@
test-options: '{robot-options}'
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
test-options: '{robot-options}'
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
+ - integration-jdk-version:
+ # Here {jdk} is taken from releng-defaults.yaml
+ jdkversion: '{jdk}'
scm:
- integration-gerrit-scm:
scm:
- integration-gerrit-scm:
@@
-252,7
+270,10
@@
pattern: 'csit/suites/{project}/**'
builders:
pattern: 'csit/suites/{project}/**'
builders:
+ - integration-cleanup-workspace
- integration-install-robotframework
- integration-install-robotframework
+ - inject:
+ properties-file: 'env.properties'
- integration-get-slave-addresses
- inject:
properties-file: 'slave_addresses.txt'
- integration-get-slave-addresses
- inject:
properties-file: 'slave_addresses.txt'
@@
-260,18
+281,20
@@
- inject:
properties-file: 'bundle_vars.txt'
- integration-deploy-controller-run-test
- inject:
properties-file: 'bundle_vars.txt'
- integration-deploy-controller-run-test
+ - integration-cleanup-tmp
publishers:
- integration-robot:
unstable-if: 0.0
publishers:
- integration-robot:
unstable-if: 0.0
- pass-if: 0.0
+ pass-if:
10
0.0
- archive:
- archive:
- artifacts: 'karaf.log'
+ artifacts: 'karaf.log
*
'
- email-notification:
email-prefix: '[{project}]'
- job-template:
name: '{project}-csit-1node-{functionality}-{install}-{stream}'
- email-notification:
email-prefix: '[{project}]'
- job-template:
name: '{project}-csit-1node-{functionality}-{install}-{stream}'
+ disabled: false
project-type: freestyle
node: dynamic_robot
project-type: freestyle
node: dynamic_robot
@@
-299,6
+322,8
@@
test-plan: '{project}-{functionality}.txt'
- integration-patch-refspec:
branch: 'master'
test-plan: '{project}-{functionality}.txt'
- integration-patch-refspec:
branch: 'master'
+ - integration-jdk-version:
+ jdkversion: '{jdk}'
scm:
- integration-gerrit-scm:
scm:
- integration-gerrit-scm:
@@
-319,12
+344,14
@@
- '{ssh-credentials}'
triggers:
- '{ssh-credentials}'
triggers:
- -
reverse
:
+ -
integration-csit-{install}
:
jobs: '{trigger-jobs}'
jobs: '{trigger-jobs}'
- result: 'success'
builders:
builders:
+ - integration-cleanup-workspace
- integration-install-robotframework
- integration-install-robotframework
+ - inject:
+ properties-file: 'env.properties'
- integration-get-slave-addresses
- inject:
properties-file: 'slave_addresses.txt'
- integration-get-slave-addresses
- inject:
properties-file: 'slave_addresses.txt'
@@
-332,13
+359,14
@@
- inject:
properties-file: 'bundle_vars.txt'
- integration-deploy-controller-run-test
- inject:
properties-file: 'bundle_vars.txt'
- integration-deploy-controller-run-test
+ - integration-cleanup-tmp
publishers:
- integration-robot:
unstable-if: 0.0
pass-if: 100.0
- archive:
publishers:
- integration-robot:
unstable-if: 0.0
pass-if: 100.0
- archive:
- artifacts: 'karaf.log'
+ artifacts: 'karaf.log
*
'
- email-notification:
email-prefix: '[{project}]'
- plot:
- email-notification:
email-prefix: '[{project}]'
- plot:
@@
-369,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
@@
-396,6
+425,8
@@
test-plan: '{project}-{functionality}.txt'
- integration-patch-refspec:
branch: 'master'
test-plan: '{project}-{functionality}.txt'
- integration-patch-refspec:
branch: 'master'
+ - integration-jdk-version:
+ jdkversion: '{jdk}'
scm:
- integration-gerrit-scm:
scm:
- integration-gerrit-scm:
@@
-418,7
+449,10
@@
- timed: '{schedule}'
builders:
- timed: '{schedule}'
builders:
+ - integration-cleanup-workspace
- integration-install-robotframework
- integration-install-robotframework
+ - inject:
+ properties-file: 'env.properties'
- integration-get-slave-addresses
- inject:
properties-file: 'slave_addresses.txt'
- integration-get-slave-addresses
- inject:
properties-file: 'slave_addresses.txt'
@@
-426,13
+460,14
@@
- inject:
properties-file: 'bundle_vars.txt'
- integration-deploy-controller-run-test
- inject:
properties-file: 'bundle_vars.txt'
- integration-deploy-controller-run-test
+ - integration-cleanup-tmp
publishers:
- integration-robot:
unstable-if: 0.0
pass-if: 100.0
- archive:
publishers:
- integration-robot:
unstable-if: 0.0
pass-if: 100.0
- archive:
- artifacts: '
karaf.log
'
+ artifacts: '
*.log,karaf.log*
'
- email-notification:
email-prefix: '[{project}]'
- plot:
- email-notification:
email-prefix: '[{project}]'
- plot:
@@
-463,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
@@
-477,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:
@@
-488,6
+524,8
@@
test-options: '{robot-options}'
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
test-options: '{robot-options}'
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
+ - integration-jdk-version:
+ jdkversion: '{jdk}'
scm:
- integration-gerrit-scm:
scm:
- integration-gerrit-scm:
@@
-514,7
+552,10
@@
pattern: 'csit/suites/{project}/**'
builders:
pattern: 'csit/suites/{project}/**'
builders:
+ - integration-cleanup-workspace
- integration-install-robotframework
- integration-install-robotframework
+ - inject:
+ properties-file: 'env.properties'
- integration-get-slave-addresses
- inject:
properties-file: 'slave_addresses.txt'
- integration-get-slave-addresses
- inject:
properties-file: 'slave_addresses.txt'
@@
-524,17
+565,20
@@
- integration-deploy-controller
- integration-configure-clustering
- integration-start-cluster-run-test
- integration-deploy-controller
- integration-configure-clustering
- integration-start-cluster-run-test
+ - integration-cleanup-tmp
+
publishers:
- integration-robot:
unstable-if: 0.0
publishers:
- integration-robot:
unstable-if: 0.0
- pass-if: 0.0
+ pass-if:
10
0.0
- archive:
- archive:
- artifacts: '*karaf.log'
+ artifacts: '*karaf.log
*
'
- email-notification:
email-prefix: '[{project}]'
- job-template:
name: '{project}-csit-3node-{functionality}-{install}-{stream}'
- email-notification:
email-prefix: '[{project}]'
- job-template:
name: '{project}-csit-3node-{functionality}-{install}-{stream}'
+ disabled: false
project-type: freestyle
node: dynamic_robot
project-type: freestyle
node: dynamic_robot
@@
-562,6
+606,8
@@
test-plan: '{project}-{functionality}.txt'
- integration-patch-refspec:
branch: 'master'
test-plan: '{project}-{functionality}.txt'
- integration-patch-refspec:
branch: 'master'
+ - integration-jdk-version:
+ jdkversion: '{jdk}'
scm:
- integration-gerrit-scm:
scm:
- integration-gerrit-scm:
@@
-582,12
+628,14
@@
- '{ssh-credentials}'
triggers:
- '{ssh-credentials}'
triggers:
- -
reverse
:
+ -
integration-csit-{install}
:
jobs: '{trigger-jobs}'
jobs: '{trigger-jobs}'
- result: 'success'
builders:
builders:
+ - integration-cleanup-workspace
- integration-install-robotframework
- integration-install-robotframework
+ - inject:
+ properties-file: 'env.properties'
- integration-get-slave-addresses
- inject:
properties-file: 'slave_addresses.txt'
- integration-get-slave-addresses
- inject:
properties-file: 'slave_addresses.txt'
@@
-597,13
+645,14
@@
- integration-deploy-controller
- integration-configure-clustering
- integration-start-cluster-run-test
- integration-deploy-controller
- integration-configure-clustering
- integration-start-cluster-run-test
+ - integration-cleanup-tmp
publishers:
- integration-robot:
unstable-if: 0.0
pass-if: 100.0
- archive:
publishers:
- integration-robot:
unstable-if: 0.0
pass-if: 100.0
- archive:
- artifacts: '*karaf.log'
+ artifacts: '*karaf.log
*
'
- email-notification:
email-prefix: '[{project}]'
- plot:
- email-notification:
email-prefix: '[{project}]'
- plot:
@@
-634,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
@@
-661,6
+711,8
@@
test-plan: '{project}-{functionality}.txt'
- integration-patch-refspec:
branch: 'master'
test-plan: '{project}-{functionality}.txt'
- integration-patch-refspec:
branch: 'master'
+ - integration-jdk-version:
+ jdkversion: '{jdk}'
scm:
- integration-gerrit-scm:
scm:
- integration-gerrit-scm:
@@
-683,7
+735,10
@@
- timed: '{schedule}'
builders:
- timed: '{schedule}'
builders:
+ - integration-cleanup-workspace
- integration-install-robotframework
- integration-install-robotframework
+ - inject:
+ properties-file: 'env.properties'
- integration-get-slave-addresses
- inject:
properties-file: 'slave_addresses.txt'
- integration-get-slave-addresses
- inject:
properties-file: 'slave_addresses.txt'
@@
-693,13
+748,14
@@
- integration-deploy-controller
- integration-configure-clustering
- integration-start-cluster-run-test
- integration-deploy-controller
- integration-configure-clustering
- integration-start-cluster-run-test
+ - integration-cleanup-tmp
publishers:
- integration-robot:
unstable-if: 0.0
pass-if: 100.0
- archive:
publishers:
- integration-robot:
unstable-if: 0.0
pass-if: 100.0
- archive:
- artifacts: '*karaf.log'
+ artifacts: '*karaf.log
*
'
- email-notification:
email-prefix: '[{project}]'
- plot:
- email-notification:
email-prefix: '[{project}]'
- plot: