From 2055b0ec8e99f88c93996536680882840efa70a3 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Fri, 23 Nov 2018 17:33:16 +0800 Subject: [PATCH] Simplify autorelease-maven-sources macro into one No reason for this macro to have 2 parts when both parts need to be run together. Combine them into 1 to simplify the macros. Change-Id: Ifafaa07d3b6abc3cd613a49dc730da5acfac68cc Signed-off-by: Thanh Ha --- jjb/autorelease/autorelease-macros.yaml | 4 ---- jjb/autorelease/autorelease-templates.yaml | 1 - 2 files changed, 5 deletions(-) diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml index 60e3cfd9d..e66dc54b6 100644 --- a/jjb/autorelease/autorelease-macros.yaml +++ b/jjb/autorelease/autorelease-macros.yaml @@ -86,10 +86,6 @@ settings-type: cfp global-settings: '{global-settings}' global-settings-type: cfp - -- builder: - name: autorelease-maven-sources-post-process - builders: - shell: | awk '/The following files have NOT been resolved:/,/^$/' sources.log > missing-sources.log diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml index 4a320b8ca..e483b3d2b 100644 --- a/jjb/autorelease/autorelease-templates.yaml +++ b/jjb/autorelease/autorelease-templates.yaml @@ -170,7 +170,6 @@ maven-version: 'mvn35' settings: 'autorelease-settings' global-settings: 'global-settings' - - autorelease-maven-sources-post-process - shell: | mkdir -p archives/ cp *.log *.prop $_ -- 2.36.6