Skip to content

Commit

Permalink
chore(topic): merge
Browse files Browse the repository at this point in the history
  • Loading branch information
nsantacruz committed Dec 19, 2024
2 parents b49ecc3 + 4cb7384 commit 5a04fc8
Show file tree
Hide file tree
Showing 10 changed files with 259 additions and 164 deletions.
56 changes: 44 additions & 12 deletions .github/workflows/continuous.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -178,13 +178,33 @@ jobs:
- name: Handle Jest Test Results
run: cat /home/runner/jestResults.json; STATUS=`jq ".numFailedTestSuites" /home/runner/jestResults.json`; exit $STATUS
if: ${{ always() }}
check-python-files:
runs-on: ubuntu-latest
outputs:
python_files_changed: ${{ steps.check-python-files.outputs.python_files_changed }}
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Check for Python file changes
id: check-python-files
uses: dorny/paths-filter@v2
with:
filters: |
python_files_changed:
- added|modified:
- '**/*.py'
- 'requirements.txt'
- 'setup.py'
- 'pyproject.toml'
sandbox-deploy:
name: "Continuous Testing: Sandbox Deploy"
concurrency:
group: dev-mongo
cancel-in-progress: false
needs: [ build-derived ]
if: github.event.pull_request.draft == false
needs: [ build-derived, check-python-files ]
if: >
github.event.pull_request.draft == false &&
needs.check-python-files.outputs.python_files_changed == 'true'
runs-on: ubuntu-latest
permissions:
contents: 'read'
Expand Down Expand Up @@ -236,7 +256,9 @@ jobs:
PROJECT_ID: "${{ secrets.DEV_PROJECT }}"
NAMESPACE: "${{secrets.DEV_SANDBOX_NAMESPACE}}"
sandbox-ready:
if: github.event.pull_request.draft == false
if: >
github.event.pull_request.draft == false &&
needs.check-python-files.outputs.python_files_changed == 'true'
needs: sandbox-deploy
runs-on: ubuntu-latest
steps:
Expand All @@ -256,8 +278,10 @@ jobs:
concurrency:
group: dev-mongo
cancel-in-progress: false
needs: [ sandbox-ready ]
if: github.event.pull_request.draft == false
needs: [ sandbox-ready, check-python-files ]
if: >
github.event.pull_request.draft == false &&
needs.check-python-files.outputs.python_files_changed == 'true'
permissions:
contents: 'read'
id-token: 'write'
Expand Down Expand Up @@ -376,11 +400,17 @@ jobs:
run: helm delete sandbox-${{ steps.get-sha.outputs.sha_short }} -n ${{ secrets.DEV_SANDBOX_NAMESPACE }} --debug --timeout 10m0s
if: steps.get-helm.outputs.count > 0
continuous-branch-protection:
needs: [ build-generic, build-derived, sandbox-deploy, sandbox-ready, pytest-job ]
needs:
- build-generic
- build-derived
- check-python-files
- sandbox-deploy
- sandbox-ready
- pytest-job
runs-on: ubuntu-latest
if: always()
steps:
- name:
- name:
run: |
if [ "${{ github.event_name }}" == "merge_group" ]; then
exit 0
Expand All @@ -391,10 +421,12 @@ jobs:
exit 1
fi
if [ "${{ github.event.pull_request.draft }}" == "false" ]; then
if [ "${{ needs.sandbox-deploy.result }}" != "success" ] || \
[ "${{ needs.sandbox-ready.result }}" != "success" ] || \
[ "${{ needs.pytest-job.result }}" != "success" ]; then
echo "One or more test jobs failed"
exit 1
if [ "${{ needs.check-python-files.outputs.python_files_changed }}" == "true" ]; then
if [ "${{ needs.sandbox-deploy.result }}" != "success" ] || \
[ "${{ needs.sandbox-ready.result }}" != "success" ] || \
[ "${{ needs.pytest-job.result }}" != "success" ]; then
echo "One or more Python-related test jobs failed"
exit 1
fi
fi
fi
11 changes: 11 additions & 0 deletions build/ci/production-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,17 @@ web:
schoolLookup:
ref: school-lookup-data-production
linker:
resources:
web:
# gunicornWorkerCount: 1
# gunicornThreadCount: 1
resources:
requests:
memory: "3Gi"
cpu: "600m"
limits:
memory: "5Gi"
cpu: "2000m"
enabled: true
containerImage:
imageRegistry:
Expand Down
13 changes: 5 additions & 8 deletions build/linker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,12 @@ RUN apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/

RUN apt-get update -qq \
&& apt-get install --no-install-recommends -y \
# install cuda toolkit
cuda-libraries-11-6 \
libnpp-11-6 \
cuda-nvtx-11-6 \
libcublas-11-6 \
cuda-libraries-12-2 \
libnpp-12-2 \
cuda-nvtx-12-2 \
libcublas-12-2 \
libnccl2 \
# install cudnn
libcudnn8=8.4.0.27-1+cuda11.6 \
&& apt-mark hold libcublas-11-6 \
libcudnn8 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

Expand Down
Loading

0 comments on commit 5a04fc8

Please sign in to comment.