From 9686a4f2b2fd010b5a15409ba65ac4eed8e11c7b Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 5 Jul 2016 13:19:22 +0200
Subject: [PATCH] Remove code creating job hash from legacy CI config
---
lib/ci/gitlab_ci_yaml_processor.rb | 5 +++--
lib/gitlab/ci/config.rb | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb
index 01ef13df57a..8d0bbe1ae56 100644
--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
@@ -68,8 +68,9 @@ module Ci
@jobs = {}
- @config.except!(*ALLOWED_YAML_KEYS)
- @config.each { |name, param| add_job(name, param) }
+ @ci_config.jobs.each do |name, param|
+ add_job(name, param)
+ end
raise ValidationError, "Please define at least one job" if @jobs.none?
end
diff --git a/lib/gitlab/ci/config.rb b/lib/gitlab/ci/config.rb
index e6cc1529760..ae82c0db3f1 100644
--- a/lib/gitlab/ci/config.rb
+++ b/lib/gitlab/ci/config.rb
@@ -8,7 +8,7 @@ module Gitlab
# Temporary delegations that should be removed after refactoring
#
delegate :before_script, :image, :services, :after_script, :variables,
- :stages, :cache, to: :@global
+ :stages, :cache, :jobs, to: :@global
def initialize(config)
@config = Loader.new(config).load!
--
GitLab