lib/packaging/rpm/repo.rb in packaging-0.99.76 vs lib/packaging/rpm/repo.rb in packaging-0.99.77
- old
+ new
@@ -14,11 +14,11 @@
return
end
Pkg::Util::RakeUtils.invoke_task("pl:fetch")
repo_dir = "#{Pkg::Config.jenkins_repo_path}/#{Pkg::Config.project}/#{Pkg::Config.ref}/#{target}/rpm"
- Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.distribution_server, "mkdir -p #{repo_dir}")
+ Pkg::Util::Net.remote_execute(Pkg::Config.distribution_server, "mkdir -p #{repo_dir}")
Pkg::Util::Execution.retry_on_fail(:times => 3) do
Pkg::Util::Net.rsync_to("pkg/#{target}/rpm/", Pkg::Config.distribution_server, repo_dir)
end
end
@@ -213,20 +213,20 @@
artifact_paths = Pkg::Repo.directories_that_contain_packages(File.join(artifact_directory, 'artifacts'), 'rpm')
Pkg::Repo.populate_repo_directory(artifact_directory)
command = Pkg::Rpm::Repo.repo_creation_command(File.join(artifact_directory, directory), artifact_paths)
begin
- Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.distribution_server, command)
+ Pkg::Util::Net.remote_execute(Pkg::Config.distribution_server, command)
# Now that we've created our package repositories, we can generate repo
# configurations for use with downstream jobs, acceptance clients, etc.
Pkg::Rpm::Repo.generate_repo_configs
# Now that we've created the repo configs, we can ship them
Pkg::Rpm::Repo.ship_repo_configs
ensure
# Always remove the lock file, even if we've failed
- Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.distribution_server, "rm -f #{artifact_directory}/repos/.lock")
+ Pkg::Util::Net.remote_execute(Pkg::Config.distribution_server, "rm -f #{artifact_directory}/repos/.lock")
end
end
def create_repos_from_artifacts(directory = "repos")
Pkg::Util.deprecate('Pkg::Rpm::Repo.create_repos_from_artifacts', 'Pkg::Rpm::Repo.create_remote_repos')
@@ -246,9 +246,9 @@
# @param destination_server [String] remote host to send rsynced content to
# @param dryrun [Boolean] whether or not to use '--dry-run'
def deploy_repos(yum_path, origin_server, destination_server, dryrun = false)
rsync_command = repo_deployment_command(yum_path, yum_path, destination_server, dryrun)
- Pkg::Util::Net.remote_ssh_cmd(origin_server, rsync_command)
+ Pkg::Util::Net.remote_execute(origin_server, rsync_command)
end
end
end