Skip to content

Commit f332cb2

Browse files
committed
(PA-7608) Update artifactory URLs for puppetcore nightlies
(PA-7608) Updated source for windows
1 parent 1dd09ad commit f332cb2

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

tasks/install_powershell.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"collection": {
1010
"description": "The Puppet collection to install from (defaults to puppet, which maps to the latest collection released)",
11-
"type": "Optional[Enum[puppet7, puppet8, puppet, puppet7-nightly, puppet8-nightly, puppet-nightly]]"
11+
"type": "Optional[Enum[puppet7, puppet8, puppet, puppet7-nightly, puppet8-nightly, puppet-nightly, puppetcore7, puppetcore8, puppetcore8-nightly]]"
1212
},
1313
"absolute_source": {
1414
"description": "The absolute source location to find the Puppet agent package",

tasks/install_powershell.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ if (Test-RunningServices) {
117117

118118
# Change windows_source only if the collection is a nightly build, and the source was not explicitly specified.
119119
if (($collection -like '*nightly*') -And -Not ($PSBoundParameters.ContainsKey('windows_source'))) {
120-
$windows_source = 'https://nightlies.puppet.com/downloads'
120+
$windows_source = 'https://artifactory.delivery.puppetlabs.net:443/artifactory/internal_nightly__local/downloads'
121121
} elseif (($collection -like '*puppetcore*') -And -Not ($PSBoundParameters.ContainsKey('windows_source'))) {
122122
$windows_source = 'https://artifacts-puppetcore.puppet.com/v1/download'
123123
}

tasks/install_shell.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"collection": {
1111
"description": "The Puppet collection to install from (defaults to puppet, which maps to the latest collection released)",
12-
"type": "Optional[Enum[puppet7, puppet8, puppet, puppet7-nightly, puppet8-nightly, puppet-nightly, puppetcore7, puppetcore8]]"
12+
"type": "Optional[Enum[puppet7, puppet8, puppet, puppet7-nightly, puppet8-nightly, puppet-nightly, puppetcore7, puppetcore8, puppetcore8-nightly]]"
1313
},
1414
"absolute_source": {
1515
"description": "The absolute source location to find the Puppet agent package",

tasks/install_shell.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,23 +123,27 @@ else
123123
collection='puppet'
124124
fi
125125

126-
if [[ "$collection" == "puppetcore"* && -z "$password" ]]; then
126+
if [[ "$collection" != puppetcore*-nightly && "$collection" == "puppetcore"* && -z "$password" ]]; then
127127
echo "A password parameter is required to install from puppetcore"
128128
exit 1
129129
fi
130130

131131
if [ -n "$PT_yum_source" ]; then
132132
yum_source=$PT_yum_source
133+
elif [[ "$collection" == puppetcore*-nightly ]]; then
134+
yum_source='https://artifactory.delivery.puppetlabs.net:443/artifactory/internal_nightly__local/yum'
133135
elif [[ "$collection" == "puppetcore"* ]]; then
134136
yum_source='https://yum-puppetcore.puppet.com/public'
135137
elif [ "$nightly" = true ]; then
136-
yum_source='https://artifactory.delivery.puppetlabs.net:443/artifactory/internal_nightly__local/yum'
138+
yum_source='http://nightlies.puppet.com/yum'
137139
else
138140
yum_source='http://yum.puppet.com'
139141
fi
140142

141143
if [ -n "$PT_apt_source" ]; then
142144
apt_source=$PT_apt_source
145+
elif [[ "$collection" == puppetcore*-nightly ]]; then
146+
apt_source='https://artifactory.delivery.puppetlabs.net:443/artifactory/internal_nightly__local/apt'
143147
elif [[ "$collection" == "puppetcore"* ]]; then
144148
apt_source='https://apt-puppetcore.puppet.com/public'
145149
elif [ "$nightly" = true ]; then
@@ -150,6 +154,9 @@ fi
150154

151155
if [ -n "$PT_mac_source" ]; then
152156
mac_source=$PT_mac_source
157+
158+
elif [[ "$collection" == puppetcore*-nightly ]]; then
159+
mac_source='https://artifactory.delivery.puppetlabs.net:443/artifactory/internal_nightly__local/downloads'
153160
elif [[ "$collection" == "puppetcore"* ]]; then
154161
mac_source='https://artifacts-puppetcore.puppet.com/v1/download'
155162
elif [ "$nightly" = true ]; then

0 commit comments

Comments
 (0)