From: Eric Ball <eball@linuxfoundation.org>
Date: Sat, 18 Nov 2023 00:59:17 +0000 (-0800)
Subject: Fix: Correct path for Jenkins settings files
X-Git-Tag: v0.37.9~3
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=10213c451765902779107ba8a500f1674b4a5af2;p=releng%2Flftools.git

Fix: Correct path for Jenkins settings files

The correct path should be "<repo>-settings", but was previously set
to just "<repo>". This is causing problems in our JCASC and other
automation.

Issue: RELENG-4490
Change-Id: I7f526d82d550acc3021548ee642a0d3706783d9f
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
---

diff --git a/lftools/git/gerrit.py b/lftools/git/gerrit.py
index 0bc8a314..6df52a6d 100644
--- a/lftools/git/gerrit.py
+++ b/lftools/git/gerrit.py
@@ -260,7 +260,7 @@ class Gerrit:
         )
         log.debug("config-params.yaml contents:\n{}".format(server_creds_content))
 
-        config_path = "jenkins-config/managed-config-files/mavenSettings/{}".format(project_dashed)
+        config_path = "jenkins-config/managed-config-files/mavenSettings/{}-settings".format(project_dashed)
         try:
             os.makedirs(config_path)
         except FileExistsError:
diff --git a/releasenotes/notes/fix-settings-path-3fd9856fcea1cb08.yaml b/releasenotes/notes/fix-settings-path-3fd9856fcea1cb08.yaml
new file mode 100644
index 00000000..184b648e
--- /dev/null
+++ b/releasenotes/notes/fix-settings-path-3fd9856fcea1cb08.yaml
@@ -0,0 +1,8 @@
+---
+fixes:
+  - |
+    Correct path for Jenkins settings files.
+
+    The correct path should be "<repo>-settings", but was previously set
+    to just "<repo>". This was causing problems in our JCASC and other
+    automation.