summaryrefslogtreecommitdiffstats
path: root/jjb/honeycomb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/honeycomb')
-rw-r--r--jjb/honeycomb/honeycomb.yaml15
-rw-r--r--jjb/honeycomb/include-raw-honeycomb-pkg-push.sh16
2 files changed, 30 insertions, 1 deletions
diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index 15b753d4c..1b8cc43c2 100644
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -6,10 +6,15 @@
- 'honeycomb-integration-{stream}-{os}'
- 'honeycomb-verify-image-{stream}-{os}'
project: 'honeycomb'
+ os:
+ - ubuntu1404:
+ repo-os-part: 'ubuntu.trusty.main'
+ - centos7:
+ repo-os-part: 'centos7'
stream:
- master:
branch: 'master'
- os: 'ubuntu1404'
+ repo-stream-part: 'master'
- job-template:
name: 'honeycomb-verify-{stream}-{os}'
@@ -157,6 +162,10 @@
project: '{project}'
- os-parameter:
os: '{os}'
+ - maven-project-parameter:
+ maven: '{mvn33}'
+ - repo-name-parameter:
+ repo-name: '{repo-stream-part}.{repo-os-part}'
scm:
- gerrit-trigger-scm:
@@ -190,6 +199,10 @@
global-settings-type: cfp
postbuilders:
+ - shell:
+ !include-raw-escape:
+ - ../scripts/maven_push_functions.sh
+ - include-raw-honeycomb-pkg-push.sh
- shell: |
if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.7.0-openjdk-amd64;fi
diff --git a/jjb/honeycomb/include-raw-honeycomb-pkg-push.sh b/jjb/honeycomb/include-raw-honeycomb-pkg-push.sh
new file mode 100644
index 000000000..c501a08f1
--- /dev/null
+++ b/jjb/honeycomb/include-raw-honeycomb-pkg-push.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+if [ "${OS}" == "centos7" ]; then
+
+ # Build the rpms
+
+ ./packaging/rpm/rpmbuild.sh
+
+ # Find the files
+ RPMS=$(find . -type f -iname '*.rpm')
+ SRPMS=$(find . -type f -iname '*.srpm')
+ SRCRPMS=$(find . -type f -name '*.src.rpm')
+ for i in $RPMS $SRPMS $SRCRPMS
+ do
+ push_rpm "$i"
+ done
+fi \ No newline at end of file