Commit 120ff412 authored by Gibbs, Ian's avatar Gibbs, Ian
Browse files

Merge branch 'nsdwrap-3342' into 'main' 

Nsdwrap 3342

See merge request !41
parents d6b6365b ba185da6

.gitlab-ci.yml

+17 −3
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ variables: 
  PROJECT: nsd-app-wrap

  GIT_STRATEGY: clone

  IMAGE: ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG}

  CENTOS7_IMG: "code.ornl.gov:4567/rse/images/centos:7"

  CENTOS9_IMG: "code.ornl.gov:4567/rse/images/centos:9"

  MINICONDA_IMG: "code.ornl.gov:4567/rse/images/miniconda3:latest"

  PKG_PATH: /var/www/html/distros/rhel/7/sns/RPMS/noarch

  PKG_PATH: /var/www/html/distros/rhel/9/sns/RPMS/noarch



stages:

  - static
@@ -46,7 +46,21 @@ rpmlint: 
    - sudo chown -R gitlab-runner .

  script:

    - *docker-login

    - docker run -v $PWD/nsd-app-wrap.spec:/tmp/nsd-app-wrap.spec "${CENTOS7_IMG}" /bin/bash -c "yum install -y git rpm-build rpmlint && rpmlint /tmp/nsd-app-wrap.spec"

    - docker run -v $PWD/nsd-app-wrap.spec:/tmp/nsd-app-wrap.spec "${CENTOS9_IMG}" /bin/bash -c "yum install -y git rpm-build rpmlint && rpmlint /tmp/nsd-app-wrap.spec"

  after_script:

    - *teardown_cleanup

    - sudo chown -R gitlab-runner .



  tags:

    - neutrons-multi-builder



rpmbuild:

  stage: static

  before_script:

    - sudo chown -R gitlab-runner .

  script:

    - *docker-login

    - docker run -v $PWD:/tmp "${CENTOS9_IMG}" /bin/bash -c "yum install -y git rpm-build rpmlint && cd /tmp && git config --global --add safe.directory /tmp && ./rpmbuild.sh || exit 1"

  after_script:

    - *teardown_cleanup

    - sudo chown -R gitlab-runner .

Dockerfile

+2 −2
Original line number Diff line number Diff line 
FROM code.ornl.gov:4567/rse/images/centos:7

FROM code.ornl.gov:4567/rse/images/centos:9



ARG SSH_KEY

ARG SSH_USER

ARG PROJECT=nsd-app-wrap

ARG PKG_PATH=/var/www/html/distros/rhel/7/sns/RPMS/noarch

ARG PKG_PATH=/var/www/html/distros/rhel/9/sns/RPMS/noarch



# setup the user account

RUN useradd ${SSH_USER}

crystalplan

0 → 100755
+15 −0
Original line number Diff line number Diff line 
#!/bin/bash



# select the environment to use

# current default is system version

CONDA_ENVIRON=crystalplan

if [ -v CONDA_ENVIRON ]; then

    # import library to do the real work

    source "$(dirname "$(realpath "$0")")/nsd-app-wrap.sh"



    # put together arguments - conda_env, application, argv

    args=("${CONDA_ENVIRON}" "crystalplan.py" "$@")



    # start the application

    activate_and_launch "${args[@]}"

fi

crystalplan.desktop

0 → 100644
+11 −0
Original line number Diff line number Diff line 
#!/usr/bin/env xdg-open

[Desktop Entry]

Encoding=UTF-8

Name=CrystalPlan

Comment=CrystalPlan

Exec=/usr/bin/crystalplan

Icon=crystalplan

StartupNotify=false

Terminal=false

Type=Application

Categories=GNOME;Application;Analysis;

crystalplan.png

0 → 100644
+76 KiB
Loading image diff...