diff options
| author |   Ed Warnicke <eaw@cisco.com> | 2016-06-15 11:45:51 -0500 |
|---|---|---|
| committer |   Ed Warnicke <hagbard@gmail.com> | 2016-06-16 20:55:36 +0000 |
| commit | 94a021b71266d451fcca9f7132e68c73b20140c4 (patch) | |
| tree | 52086f5b7d3087ab6958a7b73c8423c74a0b5785 /jjb/honeycomb | |
| parent | 995d396e9310ded5827f5ee17c345b06234f68ca (diff) | |
Setup honeycomb to build and push rpms on merge
This patch depends on the merging of https://gerrit.fd.io/r/#/c/1574/
which must merge before it.
Please also note, while there is a first step to getting the package
pushing scripts into a common sharable place, the vpp script
for pushing has *intentionally* not been changed to use
it yet because of the release later this week as a matter
of risk management.
Change-Id: Ifad185d35f582a62bb750ece3c022a24d2153b4e
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Diffstat (limited to 'jjb/honeycomb')
| -rw-r--r-- | jjb/honeycomb/honeycomb.yaml | 15 | ||||
| -rw-r--r-- | jjb/honeycomb/include-raw-honeycomb-pkg-push.sh | 16 |
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 |