feat(ondemand): gh #824 added OnDemand 2.1 RPM + Sid and FASRC profiles

Author: abujeda

ondemand/.gitignore

@@ -0,0 +1,3 @@
+/data
+
+VERSION

ondemand/Makefile

@@ -0,0 +1,92 @@
+# default build target
+all::
+
+all:: dev
+.PHONY: dev remote-dev remote-fasse test release down up clean clean-remote-dev clean-remote-fasse version next-version docker-build docker-build-slurm docker-build-ood docker-push
+
+OOD_UID := $(shell id -u)
+OOD_GID := $(shell id -g)
+OOD_TAG := 2.1.0-0.rc8.el7
+SLURM_TAG := slurm-21-08-6-1
+REMOTE_USERNAME := $(if $(SSH_USERNAME),$(SSH_USERNAME),$(USER))
+SID_SLURM_IMAGE := hmdc/sid-slurm:$(SLURM_TAG)
+SID_ONDEMAND_IMAGE := hmdc/sid-ood:$(SLURM_TAG)-ood-$(OOD_TAG)
+
+ENV := env SLURM_TAG=$(SLURM_TAG) SID_SLURM_IMAGE=$(SID_SLURM_IMAGE) SID_ONDEMAND_IMAGE=$(SID_ONDEMAND_IMAGE) OOD_UID=$(OOD_UID) OOD_GID=$(OOD_GID)
+
+DETACHED_MODE := $(if $(DETACHED),-d,)
+
+NODE_VERSION :=`cat ../.node-version`
+PWD := $(shell pwd)
+
+ifneq ($(shell git branch --show-current),stable)
+NPM_RUN_VERSION_ARGS := --config='.release-it-dev.json'
+endif
+
+TEMPLATE_LOCATION := ./application/lib/ood_core/batch_connect/templates
+TURBOVNC_TEMPLATE := turbovnc.rb
+KVM_TEMPLATE      := kvm.rb
+
+remote-dev clean-remote-dev:     LOGIN_HOST   := login.rc.fas.harvard.edu
+remote-dev clean-remote-dev:     APP_FOLDER   := ./fasrc/dev/dashboard
+remote-dev:                      TEMPLATE_URL := https://iqss-sid.rc.fas.harvard.edu/pun/sys/dashboard/files/fs/var/www/ood/apps/sys/sid/lib/ood_core/batch_connect/templates
+remote-dev:                      CHECK_TEMPLATE_VERSION  := "check_version"
+
+remote-fasse clean-remote-fasse: LOGIN_HOST   := fasselogin.rc.fas.harvard.edu
+remote-fasse clean-remote-fasse: APP_FOLDER   := ./.fasseood/dev/dashboard
+remote-fasse:                    TEMPLATE_URL := https://fasse-iqss-ood.rc.fas.harvard.edu/pun/sys/dashboard/files/fs/var/www/ood/apps/sys/sid/lib/ood_core/batch_connect/templates
+remote-fasse:                    HTTP_PROXY   := http://rcproxy.rc.fas.harvard.edu:3128
+remote-fasse:                    HTTPS_PROXY  := http://rcproxy.rc.fas.harvard.edu:3128
+remote-fasse:                    CHECK_TEMPLATE_VERSION  := ""
+
+dev: down up
+
+remote-dev remote-fasse: version
+	$(ENV) http_proxy=$(HTTP_PROXY) https_proxy=$(HTTPS_PROXY) docker-compose build
+	@echo "You need to be connected to the VPN"
+	ssh $(REMOTE_USERNAME)@$(LOGIN_HOST) mkdir -p $(APP_FOLDER)
+	$(ENV) docker-compose run --no-deps --entrypoint="" ood su - ood bash -c "export PATH=/home/ood/bin:/home/ood/ondemand/dev/dashboard/node_modules/.bin:$$PATH; cd /home/ood/ondemand/dev/dashboard; scl enable rh-ruby27 rh-nodejs14 'gem install --user-install bundler -v 2.1.4 && bundle config --local path 'vendor/bundle' && bundle install && npm install yarn --save && bundle exec rake assets:precompile'"
+	@echo "You need to be connected to the VPN"
+	@./download_and_check.sh $(REMOTE_USERNAME) $(TEMPLATE_URL)/$(TURBOVNC_TEMPLATE) $(TEMPLATE_LOCATION)/$(TURBOVNC_TEMPLATE) $(CHECK_TEMPLATE_VERSION)
+	@./download_and_check.sh $(REMOTE_USERNAME) $(TEMPLATE_URL)/$(KVM_TEMPLATE) $(TEMPLATE_LOCATION)/$(KVM_TEMPLATE) $(CHECK_TEMPLATE_VERSION)
+	rsync -avz --delete --exclude-from='rsync-exclude.conf' ./application/ -e ssh $(REMOTE_USERNAME)@$(LOGIN_HOST):$(APP_FOLDER)
+
+test:
+	$(ENV) docker-compose run --no-deps --entrypoint="" ood su - ood bash -c "export PATH=/home/ood/bin:/home/ood/ondemand/dev/dashboard/node_modules/.bin:$$PATH; cd /home/ood/ondemand/dev/dashboard; scl enable rh-ruby27 rh-nodejs14 'gem install --user-install bundler -v 2.1.4 && bundle config --local path 'vendor/bundle' && bundle install && npm install yarn --save && bundle exec rake test'"
+
+release: next-version
+	$(ENV) docker-compose run --no-deps --entrypoint="" ood su - ood bash -c "export PATH=/home/ood/bin:/home/ood/ondemand/dev/dashboard/node_modules/.bin:$$PATH; export RAILS_ENV=production; cd /home/ood/ondemand/dev/dashboard; scl enable rh-ruby27 rh-nodejs14 'gem install --user-install bundler -v 2.1.4 && bundle config --local path 'vendor/bundle' && bundle install && npm install yarn --save && bundle exec rake assets:precompile'"
+	mkdir -p ./target
+	tar -czvf ./target/sid2-dashboard.tar.gz ./application
+
+down:
+	$(ENV) docker-compose down -v || :
+
+up:
+	$(ENV) docker-compose up --build $(DETACHED_MODE)
+
+clean:
+	rm -rf application/.bundle application/VERSION application/log application/node_modules application/public/assets application/tmp application/vendor/bundle data/*
+	$(ENV) docker-compose down --rmi all --volumes
+
+clean-remote-dev clean-remote-fasse:
+	echo "For FASSE, you need to be connected to the VPN"
+	ssh $(REMOTE_USERNAME)@$(LOGIN_HOST) rm -rfv $(APP_FOLDER) || :
+
+next-version:
+	docker run --rm -v $(PWD)/..:/usr/app -w /usr/app node:$(NODE_VERSION) /bin/bash -c "npm install && npm run version -- $(NPM_RUN_VERSION_ARGS) | tail -n 1 > dashboard/application/VERSION"
+
+docker-build: docker-build-slurm docker-build-ood
+
+docker-push:
+	docker push $(SID_SLURM_IMAGE)
+	docker push $(SID_ONDEMAND_IMAGE)
+
+docker-build-slurm:
+	docker build --build-arg SLURM_TAG=$(SLURM_TAG) -t $(SID_SLURM_IMAGE) -f docker/Dockerfile.slurm .
+
+docker-build-ood:
+	docker build --build-arg OOD_TAG=$(OOD_TAG) --build-arg SLURM_TAG=$(SLURM_TAG) -t $(SID_ONDEMAND_IMAGE) -f docker/Dockerfile.ondemand .
+
+docker-push-ood:
+	docker push $(SID_ONDEMAND_IMAGE)

ondemand/announcements.d/status.md

@@ -0,0 +1 @@
+<div style='text-decoration;none;border: 1px solid #000;background-color:#53a065;padding: 6px 10px 6px 6px;'><a class='wpfront-button' href='https://status.rc.fas.harvard.edu'>STATUS PAGE</a> <span><font color='#fff' style='text-decoration:none;padding:4px;'>No known issues. </font> </span></div>

ondemand/apache/sid_development.crt

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDLjCCAhYCCQCtMM3TbnCVsTANBgkqhkiG9w0BAQsFADBZMQswCQYDVQQGEwJV
+UzEWMBQGA1UECAwNTWFzc2FjaHVzZXR0czEPMA0GA1UEBwwGQm9zdG9uMQ0wCwYD
+VQQKDARJUVNTMRIwEAYDVQQDDAlsb2NhbGhvc3QwHhcNMjIwMTEyMTYzMzM4WhcN
+NDkwNTMwMTYzMzM4WjBZMQswCQYDVQQGEwJVUzEWMBQGA1UECAwNTWFzc2FjaHVz
+ZXR0czEPMA0GA1UEBwwGQm9zdG9uMQ0wCwYDVQQKDARJUVNTMRIwEAYDVQQDDAls
+b2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDclKu05+65
+0yRV1yU/NmGLWCGqyeM7N1MIDlgHewtFiL20YEUy392wyOzo663yKxHrBoJormP6
+hbb/nW2/LLx4gJ0JZ+N7/Vo40trJV6sTdOsiL7Xzp1MURZPcBEuF/pS16MDVvtoF
+CdQrvG8dzX/Znbtmu8jVP+WOADcguvECp/tOpkYBMBwxXvmpAch15WEzuSyPXg4e
+cCufJE34c77tGcEbns+vikWrW1Evy6vVjmJPDk915p+HkPfXoXiN+4DnAttLUHNL
+sAwcuRWYSCsD/tiMtjHQIzHHiU/AmmKz84rcUlYkcSu2T78rG8TaYIK20oXHfJHA
+Hfcjfll8g/AHAgMBAAEwDQYJKoZIhvcNAQELBQADggEBANbwpF7T+Bs+o192f6E+
+JO5CfyMMCrzyED5PJmGSt/CtkG9KINd4/psoLKNocfDQaFE26BqpLAjUxNrxuHuY
+XcGPOR+CYTqRm6RK2BpEJwxa6/mu5BLT9L+3AKDK1Z2VsSe120vhNEIIoqsrHGoS
+tHXCu6HglR1XlknTsG0Yp9pHgNmS+t/J0jSZHz95UBUNuJzT2mKspW5xEFbhYIaW
+6pBgp5a/shA4fQy4ypQne6q9vp4uSHm5TtEJOQhHPOVRuS4qvGhgpsuravwq39Nv
+dqW8/n2IrNxPJ5P9JswQL9HbrtpHpbhbPDawm0wZ7C9QFxl1AZ/oLfpYtwTk4UhP
+Jlw=
+-----END CERTIFICATE-----

ondemand/apache/sid_development.key

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDclKu05+650yRV
+1yU/NmGLWCGqyeM7N1MIDlgHewtFiL20YEUy392wyOzo663yKxHrBoJormP6hbb/
+nW2/LLx4gJ0JZ+N7/Vo40trJV6sTdOsiL7Xzp1MURZPcBEuF/pS16MDVvtoFCdQr
+vG8dzX/Znbtmu8jVP+WOADcguvECp/tOpkYBMBwxXvmpAch15WEzuSyPXg4ecCuf
+JE34c77tGcEbns+vikWrW1Evy6vVjmJPDk915p+HkPfXoXiN+4DnAttLUHNLsAwc
+uRWYSCsD/tiMtjHQIzHHiU/AmmKz84rcUlYkcSu2T78rG8TaYIK20oXHfJHAHfcj
+fll8g/AHAgMBAAECggEBAJz2IhVSMVsD90gqF3Qa02Cfrx1kGhEqNih2ZIe2M/gf
+7LYtBzDDgnJpF8RK6PV5Vn/Cmwu4hKZhfi34rX6ra9Xn11c5GPRC/W+QA2Xgv3jR
+6vvhrX0bZQ/4ztVyLPfFh7bGUGoJLAUH0HXq2bsAX2jQR+k72RZ+KHBakN/2hsfW
+xAhcmMSvrN1KOlP27fsLulMKQL3y5YE3YbFczmcjhIqE4QePAbPfNslPFtsimW8y
+G2jljjH5ZS9VfSbB+uziJ0pLeaoi0dahNzrGv70cDIY4j/P68yFvUFrUW6yMcbcO
+YYSWE46wTF7z+EqUsw7z1++xfuXddBru0n8U1MK/bJkCgYEA/rLysCSLYcFSX8cf
+uDHhbqkWzTs/XECLMYAohV9wlRAGfuhAqKFMIYTocWJybxVsGbmLlc+70F1tOSvE
+wmnOLnHsuoKlH4WDb1cynHOIS1Ssp2TpTdJcnY8yrr9o5I8G/LQBfGKoCeVwFgqC
+89AaddOmxT/dScV3vmqVXhA2TGsCgYEA3bUb0XK9IDTjl3MQ+2lUKDaLOuexyY2X
+DhDI/FBjM/mUX2hVzqNNrZ6Nh7CerlsILYxrmmlJPeeQxJUFForHm3m1t56LzpkM
+/93yqtASEbQAycUW/IbpEf5KBbyDqagBfo6Ca2HR8Tulml5i2Kwf8uGG9hrPAENQ
+O44tsb2Z0dUCgYAiMCkNZcpj08xX2OW0FtX4wa+y2roViwBkI5zM0lPNXnpQvKI5
+QHV0pl+BIMLVkF2TUmmfMWQ3guLvYqWlpwgrCdXJ71F02roazuyXPZbU7cfDLHN4
+o70U1SzrcfwFegFpGEx+wstlkKur+bs8OPnkSQXAwmLUzTHWmH32Q1zWgwKBgEPG
+8RknrX+iC42qJJ/nRE4C1q+MU0KdoXcwVHEmFh22h9Be8hR4we940CWSLgB5Xdem
+3OJYm4ZsO0qNj/+jL4BtRcs7kdv32AyEioIDl/KHh9InCW7rw2a3yWNVjR6ZeNN6
+t44iWm8X3/mAL1Gz1RSIM50a9vtKmMWMIpX6s4J9AoGAUm3wf+Ce/OLlKgmshh6v
+oJtNoekUDrKrhL7+aLlqReAr5ooaF+Sr4TqT5nZgaNEDX1fBrXiyXsWPT7sChviU
+xzTuCE9BTeeUu7cjBC0cZRSziTBMEUdNJzg3QzkP8vquMzH3YapqjbsxUQzRkPxC
+IQ2FrwBk15FurU2redQNxpc=
+-----END PRIVATE KEY-----

ondemand/apps/OdysseyRD/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2016-2018 Ohio Supercomputer Center
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

ondemand/apps/OdysseyRD/README.md

@@ -0,0 +1,77 @@
+# Batch Connect - Desktop
+
+![GitHub Release](https://img.shields.io/github/release/osc/bc_desktop.svg)
+[![GitHub License](https://img.shields.io/badge/license-MIT-green.svg)](https://opensource.org/licenses/MIT)
+
+A Batch Connect app designed to launch a GUI desktop withing a batch job.
+
+## Prerequisites
+
+This Batch Connect app requires the following software be installed on the
+**compute nodes** that the batch job is intended to run on (**NOT** the
+OnDemand node).
+
+One of the following desktops:
+
+- [Xfce Desktop] 4+
+- [Mate Desktop] 1+ (*default*)
+- [Gnome Desktop] 2 (currently we do not support Gnome 3)
+
+For VNC server support:
+
+- [TurboVNC] 2.1+
+- [websockify] 0.8.0+
+
+For hardware rendering support:
+
+- [X server]
+- [VirtualGL] 2.3+
+
+[Xfce Desktop]: https://xfce.org/
+[Mate Desktop]: https://mate-desktop.org/
+[Gnome Desktop]: https://www.gnome.org/
+[TurboVNC]: http://www.turbovnc.org/
+[websockify]: https://github.com/novnc/websockify
+[X server]: https://www.x.org/
+[VirtualGL]: http://www.virtualgl.org/
+
+## Install
+
+Use git to clone this app and checkout the desired branch/version you want to
+use:
+
+```sh
+scl enable git19 -- git clone <repo>
+cd <dir>
+scl enable git19 -- git checkout <tag/branch>
+```
+
+You will not need to do anything beyond this as all necessary assets are
+installed. You will also not need to restart this app as it isn't a Passenger
+app.
+
+To update the app you would:
+
+```sh
+cd <dir>
+scl enable git19 -- git fetch
+scl enable git19 -- git checkout <tag/branch>
+```
+
+Again, you do not need to restart the app as it isn't a Passenger app.
+
+## Configuration
+
+Please see the [Install Desktops] section in the [Open OnDemand Documentation]
+to learn more about setting up and configuring a desktop at your HPC center.
+
+[Install Desktops]: https://osc.github.io/ood-documentation/master/enable-desktops.html
+[Open OnDemand Documentation]: https://osc.github.io/ood-documentation/master/index.html
+
+## Contributing
+
+1. Fork it ( https://github.com/OSC/bc_desktop/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create a new Pull Request

ondemand/apps/OdysseyRD/form.yml

@@ -0,0 +1,19 @@
+---
+cluster: "dev-cluster"
+attributes:
+  desktop: "mate"
+  bc_vnc_idle: 0
+  bc_vnc_resolution:
+    required: true
+  node_type: null
+
+form:
+  - bc_vnc_idle
+  - desktop
+  - bc_account
+  - bc_num_hours
+  - bc_num_slots
+  - node_type
+  - bc_queue
+  - bc_vnc_resolution
+  - bc_email_on_started

ondemand/apps/OdysseyRD/local/main.yml

@@ -0,0 +1,3 @@
+---
+cluster: "dev-cluster"
+title: "FAS-RC Remote Desktop"

ondemand/apps/OdysseyRD/local/ql_odyssey_dev.yml

@@ -0,0 +1,17 @@
+---
+cluster: "dev-cluster"
+title: "FAS-RC Remote Desktop"
+tile:
+  title: "Run FAS-RC Remote Desktop"
+  icon: "/public/images/desktop_logo.svg"
+  sub_caption: |
+    2 CPU cores and 4GB RAM
+    8 hours job run time
+    Cannon cluster
+attributes:
+  bc_account: ""
+  bc_num_slots: "1"
+  bc_num_hours: "1"
+  bc_queue: ""
+  bc_email_on_started: "0"
+  bc_vnc_resolution: "1024x768"