From 8795cff83b9bc1ee50cc0c4e0ede3e209c883706 Mon Sep 17 00:00:00 2001
From: Fatih Degirmenci <fdegir@gmail.com>
Date: Tue, 30 Mar 2021 10:49:50 +0200
Subject: [PATCH] nsm: Differentiate status contexts in verify job and bugfix

The GitHub Pull Request Plugin publishes status messages to GitHub PR
for developers to see the results of verification. In previous job
configuration, status context was same for all jobs, overriding each
others status contexts and preventing to show statuses of different jobs.
This change uses different context based on what job does so the feedback
can be posted properly.

Example with same contexts: https://github.com/Nordix/Meridio/pull/1
Example with different contexts: https://github.com/Nordix/Meridio/pull/2

Auth ID was still wrong so that is fixed as well and a note is included
in jjb yaml to ensure it is not missed again.

Git SCM URL is also fixed in periodic job.

Change-Id: Iece387fec405b917ec1ae7b7704d4b85c79c45b4
---
 jjb/nsm/nordix-nsm-meridio-periodic.yaml |  2 +-
 jjb/nsm/nordix-nsm-meridio-verify.yaml   | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/jjb/nsm/nordix-nsm-meridio-periodic.yaml b/jjb/nsm/nordix-nsm-meridio-periodic.yaml
index 8c4b98f2..556a15eb 100644
--- a/jjb/nsm/nordix-nsm-meridio-periodic.yaml
+++ b/jjb/nsm/nordix-nsm-meridio-periodic.yaml
@@ -78,7 +78,7 @@
 
     scm:
       - git:
-          url: 'https://github.com/$PROJECT.git'
+          url: 'https://github.com/$GITHUB_ORGANIZATION/$PROJECT.git'
           branches:
             - master
           timeout: 15
diff --git a/jjb/nsm/nordix-nsm-meridio-verify.yaml b/jjb/nsm/nordix-nsm-meridio-verify.yaml
index 2e95baf0..90e4ec3f 100644
--- a/jjb/nsm/nordix-nsm-meridio-verify.yaml
+++ b/jjb/nsm/nordix-nsm-meridio-verify.yaml
@@ -26,6 +26,11 @@
       - 'master':
           branch: '${{ghprbActualCommit}}'
 
+    # NOTE (fdegir): auth-id is taken from Jenkins Global Configuration
+    # by clicking Auth ID button for the desired GitHub Server API URL
+    # Please ensure you are looking at GitHub Pull Request Builder part
+    # of global configuration and not to GitHub Server configuration
+    ghprb-auth-id: 'cdfd2452-a9e2-41a3-8ee6-9058512b4aff'
     image-name:
       - ctraffic
       - ipam
@@ -79,13 +84,13 @@
             - uablrek
             - LionelJouin
             - fdegir
-          auth-id: 'nordix-nsm-ci'
+          auth-id: '{ghprb-auth-id}'
           github-hooks: true
           permit-all: true
           trigger-phrase: '/reverify'
           only-trigger-phrase: false
           cron: 'H/5 * * * *'
-          status-context: 'Nordix Jenkins'
+          status-context: 'Nordix Jenkins Static Analysis'
 
     builders:
       - shell:
@@ -148,13 +153,13 @@
             - uablrek
             - LionelJouin
             - fdegir
-          auth-id: 'nordix-nsm-ci'
+          auth-id: '{ghprb-auth-id}'
           github-hooks: true
           permit-all: true
           trigger-phrase: '/reverify'
           only-trigger-phrase: false
           cron: 'H/5 * * * *'
-          status-context: 'Nordix Jenkins'
+          status-context: 'Nordix Jenkins Image Build: {image-name}'
 
     wrappers:
       - build-timeout:
-- 
2.25.1