Revert "CI: Rename global-settings to mvn-glob..."

This reverts commit b2b26d4b275f686897b9cc88649cd4f68370ea6a.

Though some jobs have mvn-global-settings listed as the global
settings file, renaming to "global-settings" is a standard that will
carry forward to all projects for Github Actions.

Since we are currently transitioning to GHA, this shouldn't be
renamed. If JJB jobs still need to use this file, they should be
modified to use "global-settings."

Change-Id: Ib1190de829939d11b022361ebf72868e7152c3cc
Issue-ID: LF-Jira RELENG-4799
Signed-off-by: Eric Ball <eball@linuxfoundation.org>

diff --git a/jenkins-config/managed-config-files/globalMavenSettings/mvn-global-settings/config-params.yaml b/jenkins-config/managed-config-files/globalMavenSettings/global-settings/config-params.yaml
similarity index 60%
rename from jenkins-config/managed-config-files/globalMavenSettings/mvn-global-settings/config-params.yaml
rename to jenkins-config/managed-config-files/globalMavenSettings/global-settings/config-params.yaml
index 20690cb..cf85503 100644 (file)
--- a/jenkins-config/managed-config-files/globalMavenSettings/mvn-global-settings/config-params.yaml
+++ b/jenkins-config/managed-config-files/globalMavenSettings/global-settings/config-params.yaml
@@ -1,3 +1,3 @@
 ---
-name: "mvn-global-settings"
+name: "global-settings"
 comment: "Maven Global Settings file"

diff --git a/jenkins-config/managed-config-files/globalMavenSettings/mvn-global-settings/content b/jenkins-config/managed-config-files/globalMavenSettings/global-settings/content
similarity index 100%
rename from jenkins-config/managed-config-files/globalMavenSettings/mvn-global-settings/content
rename to jenkins-config/managed-config-files/globalMavenSettings/global-settings/content