Skip to content
Snippets Groups Projects
Commit 4c237f7c authored by Te-Hung Tseng's avatar Te-Hung Tseng
Browse files

Merge branch 'revert-23551022' into 'master'

Revert "Merge branch 'test' into 'master'"

See merge request !2
parents 23551022 18a9d539
No related branches found
No related tags found
1 merge request!2Revert "Merge branch 'test' into 'master'"
Pipeline #17420 canceled
......@@ -10,17 +10,68 @@ variables:
CONTAINER_CACHE_IMAGE: "$CI_REGISTRY_IMAGE:master"
stages:
- test
test-image:
- build
- release
- deploy
build:
<<: *runner_tags
stage: test
stage: build
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script:
- docker pull "$CONTAINER_CACHE_IMAGE" || true
- docker build --pull --cache-from "$CONTAINER_CACHE_IMAGE" -t "$CI_REGISTRY_IMAGE/base" base-notebook
- docker build --cache-from "$CONTAINER_CACHE_IMAGE" -t "$CI_REGISTRY_IMAGE/python" python-notebook
- docker build --cache-from "$CONTAINER_CACHE_IMAGE" -t "$CI_REGISTRY_IMAGE/julia" julia-notebook
- docker build --cache-from "$CONTAINER_CACHE_IMAGE" -t "$CI_REGISTRY_IMAGE/openxal" openxal-notebook
- docker tag "$CI_REGISTRY_IMAGE/openxal" "$CONTAINER_TEST_IMAGE"
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
- docker push "$CONTAINER_TEST_IMAGE"
tag-image:
<<: *runner_tags
stage: release
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script:
- docker pull "$CONTAINER_TEST_IMAGE"
- docker tag "$CONTAINER_TEST_IMAGE" "$CONTAINER_LATEST_IMAGE"
- docker push "$CONTAINER_LATEST_IMAGE"
only:
- tags
image: $CONTAINER_TEST_IMAGE
before_script:
- /opt/conda/envs/jupyter/bin/pip --nbval
- /opt/conda/envs/mantid/bin/pip --nbval
deploy-staging:
<<: *runner_tags
stage: deploy
image: registry.esss.lu.se/ics-docker/tower-cli
script:
- /opt/conda/envs/jupyter/bin/py.test --nbval notebooks/jupyter/
- /opt/conda/envs/mantid/bin/py.test --nbval notebooks/mantid/
- >
tower-cli job launch
-h torn.tn.esss.lu.se
-t ${TOWER_OAUTH_TOKEN}
-J deploy-jupyterhub-gpn-staging
--tags notebook --monitor
environment:
name: staging
url: https://icsv-ipythub02.esss.lu.se
only:
- tags
deploy-production:
<<: *runner_tags
stage: deploy
image: registry.esss.lu.se/ics-docker/tower-cli
script:
- >
tower-cli job launch
-h torn.tn.esss.lu.se
-t ${TOWER_OAUTH_TOKEN}
-J deploy-jupyterhub
--tags notebook --monitor
environment:
name: production
only:
- tags
when: manual
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
%% Cell type:code id: tags:
``` python
import oxal
```
%% Cell type:code id: tags:
``` python
oxal.startJVM()
```
%% Cell type:code id: tags:
``` python
print(oxal.JAVA_OpenXAL)
print(oxal.PATH)
print(oxal.OXAL_VERSION)
```
%% Output
/opt/openxal-1.2.11/lib/openxal.library-1.2.11.jar
/opt/OpenXAL
1.2.11
%% Cell type:code id: tags:
``` python
```
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment