Code Review
/
ci-management.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Modify tldk jenkins job to enable unit tests"
[ci-management.git]
/
jjb
/
tldk
/
tldk.yaml
diff --git
a/jjb/tldk/tldk.yaml
b/jjb/tldk/tldk.yaml
index
83cfbf4
..
f235704
100644
(file)
--- a/
jjb/tldk/tldk.yaml
+++ b/
jjb/tldk/tldk.yaml
@@
-18,7
+18,7
@@
name: '{project}-verify-{stream}-{os}'
project-type: freestyle
name: '{project}-verify-{stream}-{os}'
project-type: freestyle
- node: '
verify-{os}
'
+ node: '
{os}-basebuild-4c-4g
'
concurrent: true
logrotate:
concurrent: true
logrotate:
@@
-42,9
+42,6
@@
choosing-strategy: 'gerrit'
wrappers:
choosing-strategy: 'gerrit'
wrappers:
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@
-54,14
+51,22
@@
branch: '{branch}'
builders:
branch: '{branch}'
builders:
+ - shell:
+ !include-raw-escape: gtest-build.sh
+ - inject:
+ properties-file: gtest-env.prop
- shell:
!include-raw-escape: include-raw-build.sh
- shell:
!include-raw-escape: include-raw-build.sh
+ publishers:
+ - fdio-infra-shiplogs:
+ maven-version: 'mvn33-new'
+
- job-template:
name: '{project}-verify-image-{stream}-{os}'
project-type: freestyle
- job-template:
name: '{project}-verify-image-{stream}-{os}'
project-type: freestyle
- node: '
verify-image-{os}
'
+ node: '
{os}-basebuild-4c-4g
'
concurrent: true
logrotate:
concurrent: true
logrotate:
@@
-85,9
+90,6
@@
choosing-strategy: 'gerrit'
wrappers:
choosing-strategy: 'gerrit'
wrappers:
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@
-110,14
+112,22
@@
notbuilt: true
builders:
notbuilt: true
builders:
+ - shell:
+ !include-raw-escape: gtest-build.sh
+ - inject:
+ properties-file: gtest-env.prop
- shell:
!include-raw-escape: include-raw-build.sh
- shell:
!include-raw-escape: include-raw-build.sh
+ publishers:
+ - fdio-infra-shiplogs:
+ maven-version: 'mvn33-new'
+
- job-template:
name: '{project}-merge-{stream}-{os}'
project-type: freestyle
- job-template:
name: '{project}-merge-{stream}-{os}'
project-type: freestyle
- node: '
merge-{os}
'
+ node: '
{os}-basebuild-4c-4g
'
logrotate:
daysToKeep: '{build-days-to-keep}'
logrotate:
daysToKeep: '{build-days-to-keep}'
@@
-140,9
+150,6
@@
choosing-strategy: 'default'
wrappers:
choosing-strategy: 'default'
wrappers:
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@
-152,5
+159,13
@@
branch: '{branch}'
builders:
branch: '{branch}'
builders:
+ - shell:
+ !include-raw-escape: gtest-build.sh
+ - inject:
+ properties-file: gtest-env.prop
- shell:
!include-raw-escape: include-raw-build.sh
- shell:
!include-raw-escape: include-raw-build.sh
+
+ publishers:
+ - fdio-infra-shiplogs:
+ maven-version: 'mvn33-new'