Commit e7db92a7 authored by Peterson, Peter's avatar Peterson, Peter
Browse files

Describe deploy

parent a18dd8f9

Dockerfile

+4 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ ENV HOME /home/${SSH_USER} 
WORKDIR $HOME



# install dependencies

RUN yum install -y git rpm-build && yum clean all && rm -rf /var/cache/yum

RUN yum install -y git rpm-build rpmlint && yum clean all && rm -rf /var/cache/yum



# change user for the actual build

USER ${SSH_USER}
@@ -23,6 +23,9 @@ RUN echo "${SSH_KEY}" > .ssh/id_rsa && chmod 600 .ssh/id_rsa 
# copy in the source tree

COPY . .



# verify no issues exist in the spec file

rpmlint nsd-app-wrap.spec



# build the RPM

RUN ./rpmbuild.sh

README.md

+10 −2
Original line number Diff line number Diff line 
Wrapper scripts to launch python applications installed via anaconda



The purpose is to allow for users on the nsd analysis cluster to easily switch between different versions of software that is installed via conda in a system wide manner.



Each individual bash script selects/activates a conda environment, then launches the main entrypoint for the underlying application.

For example, `refred` will load the appropriate conda environment then start the refred application, and `refred --qa` will load the qa conda environmnent and start the `refred` application.



Quality of generated scripts

----------------------------
@@ -9,7 +10,7 @@ All bash scripts are checked using [shellcheck](https://github.com/koalaman/shel 


The desktop files are validated using `desktop-file-validate`



The spec file passes [rpmlint](https://linux.die.net/man/1/rpmlint) with one warning about the definition of the source.

The spec file passes [rpmlint](https://linux.die.net/man/1/rpmlint) with one warning about the definition of the source (`invalid-url Source0`).



Versioning

----------
@@ -17,3 +18,10 @@ Versioning 
* major changes is when an application/tool gets added or removed

* minor changes is when changes to the existing applications/tools happens

* patches are encompassed in minor changes and are not included



Deployment

----------

`nsd-app-wrap` is deployed via an rpm that is created using gitlab-ci and configured mostly in the `Dockerfile`.

The `Dockerfile` is based on a centos7 image with rpm-build installed.

It creates the rpm then uses `scp` to copy noarch to packages.sns.gov.

The analysis cluster is configured to automatically update `nsd-app-wrap` rpm whenever a new one is available.

nsd-app-wrap.spec

+3 −3
Original line number Diff line number Diff line
@@ -68,10 +68,10 @@ install -m 644 pyrs.desktop %{buildroot}%{_datadir}/applications/ 
* Mon Oct 4 2021 Donnie Earnest

- added gsas2



* Mon Sep 2 2021 Donnie Earnest

* Thu Sep 2 2021 Donnie Earnest

- changed notebook folder for dev



* Mon Aug 27 2021 Donnie Earnest

* Fri Aug 27 2021 Donnie Earnest

- forgot trailing slash with rsync



* Mon Aug 23 2021 Donnie Earnest
@@ -95,7 +95,7 @@ install -m 644 pyrs.desktop %{buildroot}%{_datadir}/applications/ 
* Mon Feb  1 2021 Peter F. Peterson

- Add wrapper for mantidtotalscattering



* Wed Sep  17 2020 Peter F. Peterson

* Thu Sep  17 2020 Peter F. Peterson

- Contains desktop file for pyrs launch scripts



* Tue Sep  1 2020 Peter F. Peterson