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
Remove all logrotate calls
[ci-management.git]
/
jjb
/
rpm_dpdk
/
rpm_dpdk.yaml
diff --git
a/jjb/rpm_dpdk/rpm_dpdk.yaml
b/jjb/rpm_dpdk/rpm_dpdk.yaml
index
9e34111
..
6ccb737
100644
(file)
--- a/
jjb/rpm_dpdk/rpm_dpdk.yaml
+++ b/
jjb/rpm_dpdk/rpm_dpdk.yaml
@@
-18,10
+18,10
@@
name: 'rpm_dpdk-verify-{stream}-{os}'
project-type: freestyle
name: 'rpm_dpdk-verify-{stream}-{os}'
project-type: freestyle
- node: '
verify-{os}
'
+ node: '
{os}-basebuild-4c-4g
'
concurrent: true
concurrent: true
-
logrotate
:
+
build-discarder
:
daysToKeep: '{build-days-to-keep}'
numToKeep: '{build-num-to-keep}'
artifactDaysToKeep: '{build-artifact-days-to-keep}'
daysToKeep: '{build-days-to-keep}'
numToKeep: '{build-num-to-keep}'
artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@
-39,14
+39,11
@@
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
- credentials-id: '
{ssh-credentials}
'
+ credentials-id: '
jenkins-gerrit-credentials
'
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
wrappers:
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@
-60,14
+57,18
@@
!include-raw-escape:
- include-raw-rpm_dpdk-pkg-build.sh
!include-raw-escape:
- include-raw-rpm_dpdk-pkg-build.sh
+ publishers:
+ - fdio-infra-shiplogs:
+ maven-version: 'mvn33-new'
+
- job-template:
name: 'rpm_dpdk-verify-image-{stream}-{os}'
project-type: freestyle
- job-template:
name: 'rpm_dpdk-verify-image-{stream}-{os}'
project-type: freestyle
- node: '
verify-image-{os}
'
+ node: '
{os}-basebuild-4c-4g
'
concurrent: true
concurrent: true
-
logrotate
:
+
build-discarder
:
daysToKeep: '{build-days-to-keep}'
numToKeep: '{build-num-to-keep}'
artifactDaysToKeep: '{build-artifact-days-to-keep}'
daysToKeep: '{build-days-to-keep}'
numToKeep: '{build-num-to-keep}'
artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@
-85,14
+86,11
@@
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
- credentials-id: '
{ssh-credentials}
'
+ credentials-id: '
jenkins-gerrit-credentials
'
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
wrappers:
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@
-118,14
+116,17
@@
- shell:
!include-raw-escape:
- include-raw-rpm_dpdk-pkg-build.sh
- shell:
!include-raw-escape:
- include-raw-rpm_dpdk-pkg-build.sh
+ publishers:
+ - fdio-infra-shiplogs:
+ maven-version: 'mvn33-new'
- job-template:
name: 'rpm_dpdk-merge-{stream}-{os}'
project-type: freestyle
- job-template:
name: 'rpm_dpdk-merge-{stream}-{os}'
project-type: freestyle
- node: '
merge-{os}
'
+ node: '
{os}-basebuild-4c-4g
'
-
logrotate
:
+
build-discarder
:
daysToKeep: '{build-days-to-keep}'
numToKeep: '{build-num-to-keep}'
artifactDaysToKeep: '{build-artifact-days-to-keep}'
daysToKeep: '{build-days-to-keep}'
numToKeep: '{build-num-to-keep}'
artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@
-140,17
+141,16
@@
os: '{os}'
- repo-name-parameter:
repo-name: '{repo-stream-part}.{repo-os-part}'
os: '{os}'
- repo-name-parameter:
repo-name: '{repo-stream-part}.{repo-os-part}'
+ - maven-exec:
+ maven-version: 'mvn33-new'
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
- credentials-id: '
{ssh-credentials}
'
+ credentials-id: '
jenkins-gerrit-credentials
'
refspec: ''
choosing-strategy: 'default'
wrappers:
refspec: ''
choosing-strategy: 'default'
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@
-160,6
+160,13
@@
branch: '{branch}'
builders:
branch: '{branch}'
builders:
+ - maven-target:
+ maven-version: 'mvn33-new'
+ goals: '--version'
+ settings: 'rpm_dpdk-settings'
+ settings-type: cfp
+ global-settings: 'global-settings'
+ global-settings-type: cfp
- config-file-provider:
files:
- file-id: 'rpm_dpdk-settings'
- config-file-provider:
files:
- file-id: 'rpm_dpdk-settings'
@@
-168,6
+175,10
@@
variable: 'GLOBAL_SETTINGS_FILE'
- shell:
!include-raw-escape:
variable: 'GLOBAL_SETTINGS_FILE'
- shell:
!include-raw-escape:
+ - ../scripts/maven_push_functions.sh
- include-raw-rpm_dpdk-pkg-build.sh
- include-raw-rpm_dpdk-pkg-push.sh
- include-raw-rpm_dpdk-pkg-build.sh
- include-raw-rpm_dpdk-pkg-push.sh
+ publishers:
+ - fdio-infra-shiplogs:
+ maven-version: 'mvn33-new'