Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merging #6073, #6074, #6075, #6076, #6077, #6078, #6079, #6080 to prod #6081

Merged
merged 18 commits into from
Sep 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 0 additions & 50 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -701,7 +652,6 @@ workflows:
- ischool image build
- julia hub image build
# - logodev image build
- nature image build
- publichealth image build
- shiny image build

Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/deploy-hubs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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)
10 changes: 1 addition & 9 deletions deployments/a11y/hubploy.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 5 additions & 0 deletions deployments/a11y/image/README.md
Original file line number Diff line number Diff line change
@@ -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.
40 changes: 0 additions & 40 deletions deployments/a11y/image/apt.txt

This file was deleted.

47 changes: 0 additions & 47 deletions deployments/a11y/image/environment.yml

This file was deleted.

29 changes: 0 additions & 29 deletions deployments/a11y/image/infra-requirements.txt

This file was deleted.

7 changes: 0 additions & 7 deletions deployments/a11y/image/postBuild

This file was deleted.

10 changes: 1 addition & 9 deletions deployments/nature/hubploy.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 5 additions & 0 deletions deployments/nature/image/README.md
Original file line number Diff line number Diff line change
@@ -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.
52 changes: 0 additions & 52 deletions deployments/nature/image/apt.txt

This file was deleted.

37 changes: 0 additions & 37 deletions deployments/nature/image/environment.yml

This file was deleted.

6 changes: 0 additions & 6 deletions deployments/nature/image/postBuild

This file was deleted.

Loading
Loading