From e1cb6f664ff68f67fb75e671f674493fbf67a11d Mon Sep 17 00:00:00 2001 From: Luis Gomez Date: Mon, 31 Aug 2015 11:12:19 -0700 Subject: [PATCH] Fix distribution jobs - Change repo name integration -> integration/distribution - Restore original gerrit triggers, we do not need custom triggers - We leave integration mail list unitl we agree on sub-lists Change-Id: I0be23566b915ded30f88c2bfafd08167ce9db7b6 Signed-off-by: Luis Gomez --- .../integration-distribution-jobs.yaml | 12 ++-- jjb/integration/integration-macros.yaml | 56 ------------------- 2 files changed, 6 insertions(+), 62 deletions(-) diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml index 81c677920..78eb68b2a 100644 --- a/jjb/integration/integration-distribution-jobs.yaml +++ b/jjb/integration/integration-distribution-jobs.yaml @@ -34,7 +34,7 @@ parameters: - project-parameter: - project: 'integration' + project: 'integration/distribution' - gerrit-parameter: branch: '{branch}' @@ -51,8 +51,8 @@ - '{ssh-credentials}' triggers: - - integration-distribution-gerrit-trigger-patch-submitted: - name: 'integration' + - gerrit-trigger-patch-submitted: + name: 'integration/distribution' branch: '{branch}' prebuilders: @@ -86,7 +86,7 @@ parameters: - project-parameter: - project: 'integration' + project: 'integration/distribution' scm: - gerrit-trigger-scm: @@ -101,8 +101,8 @@ - '{ssh-credentials}' triggers: - - integration-distribution-gerrit-trigger-patch-merged: - name: 'integration' + - gerrit-trigger-patch-merged: + name: 'integration/distribution' branch: '{branch}' prebuilders: diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index 41f29bf1d..e66647c38 100644 --- a/jjb/integration/integration-macros.yaml +++ b/jjb/integration/integration-macros.yaml @@ -99,62 +99,6 @@ skip-tag: true choosing-strategy: 'gerrit' -- trigger: - name: integration-distribution-gerrit-trigger-patch-submitted - triggers: - - gerrit: - server-name: 'OpenDaylight' - trigger-on: - - patchset-created-event: - exclude-drafts: 'true' - exclude-trivial-rebase: 'false' - exclude-no-code-change: 'true' - - draft-published-event - - comment-added-contains-event: - comment-contains-value: 'recheck' - - comment-added-contains-event: - comment-contains-value: 'reverify' - projects: - - project-compare-type: 'ANT' - project-pattern: '{name}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - file-paths: - - compare-type: 'ANT' - pattern: 'pom.xml' - - compare-type: 'ANT' - pattern: 'distributions/**' - - compare-type: 'ANT' - pattern: 'features/**' - - compare-type: 'ANT' - pattern: 'feature-selector/**' - -- trigger: - name: integration-distribution-gerrit-trigger-patch-merged - triggers: - - gerrit: - server-name: 'OpenDaylight' - trigger-on: - - change-merged-event - - comment-added-contains-event: - comment-contains-value: 'remerge' - projects: - - project-compare-type: 'ANT' - project-pattern: '{name}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - file-paths: - - compare-type: 'ANT' - pattern: 'pom.xml' - - compare-type: 'ANT' - pattern: 'distributions/**' - - compare-type: 'ANT' - pattern: 'features/**' - - compare-type: 'ANT' - pattern: 'feature-selector/**' - - trigger: name: integration-test-gerrit-trigger-patch-submitted triggers: -- 2.36.6