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

merging 6234/6237/6238/6239 to prod
berkeley-dsep-infra · Sep 24, 2024 · 506ba7b · 506ba7b
2 parents b1b0107 + 387e8eb
commit 506ba7b
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 244 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -217,12 +217,6 @@ jobs:
             hubploy deploy --timeout 30m highschool hub ${CIRCLE_BRANCH}
           no_output_timeout: 30m
 
-      - run:
-          name: Deploy ischool
-          command: |
-            hubploy deploy --timeout 30m ischool hub ${CIRCLE_BRANCH}
-          no_output_timeout: 30m
-
       - run:
           name: Deploy prob140
           command: |
@@ -282,15 +276,6 @@ workflows:
                 ignore:
                 - staging
                 - prod
-      - hubploy/build-image:
-          deployment: ischool
-          name: ischool image build
-          # Filters can only be per-job? wtf
-          filters:
-              branches:
-                ignore:
-                - staging
-                - prod
 
   deploy:
     jobs:
@@ -330,15 +315,6 @@ workflows:
               branches:
                 only:
                 - staging
-      - hubploy/build-image:
-          deployment: ischool
-          name: ischool 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
@@ -349,7 +325,6 @@ workflows:
               - data100 image build
               - datahub image build
               - edx image build
-              - ischool image build
 
           filters:
             branches:

diff --git a/.github/workflows/deploy-hubs.yaml b/.github/workflows/deploy-hubs.yaml
@@ -103,7 +103,7 @@ jobs:
             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 gradebook logodev shiny stat159 stat20 nature a11y ugr01 data101 astro biology cee dev publichealth eecs julia data102)
+          done < <(python .github/scripts/determine-hub-deployments.py --only-deploy gradebook logodev shiny stat159 stat20 nature a11y ugr01 data101 astro biology cee dev publichealth eecs julia data102 ischool)
 
   deploy-hubs-to-prod:
     if: github.event_name == 'push' && github.ref == 'refs/heads/prod'
@@ -198,4 +198,4 @@ jobs:
             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 gradebook logodev shiny stat159 stat20 nature a11y ugr01 data101 astro biology cee dev publichealth eecs julia data102)
+          done < <(python .github/scripts/determine-hub-deployments.py --only-deploy gradebook logodev shiny stat159 stat20 nature a11y ugr01 data101 astro biology cee dev publichealth eecs julia data102 ischool)
diff --git a/deployments/ischool/hubploy.yaml b/deployments/ischool/hubploy.yaml
@@ -1,12 +1,6 @@
 images:
   images:
-    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/ischool-user-image
-      path: image
-  registry:
-    provider: gcloud
-    gcloud:
-      project: ucb-datahub-2018
-      service_key: gcr-key.json
+    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/ischool-user-image:0be26ba905cb
 
 cluster:
   provider: gcloud

diff --git a/deployments/ischool/image/Dockerfile b/deployments/ischool/image/Dockerfile
diff --git a/deployments/ischool/image/README.md b/deployments/ischool/image/README.md
@@ -0,0 +1,5 @@
+# ischool Image
+
+This image is now located [in its own repo](https://github.com/berkeley-dsep-infra/ischool-user-image).
+
+Please see [the contribution guide](https://github.com/berkeley-dsep-infra/ischool-user-image/blob/main/CONTRIBUTING.md) for instructions on how to propose changes to the image.
diff --git a/deployments/ischool/image/environment.yml b/deployments/ischool/image/environment.yml
diff --git a/deployments/ischool/image/file-locks b/deployments/ischool/image/file-locks
diff --git a/deployments/ischool/image/infra-requirements.txt b/deployments/ischool/image/infra-requirements.txt
diff --git a/deployments/ischool/image/install-mambaforge.bash b/deployments/ischool/image/install-mambaforge.bash
diff --git a/scripts/user-image-management/repos.txt b/scripts/user-image-management/repos.txt
@@ -7,6 +7,7 @@ [email protected]:berkeley-dsep-infra/data102-user-image.git
 [email protected]:berkeley-dsep-infra/dev-primary-image.git
 [email protected]:berkeley-dsep-infra/dev-secondary-image.git
 [email protected]:berkeley-dsep-infra/eecs-user-image.git
+[email protected]:berkeley-dsep-infra/ischool-user-image.git
 [email protected]:berkeley-dsep-infra/julia-user-image.git
 [email protected]:berkeley-dsep-infra/logodev-user-image.git
 [email protected]:berkeley-dsep-infra/nature-user-image.git