Merge branch 'fix-os-detection-in-deployer-rake-task' into 'master'

Fix OS detection in deployer pipeline triggering logic

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

Merged-by: Andrew Patterson <[email protected]>
Approved-by: Andrew Patterson <[email protected]>
Approved-by: Jason Plum <[email protected]>
Co-authored-by: Balasankar 'Balu' C <[email protected]>

Author: Andrew Patterson

lib/gitlab/tasks/gitlab_com.rake

@@ -37,10 +37,14 @@ namespace :gitlab_com do
     # other than `master` in the deployer project
     trigger_ref = Gitlab::Util.get_env('DEPLOYER_TRIGGER_REF') || :master
 
-    current_os = OhaiHelper.fetch_os_with_codename[0..1].join("-")
+    # Find out the OS for which packages are built for. We can not use Ohai for
+    # this, as that will return the builder image being used to run this rake
+    # task. So, we detect the OS from the path of the packages.
+    package_os = Build::Info::Package.file_list.map { |path| path.split("/")[1] }.uniq.first
+
     os_for_deployment = Build::Info::Deploy::OS_MAPPING[Build::Info::Deploy.environment_key]
-    if current_os != os_for_deployment
-      puts "Deployment to #{deploy_env} not to be triggered from this build (#{current_os})."
+    if package_os != os_for_deployment
+      puts "Deployment to #{deploy_env} not to be triggered from this build (#{package_os})."
       next
     end
 

spec/lib/gitlab/tasks/gitlab_com_spec.rb

@@ -47,7 +47,7 @@
 
         context 'with the auto-deploy tag' do
           before do
-            allow(OhaiHelper).to receive(:fetch_os_with_codename).and_return(%w[ubuntu bionic])
+            allow(Dir).to receive(:glob).with("pkg/**/*.{deb,rpm}").and_return(%w[pkg/ubuntu-bionic/gitlab-ee_16.7.0-ee.0_amd64.deb])
             allow(Build::Check).to receive(:is_auto_deploy?).and_return(true)
           end
 
@@ -58,7 +58,7 @@
 
         context 'when running on Ubuntu 18.04' do
           before do
-            allow(OhaiHelper).to receive(:fetch_os_with_codename).and_return(%w[ubuntu bionic])
+            allow(Dir).to receive(:glob).with("pkg/**/*.{deb,rpm}").and_return(%w[pkg/ubuntu-bionic/gitlab-ee_16.7.0-ee.0_amd64.deb])
           end
 
           context 'with a release candidate (RC) tag' do
@@ -89,7 +89,7 @@
 
         context 'when running on Ubuntu 20.04' do
           before do
-            allow(OhaiHelper).to receive(:fetch_os_with_codename).and_return(%w[ubuntu focal])
+            allow(Dir).to receive(:glob).with("pkg/**/*.{deb,rpm}").and_return(%w[pkg/ubuntu-focal/gitlab-ee_16.7.0-ee.0_amd64.deb])
           end
 
           context 'with a release candidate (RC) tag' do