summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongjun Ni <hongjun.ni@intel.com>2019-02-28 22:00:29 +0800
committerHongjun Ni <hongjun.ni@intel.com>2019-03-01 17:30:57 +0800
commit84127d5651703c700255afbd2575b98d91304242 (patch)
tree21ea133ecc0b1dc8141ef717b9e1bc015fd79b6c
parentbd99f3b0e54c18d8b2b0e2501a0d7b5a170cec67 (diff)
Add checkstyle and build to Sweetcomb verify job
Change-Id: Ib351a6f0758eaf6799fd2465dc8928931f1b3d86 Signed-off-by: Hongjun Ni <hongjun.ni@intel.com>
-rw-r--r--jjb/sweetcomb/include-raw-sweetcomb-checkstyle.sh7
-rw-r--r--jjb/sweetcomb/sweetcomb.yaml36
2 files changed, 43 insertions, 0 deletions
diff --git a/jjb/sweetcomb/include-raw-sweetcomb-checkstyle.sh b/jjb/sweetcomb/include-raw-sweetcomb-checkstyle.sh
new file mode 100644
index 000000000..258c9e7e2
--- /dev/null
+++ b/jjb/sweetcomb/include-raw-sweetcomb-checkstyle.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [ -f build-root/scripts/checkstyle.sh ];then
+ build-root/scripts/checkstyle.sh
+else
+ echo "Cannot find cat build-root/scripts/checkstyle.sh - skipping checkstyle"
+fi
diff --git a/jjb/sweetcomb/sweetcomb.yaml b/jjb/sweetcomb/sweetcomb.yaml
index 5d6dccc6f..751de128d 100644
--- a/jjb/sweetcomb/sweetcomb.yaml
+++ b/jjb/sweetcomb/sweetcomb.yaml
@@ -77,6 +77,40 @@
build-timeout: 120
triggers:
+ - gerrit-trigger-checkstyle:
+ 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-checkstyle.sh
+ - shell:
+ !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:
+ rerun-unstable-builds: false
+ max-failed-builds: 1
+ fixed-delay: 90
+
- gerrit-trigger-patch-submitted:
name: '{project}'
branch: '{branch}'
@@ -134,6 +168,8 @@
- file-id: 'packagecloud_api'
target: '/root'
- shell:
+ !include-raw-escape: include-raw-sweetcomb-checkstyle.sh
+ - shell:
!include-raw-escape:
- include-raw-sweetcomb-build.sh
- shell: