From 362cc4d4416c79919e40d8d53120d1cbb4be5db1 Mon Sep 17 00:00:00 2001
From: Yuxiang Zhu <yuxzhu@redhat.com>
Date: May 14 2019 06:17:42 +0000
Subject: CI/CD: Fix postmerge job commit flagging


Pagure doesn't seem to allow to use the same `uid` for different commits.

---

diff --git a/openshift/pipelines/templates/waiverdb-build.Jenkinsfile b/openshift/pipelines/templates/waiverdb-build.Jenkinsfile
index 5444a5a..75efb96 100644
--- a/openshift/pipelines/templates/waiverdb-build.Jenkinsfile
+++ b/openshift/pipelines/templates/waiverdb-build.Jenkinsfile
@@ -533,7 +533,7 @@ def setBuildStatusOnPagurePR(percent, String comment) {
 }
 def flagCommit(status, percent, comment) {
   withPagureCreds {
-    it.flagCommit(username: 'c3i-jenkins', uid: 'ci-post-merge', status: status,
+    it.flagCommit(username: 'c3i-jenkins', uid: "ci-post-merge-${env.WAIVERDB_GIT_COMMIT.substring(0, 7)}", status: status,
       url: env.BUILD_URL, percent: percent, comment: comment, commit: env.WAIVERDB_GIT_COMMIT)
   }
 }