cleanup

.dockerignore

@@ -388,4 +388,4 @@ $RECYCLE.BIN/
 # .nfs files are created when an open file is removed but is still being accessed
 .nfs*
 
-
+deployments

.gitlab-ci.yml

@@ -67,16 +67,21 @@ deploy to develop:
     url: https://analytics-toolkit.nomad-coe.eu/dev/${CI_ENVIRONMENT_SLUG}
     auto_stop_in: 7 days
     on_stop: stop deploy dev
+  variables:
+    NAMESPACE: analytics-develop
   before_script:
     - mkdir ~/.kube/
-    - echo ${CI_K8S_CONFIG} | base64 -d > ~/.kube/config
+    - echo ${CI_KUBE_CONFIG} | base64 -d > ~/.kube/config
     - helm repo add jupyterhub https://jupyterhub.github.io/helm-chart
     - helm repo update
     - helm version
   script:
     - helm upgrade ${CI_ENVIRONMENT_SLUG} jupyterhub/jupyterhub
       --install
-      --namespace analytitcs
+      --namespace ${NAMESPACE}
+      --version=1.2.0
+      --timeout=40m0s
+      --cleanup-on-fail
       --values deployments/dev-values.yaml
       --set hub.baseUrl=/dev/${CI_ENVIRONMENT_SLUG}
       --set fullnameOverride=${CI_ENVIRONMENT_SLUG}-dev
@@ -87,8 +92,8 @@ deploy to develop:
       --set roll=true
       --wait
   rules:
-    # Execute jobs when a new commit is pushed to develop branch
-    - if: $CI_COMMIT_BRANCH == "develop"
+    # Execute jobs when a new commit is pushed to master branch
+    - if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop"
 
 stop deploy dev:
   stage: deploy

deployments/README.md

-# Nomad jupyterhub deployment
-
-This is a step-by-step tutorial to create a new jupyerhub deployment.
-