From 8da7b8ab1bc19df2d23acb269ecc316aa9707e4d Mon Sep 17 00:00:00 2001
From: Anil Belur <abelur@linuxfoundation.org>
Date: Fri, 15 Mar 2024 07:40:54 +1000
Subject: [PATCH] Chore: Update global-jjb to latest v0.91.3

Using YAML multiline '>-' introduces spaces between lines that causes
JJB updates to fail when the job exists on Jenkins. Therefore as
workaround use double-quoted string with newline escape.

Using '>-' introduces space that causes consecutive JJB updates
to fail with the same 500 internal error.

Issue: LF-JIRA RELENG-5118
Change-Id: I0c61cd90025d2ad9beae198d6164605b36c96dbb
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
---
 global-jjb                                     |  2 +-
 .../distribution/distribution-templates.yaml   | 18 ++++++++----------
 jjb/releng-templates-java.yaml                 | 18 ++++++++----------
 3 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/global-jjb b/global-jjb
index 8901fe0bee..b9d610a9e5 160000
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 8901fe0bee2fecb6b32accffd9f952d46da59a38
+Subproject commit b9d610a9e522d71a89d2daeb6f71b2bc2a71cdf7
diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml
index ad36d47024..0e07dfde49 100644
--- a/jjb/integration/distribution/distribution-templates.yaml
+++ b/jjb/integration/distribution/distribution-templates.yaml
@@ -132,11 +132,10 @@
     name: "distribution-verify-{type}-{stream}"
 
     disable-job: "false"
-    jacoco-exclude-pattern: >-
-      **/gen/**,
-      **/generated-sources/**,
-      **/yang-gen**,
-      **/pax/**
+    jacoco-exclude-pattern: "**/gen/**,\
+      **/generated-sources/**,\
+      **/yang-gen**,\
+      **/pax/**"
 
     project-type: freestyle
     node: centos8-builder-8c-8g
@@ -214,11 +213,10 @@
     #     https://issues.apache.org/jira/browse/MNG-5666
 
     disable-job: false
-    jacoco-exclude-pattern: >-
-      **/gen/**,
-      **/generated-sources/**,
-      **/yang-gen**,
-      **/pax/**
+    jacoco-exclude-pattern: "**/gen/**,\
+      **/generated-sources/**,\
+      **/yang-gen**,\
+      **/pax/**"
 
     project-type: maven
     node: "centos8-builder-8c-8g"
diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 6e97e45849..046b7ff747 100644
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -98,11 +98,10 @@
       **/target/surefire-reports/*-output.txt
     mvn-goals: clean install
     disable-job: false
-    jacoco-exclude-pattern: >-
-      **/gen/**,
-      **/generated-sources/**,
-      **/yang-gen**,
-      **/pax/**
+    jacoco-exclude-pattern: "**/gen/**,\
+      **/generated-sources/**,\
+      **/yang-gen**,\
+      **/pax/**"
 
     #####################
     # Job Configuration #
@@ -172,11 +171,10 @@
     # Default parameters #
     ######################
     disable-job: "false"
-    jacoco-exclude-pattern: >-
-      **/gen/**,
-      **/generated-sources/**,
-      **/yang-gen**,
-      **/pax/**
+    jacoco-exclude-pattern: "**/gen/**,\
+      **/generated-sources/**,\
+      **/yang-gen**,\
+      **/pax/**"
 
     archive-artifacts: >
       **/*.log
-- 
2.36.6