omnibus 9.0.12 → 9.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f20cc7252db28fd200af4db5bda33950070e7156613c39009f03ca486eb0e20a
-  data.tar.gz: 9dcd4a140bf26997769e5f125f205411ca2cb99c0baff4d3c5f8a8f5f637e45a
+  metadata.gz: 91e18818ba6b01864ca40a7847beb9b9cc281db69a99ad478265beb9792411fc
+  data.tar.gz: b25c8dca7eb871e4d1014fa61b270aa81db0653bc1a5061816e5ed8a0076c0f4
 SHA512:
-  metadata.gz: aa23dc9ab959bf5d738ac6377b47b96f29a44ac447e0cb22bee1dcb019ca8278907986844c4333f747986dbc77eb916d513df2c22b51b6e2c8adf9a5b70a21e5
-  data.tar.gz: f89b0e7c0d3bb79b904084de8c1b00fe9e2f4fca318335158c58ac2472de51d945c6ff641bcdf33db38d15928b7e7d30419423505af93380f546f99fc935ac74
+  metadata.gz: 311583baefc33f9b9ac500ff1b96c5f3b0f03897e08de2135c7dedff9e0d8abc35ed1c8b414d8f291331546063e47095f4f04386db794f0895f3154105fa7fbb
+  data.tar.gz: e1ed149a6899e29bdce5e26d2762ed984e74305dd4fcdf72d849f479a4dc1abf34a78fb448760df12ddc8d6b80e388ef9a396752bfe0e714e4d46d6cd076c1c1

data/README.md

@@ -279,6 +279,10 @@ However there are several caveats to be aware of:
 1. You will almost certainly want to uncomment the `base_dir` in `omnibus.rb`,
 or at the very least change `cache_dir` and `build_dir` as otherwise it'll try
 to use `/var/cache/omnibus` and `/opt/$MY_PROJECT_NAME`, requiring root.
+1. Update software dependencies listed in the project configuration in `config/projects/$MY_PROJECT_NAME.rb`. 
+You can refer the software `.rb` files present in the `config/software` folder.
+1. The `install_dir` specified in the project file typically requires `root` privilege at build time. 
+Change it another location such as `"/tmp/#{name}"` to avoid running as `root`.
 1. The default configuration created for you references a lot of things
 that are in the default config that come from the `omnibus-software` gem.
 So you want to use those you'll need to either uncomment it in the `Gemfile`,

data/lib/omnibus/build_system_metadata/buildkite.rb

@@ -0,0 +1,129 @@
+#
+# Copyright 2012-2018 Chef Software, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module Omnibus
+  # Provides methods for fetching Omnibus project build metadata from Buildkite
+  #
+  # @note Requires environment variables provided by Buildkite
+  #
+  class Buildkite
+
+    class << self
+
+      #
+      # Constants for the buildkite environment variables
+      #
+      AMI_ID_ENV_KEY = "BUILDKITE_AGENT_META_DATA_AWS_AMI_ID".freeze
+      HOSTNAME_ENV_KEY = "BUILDKITE_AGENT_META_DATA_HOSTNAME".freeze
+      DOCKER_VERSION_ENV_KEY = "BUILDKITE_AGENT_META_DATA_DOCKER".freeze
+      BUILDKITE_COMMAND_ENV_KEY = "BUILDKITE_COMMAND".freeze
+
+      #
+      # The AMI ID of the instance the build is happening on.
+      #
+      # @note This is only present when the instance is a Windows or Linux instance.
+      #
+      # @note Relies on presence of ENV["BUILDKITE_AGENT_META_DATA_AWS_AMI_ID"] in Buildkite build job.
+      #
+      # @return [String]
+      #   either the AMI ID, or 'unknown'
+      #
+      def ami_id
+        ami_id = "unknown"
+        if !ENV[AMI_ID_ENV_KEY].nil? && !ENV[AMI_ID_ENV_KEY].empty?
+          ami_id = ENV[AMI_ID_ENV_KEY]
+        end
+        ami_id
+      end
+
+      #
+      # The hostname of the instance the build is happening on.
+      #
+      # @note This is only present when the instance is a MacOS instance.
+      #
+      # @note Relies on presence of ENV["BUILDKITE_AGENT_META_DATA_HOSTNAME"] in Buildkite build job.
+      #
+      # @return [String]
+      #   either the hostname, or 'unknown'
+      #
+      def hostname
+        hostname = "unknown"
+        if !ENV[HOSTNAME_ENV_KEY].nil? && !ENV[HOSTNAME_ENV_KEY].empty? && ami_id == "unknown"
+          hostname = ENV[HOSTNAME_ENV_KEY]
+        end
+        hostname
+      end
+
+      #
+      # A boolean representing if the build is using docker or not.
+      #
+      # @note Relies on presence of ENV["BUILDKITE_AGENT_META_DATA_DOCKER"] in Buildkite build job.
+      #
+      # @return [Boolean]
+      #
+      def is_docker_build
+        !ENV[DOCKER_VERSION_ENV_KEY].nil? && !ENV[DOCKER_VERSION_ENV_KEY].empty? ? true : false
+      end
+
+      #
+      # The version of docker that was used in the build.
+      #
+      # @note Relies on presence of ENV["BUILDKITE_AGENT_META_DATA_DOCKER"] in Buildkite build job.
+      #
+      # @return [String]
+      #
+      def docker_version
+        ENV[DOCKER_VERSION_ENV_KEY] if is_docker_build
+      end
+
+      #
+      # The OS Image that is being used in the Docker build
+      #
+      # @note Relies on presence of ENV["BUILDKITE_COMMAND"] in Buildkite build job.
+      #
+      # @return [String]
+      #   String with the parameter that was provided in the `docker build` command
+      #
+      def docker_image
+        buildkite_command = ENV[BUILDKITE_COMMAND_ENV_KEY]
+        if is_docker_build && buildkite_command && buildkite_command.include?("OS_IMAGE")
+          os_image = buildkite_command.match(/OS_IMAGE=(?<image_id>[\S]*)/)
+          os_image[:image_id]
+        end
+      end
+
+      #
+      # The version of Omnibus that is in `version.rb`
+      #
+      # @return [String]
+      #
+      def omnibus_version
+        Omnibus::VERSION
+      end
+
+      def to_hash
+        ret = {}
+        ret[:ami_id] = ami_id if ami_id != "unknown"
+        ret[:hostname] = hostname if hostname != "unknown"
+        ret[:is_docker_build] = is_docker_build if is_docker_build
+        ret[:docker_version] = docker_version if docker_version
+        ret[:docker_image] = docker_image if docker_image
+        ret[:omnibus_version] = omnibus_version
+        ret
+      end
+    end
+  end
+end

data/lib/omnibus/build_system_metadata.rb

@@ -0,0 +1,36 @@
+#
+# Copyright 2012-2018 Chef Software, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "omnibus/build_system_metadata/buildkite"
+
+module Omnibus
+  # Provides methods for fetching Omnibus project build metadata from Buildkite
+  #
+  # @note Requires environment variables provided whichever platform metdata is being pulled from
+  #
+  class BuildSystemMetadata
+
+    class << self
+
+      def to_hash
+        if !ENV["BUILDKITE"].nil? && !ENV["BUILDKITE"].empty?
+          Omnibus::Buildkite.to_hash
+        end
+      end
+
+    end
+  end
+end

data/lib/omnibus/cli.rb

@@ -85,7 +85,13 @@ module Omnibus
       project = Project.load(name, manifest)
       say("Building #{project.name} #{project.build_version}...")
       Omnibus::S3Cache.populate if @options[:populate_s3_cache] && !Omnibus::S3Cache.fetch_missing.empty?
-      project.download
+      begin
+        project.download
+      rescue
+        Config.use_s3_caching(false) if Config.use_s3_caching
+        project = Project.load(name, nil)
+        project.download
+      end
       project.build
 
       if @options[:output_manifest]

data/lib/omnibus/manifest.rb

@@ -69,13 +69,20 @@ module Omnibus
 
     def to_hash
       software_hash = @data.inject({}) do |memo, (k, v)|
-        memo[k] = v.to_hash
+        h = v.to_hash
+        h[:locked_source].delete(:authorization) if h[:locked_source]
+
+        memo[k] = h
         memo
       end
+
+      build_system_metadata = Omnibus::BuildSystemMetadata.to_hash
+
       ret = {
         manifest_format: LATEST_MANIFEST_FORMAT,
         software: software_hash,
       }
+      ret[:build_system_metadata] = build_system_metadata if build_system_metadata
       ret[:build_version] = build_version if build_version
       ret[:build_git_revision] = build_git_revision if build_git_revision
       ret[:license] = license
@@ -115,7 +122,9 @@ module Omnibus
     end
 
     def self.from_hash_v2(manifest_data)
-      m = Omnibus::Manifest.new(manifest_data[:build_version], manifest_data[:build_git_revision], manifest_data[:license])
+      m = Omnibus::Manifest.new(manifest_data[:build_version],
+                                 manifest_data[:build_git_revision],
+                                 manifest_data[:license])
       manifest_data[:software].each do |name, entry_data|
         m.add(name, Omnibus::ManifestEntry.new(name, keys_to_syms(entry_data)))
       end

data/lib/omnibus/packagers/msi.rb

@@ -307,6 +307,30 @@ module Omnibus
     end
     expose :gem_path
 
+    #
+    # Provide a custom zip name
+    #
+    # @example
+    #   zip_name 'chef'
+    #
+    # @param [TrueClass, FalseClass] value
+    #   whether we're building a zip-based MSI or not
+    #
+    # @return [TrueClass, FalseClass]
+    #   whether we're building a zip-based MSI or not
+    def zip_name(val = NULL)
+      if null?(val)
+        @zip_name || project.name
+      else
+        unless val.is_a?(String)
+          raise InvalidValue.new(:zip_name, "be an String")
+        end
+
+        @zip_name = val
+      end
+    end
+    expose :zip_name
+
     #
     # @!endgroup
     # --------------------------------------------------
@@ -443,7 +467,7 @@ module Omnibus
     def zip_command
       <<-EOH.split.join(" ").squeeze(" ").strip
       7z a -r
-      #{windows_safe_path(staging_dir)}\\#{project.name}.zip
+      #{windows_safe_path(staging_dir)}\\#{zip_name}.zip
       #{windows_safe_path(project.install_dir)}\\*
       EOH
     end
@@ -457,7 +481,7 @@ module Omnibus
     def heat_command
       if fast_msi
         <<-EOH.split.join(" ").squeeze(" ").strip
-          heat.exe file "#{project.name}.zip"
+          heat.exe file "#{zip_name}.zip"
           -cg ProjectDir
           -dr INSTALLLOCATION
           -nologo -sfrag -srd -sreg -gg

data/lib/omnibus/project.rb

@@ -1062,7 +1062,10 @@ module Omnibus
     end
 
     def download
-      ThreadPool.new(Config.workers) do |pool|
+      # Setting abort_on_exception to false because it was causing
+      # errors by shutting down the main thread when encountering a cache miss
+      # in S3 and falling back to the internal source repo
+      ThreadPool.new(Config.workers, false) do |pool|
         softwares.each do |software|
           pool.schedule { software.fetch }
         end

data/lib/omnibus/thread_pool.rb

@@ -46,14 +46,16 @@ module Omnibus
     #
     # @param [Integer] size
     #   the number of items to put in the thread pool
+    # @param [Boolean] abort_on_exception
+    #   if the thread should abort the main thread also on a failure
     #
-    def initialize(size)
+    def initialize(size, abort_on_exception = true)
       @size = size
       @jobs = Queue.new
 
       @pool = Array.new(@size) do |i|
         Thread.new do
-          Thread.abort_on_exception = true
+          Thread.abort_on_exception = abort_on_exception
           Thread.current[:id] = i
 
           catch(:exit) do

data/lib/omnibus/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Omnibus
-  VERSION = "9.0.12".freeze
+  VERSION = "9.0.17".freeze
 end

data/lib/omnibus/whitelist.rb

@@ -62,6 +62,7 @@ AIX_WHITELIST_LIBS = [
   /librtl\.a/,
   /libsrc\.a/,
   /unix$/,
+  /libcrypto\.so/,
 ].freeze
 
 OMNIOS_WHITELIST_LIBS = [

data/lib/omnibus.rb

@@ -34,34 +34,36 @@ module Omnibus
   #
   DEFAULT_CONFIG = "omnibus.rb".freeze
 
-  autoload :Builder,          "omnibus/builder"
-  autoload :BuildVersion,     "omnibus/build_version"
-  autoload :BuildVersionDSL,  "omnibus/build_version_dsl"
-  autoload :Cleaner,          "omnibus/cleaner"
-  autoload :Compressor,       "omnibus/compressor"
-  autoload :Config,           "omnibus/config"
-  autoload :Error,            "omnibus/exceptions"
-  autoload :FileSyncer,       "omnibus/file_syncer"
-  autoload :Generator,        "omnibus/generator"
-  autoload :GitCache,         "omnibus/git_cache"
-  autoload :HealthCheck,      "omnibus/health_check"
-  autoload :Instrumentation,  "omnibus/instrumentation"
-  autoload :Library,          "omnibus/library"
-  autoload :Logger,           "omnibus/logger"
-  autoload :Logging,          "omnibus/logging"
-  autoload :Metadata,         "omnibus/metadata"
-  autoload :NullArgumentable, "omnibus/null_argumentable"
-  autoload :Ohai,             "omnibus/ohai"
-  autoload :Package,          "omnibus/package"
-  autoload :Packager,         "omnibus/packager"
-  autoload :Project,          "omnibus/project"
-  autoload :Publisher,        "omnibus/publisher"
-  autoload :Reports,          "omnibus/reports"
-  autoload :S3Cache,          "omnibus/s3_cache"
-  autoload :Software,         "omnibus/software"
-  autoload :Templating,       "omnibus/templating"
-  autoload :ThreadPool,       "omnibus/thread_pool"
-  autoload :Licensing,        "omnibus/licensing"
+  autoload :Builder,              "omnibus/builder"
+  autoload :BuildVersion,         "omnibus/build_version"
+  autoload :BuildVersionDSL,      "omnibus/build_version_dsl"
+  autoload :BuildSystemMetadata,  "omnibus/build_system_metadata"
+  autoload :Buildkite,            "omnibus/build_system_metadata/buildkite"
+  autoload :Cleaner,              "omnibus/cleaner"
+  autoload :Compressor,           "omnibus/compressor"
+  autoload :Config,               "omnibus/config"
+  autoload :Error,                "omnibus/exceptions"
+  autoload :FileSyncer,           "omnibus/file_syncer"
+  autoload :Generator,            "omnibus/generator"
+  autoload :GitCache,             "omnibus/git_cache"
+  autoload :HealthCheck,          "omnibus/health_check"
+  autoload :Instrumentation,      "omnibus/instrumentation"
+  autoload :Library,              "omnibus/library"
+  autoload :Logger,               "omnibus/logger"
+  autoload :Logging,              "omnibus/logging"
+  autoload :Metadata,             "omnibus/metadata"
+  autoload :NullArgumentable,     "omnibus/null_argumentable"
+  autoload :Ohai,                 "omnibus/ohai"
+  autoload :Package,              "omnibus/package"
+  autoload :Packager,             "omnibus/packager"
+  autoload :Project,              "omnibus/project"
+  autoload :Publisher,            "omnibus/publisher"
+  autoload :Reports,              "omnibus/reports"
+  autoload :S3Cache,              "omnibus/s3_cache"
+  autoload :Software,             "omnibus/software"
+  autoload :Templating,           "omnibus/templating"
+  autoload :ThreadPool,           "omnibus/thread_pool"
+  autoload :Licensing,            "omnibus/licensing"
 
   autoload :GitFetcher,  "omnibus/fetchers/git_fetcher"
   autoload :NetFetcher,  "omnibus/fetchers/net_fetcher"
@@ -77,16 +79,16 @@ module Omnibus
   autoload :ManifestEntry, "omnibus/manifest_entry"
   autoload :ManifestDiff,  "omnibus/manifest_diff"
 
-  autoload :ChangeLog, "omnibus/changelog"
-  autoload :GitRepository, "omnibus/git_repository"
+  autoload :ChangeLog,      "omnibus/changelog"
+  autoload :GitRepository,  "omnibus/git_repository"
 
   autoload :SemanticVersion, "omnibus/semantic_version"
 
   module Command
-    autoload :Base,    "omnibus/cli/base"
-    autoload :Cache,   "omnibus/cli/cache"
-    autoload :Publish, "omnibus/cli/publish"
-    autoload :ChangeLog, "omnibus/cli/changelog"
+    autoload :Base,       "omnibus/cli/base"
+    autoload :Cache,      "omnibus/cli/cache"
+    autoload :Publish,    "omnibus/cli/publish"
+    autoload :ChangeLog,  "omnibus/cli/changelog"
   end
 
   class << self

data/spec/unit/build_system_metadata_spec.rb

@@ -0,0 +1,82 @@
+require "spec_helper"
+
+module Omnibus
+  describe BuildSystemMetadata do
+
+    let(:ami_id) { "ami-1234ab5678cd9ef01" }
+    let(:hostname) { "CHF-V-ABC-DE000.local" }
+    let(:docker_version) { "20.0.0" }
+    let(:docker_image) { "artifactory-url.com/release-type/base-platform" }
+    let(:docker_command) { "docker build . -f images/omnibus_toolchain_containers/platform/Dockerfile -t artifactory-url.com/release-type/omnibus-toolchain-platform -t chefes/omnibus-toolchain-platform --build-arg OS_IMAGE=#{docker_image}" }
+
+    subject(:buildkite_metadata) { Omnibus::Buildkite }
+
+    describe "#to_hash" do
+      context "builds occur on buildkite" do
+
+        before(:each) do
+          clear_defaults
+        end
+
+        it "returns an ami_id if one is found" do
+          with_ami_id
+          expect(buildkite_metadata.to_hash[:ami_id]).to eq(ami_id)
+        end
+
+        it "returns an hostname if one is found" do
+          with_hostname
+          expect(buildkite_metadata.to_hash[:hostname]).to eq(hostname)
+        end
+
+        it "returns is_docker_build if one is found" do
+          with_docker
+          expect(buildkite_metadata.to_hash[:is_docker_build]).to eq(true)
+        end
+
+        it "returns a docker_version if one is found" do
+          with_docker
+          expect(buildkite_metadata.to_hash[:docker_version]).to eq(docker_version)
+        end
+
+        it "returns a docker_image if one is found" do
+          with_docker
+          expect(buildkite_metadata.to_hash[:docker_image]).to eq(docker_image)
+        end
+
+        it "returns an omnibus_version if one is found" do
+          expect(buildkite_metadata.to_hash[:omnibus_version]).to eq(Omnibus::VERSION)
+        end
+
+      end
+    end
+
+    def with_ami_id
+      stub_env("BUILDKITE_AGENT_META_DATA_AWS_AMI_ID", ami_id)
+    end
+
+    def with_hostname
+      stub_env("BUILDKITE_AGENT_META_DATA_HOSTNAME", hostname)
+    end
+
+    def with_docker
+      stub_env("BUILDKITE_AGENT_META_DATA_DOCKER", docker_version)
+      stub_env("BUILDKITE_COMMAND", docker_command)
+    end
+
+    def clear_defaults
+      without_ami_id_and_hostname
+      without_docker
+    end
+
+    def without_ami_id_and_hostname
+      stub_env("BUILDKITE_AGENT_META_DATA_AWS_AMI_ID", nil)
+      stub_env("BUILDKITE_AGENT_META_DATA_HOSTNAME", nil)
+    end
+
+    def without_docker
+      stub_env("BUILDKITE_AGENT_META_DATA_DOCKER", nil)
+      stub_env("BUILDKITE_COMMAND", nil)
+    end
+
+  end
+end

data/spec/unit/buildkite_spec.rb

@@ -0,0 +1,207 @@
+require "spec_helper"
+
+module Omnibus
+  describe Buildkite do
+
+    let(:ami_id) { "ami-1234ab5678cd9ef01" }
+    let(:hostname) { "CHF-V-ABC-DE000.local" }
+    let(:docker_version) { "20.0.0" }
+    let(:docker_image) { "artifactory-url.com/release-type/base-platform" }
+    let(:docker_command) { "docker build . -f images/omnibus_toolchain_containers/platform/Dockerfile -t artifactory-url.com/release-type/omnibus-toolchain-platform -t chefes/omnibus-toolchain-platform --build-arg OS_IMAGE=#{docker_image}" }
+
+    subject(:buildkite_metadata) { described_class }
+
+    before(:each) do
+      clear_defaults
+    end
+
+    describe "#ami_id" do
+      it "returns the ami_id if one is found" do
+        with_ami_id
+        expect(buildkite_metadata.ami_id).to eq(ami_id)
+      end
+
+      it "returns the unknown if nothing present" do
+        expect(buildkite_metadata.ami_id).to eq("unknown")
+      end
+    end
+
+    describe "#hostname" do
+      it "returns the hostname if one is found" do
+        with_hostname
+        expect(buildkite_metadata.hostname).to eq(hostname)
+      end
+
+      it "returns the unknown if nothing present" do
+        expect(buildkite_metadata.hostname).to eq("unknown")
+      end
+    end
+
+    describe "#is_docker_build" do
+      it "returns true if docker metadata is present" do
+        with_docker
+        expect(buildkite_metadata.is_docker_build).to eq(true)
+      end
+
+      it "returns false if docker metadata is missing" do
+        expect(buildkite_metadata.is_docker_build).to eq(false)
+      end
+    end
+
+    describe "#docker_version" do
+      it "returns the docker version if one is found" do
+        with_docker
+        expect(buildkite_metadata.docker_version).to eq(docker_version)
+      end
+
+      it "returns nothing if docker version is missing" do
+        expect(buildkite_metadata.docker_version).to be_nil
+      end
+    end
+
+    describe "#docker_image" do
+      it "returns the docker image id if one is found" do
+        with_docker
+        expect(buildkite_metadata.docker_image).to eq(docker_image)
+      end
+
+      it "returns nothing if docker image id is missing" do
+        expect(buildkite_metadata.docker_image).to be_nil
+      end
+    end
+
+    describe "#omnibus_version" do
+      it "returns the omnibus_version if one is found" do
+        expect(buildkite_metadata.omnibus_version).to eq(Omnibus::VERSION)
+      end
+    end
+
+    describe "#to_hash" do
+      it "returns an ami_id if one is found" do
+        with_ami_id
+        expect(buildkite_metadata.to_hash[:ami_id]).to eq(ami_id)
+      end
+
+      it "returns an hostname if one is found" do
+        with_hostname
+        expect(buildkite_metadata.to_hash[:hostname]).to eq(hostname)
+      end
+
+      it "returns is_docker_build if one is found" do
+        with_docker
+        expect(buildkite_metadata.to_hash[:is_docker_build]).to eq(true)
+      end
+
+      it "returns a docker_version if one is found" do
+        with_docker
+        expect(buildkite_metadata.to_hash[:docker_version]).to eq(docker_version)
+      end
+
+      it "returns a docker_image if one is found" do
+        with_docker
+        expect(buildkite_metadata.to_hash[:docker_image]).to eq(docker_image)
+      end
+
+      it "returns an omnibus_version if one is found" do
+        expect(buildkite_metadata.to_hash[:omnibus_version]).to eq(Omnibus::VERSION)
+      end
+    end
+
+    context "platform builds on linux" do
+      it "uses docker" do
+        with_ami_id
+        with_docker
+
+        expect(buildkite_metadata.ami_id).to eq(ami_id)
+        expect(buildkite_metadata.is_docker_build).to eq(true)
+        expect(buildkite_metadata.docker_version).to eq(docker_version)
+        expect(buildkite_metadata.docker_image).to eq(docker_image)
+        expect(buildkite_metadata.omnibus_version).to eq(Omnibus::VERSION)
+      end
+
+      it "does not use docker" do
+        with_ami_id
+
+        expect(buildkite_metadata.ami_id).to eq(ami_id)
+        expect(buildkite_metadata.is_docker_build).to eq(false)
+        expect(buildkite_metadata.docker_version).to be_nil
+        expect(buildkite_metadata.docker_image).to be_nil
+        expect(buildkite_metadata.omnibus_version).to eq(Omnibus::VERSION)
+      end
+    end
+
+    context "platform builds on windows" do
+      it "uses docker" do
+        with_ami_id
+        with_docker
+
+        expect(buildkite_metadata.ami_id).to eq(ami_id)
+        expect(buildkite_metadata.is_docker_build).to eq(true)
+        expect(buildkite_metadata.docker_version).to eq(docker_version)
+        expect(buildkite_metadata.docker_image).to eq(docker_image)
+        expect(buildkite_metadata.omnibus_version).to eq(Omnibus::VERSION)
+      end
+
+      it "does not use docker" do
+        with_ami_id
+
+        expect(buildkite_metadata.ami_id).to eq(ami_id)
+        expect(buildkite_metadata.is_docker_build).to eq(false)
+        expect(buildkite_metadata.docker_version).to be_nil
+        expect(buildkite_metadata.docker_image).to be_nil
+        expect(buildkite_metadata.omnibus_version).to eq(Omnibus::VERSION)
+      end
+    end
+
+    describe "platform builds on macOS" do
+      it "uses docker" do
+        with_hostname
+        with_docker
+
+        expect(buildkite_metadata.hostname).to eq(hostname)
+        expect(buildkite_metadata.is_docker_build).to eq(true)
+        expect(buildkite_metadata.docker_version).to eq(docker_version)
+        expect(buildkite_metadata.docker_image).to eq(docker_image)
+        expect(buildkite_metadata.omnibus_version).to eq(Omnibus::VERSION)
+      end
+
+      it "does not use docker" do
+        with_hostname
+
+        expect(buildkite_metadata.hostname).to eq(hostname)
+        expect(buildkite_metadata.is_docker_build).to eq(false)
+        expect(buildkite_metadata.docker_version).to be_nil
+        expect(buildkite_metadata.docker_image).to be_nil
+        expect(buildkite_metadata.omnibus_version).to eq(Omnibus::VERSION)
+      end
+    end
+
+    def with_ami_id
+      stub_env("BUILDKITE_AGENT_META_DATA_AWS_AMI_ID", ami_id)
+    end
+
+    def with_hostname
+      stub_env("BUILDKITE_AGENT_META_DATA_HOSTNAME", hostname)
+    end
+
+    def with_docker
+      stub_env("BUILDKITE_AGENT_META_DATA_DOCKER", docker_version)
+      stub_env("BUILDKITE_COMMAND", docker_command)
+    end
+
+    def clear_defaults
+      without_ami_id_and_hostname
+      without_docker
+    end
+
+    def without_ami_id_and_hostname
+      stub_env("BUILDKITE_AGENT_META_DATA_AWS_AMI_ID", nil)
+      stub_env("BUILDKITE_AGENT_META_DATA_HOSTNAME", nil)
+    end
+
+    def without_docker
+      stub_env("BUILDKITE_AGENT_META_DATA_DOCKER", nil)
+      stub_env("BUILDKITE_COMMAND", nil)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 9.0.12
+  version: 9.0.17
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-17 00:00:00.000000000 Z
+date: 2023-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -372,6 +372,8 @@ files:
 - lib/omnibus.rb
 - lib/omnibus/assets/README-logo.png
 - lib/omnibus/assets/logo.psd
+- lib/omnibus/build_system_metadata.rb
+- lib/omnibus/build_system_metadata/buildkite.rb
 - lib/omnibus/build_version.rb
 - lib/omnibus/build_version_dsl.rb
 - lib/omnibus/builder.rb
@@ -522,9 +524,11 @@ files:
 - spec/support/output_helpers.rb
 - spec/support/path_helpers.rb
 - spec/support/shell_helpers.rb
+- spec/unit/build_system_metadata_spec.rb
 - spec/unit/build_version_dsl_spec.rb
 - spec/unit/build_version_spec.rb
 - spec/unit/builder_spec.rb
+- spec/unit/buildkite_spec.rb
 - spec/unit/changelog_spec.rb
 - spec/unit/changelogprinter_spec.rb
 - spec/unit/cleanroom_spec.rb
@@ -626,9 +630,11 @@ test_files:
 - spec/support/output_helpers.rb
 - spec/support/path_helpers.rb
 - spec/support/shell_helpers.rb
+- spec/unit/build_system_metadata_spec.rb
 - spec/unit/build_version_dsl_spec.rb
 - spec/unit/build_version_spec.rb
 - spec/unit/builder_spec.rb
+- spec/unit/buildkite_spec.rb
 - spec/unit/changelog_spec.rb
 - spec/unit/changelogprinter_spec.rb
 - spec/unit/cleanroom_spec.rb