From 4a05fa8bb97939b9356e92232db36a3d620326b8 Mon Sep 17 00:00:00 2001 From: Divya Madala Date: Tue, 1 Oct 2024 09:53:56 -0700 Subject: [PATCH] Update log message Signed-off-by: Divya Madala --- .../release-workflows/release-manifest-commit-lock.jenkinsfile | 2 +- tests/jenkins/TestReleaseManifestCommitLock.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins/release-workflows/release-manifest-commit-lock.jenkinsfile b/jenkins/release-workflows/release-manifest-commit-lock.jenkinsfile index 3953b7982c..82285da0f0 100644 --- a/jenkins/release-workflows/release-manifest-commit-lock.jenkinsfile +++ b/jenkins/release-workflows/release-manifest-commit-lock.jenkinsfile @@ -62,7 +62,7 @@ pipeline { } if (params.MANIFEST_LOCK_ACTION == 'MATCH_BUILD_MANIFEST' && (OPENSEARCH_RELEASE_CANDIDATE.isEmpty() || OPENSEARCH_DASHBOARDS_RELEASE_CANDIDATE.isEmpty())) { currentBuild.result = 'ABORTED' - error('OPENSEARCH_RELEASE_CANDIDATE and/or OPENSEARCH_DASHBOARDS_RELEASE_CANDIDATE cannot be empty when MANIFEST_LOCK_ACTION is MATCH_BUILD_MANIFEST or UPDATE_TO_RECENT_COMMITS.') + error('OPENSEARCH_RELEASE_CANDIDATE and/or OPENSEARCH_DASHBOARDS_RELEASE_CANDIDATE cannot be empty when MANIFEST_LOCK_ACTION is MATCH_BUILD_MANIFEST.') } } } diff --git a/tests/jenkins/TestReleaseManifestCommitLock.groovy b/tests/jenkins/TestReleaseManifestCommitLock.groovy index 68d83ab667..ce08f239eb 100644 --- a/tests/jenkins/TestReleaseManifestCommitLock.groovy +++ b/tests/jenkins/TestReleaseManifestCommitLock.groovy @@ -68,7 +68,7 @@ class TestReleaseManifestCommitLock extends BuildPipelineTest { runScript('jenkins/release-workflows/release-manifest-commit-lock.jenkinsfile') } def callStack = helper.getCallStack() - assertCallStack().contains('OPENSEARCH_RELEASE_CANDIDATE and/or OPENSEARCH_DASHBOARDS_RELEASE_CANDIDATE cannot be empty when MANIFEST_LOCK_ACTION is MATCH_BUILD_MANIFEST or UPDATE_TO_RECENT_COMMITS.') + assertCallStack().contains('OPENSEARCH_RELEASE_CANDIDATE and/or OPENSEARCH_DASHBOARDS_RELEASE_CANDIDATE cannot be empty when MANIFEST_LOCK_ACTION is MATCH_BUILD_MANIFEST.') } @Test