remove unused macros

Change-Id: I2cec2c939b7f16d517a2527606cf024fca81583e
Signed-off-by: Sandra Biton <sandra.biton@hpe.com>

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 0513be63a2b34d9f0e2ba7b573d8fe5a9c8f7546..532a55bb4f770210edd35eaadefb1ce1c97b689f 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -23,54 +23,6 @@
             timeout: 1440
             fail: true
 
-- trigger:
-    name: autorelease-trigger-patch-site-merged
-    triggers:
-        - gerrit:
-            server-name: 'OpenDaylight'
-            trigger-on:
-                - change-merged-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'republish'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{name}'
-                branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/{branch}'
-                file-paths:
-                    - compare-type: ANT
-                      pattern: src/site/**
-                    - compare-type: ANT
-                      pattern: site.xml
-
-- trigger:
-    name: autorelease-trigger-patch-site-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: src/site/**
-                    - compare-type: ANT
-                      pattern: site.xml
-
 - builder:
     name: autorelease-checkout-gerrit-patch
     builders:

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 83daad88bdfbfe1b864d2540a43452f326453463..c7ab8979c00177b3c19aed59c36872bbd4ad9d34 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -151,29 +151,6 @@
                   - compare-type: 'ANT'
                     pattern: '{pattern}'
 
-# Macro: integration-trigger-patch-merged
-# Operation: this macro sets a trigger for patch merged on a path pattern
-# Used by: not used yet
-
-- trigger:
-    name: integration-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: '{pattern}'
-
 # Macro: integration-csit-only
 # Operation: this macro sets a trigger on reverse job list
 # Used by: csit -only- job templates

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index c7e397cba19c77f43cf059f134c7b6779b884315..af82785503909f65b712f2cccfdaef35477b05cc 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -203,35 +203,6 @@
                 unstable: true
                 notbuilt: true
 
-- trigger:
-    name: gerrit-trigger-patch-site-merged
-    triggers:
-        - gerrit:
-            server-name: 'OpenDaylight'
-            trigger-on:
-                - change-merged-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'republish'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{name}'
-                branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/{branch}'
-            # Force Jenkins always vote the values it should already have voted
-            # during the prior verify phase
-            override-votes: true
-            gerrit-build-started-verified-value: 1
-            gerrit-build-successful-verified-value: 1
-            gerrit-build-failed-verified-value: 1
-            gerrit-build-unstable-verified-value: 1
-            gerrit-build-notbuilt-verified-value: 1
-            gerrit-build-started-codereview-value: 0
-            gerrit-build-successful-codereview-value: 0
-            gerrit-build-failed-codereview-value: 0
-            gerrit-build-unstable-codereview-value: 0
-            gerrit-build-notbuilt-codereview-value: 0
-
 - publisher:
     name: archive-artifacts
     publishers: