Skip to content

Commit

Permalink
Merge pull request #6141 from shaneknapp/moving-publichealth-new-cicd
Browse files Browse the repository at this point in the history
[DH-301] moving publichealth to its own repo
  • Loading branch information
shaneknapp authored Sep 11, 2024
2 parents e8cbe10 + be9fd6e commit 0bd9dba
Show file tree
Hide file tree
Showing 16 changed files with 5 additions and 359 deletions.
25 changes: 0 additions & 25 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -247,12 +247,6 @@ jobs:
hubploy deploy --timeout 30m prob140 hub ${CIRCLE_BRANCH}
no_output_timeout: 30m

- run:
name: Deploy publichealth
command: |
hubploy deploy --timeout 30m publichealth hub ${CIRCLE_BRANCH}
no_output_timeout: 30m

- run:
name: Deploy R
command: |
Expand Down Expand Up @@ -341,15 +335,6 @@ workflows:
ignore:
- staging
- prod
- hubploy/build-image:
deployment: publichealth
name: publichealth image build
# Filters can only be per-job? wtf
filters:
branches:
ignore:
- staging
- prod

deploy:
jobs:
Expand Down Expand Up @@ -424,15 +409,6 @@ workflows:
branches:
only:
- staging
- hubploy/build-image:
deployment: publichealth
name: publichealth 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
Expand All @@ -447,7 +423,6 @@ workflows:
- eecs image build
- ischool image build
- julia hub image build
- publichealth image build

filters:
branches:
Expand Down
6 changes: 0 additions & 6 deletions deployments/publichealth/hubploy.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
images:
images:
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/publichealth-user-image
path: image
registry:
provider: gcloud
gcloud:
project: ucb-datahub-2018
service_key: gcr-key.json

cluster:
provider: gcloud
Expand Down
101 changes: 0 additions & 101 deletions deployments/publichealth/image/Dockerfile

This file was deleted.

5 changes: 5 additions & 0 deletions deployments/publichealth/image/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Publichealth Image

This image is now located [in its own repo](https://github.com/berkeley-dsep-infra/publichealth-user-image).

Please see [the contribution guide](https://github.com/berkeley-dsep-infra/publichealth-user-image/blob/main/CONTRIBUTING.md) for instructions on how to propose changes to the image.
20 changes: 0 additions & 20 deletions deployments/publichealth/image/class-libs.R

This file was deleted.

17 changes: 0 additions & 17 deletions deployments/publichealth/image/environment.yml

This file was deleted.

13 changes: 0 additions & 13 deletions deployments/publichealth/image/file-locks

This file was deleted.

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

This file was deleted.

42 changes: 0 additions & 42 deletions deployments/publichealth/image/install-mambaforge.bash

This file was deleted.

6 changes: 0 additions & 6 deletions deployments/publichealth/image/install.R

This file was deleted.

This file was deleted.

11 changes: 0 additions & 11 deletions deployments/publichealth/image/r-packages/2021-spring-phw-272a.r

This file was deleted.

6 changes: 0 additions & 6 deletions deployments/publichealth/image/r-packages/ottr.r

This file was deleted.

29 changes: 0 additions & 29 deletions deployments/publichealth/image/r-packages/ph-142.r

This file was deleted.

32 changes: 0 additions & 32 deletions deployments/publichealth/image/r-packages/ph-252.r

This file was deleted.

Loading

0 comments on commit 0bd9dba

Please sign in to comment.