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

Merge #5032, #5041, #5044.
berkeley-dsep-infra · Sep 18, 2023 · 542b152 · 542b152
2 parents dd48b84 + c6300d8
commit 542b152
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -628,15 +628,15 @@ workflows:
               branches:
                 only:
                 - staging
-      - hubploy/build-image:
-          deployment: logodev
-          name: logodev image build
-          push: true
-          # Filters can only be per-job? wtf
-          filters:
-              branches:
-                only:
-                - staging
+      #- hubploy/build-image:
+      #    deployment: logodev
+      #    name: logodev image build
+      #    push: true
+      #    # Filters can only be per-job? wtf
+      #    filters:
+      #        branches:
+      #          only:
+      #          - staging
       - hubploy/build-image:
           deployment: cee
           name: cee image build
@@ -798,7 +798,7 @@ workflows:
               - publichealth image build
               - cee image build
               - shiny image build
-              - logodev image build
+              #- logodev image build
               - biology image build
               - julia hub image build
 #              - data8x image build

diff --git a/deployments/data100/config/common.yaml b/deployments/data100/config/common.yaml
@@ -56,8 +56,8 @@ jupyterhub:
           subPath: _shared
           readOnly: true
     memory:
-      guarantee: 4G
-      limit: 4G
+      guarantee: 2G
+      limit: 2G
     image: {}
 
   custom:

diff --git a/deployments/data102/config/common.yaml b/deployments/data102/config/common.yaml
@@ -61,7 +61,7 @@ jupyterhub:
         pvcName: home-nfs-v3
         subPath: "{username}"
     memory:
-      guarantee: 1G
-      limit: 2G
+      guarantee: 2G
+      limit: 4G
     image: {}
     defaultUrl: "/lab"