Merge pull request #824 from puppetlabs/nightly_no_token

(PA-8041) Fix puppetcore8-nightly installs on rpm and mac

Author: joshcooper

docker/bin/helpers/run-install.sh

@@ -27,6 +27,7 @@ fi
 export PT__installdir=../
 export PT_version=${to_version}
 export PT_collection=${to_collection}
+export PT_username=${PUPPET_FORGE_USERNAME}
 export PT_password=${PUPPET_FORGE_TOKEN}
 chmod u+x tasks/install_shell.sh
 tasks/install_shell.sh

docker/bin/install.sh

@@ -19,15 +19,16 @@
 #          Default: 8.1.0
 set -e
 
-if [[ -z "${PUPPET_FORGE_TOKEN}" ]]; then
-    echo "$0: Environment variable PUPPET_FORGE_TOKEN must be set"
-    exit 1
-fi
-
 cd "$(dirname "$0")/../.."
 platforms=${1:-rocky}
 version=${2:-8.11.0}
 collection=${3:-puppetcore8}
+
+if [[ -z "${PUPPET_FORGE_TOKEN}" && "$collection" != puppetcore*-nightly && "$collection" =~ core ]]; then
+    echo "$0: Environment variable PUPPET_FORGE_TOKEN must be set"
+    exit 1
+fi
+
 for platform in ${platforms//,/ }
 do
     case $platform in
@@ -71,6 +72,6 @@ do
     # Add "--progress plain" for complete build output
     docker build --rm -f "${dockerfile}" . -t pa-dev:$platform.install \
            --build-arg BASE_IMAGE="${base_image}"
-    docker run -e PUPPET_FORGE_TOKEN --rm -ti pa-dev:$platform.install "${version}" "${collection}"
+    docker run -e PUPPET_FORGE_USERNAME -e PUPPET_FORGE_TOKEN --rm -ti pa-dev:$platform.install "${version}" "${collection}"
 done
 echo Complete

tasks/install_shell.sh

@@ -629,7 +629,7 @@ install_file() {
 
       repo="/etc/yum.repos.d/${collection/core/}-release.repo"
       rpm -Uvh --oldpackage --replacepkgs "$2"
-      if [[ "$collection" =~ core ]]; then
+      if [[ "$collection" != puppetcore*-nightly && "$collection" =~ core ]]; then
         if [[ -n $username ]]; then
           sed -i "s/^#\?username=.*/username=${username}/" "${repo}"
         fi
@@ -661,7 +661,7 @@ install_file() {
       fi
 
       run_cmd "zypper install --no-confirm '$2'"
-      if [[ "$collection" =~ core ]]; then
+      if [[ "$collection" != puppetcore*-nightly && "$collection" =~ core ]]; then
         if [[ -n $username ]]; then
           sed -i "s/^username=.*/username=${username}/" "/etc/zypp/credentials.d/PuppetcoreCreds"
         fi
@@ -842,7 +842,7 @@ case $platform in
     if [[ $(uname -p) == "arm" ]]; then
         arch="arm64"
     fi
-    if [[ "$collection" =~ "puppetcore" ]]; then
+    if [[ "$collection" != puppetcore*-nightly && "$collection" =~ core ]]; then
       if [[ -z "$version" ]]; then
         critical "You must provide a version to install the agent from puppetcore on MacOS/Windows."
         exit 1
@@ -854,7 +854,7 @@ case $platform in
         download_url="${mac_source}?type=native&version=${version}&os_name=osx&os_version=${platform_version}&os_arch=${arch}"
       fi
     else
-      download_url="${mac_source}/mac/${collection}/${platform_version}/${arch}/${filename}"
+      download_url="${mac_source}/mac/${collection/core/}/${platform_version}/${arch}/${filename}"
     fi
     ;;
   *)