From db7f38351e5a8f5a98ae50874e403b3bc232da2b Mon Sep 17 00:00:00 2001
From: Aric Gardner <agardner@linuxfoundation.org>
Date: Wed, 16 May 2018 10:40:38 -0400
Subject: Clone Releng with submodules to include jjb

Needed for JJB verify and Merge to work.
These jobs are going away, but first we need to get a verified +1
from jenkins

Also remove  releng-comment-jjb its unused

Change-Id: Ice2ad625f87f1d9c841979ede4bb1943110691c8
Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
---
 jjb/global/releng-macros.yml  | 11 +++++++++++
 jjb/releng/releng-ci-jobs.yml | 27 ++-------------------------
 2 files changed, 13 insertions(+), 25 deletions(-)

(limited to 'jjb')

diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml
index 5b403ab2c..1ff4799ab 100644
--- a/jjb/global/releng-macros.yml
+++ b/jjb/global/releng-macros.yml
@@ -121,6 +121,17 @@
           choosing-strategy: 'gerrit'
           refspec: '$GERRIT_REFSPEC'
           <<: *git-scm-defaults
+
+- scm:
+    name: git-scm-gerrit-with-submodules
+    scm:
+      - git:
+          choosing-strategy: 'gerrit'
+          refspec: '$GERRIT_REFSPEC'
+          submodule:
+            recursive: true
+            timeout: 20
+          <<: *git-scm-defaults
 - scm:
     name: git-scm-with-submodules
     scm:
diff --git a/jjb/releng/releng-ci-jobs.yml b/jjb/releng/releng-ci-jobs.yml
index 6fb6804bc..5420406cd 100644
--- a/jjb/releng/releng-ci-jobs.yml
+++ b/jjb/releng/releng-ci-jobs.yml
@@ -4,7 +4,6 @@
     jobs:
       - 'releng-verify-jjb'
       - 'releng-merge-jjb'
-      - 'releng-comment-jjb'
 
     project: 'releng'
 
@@ -17,7 +16,7 @@
           branch: 'master'
 
     scm:
-      - git-scm-gerrit
+      - git-scm-gerrit-with-submodules
 
     triggers:
       - gerrit:
@@ -56,28 +55,6 @@
           artifacts: 'job_output/*'
       - email-jenkins-admins-on-failure
 
-- job-template:
-    name: releng-comment-jjb
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: 'master'
-
-    scm:
-      - git-scm-gerrit
-
-    triggers:
-      - experimental:
-          project: '{project}'
-          branch: 'master'
-          files: 'jjb/**'
-
-    builders:
-      - shell:
-          !include-raw-escape: generate-job-list.sh
-      - report-build-result-to-gerrit
-
 - job-template:
     name: 'releng-merge-jjb'
 
@@ -97,7 +74,7 @@
           option: 'project'
 
     scm:
-      - git-scm
+      - git-scm-with-submodules
 
     triggers:
       - gerrit:
-- 
cgit 1.2.3-korg