merging 6090/6091/6092/6095/6096/6097/6068/6099/6100/6101/6104/6105/6106/6107/6108/6109/6110/6111/6112/6113/6114 to prod

.circleci/config.yml

@@ -181,24 +181,6 @@ jobs:
           command: |
             gcloud components install gke-gcloud-auth-plugin
 
-      - run:
-          name: Deploy astro
-          command: |
-            hubploy deploy --timeout 30m astro hub ${CIRCLE_BRANCH}
-          no_output_timeout: 30m
-
-      - run:
-          name: Deploy biology
-          command: |
-            hubploy deploy --timeout 30m biology hub ${CIRCLE_BRANCH}
-          no_output_timeout: 30m
-
-      - run:
-          name: Deploy cee
-          command: |
-            hubploy deploy --timeout 30m cee hub ${CIRCLE_BRANCH}
-          no_output_timeout: 30m
-
       - run:
           name: Deploy data8
           command: |
@@ -211,12 +193,6 @@ jobs:
             hubploy deploy --timeout 30m data100 hub ${CIRCLE_BRANCH}
           no_output_timeout: 30m
 
-      - run:
-          name: Deploy data101
-          command: |
-            hubploy deploy --timeout 30m data101 hub ${CIRCLE_BRANCH}
-          no_output_timeout: 30m
-
       - run:
           name: Deploy data102
           command: |
@@ -253,12 +229,6 @@ jobs:
             hubploy deploy --timeout 30m eecs hub ${CIRCLE_BRANCH}
           no_output_timeout: 30m
 
-      - run:
-          name: Deploy gradebook
-          command: |
-            hubploy deploy --timeout 30m gradebook hub ${CIRCLE_BRANCH}
-          no_output_timeout: 30m
-
       - run:
           name: Deploy highschool hub
           command: |
@@ -301,12 +271,6 @@ jobs:
             hubploy deploy --timeout 30m r hub ${CIRCLE_BRANCH}
           no_output_timeout: 30m
 
-      - run:
-          name: Deploy shiny
-          command: |
-            hubploy deploy --timeout 30m shiny hub ${CIRCLE_BRANCH}
-          no_output_timeout: 30m
-
       - run:
           name: Deploy workshop
           command: |
@@ -317,33 +281,6 @@ workflows:
   version: 2
   test-build-images:
     jobs:
-      - hubploy/build-image:
-          deployment: astro
-          name: astro image build
-          # Filters can only be per-job? wtf
-          filters:
-              branches:
-                ignore:
-                - staging
-                - prod
-      - hubploy/build-image:
-          deployment: biology
-          name: biology image build
-          # Filters can only be per-job? wtf
-          filters:
-              branches:
-                ignore:
-                - staging
-                - prod
-      - hubploy/build-image:
-          deployment: cee
-          name: cee image build
-          # Filters can only be per-job? wtf
-          filters:
-              branches:
-                ignore:
-                - staging
-                - prod
       - hubploy/build-image:
           deployment: data8
           name: data8 image build
@@ -362,15 +299,6 @@ workflows:
                 ignore:
                 - staging
                 - prod
-      - hubploy/build-image:
-          deployment: data101
-          name: data101 image build
-          # Filters can only be per-job? wtf
-          filters:
-              branches:
-                ignore:
-                - staging
-                - prod
       - hubploy/build-image:
           deployment: data102
           name: data102 image build
@@ -454,45 +382,9 @@ workflows:
                 ignore:
                 - staging
                 - prod
-      - hubploy/build-image:
-          deployment: shiny
-          name: shiny image build
-          # Filters can only be per-job? wtf
-          filters:
-              branches:
-                ignore:
-                - staging
-                - prod
 
   deploy:
     jobs:
-      - hubploy/build-image:
-          deployment: astro
-          name: astro image build
-          push: true
-          # Filters can only be per-job? wtf
-          filters:
-              branches:
-                only:
-                - staging
-      - hubploy/build-image:
-          deployment: biology
-          name: biology image build
-          push: true
-          # Filters can only be per-job? wtf
-          filters:
-              branches:
-                only:
-                - staging
-      - hubploy/build-image:
-          deployment: cee
-          name: cee image build
-          push: true
-          # Filters can only be per-job? wtf
-          filters:
-              branches:
-                only:
-                - staging
       - hubploy/build-image:
           deployment: data8
           name: data8 image build
@@ -510,15 +402,6 @@ workflows:
               branches:
                 only:
                 - staging
-      - hubploy/build-image:
-          deployment: data101
-          name: data101 image build
-          push: true
-          # Filters can only be per-job? wtf
-          filters:
-              branches:
-                only:
-                - staging
       - hubploy/build-image:
           deployment: data102
           name: data102 image build
@@ -600,27 +483,14 @@ workflows:
               branches:
                 only:
                 - staging
-      - hubploy/build-image:
-          deployment: shiny
-          name: shiny image build
-          push: true
-          # Filters can only be per-job? wtf
-          filters:
-              branches:
-                only:
-                - staging
       # Build images only during the staging deploy. All merges
       # to prod need to go via staging, so prod should *never*
       # use images not built for staging. By enforcing this at the
       # CI level, we also make prod deploys go faster!
       - deploy:
           requires:
-              - astro image build
-              - biology image build
-              - cee image build
               - data8 image build
               - data100 image build
-              - data101 image build
               - data102 image build
               - datahub image build
               - dev image build
@@ -630,7 +500,6 @@ workflows:
               - julia hub image build
 #              - logodev image build
               - publichealth image build
-              - shiny image build
 
           filters:
             branches:

.github/workflows/deploy-hubs.yaml

@@ -100,10 +100,10 @@ jobs:
         if: ${{ env.DEPLOY }}
         run: |
           while read deployment; do
-            echo "Depoying base hub image to ${deployment}"
+            echo "Deploying single-user image and hub config to ${deployment}"
             hubploy --verbose deploy --timeout 30m ${deployment} hub staging
             echo
-          done < <(python .github/scripts/determine-hub-deployments.py --only-deploy logodev stat159 stat20 nature a11y ugr01)
+          done < <(python .github/scripts/determine-hub-deployments.py --only-deploy gradebook logodev shiny stat159 stat20 nature a11y ugr01 data101 astro biology cee)
 
   deploy-hubs-to-prod:
     if: github.event_name == 'push' && github.ref == 'refs/heads/prod'
@@ -195,7 +195,7 @@ jobs:
         if: ${{ env.DEPLOY }}
         run: |
           while read deployment; do
-            echo "Deploying base hub image to ${deployment}"
+            echo "Deploying single-user image and hub config to ${deployment}"
             hubploy --verbose deploy --timeout 30m ${deployment} hub prod
             echo
-          done < <(python .github/scripts/determine-hub-deployments.py --only-deploy logodev stat159 stat20 nature a11y ugr01)
+          done < <(python .github/scripts/determine-hub-deployments.py --only-deploy gradebook logodev shiny stat159 stat20 nature a11y ugr01 data101 astro biology cee)

deployments/a11y/hubploy.yaml

@@ -1,6 +1,6 @@
 images:
   images:
-    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/a11y-user-image:7c4cd8df980c
+    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/a11y-user-image:65e4cb99b4aa
 
 cluster:
   provider: gcloud

deployments/astro/hubploy.yaml

@@ -1,10 +1,5 @@
 images:
-  image_name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/astro-user-image
-  registry:
-    provider: gcloud
-    gcloud:
-      project: ucb-datahub-2018
-      service_key: gcr-key.json
+  image_name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/astro-user-image:ffc76921fb47
 
 cluster:
   provider: gcloud

deployments/astro/image/README.md

@@ -0,0 +1,5 @@
+# Astro Image
+
+This image is now located [in its own repo](https://github.com/berkeley-dsep-infra/astro-user-image).
+
+Please see [the contribution guide](https://github.com/berkeley-dsep-infra/astro-user-image/blob/main/CONTRIBUTING.md) for instructions on how to propose changes to the image.