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

merging 6068/6069/6070/6071 to prod

.circleci/config.yml

@@ -319,12 +319,6 @@ jobs:
             hubploy deploy --timeout 30m shiny hub ${CIRCLE_BRANCH}
           no_output_timeout: 30m
 
-      - run:
-          name: Deploy stat20
-          command: |
-            hubploy deploy --timeout 30m stat20 hub ${CIRCLE_BRANCH}
-          no_output_timeout: 30m
-
       - run:
           name: Deploy ugr01
           command: |
@@ -505,15 +499,6 @@ workflows:
                 ignore:
                 - staging
                 - prod
-      - hubploy/build-image:
-          deployment: stat20
-          name: stat20 image build
-          # Filters can only be per-job? wtf
-          filters:
-              branches:
-                ignore:
-                - staging
-                - prod
       - hubploy/build-image:
           deployment: ugr01
           name: ugr01 image build
@@ -687,15 +672,6 @@ workflows:
               branches:
                 only:
                 - staging
-      - hubploy/build-image:
-          deployment: stat20
-          name: stat20 image build
-          push: true
-          # Filters can only be per-job? wtf
-          filters:
-              branches:
-                only:
-                - staging
       - hubploy/build-image:
           deployment: ugr01
           name: ugr01 image build
@@ -728,7 +704,6 @@ workflows:
               - nature image build
               - publichealth image build
               - shiny image build
-              - stat20 image build
 
           filters:
             branches:

.github/workflows/deploy-hubs.yaml

@@ -102,7 +102,7 @@ jobs:
           while read deployment; do
             echo "Pretending to deploy base hub image to ${deployment}  :P"
             hubploy --verbose deploy --timeout 30m ${deployment} hub staging
-          done < <(python .github/scripts/determine-hub-deployments.py --only-deploy logodev stat159)
+          done < <(python .github/scripts/determine-hub-deployments.py --only-deploy logodev stat159 stat20)
 
   deploy-hubs-to-prod:
     if: github.event_name == 'push' && github.ref == 'refs/heads/prod'
@@ -196,4 +196,4 @@ jobs:
           while read deployment; do
             echo "Pretending to deploy base hub image to ${deployment}  :P"
             hubploy --verbose deploy --timeout 30m ${deployment} hub prod
-          done < <(python .github/scripts/determine-hub-deployments.py --only-deploy logodev stat159)
+          done < <(python .github/scripts/determine-hub-deployments.py --only-deploy logodev stat159 stat20)

deployments/stat20/hubploy.yaml

@@ -1,10 +1,5 @@
 images:
-  image_name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/stat20-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/stat20-user-image:5eed7cbfc7ff
 
 cluster:
   provider: gcloud

deployments/stat20/image/README.md

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