Added any matching to patchset manipulation
Change-Id: I1054ece43833bd631dbbd0fc5bcafb7c6fd9f49d
diff --git a/src/com/mirantis/mk/Gerrit.groovy b/src/com/mirantis/mk/Gerrit.groovy
index cb539e4..a71994a 100644
--- a/src/com/mirantis/mk/Gerrit.groovy
+++ b/src/com/mirantis/mk/Gerrit.groovy
@@ -190,17 +190,19 @@
* Returns boolean result of test given gerrit patchset for given approval type and value
* @param patchset gerrit patchset
* @param approvalType type of tested approval (optional, default Verified)
- * @param approvalValue value of tested approval (optional, default 1)
+ * @param approvalValue value of tested approval (optional, default empty string which means any value)
* @return boolean result
* @example patchsetHasApproval(gerrit.getGerritChange(*,*,*,*, true).currentPatchSet)
*/
@NonCPS
-def patchsetHasApproval(patchSet, approvalType="Verified", approvalValue="1"){
+def patchsetHasApproval(patchSet, approvalType="Verified", approvalValue = ""){
if(patchSet && patchSet.approvals){
for(int i=0; i < patchSet.approvals.size();i++){
def approval = patchSet.approvals.get(i)
- if(approval.type.equals(approvalType) && approval.value.equals(approvalValue)){
- return true
+ if(approval.type.equals(approvalType)){
+ if(approvalValue.equals("") || approval.value.equals(approvalValue)){
+ return true
+ }
}
}
}