add R 3.4.2

Fixes #3

CHANGELOG.md

@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+- Added support for R 3.4.2 alongside 3.3.2 on Owens.
+  [#3](https://github.com/OSC/bc_osc_rstudio_server/issues/3)
+
 ### Security
 - Fixed permissions on generated script with env vars inside.
 

form.yml

@@ -1,6 +1,7 @@
 ---
 cluster: "owens"
 form:
+  - version
   - bc_account
   - bc_num_hours
   - bc_num_slots
@@ -21,3 +22,10 @@ attributes:
     options:
       - [ "any",     ":ppn=28"         ]
       - [ "hugemem", ":ppn=48:hugemem" ]
+  version:
+    widget: select
+    label: "R version"
+    help: "This defines the version of R you want to load."
+    options:
+      - [ "3.4.2", "intel/16.0.3 R/3.4.2 rstudio/1.1.380_server"]
+      - [ "3.3.2", "intel/16.0.3 R/3.3.2 rstudio/1.0.136_server"]

manifest.yml

@@ -1,7 +1,11 @@
 ---
 name: RStudio Server
-description: |
-  This app will launch an RStudio Server on one or more Owens nodes.
 category: Interactive Apps
 subcategory: Servers
 role: batch_connect
+description: |
+  This app will launch [RStudio Server] an IDE for [R] on the [Owens cluster].
+
+  [RStudio Server]: https://www.rstudio.com/products/rstudio-server/
+  [R]: https://www.r-project.org/
+  [Owens cluster]: https://www.osc.edu/resources/technical_support/supercomputers/owens

template/script.sh.erb

@@ -7,7 +7,7 @@
 # Load the required environment
 setup_env () {
   module purge
-  module load intel/16.0.3 R/3.3.2 rstudio/1.0.136_server
+  module load <%= context.version %>
 }
 setup_env