allow for versions to be specified in scripts (#100)

allow for versions to be specified in scripts so that users may use
different versions of their given software packages.

Author: johrstrom

app/controllers/scripts_controller.rb

@@ -128,7 +128,7 @@ def script_params
       .require(:script)
       .permit(
         :name, :frames, :camera, :file, :accounting_id, :cluster, :nodes,
-        :renderer, :extra, :walltime, :email, :skip_existing
+        :renderer, :extra, :walltime, :email, :skip_existing, :version
       )
   end
 

app/helpers/scripts_helper.rb

@@ -4,4 +4,14 @@ module ScriptsHelper
   def normalize_css_str(str)
     str.to_s.sub(' ', '-')
   end
+
+  def version_label(project)
+    if ProjectFactory.maya_project?(project)
+      'Maya'
+    elsif ProjectFactory.vray_project?(project)
+      'VRay'
+    else
+      'Maya'
+    end
+  end
 end

app/models/maya_script.rb

@@ -25,6 +25,10 @@ def cluster
     Configuration.submit_cluster
   end
 
+  def available_versions
+    ['2020', '2022']
+  end
+
   def job_name
     'maya-render'
   end

app/models/script.rb

@@ -76,6 +76,16 @@ def job_name
     raise 'Subclasses need to define `job_name`'
   end
 
+  def available_versions
+    raise 'Subclasses need to define `versions_available`'
+  end
+
+  # shell scripts files need to use this method so that we keep backward compatability
+  # with jobs that never set versions.
+  def module_version
+    version.to_s.present? ? version : available_versions.first
+  end
+
   def task_start_frames
     Array.new(tasks).map.with_index(1) do |_, array_id|
       task_start_frame(array_id)

app/models/v_ray_script.rb

@@ -27,6 +27,10 @@ def job_name
     'vray-render'
   end
 
+  def available_versions
+    ['5.10.02']
+  end
+
   def normalized_name
     name.parameterize(separator: '_')
   end

app/views/scripts/_form.html.erb

@@ -9,6 +9,8 @@
       <div class="panel-body", role="main">
         <%= form.text_field :name, required: true %> 
 
+        <%= form.select :version, @script.available_versions, required: true, label: "#{version_label(@project)} version" %>
+
         <%= form.text_field :frames,
           required: true, placeholder: '1-100',
           pattern: '\d+-\d+', help: "Must be in the form startframe-endframe" %>

db/migrate/20210909190250_add_version_to_scripts.rb

@@ -0,0 +1,5 @@
+class AddVersionToScripts < ActiveRecord::Migration[5.2]
+  def change
+    add_column :scripts, :version, :string
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_09_07_155035) do
+ActiveRecord::Schema.define(version: 2021_09_09_190250) do
 
   create_table "jobs", force: :cascade do |t|
     t.string "status"
@@ -58,6 +58,7 @@
     t.text "script_attrs", default: ""
     t.string "accounting_id"
     t.text "type"
+    t.string "version"
     t.index ["project_id"], name: "index_scripts_on_project_id"
   end
 

jobs/video_jobs/maya_submit.sh.erb

@@ -59,11 +59,11 @@ module load ruby
 
 <% if groups.include?('mayakentst') %>
 module load project/kent
-module load maya/2020-kent
+module load maya/<%= module_version %>-kent
 <% else %>
 <%# this module blocked by group membership on the file system, so OK to be in else block %>
 module load project/accad
-module load maya/2022-accad
+module load maya/<%= module_version %>-accad
 <% end %>
 
 mkdir -p $JOB_TMPDIR/Autodesk

jobs/video_jobs/vray_submit.sh.erb

@@ -3,12 +3,10 @@
 
 module purge
 module load project/kent
-module load vray
+module load vray/<%= module_version %>
 module load ruby
 
 UTIL_FILE="$TMPDIR/utils.rb"
-export TASK_START_FRAME="<%= start_frame %>"
-export TASK_END_FRAME="<%= end_frame %>"
 
 # added 'shift' to this array as the 0th index because SLURM_ARRAY_TASK_ID is always
 # greater than or equal to 1.