[Compass-ci] Re: [PATCH v2 compass-ci] src/lib/job.cr: change rpm_repo to upstream_repo

please ignore this email

On Tue, Mar 16, 2021 at 11:02:26AM +0800, Li Ping wrote:

src/lib/job.cr: open the path for uploading rpm packages.

Signed-off-by: Li Ping 1477412247@qq.com

src/lib/job.cr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/job.cr b/src/lib/job.cr index 9e18a4c..40aaa62 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -278,7 +278,7 @@ class Job mount_type = "nfs" if mount_type == "cifs"

common_dir = "#{mount_type}/#{tmp_os}/#{tmp_os_arch}/#{tmp_os_version}"

• common_dir = "#{tmp_os}-#{tmp_os_version}/#{tmp_os_arch}" if @hash.has_key?("rpmbuild-pkg")

• common_dir = "#{tmp_os}-#{tmp_os_version}" if @hash.has_key?("rpmbuild-pkg")

  return common_dir end

@@ -293,7 +293,7 @@ class Job elsif @hash["cci-depends"]? package_dir = ",/initrd/deps/#{common_dir}/#{@hash["cci-depends"]["benchmark"]}" elsif @hash["rpmbuild-pkg"]?

•  package_dir = ",/initrd/rpmbuild-pkg/#{common_dir}/#{@hash["rpm_repo"].to_s.split("/")[-1]}"
  

•  package_dir = ",/initrd/rpmbuild-pkg/#{common_dir}"
  

  elsif @hash["build-pkg"]? if @hash["pkgbuild_repo"].to_s =~ /(packages|community)/// package_name = @hash["pkgbuild_repo"].to_s.split("/")[-2]

-- 2.23.0