Remove portal OOD env remnants

Author: jscgh

completed.html.erb

@@ -72,8 +72,8 @@ def sanitize_live_log(text)
   compact.join("\n").strip
 end
 
-base_out_dir = (connect.respond_to?(:base_out_dir) && !connect.base_out_dir.blank?) ? connect.base_out_dir : (ENV["PFOLD_BASE_OUT_DIR"] || portal_default_base_out_dir)
-results_url_base = (connect.respond_to?(:results_url_base) && !connect.results_url_base.blank?) ? connect.results_url_base : (ENV["OOD_RESULTS_URL_BASE"] || portal_default_results_url_base)
+base_out_dir = (connect.respond_to?(:base_out_dir) && !connect.base_out_dir.blank?) ? connect.base_out_dir : portal_default_base_out_dir
+results_url_base = (connect.respond_to?(:results_url_base) && !connect.results_url_base.blank?) ? connect.results_url_base : portal_default_results_url_base
 session_output_dir = (connect.respond_to?(:session_output_dir) && !connect.session_output_dir.blank?) ? connect.session_output_dir : nil
 log_dir = session_output_dir || File.join(base_out_dir, connect.run_dir)
 live_log_path = File.join(log_dir, "live_log.log")

form.yml.erb

@@ -1,5 +1,5 @@
 <%
-portal_default_cluster = ENV.fetch("OOD_CLUSTER", "katana")
+portal_default_cluster = "katana"
 %>
 
 form:

info.html.erb

@@ -8,8 +8,8 @@ def file_url(base, path)
   "#{base}/#{encoded_path}"
 end
 
-base_out_dir = (connect.respond_to?(:base_out_dir) && !connect.base_out_dir.blank?) ? connect.base_out_dir : (ENV["PFOLD_BASE_OUT_DIR"] || portal_default_base_out_dir)
-results_url_base = (connect.respond_to?(:results_url_base) && !connect.results_url_base.blank?) ? connect.results_url_base : (ENV["OOD_RESULTS_URL_BASE"] || portal_default_results_url_base)
+base_out_dir = (connect.respond_to?(:base_out_dir) && !connect.base_out_dir.blank?) ? connect.base_out_dir : portal_default_base_out_dir
+results_url_base = (connect.respond_to?(:results_url_base) && !connect.results_url_base.blank?) ? connect.results_url_base : portal_default_results_url_base
 %>
 <b>Results</b>: <a target="_blank" rel="noopener" href="<%= file_url(results_url_base, File.join(base_out_dir, connect.run_dir)) %>"><%= connect.run_dir %></a>
 <% end %>

submit.yml.erb

@@ -6,11 +6,11 @@ portal_default_native = "-A kod_proteinfold;-l select=1:ncpus=2:mem=4gb;-l wallt
 portal_default_gpu_native = "-l select=1:mwacgpu200=gpu-mwac:ncpus=8:ngpus=1:mem=124gb;-l walltime=12:00:00"
 portal_default_email_domain = "@ad.unsw.edu.au"
 
-cluster_name = ENV.fetch("OOD_CLUSTER", portal_default_cluster)
-queue_name = ENV.fetch("OOD_QUEUE", portal_default_queue)
-script_path = ENV.fetch("PFOLD_SCRIPT_FILE", portal_default_script_path)
-default_native = ENV.fetch("PFOLD_NATIVE_DEFAULT", portal_default_native)
-gpu_native = ENV.fetch("PFOLD_NATIVE_GPU", portal_default_gpu_native)
+cluster_name = portal_default_cluster
+queue_name = portal_default_queue
+script_path = portal_default_script_path
+default_native = portal_default_native
+gpu_native = portal_default_gpu_native
 
 def parse_native(val)
     val.split(/\s*;\s*/).reject(&:empty?)
@@ -19,7 +19,7 @@ end
 native_default_list = parse_native(default_native)
 native_gpu_list = parse_native(gpu_native)
 
-email_default = ENV["OOD_EMAIL"] || "#{ENV['USER']}#{ENV.fetch('OOD_EMAIL_DOMAIN', portal_default_email_domain)}"
+email_default = "#{ENV['USER']}#{portal_default_email_domain}"
 email_selected = (defined?(email) && email && !email.strip.empty?) ? email : email_default
 %>
 

view.html.erb

@@ -98,8 +98,8 @@ def sanitize_live_log(text)
   compact.join("\n").strip
 end
 
-base_dir = (defined?(base_out_dir) && base_out_dir && !base_out_dir.to_s.empty?) ? base_out_dir.to_s : (ENV["PFOLD_BASE_OUT_DIR"] || portal_default_base_out_dir)
-results_base = (defined?(results_url_base) && results_url_base && !results_url_base.to_s.empty?) ? results_url_base.to_s : (ENV["OOD_RESULTS_URL_BASE"] || portal_default_results_url_base)
+base_dir = (defined?(base_out_dir) && base_out_dir && !base_out_dir.to_s.empty?) ? base_out_dir.to_s : portal_default_base_out_dir
+results_base = (defined?(results_url_base) && results_url_base && !results_url_base.to_s.empty?) ? results_url_base.to_s : portal_default_results_url_base
 log_dir = (defined?(session_output_dir) && session_output_dir && !session_output_dir.to_s.empty?) ? session_output_dir.to_s : File.join(base_dir, run_dir.to_s)
 log_path = File.join(log_dir, "live_log.log")
 log_url = file_url(results_base, log_path)