Merge pull request #3031 from berkeley-dsep-infra/staging

Merging #3026, #3028, #3029, #3030 to prod
berkeley-dsep-infra · Nov 19, 2021 · 7ada4e6 · 7ada4e6
2 parents 546865b + d6968d9
commit 7ada4e6
Show file tree

Hide file tree

Showing 13 changed files with 95 additions and 26 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -175,77 +175,92 @@ jobs:
       - run:
           name: Deploy datahub
           command: |
-            hubploy deploy datahub hub ${CIRCLE_BRANCH}
-
+            hubploy deploy --timeout 30m datahub hub ${CIRCLE_BRANCH}
+          no_output_timeout: 30m
+
       - run:
           name: Deploy data8
           command: |
-            hubploy deploy data8 hub ${CIRCLE_BRANCH}
+            hubploy deploy --timeout 30m data8 hub ${CIRCLE_BRANCH}
+          no_output_timeout: 30m
 
       - run:
           name: Deploy ischool
           command: |
-            hubploy deploy ischool hub ${CIRCLE_BRANCH}
+            hubploy deploy --timeout 30m ischool hub ${CIRCLE_BRANCH}
+          no_output_timeout: 30m
 
       - run:
           name: Deploy publichealth
           command: |
-            hubploy deploy publichealth hub ${CIRCLE_BRANCH}
+            hubploy deploy --timeout 30m publichealth hub ${CIRCLE_BRANCH}
+          no_output_timeout: 30m
 
       - run:
           name: Deploy highschool hub
           command: |
-            hubploy deploy highschool hub ${CIRCLE_BRANCH}
+            hubploy deploy --timeout 30m highschool hub ${CIRCLE_BRANCH}
+          no_output_timeout: 30m
 
       - run:
           name: Deploy prob140
           command: |
-            hubploy deploy prob140 hub ${CIRCLE_BRANCH}
+            hubploy deploy --timeout 30m prob140 hub ${CIRCLE_BRANCH}
+          no_output_timeout: 30m
 
       - run:
           name: Deploy biology
           command: |
-            hubploy deploy --timeout 15m biology hub ${CIRCLE_BRANCH}
+            hubploy deploy --timeout 30m biology hub ${CIRCLE_BRANCH}
+          no_output_timeout: 30m
 
       - run:
           name: Deploy julia
           command: |
-            hubploy deploy julia hub ${CIRCLE_BRANCH}
+            hubploy deploy --timeout 30m julia hub ${CIRCLE_BRANCH}
+          no_output_timeout: 30m
 
       - run:
           name: Deploy R
           command: |
-            hubploy deploy r hub ${CIRCLE_BRANCH}
+            hubploy deploy --timeout 30m r hub ${CIRCLE_BRANCH}
+          no_output_timeout: 30m
 
       - run:
           name: Deploy dlab
           command: |
-            hubploy deploy dlab hub ${CIRCLE_BRANCH}
+            hubploy deploy --timeout 30m dlab hub ${CIRCLE_BRANCH}
+          no_output_timeout: 30m
 
       - run:
           name: Deploy data8x
           command: |
-            hubploy deploy data8x hub ${CIRCLE_BRANCH}
+            hubploy deploy --timeout 30m data8x hub ${CIRCLE_BRANCH}
+          no_output_timeout: 30m
 
       - run:
           name: Deploy data102
           command: |
-            hubploy deploy data102 hub ${CIRCLE_BRANCH}
+            hubploy deploy --timeout 30m data102 hub ${CIRCLE_BRANCH}
+          no_output_timeout: 30m
 
       - run:
           name: Deploy data100
           command: |
-            hubploy deploy data100 hub ${CIRCLE_BRANCH}
+            hubploy deploy --timeout 30m data100 hub ${CIRCLE_BRANCH}
+          no_output_timeout: 30m
 
       - run:
           name: Deploy workshop
           command: |
-            hubploy deploy workshop hub ${CIRCLE_BRANCH}
+            hubploy deploy --timeout 30m workshop hub ${CIRCLE_BRANCH}
+          no_output_timeout: 30m
 
       - run:
           name: Deploy eecs
           command: |
-            hubploy deploy eecs hub ${CIRCLE_BRANCH}
+            hubploy deploy --timeout 30m eecs hub ${CIRCLE_BRANCH}
+          no_output_timeout: 30m
 
   deploy-node-placeholder:
     docker:

diff --git a/.github/ISSUE_TEMPLATE/cpu_template.yml b/.github/ISSUE_TEMPLATE/cpu_template.yml
@@ -0,0 +1,41 @@
+name: CPU Request
+description: Raise more CPU for students in your class
+labels: "support"
+assignees: 
+- felder
+- yuvipanda
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please provide details for your CPU request! 
+  - type: textarea
+    attributes:
+      label: Reason for the request
+      description: Detail the issue faced which resulted in this request! Your request may have financial implications at our end!
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Student Count
+      description: Total number of students affected by the issue
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Duration for this request
+      description: Share the specific date(s)(MM/DD) & time (if applicable) when you require additional CPU resources. 
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Deadline for this request
+      description: When do you want this request to get fulfilled?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Additional inputs
+      description: Any other additional information we need to know about?
+    validations:
+      required: true
diff --git a/deployments/biology/image/infra-requirements.txt b/deployments/biology/image/infra-requirements.txt
@@ -11,7 +11,8 @@
 notebook==6.4.5
 # FIXME: Conflicts with jupyter-server-proxy somehow
 jupyter-client<7.0
-jupyterlab==3.2.2
+jupyterlab==3.2.4
+jupyterlab-link-share==0.2.1
 nbconvert==6.1.0
 retrolab==0.3.13
 nbgitpuller==1.0.2

diff --git a/deployments/data8/image/infra-requirements.txt b/deployments/data8/image/infra-requirements.txt
@@ -11,7 +11,8 @@
 notebook==6.4.5
 # FIXME: Conflicts with jupyter-server-proxy somehow
 jupyter-client<7.0
-jupyterlab==3.2.2
+jupyterlab==3.2.4
+jupyterlab-link-share==0.2.1
 nbconvert==6.1.0
 retrolab==0.3.13
 nbgitpuller==1.0.2

diff --git a/deployments/data8x/image/infra-requirements.txt b/deployments/data8x/image/infra-requirements.txt
@@ -11,7 +11,8 @@
 notebook==6.4.5
 # FIXME: Conflicts with jupyter-server-proxy somehow
 jupyter-client<7.0
-jupyterlab==3.2.2
+jupyterlab==3.2.4
+jupyterlab-link-share==0.2.1
 nbconvert==6.1.0
 retrolab==0.3.13
 nbgitpuller==1.0.2

diff --git a/deployments/datahub/config/common.yaml b/deployments/datahub/config/common.yaml
@@ -88,6 +88,9 @@ jupyterhub:
       nodeSelector:
         hub.jupyter.org/pool-name: core-pool
   singleuser:
+    cmd:
+    - jupyterhub-singleuser
+    - --LabApp.collaborative=true
     nodeSelector:
       hub.jupyter.org/pool-name: alpha-pool
     storage:

diff --git a/deployments/datahub/images/default/infra-requirements.txt b/deployments/datahub/images/default/infra-requirements.txt
@@ -11,7 +11,8 @@
 notebook==6.4.5
 # FIXME: Conflicts with jupyter-server-proxy somehow
 jupyter-client<7.0
-jupyterlab==3.2.2
+jupyterlab==3.2.4
+jupyterlab-link-share==0.2.1
 nbconvert==6.1.0
 retrolab==0.3.13
 nbgitpuller==1.0.2

diff --git a/deployments/dlab/image/infra-requirements.txt b/deployments/dlab/image/infra-requirements.txt
@@ -11,7 +11,8 @@
 notebook==6.4.5
 # FIXME: Conflicts with jupyter-server-proxy somehow
 jupyter-client<7.0
-jupyterlab==3.2.2
+jupyterlab==3.2.4
+jupyterlab-link-share==0.2.1
 nbconvert==6.1.0
 retrolab==0.3.13
 nbgitpuller==1.0.2

diff --git a/deployments/eecs/image/infra-requirements.txt b/deployments/eecs/image/infra-requirements.txt
@@ -11,7 +11,8 @@
 notebook==6.4.5
 # FIXME: Conflicts with jupyter-server-proxy somehow
 jupyter-client<7.0
-jupyterlab==3.2.2
+jupyterlab==3.2.4
+jupyterlab-link-share==0.2.1
 nbconvert==6.1.0
 retrolab==0.3.13
 nbgitpuller==1.0.2

diff --git a/deployments/ischool/image/infra-requirements.txt b/deployments/ischool/image/infra-requirements.txt
@@ -11,7 +11,8 @@
 notebook==6.4.5
 # FIXME: Conflicts with jupyter-server-proxy somehow
 jupyter-client<7.0
-jupyterlab==3.2.2
+jupyterlab==3.2.4
+jupyterlab-link-share==0.2.1
 nbconvert==6.1.0
 retrolab==0.3.13
 nbgitpuller==1.0.2

diff --git a/deployments/julia/image/infra-requirements.txt b/deployments/julia/image/infra-requirements.txt
@@ -11,7 +11,8 @@
 notebook==6.4.5
 # FIXME: Conflicts with jupyter-server-proxy somehow
 jupyter-client<7.0
-jupyterlab==3.2.2
+jupyterlab==3.2.4
+jupyterlab-link-share==0.2.1
 nbconvert==6.1.0
 retrolab==0.3.13
 nbgitpuller==1.0.2

diff --git a/deployments/publichealth/image/infra-requirements.txt b/deployments/publichealth/image/infra-requirements.txt
@@ -11,7 +11,8 @@
 notebook==6.4.5
 # FIXME: Conflicts with jupyter-server-proxy somehow
 jupyter-client<7.0
-jupyterlab==3.2.2
+jupyterlab==3.2.4
+jupyterlab-link-share==0.2.1
 nbconvert==6.1.0
 retrolab==0.3.13
 nbgitpuller==1.0.2

diff --git a/scripts/infra-packages/requirements.txt b/scripts/infra-packages/requirements.txt
@@ -11,7 +11,8 @@
 notebook==6.4.5
 # FIXME: Conflicts with jupyter-server-proxy somehow
 jupyter-client<7.0
-jupyterlab==3.2.2
+jupyterlab==3.2.4
+jupyterlab-link-share==0.2.1
 nbconvert==6.1.0
 retrolab==0.3.13
 nbgitpuller==1.0.2