diff options
| author |   Hongjun Ni <hongjun.ni@intel.com> | 2019-02-02 22:26:09 +0800 |
|---|---|---|
| committer | Hongjun Ni <hongjun.ni@intel.com> | 2019-02-02 22:26:09 +0800 |
| commit | 0cecbf0b2e4bbdb6570abbe819c56dada669edab (patch) | |
| tree | 7a2bc9a8a23182be4e68cf070fd26fb2da8507b7 /jjb/sweetcomb | |
| parent | f40f8903795cc9b1b893ee0fd620ce221fd743a4 (diff) | |
Add publisher feature to merge job
Change-Id: I6096cc0f3ae397cf9108521f44e90b198da8a7b8
Signed-off-by: Hongjun Ni <hongjun.ni@intel.com>
Diffstat (limited to 'jjb/sweetcomb')
| -rw-r--r-- | jjb/sweetcomb/include-raw-sweetcomb-build.sh | 20 | ||||
| -rw-r--r-- | jjb/sweetcomb/sweetcomb.yaml | 53 |
2 files changed, 64 insertions, 9 deletions
diff --git a/jjb/sweetcomb/include-raw-sweetcomb-build.sh b/jjb/sweetcomb/include-raw-sweetcomb-build.sh new file mode 100644 index 000000000..30e42c4a4 --- /dev/null +++ b/jjb/sweetcomb/include-raw-sweetcomb-build.sh @@ -0,0 +1,20 @@ +#!/bin/bash +# basic build script example +set -xe -o pipefail + +OS_ID=$(grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g') +OS_VERSION_ID=$(grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g') + +echo OS_ID: $OS_ID +echo OS_VERSION_ID: $OS_VERSION_ID + +echo "Building using \"make build-root/build.sh\"" +[ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes install-dep +[ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes install-dep-extra +[ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes install-vpp +[ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes build-scvpp +[ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes build + +echo "*******************************************************************" +echo "* SWEETCOMB BUILD SUCCESSFULLY COMPLETED" +echo "*******************************************************************" diff --git a/jjb/sweetcomb/sweetcomb.yaml b/jjb/sweetcomb/sweetcomb.yaml index 661adf9ee..10f042ab4 100644 --- a/jjb/sweetcomb/sweetcomb.yaml +++ b/jjb/sweetcomb/sweetcomb.yaml @@ -39,22 +39,26 @@ name: 'sweetcomb-verify-{stream}-{os}' project-type: freestyle - node: '{os}-basebuild-4c-4g' + node: '{os}-us' concurrent: true build-discarder: daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' + numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' artifactNumToKeep: '{build-artifact-num-to-keep}' parameters: - project-parameter: - project: 'sweetcomb' + project: '{project}' - gerrit-parameter: branch: '{branch}' - os-parameter: os: '{os}' + - repo-name-parameter: + repo-name: '{repo-stream-part}.{repo-os-part}' + - stream-parameter: + stream: '{stream}' scm: - gerrit-trigger-scm: @@ -64,11 +68,11 @@ wrappers: - fdio-infra-wrappers: - build-timeout: '{build-timeout}' + build-timeout: 120 triggers: - gerrit-trigger-patch-submitted: - name: 'sweetcomb' + name: '{project}' branch: '{branch}' publishers: @@ -79,21 +83,25 @@ name: 'sweetcomb-merge-{stream}-{os}' project-type: freestyle - node: '{os}-basebuild-4c-4g' + node: '{os}-us' build-discarder: daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' + numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' artifactNumToKeep: '{build-artifact-num-to-keep}' parameters: - project-parameter: - project: 'sweetcomb' + project: '{project}' - gerrit-parameter: branch: '{branch}' - os-parameter: os: '{os}' + - stream-parameter: + stream: '{stream}' + - repo-name-parameter: + repo-name: '{repo-stream-part}.{repo-os-part}' scm: - gerrit-trigger-scm: @@ -107,10 +115,37 @@ triggers: - gerrit-trigger-patch-merged: - name: 'sweetcomb' + name: '{project}' branch: '{branch}' + builders: + - config-file-provider: + files: + - file-id: '.packagecloud' + target: '/root' + - config-file-provider: + files: + - file-id: 'packagecloud_api' + target: '/root' + - shell: + !include-raw-escape: + - include-raw-sweetcomb-build.sh + - shell: + !include-raw-escape: + - ../scripts/packagecloud_push.sh publishers: + - archive: + artifacts: > + **/build-root/*.rpm, + **/build-root/*.deb, + allow-empty: 'true' + fingerprint: false + only-if-success: true + default-excludes: false - fdio-infra-shiplogs: maven-version: 'mvn33-new' + - naginator: + rerun-unstable-builds: false + max-failed-builds: 1 + fixed-delay: 90 |