Skip to content

Commit

Permalink
Merge pull request #6104 from shaneknapp/move-astro-bio-cee-new-cicd
Browse files Browse the repository at this point in the history
[DH-301] moving bio, cee and astro to new CI/CD workflow
  • Loading branch information
shaneknapp authored Sep 6, 2024
2 parents 58d8893 + 63fdfc5 commit 2f42270
Show file tree
Hide file tree
Showing 32 changed files with 20 additions and 1,707 deletions.
75 changes: 0 additions & 75 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -181,24 +181,6 @@ jobs:
command: |
gcloud components install gke-gcloud-auth-plugin
- run:
name: Deploy astro
command: |
hubploy deploy --timeout 30m astro hub ${CIRCLE_BRANCH}
no_output_timeout: 30m

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

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

- run:
name: Deploy data8
command: |
Expand Down Expand Up @@ -311,33 +293,6 @@ workflows:
version: 2
test-build-images:
jobs:
- hubploy/build-image:
deployment: astro
name: astro image build
# Filters can only be per-job? wtf
filters:
branches:
ignore:
- staging
- prod
- hubploy/build-image:
deployment: biology
name: biology image build
# Filters can only be per-job? wtf
filters:
branches:
ignore:
- staging
- prod
- hubploy/build-image:
deployment: cee
name: cee image build
# Filters can only be per-job? wtf
filters:
branches:
ignore:
- staging
- prod
- hubploy/build-image:
deployment: data8
name: data8 image build
Expand Down Expand Up @@ -451,33 +406,6 @@ workflows:

deploy:
jobs:
- hubploy/build-image:
deployment: astro
name: astro image build
push: true
# Filters can only be per-job? wtf
filters:
branches:
only:
- staging
- hubploy/build-image:
deployment: biology
name: biology image build
push: true
# Filters can only be per-job? wtf
filters:
branches:
only:
- staging
- hubploy/build-image:
deployment: cee
name: cee image build
push: true
# Filters can only be per-job? wtf
filters:
branches:
only:
- staging
- hubploy/build-image:
deployment: data8
name: data8 image build
Expand Down Expand Up @@ -591,9 +519,6 @@ workflows:
# CI level, we also make prod deploys go faster!
- deploy:
requires:
- astro image build
- biology image build
- cee image build
- data8 image build
- data100 image build
- data102 image build
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-hubs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 logodev stat159 stat20 nature a11y ugr01 data101)
done < <(python .github/scripts/determine-hub-deployments.py --only-deploy logodev stat159 stat20 nature a11y ugr01 data101) # astro biology cee)
deploy-hubs-to-prod:
if: github.event_name == 'push' && github.ref == 'refs/heads/prod'
Expand Down Expand Up @@ -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 logodev stat159 stat20 nature a11y ugr01 data101)
done < <(python .github/scripts/determine-hub-deployments.py --only-deploy logodev stat159 stat20 nature a11y ugr01 data101) # astro biology cee)
7 changes: 1 addition & 6 deletions deployments/astro/hubploy.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
images:
image_name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/astro-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/astro-user-image:placeholder

cluster:
provider: gcloud
Expand Down
5 changes: 5 additions & 0 deletions deployments/astro/image/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Astro Image

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

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

This file was deleted.

109 changes: 0 additions & 109 deletions deployments/astro/image/environment.yml

This file was deleted.

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

This file was deleted.

10 changes: 0 additions & 10 deletions deployments/astro/image/postBuild

This file was deleted.

5 changes: 0 additions & 5 deletions deployments/astro/image/start

This file was deleted.

7 changes: 1 addition & 6 deletions deployments/biology/hubploy.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
images:
image_name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/biology-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/biology-user-image:placeholder

cluster:
provider: gcloud
Expand Down
Loading

0 comments on commit 2f42270

Please sign in to comment.