add build config path

Author: olegantonyan

exe/omnipackage

@@ -66,6 +66,9 @@ subcommands = {
       k, v = v.split('=')
       options[:secrets][k] = v
     end
+    opts.on('-b', '--build-config BUILD_CONFIG_PATH', "override default path to .omnipackage/config.yml") do |v|
+      options[:build_config_path] = build_config_path
+    end
   end,
 
   'portal' => ::OptionParser.new do |opts|
@@ -116,7 +119,11 @@ begin
     logger = ::OmnipackageAgent::Logging::Logger.new
     secrets = ::OmnipackageAgent::Build::Secrets.deserialize(options[:secrets])
     rest.each do |path|
-      result = ::OmnipackageAgent::Build.new(logger: logger, config: config, secrets: secrets).call(path, distros: options[:distros])
+      result = ::OmnipackageAgent::Build.new(
+        logger: logger,
+        config: config,
+        secrets: secrets
+      ).call(path, distros: options[:distros], build_config_path: options[:build_config_path])
       print_result(path, result)
     end
   when 'init'

lib/omnipackage_agent/api/scheduler.rb

@@ -22,15 +22,16 @@ def call(payload) # rubocop: disable Metrics/MethodLength, Metrics/AbcSize
         case # rubocop: disable Style/EmptyCaseCondition
         when state.idle? && payload['command'] == 'start'
           task = ::OmnipackageAgent::Api::Task.new(
-            id:           payload.fetch('task').fetch('id'),
-            tarball_url:  payload.fetch('task').fetch('sources_tarball_url'),
-            upload_url:   payload.fetch('task').fetch('upload_artefact_url'),
-            distros:      payload.fetch('task').fetch('distros'),
-            limits:       ::OmnipackageAgent::Build::Limits.deserialize(payload.fetch('task')['limits']),
-            secrets:      ::OmnipackageAgent::Build::Secrets.deserialize(payload.fetch('task')['secrets']),
-            downloader:   downloader,
-            logger:       logger,
-            config:       config
+            id:                 payload.fetch('task').fetch('id'),
+            tarball_url:        payload.fetch('task').fetch('sources_tarball_url'),
+            upload_url:         payload.fetch('task').fetch('upload_artefact_url'),
+            distros:            payload.fetch('task').fetch('distros'),
+            build_config_path:  payload.fetch('task').fetch('build_config_path', nil),
+            limits:             ::OmnipackageAgent::Build::Limits.deserialize(payload.fetch('task')['limits']),
+            secrets:            ::OmnipackageAgent::Build::Secrets.deserialize(payload.fetch('task')['secrets']),
+            downloader:         downloader,
+            logger:             logger,
+            config:             config
           )
           start!(task)
         when state.busy? && payload['command'] == 'stop'

lib/omnipackage_agent/api/task.rb

@@ -9,9 +9,9 @@
 module OmnipackageAgent
   module Api
     class Task
-      attr_reader :id, :tarball_url, :upload_url, :distros, :downloader, :build_outputs, :exception, :logger, :config, :limits, :secrets
+      attr_reader :id, :tarball_url, :upload_url, :distros, :downloader, :build_outputs, :exception, :logger, :config, :limits, :secrets, :build_config_path
 
-      def initialize(id:, tarball_url:, upload_url:, distros:, downloader:, logger:, config:, limits:, secrets:) # rubocop: disable Metrics/ParameterLists, Metrics/MethodLength
+      def initialize(id:, tarball_url:, upload_url:, distros:, downloader:, logger:, config:, limits:, secrets:, build_config_path:) # rubocop: disable Metrics/ParameterLists, Metrics/MethodLength
         @id = id
         @distros = distros
         @tarball_url = tarball_url
@@ -23,6 +23,7 @@ def initialize(id:, tarball_url:, upload_url:, distros:, downloader:, logger:, c
         @terminator = ::OmnipackageAgent::Utils::Terminator.new
         @limits = limits
         @secrets = secrets
+        @build_config_path = build_config_path
       end
 
       def start(&block) # rubocop: disable Metrics/MethodLength, Metrics/AbcSize
@@ -37,7 +38,7 @@ def start(&block) # rubocop: disable Metrics/MethodLength, Metrics/AbcSize
             terminator: terminator,
             limits: limits,
             secrets: secrets
-          ).call(sources_dir, distros: distros)
+          ).call(sources_dir, distros: distros, build_config_path: build_config_path)
           upload_artefacts unless terminator.called?
         rescue ::StandardError => e
           @exception = e

lib/omnipackage_agent/build.rb

@@ -20,8 +20,8 @@ def initialize(config:, logger:, limits: nil, terminator: nil, secrets: nil)
       @secrets = secrets || ::OmnipackageAgent::Build::Secrets.new
     end
 
-    def call(source_path, distros: nil)
-      build_config = ::OmnipackageAgent::Build::Config.new(source_path)
+    def call(source_path, distros: nil, build_config_path: nil)
+      build_config = ::OmnipackageAgent::Build::Config.new(source_path, build_config_path: build_config_path)
 
       job_variables = {
         version: ::OmnipackageAgent::Build::ExtractVersion.new(build_config, source_path).call,

lib/omnipackage_agent/build/config.rb

@@ -8,8 +8,9 @@ class Build
     module Config
       extend self
 
-      def new(source_path)
-        fpath = ::OmnipackageAgent::Utils::Path.mkpath(source_path, '.omnipackage', 'config.yml')
+      def new(source_path, build_config_path: nil)
+        build_config_path ||= '.omnipackage/config.yml'
+        fpath = ::OmnipackageAgent::Utils::Path.mkpath(source_path, build_config_path)
         ::OmnipackageAgent::Yaml.load_file(fpath, symbolize_names: true)
       end
     end