Skip to content

Commit 60a87a5

Browse files
Merge pull request #777 from joshcooper/nightly_server
(PA-7432) Install server packages from internal nightlies
2 parents f434c10 + c1d800f commit 60a87a5

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

acceptance/pre_suite/00_master_setup.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
# Install a puppet-agent package on the master:
1818
test_name "Pre-Suite: Install puppet-agent #{description} on the master" do
19+
install_options[:nightly_yum_repo_url] = 'https://artifactory.delivery.puppetlabs.net:443/artifactory/internal_nightly__local/yum'
1920
install_puppet_agent_on(master, install_options)
2021

2122
agent_version = puppet_agent_version_on(master)
@@ -30,7 +31,10 @@
3031

3132
step 'Install puppetserver' do
3233
# puppetserver is distributed in "release streams" instead of collections.
33-
opts = { release_stream: install_options[:puppet_collection] }
34+
opts = {
35+
release_stream: install_options[:puppet_collection],
36+
nightly_yum_repo_url: 'https://artifactory.delivery.puppetlabs.net:443/artifactory/internal_nightly__local/yum'
37+
}
3438

3539
install_puppetserver_on(master, opts)
3640

0 commit comments

Comments
 (0)