# HG changeset patch
# User Balasankar 'Balu' C <balasankar@gitlab.com>
# Date 1676595455 0
#      Fri Feb 17 00:57:35 2023 +0000
# Node ID 9f2cc497bcc69269172ba60ee36dd8629a0f2643
# Parent  6b55897784104afe0d424734ca6507a2838e1e70
Use package cloud repositories for RAT

- Use packages published to packagecloud instead of direct
  downloads for nightly and pre-release RAT Pipelines

Closes https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/7437

Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>

diff --git a/gitlab-ci-config/dev-gitlab-org.yml b/gitlab-ci-config/dev-gitlab-org.yml
--- a/gitlab-ci-config/dev-gitlab-org.yml
+++ b/gitlab-ci-config/dev-gitlab-org.yml
@@ -453,7 +453,7 @@
 # This job runs only on nightly EE builds
 RAT-Nightly-FIPS:
   stage: slow_jobs
-  image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_16.04:${BUILDER_IMAGE_REVISION}"
+  image: "${BUILDER_IMAGE_REGISTRY}/centos_8_fips:${BUILDER_IMAGE_REVISION}"
   variables:
     USE_SYSTEM_SSL: "true"
     RAT_REFERENCE_ARCHITECTURE: "omnibus-gitlab-mrs-fips"
diff --git a/lib/gitlab/build/info.rb b/lib/gitlab/build/info.rb
--- a/lib/gitlab/build/info.rb
+++ b/lib/gitlab/build/info.rb
@@ -309,6 +309,21 @@
       def package_list
         Dir.glob(PACKAGE_GLOB)
       end
+
+      def name_version
+        Omnibus.load_configuration('omnibus.rb')
+        project = Omnibus::Project.load('gitlab')
+        packager = project.packagers_for_system[0]
+
+        case packager
+        when Omnibus::Packager::DEB
+          "#{Build::Info.package}=#{packager.safe_version}-#{packager.safe_build_iteration}"
+        when Omnibus::Packager::RPM
+          "#{Build::Info.package}-#{packager.safe_version}-#{packager.safe_build_iteration}#{packager.dist_tag}"
+        else
+          raise "Unable to detect version"
+        end
+      end
     end
   end
 end
diff --git a/lib/gitlab/build/rat/nightly.rb b/lib/gitlab/build/rat/nightly.rb
--- a/lib/gitlab/build/rat/nightly.rb
+++ b/lib/gitlab/build/rat/nightly.rb
@@ -15,16 +15,12 @@
       end
 
       def self.get_params(image: nil)
-        package_url = if Build::Check.use_system_ssl?
-                        Build::Info.rpm_package_download_url
-                      else
-                        Build::Info.deb_package_download_url
-                      end
         {
           'ref' => 'master',
           'token' => Gitlab::Util.get_env('RAT_TRIGGER_TOKEN'),
           'variables[REFERENCE_ARCHITECTURE]' => Gitlab::Util.get_env('RAT_REFERENCE_ARCHITECTURE') || 'omnibus-gitlab-mrs',
-          'variables[PACKAGE_URL]' => Gitlab::Util.get_env('PACKAGE_URL') || package_url,
+          'variables[NIGHTLY]' => "true",
+          'variables[PACKAGE_VERSION]' => Build::Info.name_version,
           'variables[QA_IMAGE]' => Gitlab::Util.get_env('QA_IMAGE') || image || 'gitlab/gitlab-ee-qa:nightly'
         }
       end
diff --git a/lib/gitlab/build/rat/tag.rb b/lib/gitlab/build/rat/tag.rb
--- a/lib/gitlab/build/rat/tag.rb
+++ b/lib/gitlab/build/rat/tag.rb
@@ -19,8 +19,9 @@
           'ref' => 'master',
           'token' => Gitlab::Util.get_env('RAT_TRIGGER_TOKEN'),
           'variables[REFERENCE_ARCHITECTURE]' => 'omnibus-gitlab-mrs',
-          'variables[PACKAGE_URL]' => Gitlab::Util.get_env('PACKAGE_URL') || Build::Info.deb_package_download_url,
-          'variables[QA_IMAGE]' => Gitlab::Util.get_env('QA_IMAGE') || image || "dev.gitlab.org:5005/gitlab/omnibus-gitlab/gitlab-ee-qa:#{version.partition(/\.\d+$/).first}"
+          'variables[PRE_RELEASE]' => "true",
+          'variables[PACKAGE_VERSION]' => Build::Info.name_version,
+          'variables[QA_IMAGE]' => Gitlab::Util.get_env('QA_IMAGE') || image || "dev.gitlab.org:5005/gitlab/gitlab-ee/gitlab-ee-qa:#{version.partition(/\.\d+$/).first}"
         }
       end
 
diff --git a/lib/gitlab/tasks/build.rake b/lib/gitlab/tasks/build.rake
--- a/lib/gitlab/tasks/build.rake
+++ b/lib/gitlab/tasks/build.rake
@@ -101,18 +101,7 @@
 
     desc 'Print the package name-version string to install the specific version of package'
     task :name_version do
-      Omnibus.load_configuration('omnibus.rb')
-      project = Omnibus::Project.load('gitlab')
-      packager = project.packagers_for_system[0]
-
-      case packager
-      when Omnibus::Packager::DEB
-        puts "#{Build::Info.package}=#{packager.safe_version}-#{packager.safe_build_iteration}"
-      when Omnibus::Packager::RPM
-        puts "#{Build::Info.package}-#{packager.safe_version}-#{packager.safe_build_iteration}#{packager.dist_tag}"
-      else
-        raise "Unable to detect version"
-      end
+      puts Build::Info.name_version
     end
   end