Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(maint) point release package to root of yum.p.c #2387

Merged
merged 1 commit into from
Aug 23, 2023
Merged

(maint) point release package to root of yum.p.c #2387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ext/smoke/repos/steps/setup-masters.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ echo "STEP: Install puppetserver and puppet-agent on both masters"

for master_vm in ${master_vm1} ${master_vm2}; do
which_master=`identify_master ${master_vm}`
on_master ${master_vm} "rpm -Uvh http://yum.puppetlabs.com/${collection}/${collection}-release-el-7.noarch.rpm --force"
on_master ${master_vm} "rpm -Uvh http://yum.puppetlabs.com/${collection}-release-el-7.noarch.rpm --force"

echo "STEP: Install puppet-agent on ${which_master}"
on_master ${master_vm} "rpm --quiet --query puppet-agent-${agent_version} || yum install -y puppet-agent-${agent_version}"
Expand Down
2 changes: 1 addition & 1 deletion ext/smoke/steps/setup-agent.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ echo "STEP: Install the puppet-agent package"
master_ip=`on_master "facter ipaddress" | tail -n 1`
on_agent "echo ${master_ip} puppet >> /etc/hosts"
if [[ "${type}" = "repo" ]]; then
on_agent "rpm -Uvh http://yum.puppetlabs.com/${collection}/${collection}-release-el-7.noarch.rpm --force"
on_agent "rpm -Uvh http://yum.puppetlabs.com/${collection}-release-el-7.noarch.rpm --force"
on_agent "rpm --quiet --query puppet-agent-${agent_version} || yum install -y puppet-agent-${agent_version}"
elif [[ "${type}" = "package" ]]; then
on_agent "curl -f -O http://builds.delivery.puppetlabs.net/puppet-agent/${agent_version}/artifacts/el/7/${collection}/x86_64/puppet-agent-${agent_version}-1.el7.x86_64.rpm"
Expand Down