From f8156667ecaae577ab90fc724cf21c6d5c54814b Mon Sep 17 00:00:00 2001
From: Eric Ball <eball@linuxfoundation.org>
Date: Thu, 4 Jun 2020 13:37:28 -0700
Subject: [PATCH] Improve upstream gjjb jobs, add Github version

ODL already has the upstream LF Gerrit in its Gerrit triggers, and it
is named "lf-releng". This should therefore be used as the standard
name for other projects.

Added a Github version of the upstream global-jjb verify, which just
needs SCM changes for pulling in its ci-man repo.

Documentation for preparing a Jenkins server to test upstream gjjb
changes is available here: https://confluence.linuxfoundation.org/display/RELEN/Add+upstream+global-jjb+testing+to+Jenkins

Issue: RELENG-1043
Change-Id: I0a2f757c0e58355bc59eaa1e56eaa396f60b0f32
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
---
 docs/jjb/lf-ci-jobs.rst                            |  1 +
 jjb/lf-ci-jobs.yaml                                | 83 ++++++++++++++++------
 .../improve-upstream-gjjb-836952adce2508c3.yaml    |  6 ++
 3 files changed, 67 insertions(+), 23 deletions(-)
 create mode 100644 releasenotes/notes/improve-upstream-gjjb-836952adce2508c3.yaml

diff --git a/docs/jjb/lf-ci-jobs.rst b/docs/jjb/lf-ci-jobs.rst
index 1ec54851..116de87a 100644
--- a/docs/jjb/lf-ci-jobs.rst
+++ b/docs/jjb/lf-ci-jobs.rst
@@ -508,6 +508,7 @@ project level jobs.
 :Template Names:
     - {project-name}-jjb-verify-upstream-gjjb
     - gerrit-jjb-verify-upstream-gjjb
+    - github-jjb-verify-upstream-gjjb
 
 :Comment Trigger: recheck|reverify
 
diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index cc0b2d5e..9c62d971 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -957,7 +957,30 @@
       - lf-infra-jjbini
       - shell: !include-raw-escape:
           - ../shell/jjb-verify-job.sh
-      - lf-infra-gpg-verify-git-signature
+
+    # All jobs are triggering from the same source
+    triggers:
+      - gerrit:
+          server-name: "lf-releng"
+          trigger-on:
+            - patchset-created-event:
+                exclude-drafts: true
+                exclude-trivial-rebase: false
+                exclude-no-code-change: false
+            - draft-published-event
+            - comment-added-contains-event:
+                comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$'
+          projects:
+            - project-compare-type: ANT
+              project-pattern: "releng/global-jjb"
+              branches:
+                - branch-compare-type: ANT
+                  branch-pattern: "**/master"
+          override-votes: true
+          gerrit-build-failed-codereview-value: -1
+          gerrit-build-failed-verified-value: 0
+          gerrit-build-successful-codereview-value: 1
+          gerrit-build-successful-verified-value: 0
 
 - job-template:
     name: "{project-name}-jjb-verify-upstream-gjjb"
@@ -989,28 +1012,42 @@
           choosing-strategy: default
           jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
-    triggers:
-      - gerrit:
-          server-name: "LinuxFoundation"
-          trigger-on:
-            - patchset-created-event:
-                exclude-drafts: true
-                exclude-trivial-rebase: false
-                exclude-no-code-change: false
-            - draft-published-event
-            - comment-added-contains-event:
-                comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$'
-          projects:
-            - project-compare-type: ANT
-              project-pattern: "releng/global-jjb"
-              branches:
-                - branch-compare-type: ANT
-                  branch-pattern: "**/master"
-          override-votes: true
-          gerrit-build-failed-codereview-value: -1
-          gerrit-build-failed-verified-value: 0
-          gerrit-build-successful-codereview-value: 1
-          gerrit-build-successful-verified-value: 0
+- job-template:
+    name: "{project-name}-jjb-verify-upstream-gjjb"
+    id: github-jjb-verify-upstream-gjjb
+    <<: *lf_jjb_common
+    # yamllint disable-line rule:key-duplicates
+    <<: *lf_jjb_verify_upstream_gjjb
+
+    ######################
+    # Default parameters #
+    ######################
+
+    git-url: "$GIT_URL/$PROJECT"
+    submodule-timeout: 10
+    submodule-disable: false
+
+    #####################
+    # Job Configuration #
+    #####################
+
+    properties:
+      - lf-infra-properties:
+          project: "{project}"
+          build-days-to-keep: 7
+      - github:
+          url: "{github-url}/{github-org}/{project}"
+
+    scm:
+      - lf-infra-github-scm:
+          url: "{git-clone-url}{github-org}/{project}"
+          refspec: "+refs/pull/*:refs/remotes/origin/pr/*"
+          branch: "$sha1"
+          submodule-recursive: "{submodule-recursive}"
+          submodule-timeout: "{submodule-timeout}"
+          submodule-disable: "{submodule-disable}"
+          choosing-strategy: default
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
 #################
 # License Check #
diff --git a/releasenotes/notes/improve-upstream-gjjb-836952adce2508c3.yaml b/releasenotes/notes/improve-upstream-gjjb-836952adce2508c3.yaml
new file mode 100644
index 00000000..36b22705
--- /dev/null
+++ b/releasenotes/notes/improve-upstream-gjjb-836952adce2508c3.yaml
@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    verify-upstream-global-jjb jobs have been improved in two ways: the upstream
+    Gerrit name has been changed to lf-releng to match the precedent set by
+    OpenDaylight, and we have added a Github version of the job.
-- 
2.16.6