From 43a9dcbcfd05f583c5927eedc3c2369081bb67ba Mon Sep 17 00:00:00 2001 From: Marcus Holl Date: Thu, 19 Jul 2018 10:26:34 +0200 Subject: [PATCH] Do not fail immediatly in case commit history does not contain a changeDocumentId we emit a log message and fail later at withManadotoryProperty check. --- test/groovy/CheckChangeInDevelopmentTest.groovy | 5 +++-- vars/checkChangeInDevelopment.groovy | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test/groovy/CheckChangeInDevelopmentTest.groovy b/test/groovy/CheckChangeInDevelopmentTest.groovy index 6689843ed..b7e9ded1c 100644 --- a/test/groovy/CheckChangeInDevelopmentTest.groovy +++ b/test/groovy/CheckChangeInDevelopmentTest.groovy @@ -103,8 +103,9 @@ class CheckChangeInDevelopmentTest extends BasePiperTest { @Test public void changeDocumentIdRetrievalFailsTest() { - thrown.expect(AbortException) - thrown.expectMessage('Something went wrong') + thrown.expect(IllegalArgumentException) + thrown.expectMessage("No changeDocumentId provided. Neither via parameter 'changeDocumentId' nor via " + + "label 'ChangeDocument\\s?:' in commit range [from: origin/master, to: HEAD].") ChangeManagement cm = new ChangeManagement(nullScript, null) { diff --git a/vars/checkChangeInDevelopment.groovy b/vars/checkChangeInDevelopment.groovy index 64b2c6b49..afc44650a 100644 --- a/vars/checkChangeInDevelopment.groovy +++ b/vars/checkChangeInDevelopment.groovy @@ -65,7 +65,7 @@ def call(parameters = [:]) { echo "[INFO] ChangeDocumentId '${changeId}' retrieved from commit history" } } catch(ChangeManagementException ex) { - throw new AbortException(ex.getMessage()) + echo "[WARN] Cannot retrieve changeDocumentId from commit history: ${ex.getMessage()}." } }