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

Merging #6073, #6074, #6075, #6076, #6077, #6078, #6079, #6080 to prod
berkeley-dsep-infra · Sep 4, 2024 · 226536a · 226536a
2 parents f0a20ec + 1f00a89
commit 226536a
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 295 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -181,12 +181,6 @@ jobs:
           command: |
             gcloud components install gke-gcloud-auth-plugin
 
-      - run:
-          name: Deploy a11y
-          command: |
-            hubploy deploy --timeout 30m a11y hub ${CIRCLE_BRANCH}
-          no_output_timeout: 30m
-
       - run:
           name: Deploy astro
           command: |
@@ -289,12 +283,6 @@ jobs:
 #            hubploy deploy --timeout 30m logodev hub ${CIRCLE_BRANCH}
 #          no_output_timeout: 30m
 
-      - run:
-          name: Deploy nature
-          command: |
-            hubploy deploy --timeout 30m nature hub ${CIRCLE_BRANCH}
-          no_output_timeout: 30m
-
       - run:
           name: Deploy prob140
           command: |
@@ -335,15 +323,6 @@ workflows:
   version: 2
   test-build-images:
     jobs:
-      - hubploy/build-image:
-          deployment: a11y
-          name: a11y image build
-          # Filters can only be per-job? wtf
-          filters:
-              branches:
-                ignore:
-                - staging
-                - prod
       - hubploy/build-image:
           deployment: astro
           name: astro image build
@@ -472,15 +451,6 @@ workflows:
 #                ignore:
 #                - staging
 #                - prod
-      - hubploy/build-image:
-          deployment: nature
-          name: nature image build
-          # Filters can only be per-job? wtf
-          filters:
-              branches:
-                ignore:
-                - staging
-                - prod
       - hubploy/build-image:
           deployment: publichealth
           name: publichealth image build
@@ -511,15 +481,6 @@ workflows:
 
   deploy:
     jobs:
-      - hubploy/build-image:
-          deployment: a11y
-          name: a11y image build
-          push: true
-          # Filters can only be per-job? wtf
-          filters:
-              branches:
-                only:
-                - staging
       - hubploy/build-image:
           deployment: astro
           name: astro image build
@@ -645,15 +606,6 @@ workflows:
 #              branches:
 #                only:
 #                - staging
-      - hubploy/build-image:
-          deployment: nature
-          name: nature image build
-          push: true
-          # Filters can only be per-job? wtf
-          filters:
-              branches:
-                only:
-                - staging
       - hubploy/build-image:
           deployment: publichealth
           name: publichealth image build
@@ -686,7 +638,6 @@ workflows:
       # CI level, we also make prod deploys go faster!
       - deploy:
           requires:
-              - a11y image build
               - astro image build
               - biology image build
               - cee image build
@@ -701,7 +652,6 @@ workflows:
               - ischool image build
               - julia hub image build
 #              - logodev image build
-              - nature image build
               - publichealth image build
               - shiny image build
 

diff --git a/.github/workflows/deploy-hubs.yaml b/.github/workflows/deploy-hubs.yaml
@@ -100,9 +100,10 @@ jobs:
         if: ${{ env.DEPLOY }}
         run: |
           while read deployment; do
-            echo "Pretending to deploy base hub image to ${deployment}  :P"
+            echo "Depoying base hub image to ${deployment}"
             hubploy --verbose deploy --timeout 30m ${deployment} hub staging
-          done < <(python .github/scripts/determine-hub-deployments.py --only-deploy logodev stat159 stat20)
+            echo
+          done < <(python .github/scripts/determine-hub-deployments.py --only-deploy logodev stat159 stat20 nature a11y)
 
   deploy-hubs-to-prod:
     if: github.event_name == 'push' && github.ref == 'refs/heads/prod'
@@ -194,6 +195,7 @@ jobs:
         if: ${{ env.DEPLOY }}
         run: |
           while read deployment; do
-            echo "Pretending to deploy base hub image to ${deployment}  :P"
+            echo "Deploying base hub image to ${deployment}"
             hubploy --verbose deploy --timeout 30m ${deployment} hub prod
-          done < <(python .github/scripts/determine-hub-deployments.py --only-deploy logodev stat159 stat20)
+            echo
+          done < <(python .github/scripts/determine-hub-deployments.py --only-deploy logodev stat159 stat20 nature a11y)
diff --git a/deployments/a11y/hubploy.yaml b/deployments/a11y/hubploy.yaml
@@ -1,14 +1,6 @@
 images:
   images:
-    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/a11y-user-image
-      path: image/
-      repo2docker:
-        base_image: docker.io/library/buildpack-deps:jammy
-  registry:
-    provider: gcloud
-    gcloud:
-      project: ucb-datahub-2018
-      service_key: gcr-key.json
+    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/a11y-user-image:1967ba9bc53f
 
 cluster:
   provider: gcloud

diff --git a/deployments/a11y/image/README.md b/deployments/a11y/image/README.md
@@ -0,0 +1,5 @@
+# a11y Image
+
+This image is now located [in its own repo](https://github.com/berkeley-dsep-infra/a11y-user-image).
+
+Please see [the contribution guide](https://github.com/berkeley-dsep-infra/a11y-user-image/blob/main/CONTRIBUTING.md) for instructions on how to propose changes to the image.
diff --git a/deployments/a11y/image/apt.txt b/deployments/a11y/image/apt.txt
diff --git a/deployments/a11y/image/environment.yml b/deployments/a11y/image/environment.yml
diff --git a/deployments/a11y/image/infra-requirements.txt b/deployments/a11y/image/infra-requirements.txt
diff --git a/deployments/a11y/image/postBuild b/deployments/a11y/image/postBuild
diff --git a/deployments/nature/hubploy.yaml b/deployments/nature/hubploy.yaml
@@ -1,14 +1,6 @@
 images:
   images:
-    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/nature-user-image
-      path: image/
-      repo2docker:
-        base_image: docker.io/library/buildpack-deps:jammy
-  registry:
-    provider: gcloud
-    gcloud:
-      project: ucb-datahub-2018
-      service_key: gcr-key.json
+    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/nature-user-image:9ad22965ad22
 
 cluster:
   provider: gcloud

diff --git a/deployments/nature/image/README.md b/deployments/nature/image/README.md
@@ -0,0 +1,5 @@
+# nature Image
+
+This image is now located [in its own repo](https://github.com/berkeley-dsep-infra/nature-user-image).
+
+Please see [the contribution guide](https://github.com/berkeley-dsep-infra/nature-user-image/blob/main/CONTRIBUTING.md) for instructions on how to propose changes to the image.
diff --git a/deployments/nature/image/apt.txt b/deployments/nature/image/apt.txt
diff --git a/deployments/nature/image/environment.yml b/deployments/nature/image/environment.yml
diff --git a/deployments/nature/image/postBuild b/deployments/nature/image/postBuild