From f0e34b72ddb932386785fe828da7310fe12592e4 Mon Sep 17 00:00:00 2001
From: Sugat <233906380+SugatD@users.noreply.github.com>
Date: Tue, 25 Nov 2025 12:37:41 +0530
Subject: [PATCH 1/4] update urls

---
 tasks/install_puppetserver.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tasks/install_puppetserver.sh b/tasks/install_puppetserver.sh
index c544b6f..73175cc 100644
--- a/tasks/install_puppetserver.sh
+++ b/tasks/install_puppetserver.sh
@@ -157,7 +157,7 @@ if [[ "$osfamily" == "debian" ]]; then
     echo "No builds for $platform"
     exit 1
   else
-    run_cmd "curl -o puppet.deb http://apt.puppetlabs.com/${collection}-release-${codename}.deb"
+    run_cmd "curl -o puppet.deb https://artifactory.delivery.puppetlabs.net:443/artifactory/internal_nightly__local/apt/${collection}-release-${codename}.deb"
     dpkg -i --force-confmiss puppet.deb
     apt-get update -y
     apt-get install puppetserver -y
@@ -165,7 +165,7 @@ if [[ "$osfamily" == "debian" ]]; then
 fi
 
 if [[ "$osfamily" == "redhat" ]]; then
-  run_cmd "curl -o puppet.rpm http://yum.puppetlabs.com/${collection}-release-el-${major_version}.noarch.rpm"
+  run_cmd "curl -o puppet.rpm https://artifactory.delivery.puppetlabs.net:443/artifactory/internal_nightly__local/yum/${collection}-release-el-${major_version}.noarch.rpm"
   rpm -Uvh puppet.rpm --quiet
   yum install puppetserver -y --quiet
 fi

From d4b6b9fa10ae9929beb129dfbb89e2db77d687e9 Mon Sep 17 00:00:00 2001
From: Sugat <233906380+SugatD@users.noreply.github.com>
Date: Mon, 1 Dec 2025 15:49:33 +0530
Subject: [PATCH 2/4] update collection nameing

---
 tasks/install_puppetserver.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tasks/install_puppetserver.sh b/tasks/install_puppetserver.sh
index 73175cc..896092d 100644
--- a/tasks/install_puppetserver.sh
+++ b/tasks/install_puppetserver.sh
@@ -139,7 +139,9 @@ fi
 osname=$(parse_platform "$platform" "osname")
 major_version=$(parse_platform "$platform" "majorversion")
 osfamily=$(fetch_osfamily "$osname")
-collection=$(fetch_collection "$collection")
+# Keep the full collection name (e.g., puppet8-nightly) instead of truncating
+# collection=$(fetch_collection "$collection")
+collection=$collection
 
 if [[ "$collection" == "puppet5" ]]; then
   echo "puppet5 eol!"

From a65a2ceabd658a059ea8026312763ede027ebc3f Mon Sep 17 00:00:00 2001
From: Sugat <233906380+SugatD@users.noreply.github.com>
Date: Mon, 1 Dec 2025 17:37:35 +0530
Subject: [PATCH 3/4] update collection name for puppetcore8

---
 tasks/install_puppetserver.sh | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/tasks/install_puppetserver.sh b/tasks/install_puppetserver.sh
index 896092d..0673b67 100644
--- a/tasks/install_puppetserver.sh
+++ b/tasks/install_puppetserver.sh
@@ -59,12 +59,17 @@ fetch_osfamily() {
 }
 
 fetch_collection() {
-  myarr=()
-  for x in $(echo "$1" | tr "-" "\n")
-  do
-    myarr+=("$x")
-  done
-  echo "${myarr[0]}"
+  # Handle puppetcore8-nightly -> puppet8-nightly conversion
+  if [[ "$1" == puppetcore8* ]]; then
+    echo "${1/puppetcore8/puppet8}"
+  else
+    myarr=()
+    for x in $(echo "$1" | tr "-" "\n")
+    do
+      myarr+=("$x")
+    done
+    echo "${myarr[0]}"
+  fi
 }
 
 fetch_codename() {

From 7d9a5969b3102a52c0ef465d73ccdf4007488eec Mon Sep 17 00:00:00 2001
From: Sugat <233906380+SugatD@users.noreply.github.com>
Date: Mon, 1 Dec 2025 18:59:30 +0530
Subject: [PATCH 4/4] revert collect naming

---
 tasks/install_puppetserver.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tasks/install_puppetserver.sh b/tasks/install_puppetserver.sh
index 0673b67..caf7fc7 100644
--- a/tasks/install_puppetserver.sh
+++ b/tasks/install_puppetserver.sh
@@ -144,9 +144,7 @@ fi
 osname=$(parse_platform "$platform" "osname")
 major_version=$(parse_platform "$platform" "majorversion")
 osfamily=$(fetch_osfamily "$osname")
-# Keep the full collection name (e.g., puppet8-nightly) instead of truncating
-# collection=$(fetch_collection "$collection")
-collection=$collection
+collection=$(fetch_collection "$collection")
 
 if [[ "$collection" == "puppet5" ]]; then
   echo "puppet5 eol!"