improve migrator of deprecated jobs

1 files changed, 5 insertions, 2 deletions

diff --git a/db/migrate/20150601043222_migrate_jobs_to_yaml.rb b/db/migrate/20150601043222_migrate_jobs_to_yaml.rb
index b8f8553..19533b3 100644
--- a/db/migrate/20150601043222_migrate_jobs_to_yaml.rb
+++ b/db/migrate/20150601043222_migrate_jobs_to_yaml.rb
@@ -25,7 +25,7 @@ class MigrateJobsToYaml < ActiveRecord::Migration
       # Create Jobs
       select_all(sql).each do |job|
         config[:jobs] << {
-          script: job["commands"],
+          script: job["commands"].split("\n").map(&:strip),
           name: job["name"],
           branches: parse_boolean_value(job["build_branches"]),
           tags: parse_boolean_value(job["build_tags"]),
@@ -36,7 +36,7 @@ class MigrateJobsToYaml < ActiveRecord::Migration
       # Create Deploy Jobs
       select_all(sql.sub("parallel", 'deploy')).each do |job|
         config[:deploy_jobs] << {
-          script: job["commands"],
+          script: job["commands"].split("\n").map(&:strip),
           name: job["name"],
           refs: job["refs"],
           runner: job["tags"]
@@ -49,6 +49,9 @@ class MigrateJobsToYaml < ActiveRecord::Migration
 
       yaml_config.sub!("---", "# This file is generated by GitLab CI")
 
+      # Convert array of scripts to multiline string
+      yaml_config.gsub!("  -", "   ").gsub!("script:", "script: |")
+
       execute("UPDATE projects SET generated_yaml_config = '#{quote_string(yaml_config)}' WHERE projects.id = #{project["id"]}")
     end
   end