Merge branch 'fix_package_download_url' into 'master'

Fix for missing branch_build_package_download_url

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7554

Merged-by: Jason Plum <jplum@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Jason Plum <jplum@gitlab.com>
Co-authored-by: Andrew Patterson <apatterson@gitlab.com>

Author: WarheadsSE

lib/gitlab/aws_helper.rb

@@ -29,7 +29,7 @@ def create_ami
       architecture = 'amd64'
     end
 
-    @download_url = Build::Info::CI.branch_build_package_download_url(job_name: "Ubuntu-20.04", arch: architecture)
+    @download_url = Build::Info::CI.package_download_url(job_name: "Ubuntu-20.04", arch: architecture)
 
     system(*%W[support/packer/packer_ami.sh #{@version} #{@type} #{@download_url} #{Build::Info::CI.job_token} #{@license_file}])
   end

spec/lib/gitlab/tasks/aws_spec.rb

@@ -49,7 +49,7 @@ def deregister_image(parameters)
       allow(Build::Check).to receive(:on_tag?).and_return(true)
       allow(Build::Check).to receive(:is_auto_deploy?).and_return(false)
       allow(Build::Check).to receive(:is_rc_tag?).and_return(false)
-      allow(Build::Info::CI).to receive(:branch_build_package_download_url).and_return('http://example.com')
+      allow(Build::Info::CI).to receive(:package_download_url).and_return('http://example.com')
     end
 
     it 'should identify ce category correctly, if specified' do
@@ -129,7 +129,7 @@ def deregister_image(parameters)
       allow(Build::Check).to receive(:on_tag?).and_return(true)
       allow(Build::Check).to receive(:is_auto_deploy?).and_return(false)
       allow(Build::Check).to receive(:is_rc_tag?).and_return(true)
-      allow(Build::Info::CI).to receive(:branch_build_package_download_url).and_return('http://example.com')
+      allow(Build::Info::CI).to receive(:package_download_url).and_return('http://example.com')
     end
 
     it 'does not do anything' do
@@ -144,7 +144,7 @@ def deregister_image(parameters)
       allow(Build::Check).to receive(:on_tag?).and_return(true)
       allow(Build::Check).to receive(:is_auto_deploy?).and_return(true)
       allow(Build::Check).to receive(:is_rc_tag?).and_return(false)
-      allow(Build::Info::CI).to receive(:branch_build_package_download_url).and_return('http://example.com')
+      allow(Build::Info::CI).to receive(:package_download_url).and_return('http://example.com')
     end
 
     it 'does not do anything' do