Merge branch 'remove-old-ami-build-logic' into 'master'

Remove old code used for AMI builds

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

Merged-by: DJ Mountney <[email protected]>
Approved-by: Jason Plum <[email protected]>
Approved-by: DJ Mountney <[email protected]>
Co-authored-by: Balasankar "Balu" C <[email protected]>

Author: twk3

lib/gitlab/aws_helper.rb

@@ -14,26 +14,6 @@ def initialize(version, type)
     @type = type || 'ce'
   end
 
-  def create_ami_old
-    release_type = Gitlab::Util.get_env('AWS_RELEASE_TYPE')
-    architecture = Gitlab::Util.get_env('AWS_ARCHITECTURE')
-    args = {}
-
-    if (@type == 'ee') && release_type
-      @type = "ee-#{release_type}"
-      @license_file = "AWS_#{release_type}_LICENSE_FILE".upcase
-    end
-
-    if architecture
-      args = { arch: architecture }
-      @type = "#{@type}-#{architecture}"
-    end
-
-    @download_url = Build::Info.ami_deb_package_download_url(**args)
-
-    system(*%W[support/packer_old/packer_ami.sh #{@version} #{@type} #{@download_url} #{@license_file}])
-  end
-
   def create_ami
     release_type = Gitlab::Util.get_env('AWS_RELEASE_TYPE')
     architecture = Gitlab::Util.get_env('AWS_ARCHITECTURE')

lib/gitlab/build/info.rb

@@ -156,15 +156,6 @@ def log_level
         end
       end
 
-      # Fetch the package used in AWS AMIs from an S3 bucket
-      def ami_deb_package_download_url(arch: 'amd64')
-        folder = 'ubuntu-focal'
-        folder = "#{folder}_aarch64" if arch == 'arm64'
-
-        package_filename_url_safe = Info.release_version.gsub("+", "%2B")
-        "https://#{Info.release_bucket}.#{Info.release_bucket_s3_endpoint}/#{folder}/#{Info.package}_#{package_filename_url_safe}_#{arch}.deb"
-      end
-
       def release_file_contents
         repo = Gitlab::Util.get_env('PACKAGECLOUD_REPO') # Target repository
 

lib/gitlab/tasks/aws.rake

@@ -12,11 +12,7 @@ namespace :aws do
       next if Build::Check.is_auto_deploy? || Build::Check.is_rc_tag?
 
       Omnibus.load_configuration('omnibus.rb')
-      if Gitlab::Util.get_env('AMI_USE_OLD_BUILD_PROCESS') == "true"
-        AWSHelper.new(Omnibus::BuildVersion.semver, Build::Info.edition).create_ami_old
-      else
-        AWSHelper.new(Omnibus::BuildVersion.semver, Build::Info.edition).create_ami
-      end
+      AWSHelper.new(Omnibus::BuildVersion.semver, Build::Info.edition).create_ami
     end
   end
 

spec/lib/gitlab/tasks/aws_spec.rb

@@ -44,25 +44,6 @@ def deregister_image(parameters)
     stub_env_var('CI_JOB_TOKEN', 'CI-NO-JOB-TOKEN')
   end
 
-  context 'when using `AMI_USE_OLD_BUILD_PROCESS` environment variable' do
-    before do
-      stub_env_var('AMI_USE_OLD_BUILD_PROCESS', 'true')
-      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).to receive(:ami_deb_package_download_url).and_return('http://example.com')
-    end
-
-    it 'should call the old script' do
-      allow(Build::Info).to receive(:edition).and_return('ce')
-      allow(Omnibus::BuildVersion).to receive(:semver).and_return('9.3.0')
-
-      expect_any_instance_of(Kernel).to receive(:system).with(*["support/packer_old/packer_ami.sh", "9.3.0", "ce", "http://example.com", ""])
-
-      Rake::Task['aws:ami:create'].invoke
-    end
-  end
-
   describe 'on a regular tag' do
     before do
       allow(Build::Check).to receive(:on_tag?).and_return(true)