Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 24da0923 authored by Alexandre MERLIN's avatar Alexandre MERLIN
Browse files

Merge branch 'rename_queue' into 'master'

[gen/wiki] rename production queue to abaca

See merge request !1179
parents 13da91df d6ba3acc
No related branches found
No related tags found
1 merge request!1179[gen/wiki] rename production queue to abaca
Pipeline #1149954 passed
Pipeline: Resources Explorer

#1149959

    ...@@ -62,7 +62,7 @@ class SiteHardwareGenerator < WikiGenerator ...@@ -62,7 +62,7 @@ class SiteHardwareGenerator < WikiGenerator
    output = '' output = ''
    [ [
    [ '== Default queue resources ==', /(^$|exotic)/ ], [ '== Default queue resources ==', /(^$|exotic)/ ],
    [ '== Production queue resources ==', /production/], [ '== Abaca queue resources ==', /production/],
    [ '== Testing queue resources ==', /testing/] [ '== Testing queue resources ==', /testing/]
    ].each do |title,regexp| ].each do |title,regexp|
    if table_data.select{ |row| row[column] =~ regexp}.length > 0 if table_data.select{ |row| row[column] =~ regexp}.length > 0
    ...@@ -115,7 +115,7 @@ class SiteHardwareGenerator < WikiGenerator ...@@ -115,7 +115,7 @@ class SiteHardwareGenerator < WikiGenerator
    summary += MW::TABLE_CELL + ' width="50%" valign="top" ' + MW::TABLE_CELL + MW::LINE_FEED summary += MW::TABLE_CELL + ' width="50%" valign="top" ' + MW::TABLE_CELL + MW::LINE_FEED
    ## 2st inner table ## 2st inner table
    summary += MW::TABLE_START + ' width="100%"' + MW::LINE_FEED summary += MW::TABLE_START + ' width="100%"' + MW::LINE_FEED
    summary += print_header_summary('=== Production queue resources ===', 'production', store) summary += print_header_summary('=== Abaca queue resources ===', 'production', store)
    summary += MW::TABLE_END + MW::LINE_FEED summary += MW::TABLE_END + MW::LINE_FEED
    ## End outer-tablie ## End outer-tablie
    ...@@ -194,7 +194,7 @@ class SiteHardwareGenerator < WikiGenerator ...@@ -194,7 +194,7 @@ class SiteHardwareGenerator < WikiGenerator
    queue = cluster_hash.map { |_k, v| v['queue']}.first queue = cluster_hash.map { |_k, v| v['queue']}.first
    access_conditions = [] access_conditions = []
    if queue == 'production' if queue == 'production'
    access_conditions << "<b>[[Grid5000:UsagePolicy#Rules_for_the_production_queue|#{queue}]]</b>&nbsp;queue" access_conditions << "<b>[[Grid5000:UsagePolicy#Rules_for_the_production_queue|abaca]]</b>&nbsp;queue"
    elsif queue != '' elsif queue != ''
    access_conditions << "<b>#{queue}</b>&nbsp;queue" access_conditions << "<b>#{queue}</b>&nbsp;queue"
    end end
    ...@@ -269,7 +269,7 @@ class SiteHardwareGenerator < WikiGenerator ...@@ -269,7 +269,7 @@ class SiteHardwareGenerator < WikiGenerator
    reservation_cmd = "\n{{Term|location=f#{site}|cmd=" reservation_cmd = "\n{{Term|location=f#{site}|cmd="
    reservation_cmd += "<code class=\"command\">oarsub</code> " reservation_cmd += "<code class=\"command\">oarsub</code> "
    reservation_cmd += "<code class=\"replace\">-q #{queue}</code> " reservation_cmd += "<code class=\"replace\">-q #{queue == 'production' ? 'abaca' : queue}</code> "
    reservation_cmd += "<code class=\"replace\">-t exotic</code> " if cluster_hash.map { |_k, v| v['exotic']}.first reservation_cmd += "<code class=\"replace\">-t exotic</code> " if cluster_hash.map { |_k, v| v['exotic']}.first
    reservation_cmd += "<code class=\"env\">-p #{cluster_uid}</code> " reservation_cmd += "<code class=\"env\">-p #{cluster_uid}</code> "
    reservation_cmd += "<code>-I</code>" reservation_cmd += "<code>-I</code>"
    ......
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment