From e994cc641bd4e4259f5058afbebfb498679e5dcb Mon Sep 17 00:00:00 2001 From: poorndm Date: Fri, 19 Sep 2025 15:39:18 +0530 Subject: [PATCH 1/8] Update for s3 private access and set Internal source url Signed-off-by: poorndm --- omnibus/config/software/file.rb | 2 ++ omnibus/config/software/postgresql13.rb | 3 +++ omnibus/config/software/postgresql93-bin.rb | 3 +++ omnibus/omnibus.rb | 7 ++++++- 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/omnibus/config/software/file.rb b/omnibus/config/software/file.rb index fdb60bde9b..17cbd14718 100644 --- a/omnibus/config/software/file.rb +++ b/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}" diff --git a/omnibus/config/software/postgresql13.rb b/omnibus/config/software/postgresql13.rb index c3fe129665..5fc0e7fb21 100644 --- a/omnibus/config/software/postgresql13.rb +++ b/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 diff --git a/omnibus/config/software/postgresql93-bin.rb b/omnibus/config/software/postgresql93-bin.rb index f12ebf561c..fc407f0563 100644 --- a/omnibus/config/software/postgresql93-bin.rb +++ b/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"]}/#{name}/postgresql-#{version}.tar.bz2", + authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}" + relative_path "postgresql-#{version}" build do diff --git a/omnibus/omnibus.rb b/omnibus/omnibus.rb index ce3e6dad39..2cc76ef8c9 100644 --- a/omnibus/omnibus.rb +++ b/omnibus/omnibus.rb @@ -33,7 +33,9 @@ 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 "opscode-omnibus-cache-private" +s3_acl "private" +s3_region "us-west-2" # Customize compiler bits # ------------------------------ @@ -45,6 +47,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" From 898313975d8b15468461c31d0eb33e95600f9db0 Mon Sep 17 00:00:00 2001 From: poorndm Date: Fri, 19 Sep 2025 15:44:12 +0530 Subject: [PATCH 2/8] Modified to latest omnibus and omnibus- s/w version Signed-off-by: poorndm --- omnibus/Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 30b33c97cd..4ab9d9ca77 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,17 +1,17 @@ GIT remote: https://github.com/chef/omnibus-software.git - revision: 2dc7aa6530d7bf2860c6771f1f572e06d1b52907 + 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) From 3ad1319082a5ffa8a0ed714cd26c8fc8a995a633 Mon Sep 17 00:00:00 2001 From: poorndm Date: Fri, 19 Sep 2025 15:48:24 +0530 Subject: [PATCH 3/8] Modified internal_src path - postgresql Signed-off-by: poorndm --- omnibus/config/software/postgresql93-bin.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omnibus/config/software/postgresql93-bin.rb b/omnibus/config/software/postgresql93-bin.rb index fc407f0563..30f1100476 100644 --- a/omnibus/config/software/postgresql93-bin.rb +++ b/omnibus/config/software/postgresql93-bin.rb @@ -32,7 +32,7 @@ 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"]}/#{name}/postgresql-#{version}.tar.bz2", +internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/postgresql/postgresql-#{version}.tar.bz2", authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}" relative_path "postgresql-#{version}" From 4b76ba5a966fc9f1a3e38bd91e950be75402d407 Mon Sep 17 00:00:00 2001 From: Rajesh Paul Date: Thu, 25 Sep 2025 17:40:49 +0530 Subject: [PATCH 4/8] testing omnibus s3 config for build pipeline Signed-off-by: Rajesh Paul --- omnibus/omnibus.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/omnibus/omnibus.rb b/omnibus/omnibus.rb index 2cc76ef8c9..7cf25d9afe 100644 --- a/omnibus/omnibus.rb +++ b/omnibus/omnibus.rb @@ -33,9 +33,10 @@ use_s3_caching true s3_access_key ENV['AWS_ACCESS_KEY_ID'] s3_secret_key ENV['AWS_SECRET_ACCESS_KEY'] -s3_bucket "opscode-omnibus-cache-private" -s3_acl "private" -s3_region "us-west-2" +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 # ------------------------------ From ecc56bd37b836736436a19330b7fce43281e30b3 Mon Sep 17 00:00:00 2001 From: poorndm Date: Tue, 30 Sep 2025 13:52:45 +0530 Subject: [PATCH 5/8] upgrade openresty Signed-off-by: poorndm --- omnibus_overrides.rb | 1 + 1 file changed, 1 insertion(+) create mode 100644 omnibus_overrides.rb diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb new file mode 100644 index 0000000000..7bf9f324c2 --- /dev/null +++ b/omnibus_overrides.rb @@ -0,0 +1 @@ +override "openresty", version: "1.27.1.2" From 0d621ac8eb5cdeb90be6a0e4127cb4c1ae1eba65 Mon Sep 17 00:00:00 2001 From: poorndm Date: Fri, 3 Oct 2025 21:07:44 +0530 Subject: [PATCH 6/8] MOdified latest omnibus-s/w sha to pick openresty latest version Signed-off-by: poorndm --- omnibus/Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 4ab9d9ca77..c697c92d18 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/chef/omnibus-software.git - revision: e5f302c1140764c1167ec89ed2138bca2cfa9b5e - branch: main + revision: fd979b9270f6fb65e9c1c42cc7392a98a0acba17 + branch: CHEF-26818-openrusty-1-27-1-2 specs: omnibus-software (25.9.346) omnibus (>= 9.0.0) From 1dcf6f97525ecc302b33fcb96e4ed114b0c7a7f6 Mon Sep 17 00:00:00 2001 From: poorndm Date: Fri, 3 Oct 2025 21:28:32 +0530 Subject: [PATCH 7/8] modifed to test latest ver of openresty Signed-off-by: poorndm --- omnibus/Gemfile | 1 + omnibus/Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/omnibus/Gemfile b/omnibus/Gemfile index 651e1f94b0..21abe35cb6 100644 --- a/omnibus/Gemfile +++ b/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", "CHEF-26818-openrusty-1-27-1-2") # 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. diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index c697c92d18..f9ee2c3047 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/chef/omnibus-software.git - revision: fd979b9270f6fb65e9c1c42cc7392a98a0acba17 - branch: CHEF-26818-openrusty-1-27-1-2 + revision: e5f302c1140764c1167ec89ed2138bca2cfa9b5e + branch: main specs: omnibus-software (25.9.346) omnibus (>= 9.0.0) From 4b70013d3eb7977bbaa76eb14d8177c3fd2048ed Mon Sep 17 00:00:00 2001 From: poorndm Date: Fri, 3 Oct 2025 21:32:38 +0530 Subject: [PATCH 8/8] update for Gemfile Signed-off-by: poorndm --- omnibus/Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omnibus/Gemfile b/omnibus/Gemfile index 21abe35cb6..b7a0ec548a 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -2,7 +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", "CHEF-26818-openrusty-1-27-1-2") +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.