TEST PR

omnibus/Gemfile

@@ -2,6 +2,7 @@ source 'https://rubygems.org'
 
 # Install omnibus
 gem 'omnibus', git: 'https://github.com/chef/omnibus.git', branch: 'main'
+gem "omnibus-software", github: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_REPO", "chef/omnibus-software"), branch: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_BRANCH", "main")
 
 # Use Chef's software definitions. It is recommended that you write your own
 # software definitions, but you can clone/fork Chef's to get you started.

omnibus/Gemfile.lock

@@ -1,17 +1,17 @@
 GIT
   remote: https://github.com/chef/omnibus-software.git
-  revision: 2dc7aa6530d7bf2860c6771f1f572e06d1b52907
-  branch: main
+  revision: e5f302c1140764c1167ec89ed2138bca2cfa9b5e
+  branch: main 
   specs:
-    omnibus-software (24.6.323)
+    omnibus-software (25.9.346)
       omnibus (>= 9.0.0)
 
 GIT
   remote: https://github.com/chef/omnibus.git
-  revision: 3efa84c1a26daf55c4d477bf3653e5905ab4f737
+  revision: 39f0b3049936841589406bdcfb9d115f4db17041
   branch: main
   specs:
-    omnibus (9.0.25)
+    omnibus (9.1.1)
       aws-sdk-s3 (~> 1.116.0)
       chef-cleanroom (~> 1.0)
       chef-utils (>= 15.4)

omnibus/config/software/file.rb

@@ -25,6 +25,8 @@
 license_file "COPYING"
 
 source url: "ftp://ftp.astron.com/pub/file/file-#{version}.tar.gz"
+internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+                authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
 
 relative_path "file-#{version}"
 

omnibus/config/software/postgresql13.rb

@@ -33,6 +33,9 @@
 version("13.18") { source sha256: "ceea92abee2a8c19408d278b68de6a78b6bd3dbb4fa2d653fa7ca745d666aab1" }
 version("13.4") { source sha256: "ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd" }
 
+internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.bz2",
+                authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
+
 relative_path "postgresql-#{version}"
 
 build do

omnibus/config/software/postgresql93-bin.rb

@@ -32,6 +32,9 @@
 source url: "https://ftp.postgresql.org/pub/source/v#{version}/postgresql-#{version}.tar.bz2"
 version("9.3.25") { source sha256: "e4953e80415d039ccd33d34be74526a090fd585cf93f296cd9c593972504b6db" }
 
+internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/postgresql/postgresql-#{version}.tar.bz2",
+                authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
+
 relative_path "postgresql-#{version}"
 
 build do

omnibus/omnibus.rb

@@ -33,7 +33,10 @@
 use_s3_caching true
 s3_access_key  ENV['AWS_ACCESS_KEY_ID']
 s3_secret_key  ENV['AWS_SECRET_ACCESS_KEY']
-s3_bucket      ENV['AWS_S3_BUCKET'] || 'opscode-omnibus-cache'
+s3_bucket      ENV['OMNIBUS_S3_BUCKET'] || "opscode-omnibus-cache-private"
+# testing without these two options
+# s3_acl         "private"
+# s3_region      "us-west-2"
 
 # Customize compiler bits
 # ------------------------------
@@ -45,6 +48,9 @@
 # software_gems ['omnibus-software', 'my-company-software']
 # local_software_dirs ['/path/to/local/software']
 
+# note, this is statically set in the omnibus-buildkite-plugin, you are always going to be forced to use internal sources. If you dont want internal sources, you must enable this to false.
+use_internal_sources ENV.fetch("OMNIBUS_USE_INTERNAL_SOURCES", true)
+
 # Build in FIPS compatability mode
 # ------------------------------
 fips_mode (ENV['OMNIBUS_FIPS_MODE'] || '').downcase == "true"

omnibus_overrides.rb

@@ -0,0 +1 @@
+override "openresty", version: "1.27.1.2"