From 8b61e9fe9cc3b46dc40340a25b710d5b67b04a49 Mon Sep 17 00:00:00 2001 From: Ed Warnicke Date: Wed, 29 Jun 2016 17:00:54 -0500 Subject: [PATCH] Move from rpm push in merge to rpm push in integration It turns out that doing rpm push in both merge and integration job leads to collisions because they have two separate sequences of BUILD_NUMBERs and those BUILD_NUMBERS are used for the rpm release number. So... this patch makes the merge job *stop* pushing rpms, and should cause the integration job to trigger on both vpp *and* honeycomb merge job success. Change-Id: I12fe582ea8a1444096b86c214b3cd3c412bc7591 Signed-off-by: Ed Warnicke --- jjb/honeycomb/honeycomb.yaml | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml index fe605b848..c82a71512 100644 --- a/jjb/honeycomb/honeycomb.yaml +++ b/jjb/honeycomb/honeycomb.yaml @@ -198,20 +198,6 @@ global-settings-type: cfp postbuilders: - - maven-target: - maven-version: '{mvn33}' - goals: '--version' - settings: 'honeycomb-settings' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - provide-maven-settings: - settings-file: 'honeycomb-settings' - global-settings-file: 'global-settings' - - 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 @@ -223,10 +209,6 @@ language: 'java' - email-notification: email-prefix: '[honeycomb]' - - maven-deploy: - id: '' - unique-version: true - deploy-unstable: false - job-template: name: 'honeycomb-integration-{stream}-{os}' @@ -263,7 +245,7 @@ triggers: - reverse: - jobs: 'vpp-merge-{branch}-{os}' + jobs: 'vpp-merge-{branch}-{os},honeycomb-merge-{branch}-{os}' result: 'success' prebuilders: -- 2.16.6