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

merging 6266/6267/6270/6271 to prod
berkeley-dsep-infra · Sep 26, 2024 · e6202bd · e6202bd
2 parents 3ee7a86 + 623d18b
commit e6202bd
Show file tree

Hide file tree

Showing 32 changed files with 18 additions and 1,414 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.circleci/get-commit-range.py b/.circleci/get-commit-range.py
diff --git a/.github/scripts/determine-hub-deployments.py b/.github/scripts/determine-hub-deployments.py
@@ -53,6 +53,7 @@ def main(args):
         "--ignore",
         "-i",
         nargs="*",
+        action="extend",
         default=["template"],
         help="Ignore one or more deployment targets."
     )

diff --git a/.github/workflows/deploy-hubs.yaml b/.github/workflows/deploy-hubs.yaml
@@ -57,7 +57,6 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install -r requirements.txt
-          pip install --force-reinstall git+https://github.com/shaneknapp/hubploy.git@major-refactor
 
       - name: Auth to gcloud
         if: ${{ env.DEPLOY }}
@@ -103,7 +102,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 ischool data8 data100)
+          done < <(python .github/scripts/determine-hub-deployments.py --ignore edx)
 
   deploy-hubs-to-prod:
     if: github.event_name == 'push' && github.ref == 'refs/heads/prod'
@@ -152,7 +151,6 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install -r requirements.txt
-          pip install --force-reinstall git+https://github.com/shaneknapp/hubploy.git@major-refactor
 
       - name: Auth to gcloud
         if: ${{ env.DEPLOY }}
@@ -198,4 +196,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 ischool data8 data100)
+          done < <(python .github/scripts/determine-hub-deployments.py --ignore edx)