From b3f020021412a5b7437b5ae05fb4d11f51c3153b Mon Sep 17 00:00:00 2001
From: Luke Sikina <lucas.skina@gmail.com>
Date: Mon, 26 Feb 2024 14:41:13 -0500
Subject: [PATCH] [ALS-5906] Misc fixes found while doing fresh install

- Fix plugin versions
- Correct obfuscation threshold
- cd to correct dir before starting jenkins
---
 initial-configuration/install-dependencies.sh                | 5 ++++-
 .../jobs/Configure Institution Node/config.xml               | 2 +-
 initial-configuration/jenkins/jenkins-docker/plugins.yml     | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/initial-configuration/install-dependencies.sh b/initial-configuration/install-dependencies.sh
index f655b3bc..05521670 100755
--- a/initial-configuration/install-dependencies.sh
+++ b/initial-configuration/install-dependencies.sh
@@ -135,4 +135,7 @@ if [ -n "$1" ]; then
 fi
 
 echo "Installation script complete.  Staring Jenkins."
-../start-jenkins.sh
+
+cd ..
+./start-jenkins.sh
+cd $CWD
\ No newline at end of file
diff --git a/initial-configuration/jenkins/jenkins-docker/jobs/Configure Institution Node/config.xml b/initial-configuration/jenkins/jenkins-docker/jobs/Configure Institution Node/config.xml
index 9acafbe2..2103bad3 100644
--- a/initial-configuration/jenkins/jenkins-docker/jobs/Configure Institution Node/config.xml	
+++ b/initial-configuration/jenkins/jenkins-docker/jobs/Configure Institution Node/config.xml	
@@ -65,7 +65,7 @@
          <hudson.model.StringParameterDefinition>
           <name>TARGET_OBFUSCATION_THRESHOLD</name>
           <description>The aggregate resource will be configured to obfuscate result counts lower than this threshold</description>
-          <defaultValue>10</defaultValue>
+          <defaultValue>0</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         
diff --git a/initial-configuration/jenkins/jenkins-docker/plugins.yml b/initial-configuration/jenkins/jenkins-docker/plugins.yml
index fc11d14f..7f6abcf7 100644
--- a/initial-configuration/jenkins/jenkins-docker/plugins.yml
+++ b/initial-configuration/jenkins/jenkins-docker/plugins.yml
@@ -43,7 +43,7 @@ plugins:
       version: 1.10
   - artifactId: git
     source:
-      version: 5.2.0
+      version: 5.2.1
   - artifactId: ws-cleanup
     source:
       version: 0.45