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
csit-verify: Do not change Java version
[releng/builder.git]
/
jjb
/
integration
/
integration-templates.yaml
diff --git
a/jjb/integration/integration-templates.yaml
b/jjb/integration/integration-templates.yaml
index dff4e52c52fe187ef9aef0a7340355657b7f6f79..3a4cade5e483d081b99f91ebc3a10e8eb37c94d4 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,6
+83,7
@@
pattern: 'csit/suites/{project}/**'
builders:
pattern: 'csit/suites/{project}/**'
builders:
+ - integration-cleanup-workspace
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
@@
-95,14
+99,15
@@
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
@@
-130,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:
@@
-149,12
+156,13
@@
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
- inject:
properties-file: 'env.properties'
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
@@
-172,7
+180,7
@@
unstable-if: 0.0
pass-if: 100.0
- archive:
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:
@@
-207,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
@@
-221,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:
@@
-232,6
+241,7
@@
test-options: '{robot-options}'
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
test-options: '{robot-options}'
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
+ # TODO: Use integration-jdk-version macro when switching to Boron
scm:
- integration-gerrit-scm:
scm:
- integration-gerrit-scm:
@@
-258,6
+268,7
@@
pattern: 'csit/suites/{project}/**'
builders:
pattern: 'csit/suites/{project}/**'
builders:
+ - integration-cleanup-workspace
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
@@
-273,14
+284,15
@@
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
@@
-308,6
+320,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:
@@
-328,11
+342,11
@@
- '{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
- inject:
properties-file: 'env.properties'
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
@@
-350,7
+364,7
@@
unstable-if: 0.0
pass-if: 100.0
- archive:
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:
@@
-381,6
+395,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
@@
-408,6
+423,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:
@@
-430,6
+447,7
@@
- timed: '{schedule}'
builders:
- timed: '{schedule}'
builders:
+ - integration-cleanup-workspace
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
@@
-447,7
+465,7
@@
unstable-if: 0.0
pass-if: 100.0
- archive:
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:
@@
-478,6
+496,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
@@
-492,7
+511,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:
@@
-503,6
+522,7
@@
test-options: '{robot-options}'
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
test-options: '{robot-options}'
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
+ # TODO: Use integration-jdk-version macro when switching to Boron
scm:
- integration-gerrit-scm:
scm:
- integration-gerrit-scm:
@@
-529,6
+549,7
@@
pattern: 'csit/suites/{project}/**'
builders:
pattern: 'csit/suites/{project}/**'
builders:
+ - integration-cleanup-workspace
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
@@
-546,14
+567,15
@@
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
@@
-581,6
+603,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:
@@
-601,11
+625,11
@@
- '{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
- inject:
properties-file: 'env.properties'
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
@@
-625,7
+649,7
@@
unstable-if: 0.0
pass-if: 100.0
- archive:
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:
@@
-656,6
+680,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
@@
-683,6
+708,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:
@@
-705,6
+732,7
@@
- timed: '{schedule}'
builders:
- timed: '{schedule}'
builders:
+ - integration-cleanup-workspace
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
- integration-install-robotframework
- inject:
properties-file: 'env.properties'
@@
-724,7
+752,7
@@
unstable-if: 0.0
pass-if: 100.0
- archive:
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: