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 "Add INFO.yaml verify job"
[ci-management.git]
/
jjb
/
sweetcomb
/
sweetcomb.yaml
diff --git
a/jjb/sweetcomb/sweetcomb.yaml
b/jjb/sweetcomb/sweetcomb.yaml
index
f1accc6
..
3f58ccd
100644
(file)
--- a/
jjb/sweetcomb/sweetcomb.yaml
+++ b/
jjb/sweetcomb/sweetcomb.yaml
@@
-20,14
+20,12
@@
jobs:
- 'sweetcomb-verify-{stream}-{os}'
- 'sweetcomb-merge-{stream}-{os}'
jobs:
- 'sweetcomb-verify-{stream}-{os}'
- 'sweetcomb-merge-{stream}-{os}'
-
- 'sweetcomb-test-{stream}-{os}
'
+
#- 'sweetcomb-test-{stream}-ubuntu1604
'
project: 'sweetcomb'
os:
- ubuntu1604:
repo-os-part: 'ubuntu.xenial.main'
project: 'sweetcomb'
os:
- ubuntu1604:
repo-os-part: 'ubuntu.xenial.main'
- - ubuntu1804:
- repo-os-part: 'ubuntu.bionic.main'
- centos7:
repo-os-part: 'centos7'
stream:
- centos7:
repo-os-part: 'centos7'
stream:
@@
-40,6
+38,9
@@
- '1901':
branch: 'stable/1901'
repo-stream-part: 'stable.1901'
- '1901':
branch: 'stable/1901'
repo-stream-part: 'stable.1901'
+ - vom:
+ branch: 'vom'
+ repo-stream-part: 'vom'
- project:
name: sweetcomb-view
- project:
name: sweetcomb-view
@@
-60,6
+61,14
@@
artifactDaysToKeep: '{build-artifact-days-to-keep}'
artifactNumToKeep: '{build-artifact-num-to-keep}'
artifactDaysToKeep: '{build-artifact-days-to-keep}'
artifactNumToKeep: '{build-artifact-num-to-keep}'
+ archive-artifacts: >
+ **/build-root/build-package/*.rpm
+ **/build-root/build-package/*.deb
+ allow-empty: 'true'
+ fingerprint: false
+ only-if-success: true
+ default-excludes: false
+
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
@@
-71,6
+80,10
@@
repo-name: '{repo-stream-part}.{repo-os-part}'
- stream-parameter:
stream: '{stream}'
repo-name: '{repo-stream-part}.{repo-os-part}'
- stream-parameter:
stream: '{stream}'
+ - string:
+ name: ARCHIVE_ARTIFACTS
+ default: '{archive-artifacts}'
+ description: Artifacts to archive to the logs server.
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
@@
-105,14
+118,6
@@
!include-raw-escape:
- include-raw-sweetcomb-build.sh
publishers:
!include-raw-escape:
- include-raw-sweetcomb-build.sh
publishers:
- - archive:
- artifacts: >
- **/build-root/build-package/*.rpm,
- **/build-root/build-package/*.deb,
- allow-empty: 'true'
- fingerprint: false
- only-if-success: true
- default-excludes: false
- fdio-infra-shiplogs:
maven-version: 'mvn33-new'
- naginator:
- fdio-infra-shiplogs:
maven-version: 'mvn33-new'
- naginator:
@@
-120,10
+125,6
@@
max-failed-builds: 1
fixed-delay: 90
max-failed-builds: 1
fixed-delay: 90
- publishers:
- - fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
-
- job-template:
name: 'sweetcomb-merge-{stream}-{os}'
- job-template:
name: 'sweetcomb-merge-{stream}-{os}'
@@
-138,7
+139,7
@@
archive-artifacts: >
**/build-root/build-package/*.rpm
archive-artifacts: >
**/build-root/build-package/*.rpm
- **/build-root/build-package/*.deb
,
+ **/build-root/build-package/*.deb
allow-empty: 'true'
fingerprint: false
only-if-success: true
allow-empty: 'true'
fingerprint: false
only-if-success: true
@@
-160,7
+161,6
@@
default: '{archive-artifacts}'
description: Artifacts to archive to the logs server.
default: '{archive-artifacts}'
description: Artifacts to archive to the logs server.
-
scm:
- gerrit-trigger-scm:
credentials-id: 'jenkins-gerrit-credentials'
scm:
- gerrit-trigger-scm:
credentials-id: 'jenkins-gerrit-credentials'
@@
-194,14
+194,6
@@
!include-raw-escape:
- ../scripts/packagecloud_push.sh
publishers:
!include-raw-escape:
- ../scripts/packagecloud_push.sh
publishers:
- - archive:
- artifacts: >
- **/build-root/build-package/*.rpm,
- **/build-root/build-package/*.deb,
- allow-empty: 'true'
- fingerprint: false
- only-if-success: true
- default-excludes: false
- fdio-infra-shiplogs:
maven-version: 'mvn33-new'
- naginator:
- fdio-infra-shiplogs:
maven-version: 'mvn33-new'
- naginator:
@@
-210,10
+202,10
@@
fixed-delay: 90
- job-template:
fixed-delay: 90
- job-template:
- name: 'sweetcomb-test-{stream}-
{os}
'
+ name: 'sweetcomb-test-{stream}-
ubuntu1604
'
project-type: freestyle
project-type: freestyle
- node: '
{os}
-us'
+ node: '
ubuntu1604
-us'
concurrent: true
build-discarder:
concurrent: true
build-discarder:
@@
-222,15
+214,21
@@
artifactDaysToKeep: '{build-artifact-days-to-keep}'
artifactNumToKeep: '{build-artifact-num-to-keep}'
artifactDaysToKeep: '{build-artifact-days-to-keep}'
artifactNumToKeep: '{build-artifact-num-to-keep}'
+ archive-artifacts: >
+ allow-empty: 'true'
+ fingerprint: false
+ only-if-success: true
+ default-excludes: false
+
parameters:
- project-parameter:
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- os-parameter:
parameters:
- project-parameter:
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- os-parameter:
- os: '
{os}
'
+ os: '
ubuntu1604
'
- repo-name-parameter:
- repo-name-parameter:
- repo-name: '{repo-stream-part}.
{repo-os-part}
'
+ repo-name: '{repo-stream-part}.
ubuntu.xenial.main
'
- stream-parameter:
stream: '{stream}'
- stream-parameter:
stream: '{stream}'
@@
-263,11
+261,6
@@
- include-raw-sweetcomb-build.sh
- include-raw-sweetcomb-test.sh
publishers:
- include-raw-sweetcomb-build.sh
- include-raw-sweetcomb-test.sh
publishers:
- - archive:
- allow-empty: 'true'
- fingerprint: false
- only-if-success: true
- default-excludes: false
- fdio-infra-shiplogs:
maven-version: 'mvn33-new'
- naginator:
- fdio-infra-shiplogs:
maven-version: 'mvn33-new'
- naginator:
@@
-275,6
+268,11
@@
max-failed-builds: 1
fixed-delay: 90
max-failed-builds: 1
fixed-delay: 90
- publishers:
- - fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
+- project:
+ name: sweetcomb-info
+ project-name: sweetcomb
+ jobs:
+ - gerrit-info-yaml-verify
+ build-node: centos7-builder-4c-4g
+ project: sweetcomb
+ branch: master