run 2.5.1 test without waiting for 1st e2e

This commit is contained in:
Wing Lian
2024-12-07 08:47:36 -05:00
parent 0689419d25
commit 3afc91fba9

View File

@@ -148,52 +148,53 @@ jobs:
run: | run: |
find "$(pip cache dir)/http-v2" -type f -mtime +14 -exec rm {} \; find "$(pip cache dir)/http-v2" -type f -mtime +14 -exec rm {} \;
docker-e2e-tests-1st: # docker-e2e-tests-1st:
if: ${{ ! contains(github.event.commits[0].message, '[skip e2e]') && github.repository_owner == 'axolotl-ai-cloud' }} # if: ${{ ! contains(github.event.commits[0].message, '[skip e2e]') && github.repository_owner == 'axolotl-ai-cloud' }}
# this job needs to be run on self-hosted GPU runners... # # this job needs to be run on self-hosted GPU runners...
runs-on: [self-hosted, modal] # runs-on: [self-hosted, modal]
timeout-minutes: 90 # timeout-minutes: 90
needs: [pre-commit, pytest, pytest-sdist] # needs: [pre-commit, pytest, pytest-sdist]
#
strategy: # strategy:
fail-fast: false # fail-fast: false
matrix: # matrix:
include: # include:
- cuda: 124 # - cuda: 124
cuda_version: 12.4.1 # cuda_version: 12.4.1
python_version: "3.11" # python_version: "3.11"
pytorch: 2.4.1 # pytorch: 2.4.1
num_gpus: 1 # num_gpus: 1
axolotl_extras: # axolotl_extras:
steps: # steps:
- name: Checkout # - name: Checkout
uses: actions/checkout@v4 # uses: actions/checkout@v4
- name: Install Python # - name: Install Python
uses: actions/setup-python@v5 # uses: actions/setup-python@v5
with: # with:
python-version: "3.10" # python-version: "3.10"
- name: Install Modal # - name: Install Modal
run: | # run: |
python -m pip install --upgrade pip # python -m pip install --upgrade pip
pip install modal==0.63.64 jinja2 # pip install modal==0.63.64 jinja2
- name: Update env vars # - name: Update env vars
run: | # run: |
echo "BASE_TAG=main-base-py${{ matrix.python_version }}-cu${{ matrix.cuda }}-${{ matrix.pytorch }}" >> $GITHUB_ENV # echo "BASE_TAG=main-base-py${{ matrix.python_version }}-cu${{ matrix.cuda }}-${{ matrix.pytorch }}" >> $GITHUB_ENV
echo "PYTORCH_VERSION=${{ matrix.pytorch}}" >> $GITHUB_ENV # echo "PYTORCH_VERSION=${{ matrix.pytorch}}" >> $GITHUB_ENV
echo "AXOLOTL_ARGS=${{ matrix.axolotl_args}}" >> $GITHUB_ENV # echo "AXOLOTL_ARGS=${{ matrix.axolotl_args}}" >> $GITHUB_ENV
echo "AXOLOTL_EXTRAS=${{ matrix.axolotl_extras}}" >> $GITHUB_ENV # echo "AXOLOTL_EXTRAS=${{ matrix.axolotl_extras}}" >> $GITHUB_ENV
echo "CUDA=${{ matrix.cuda }}" >> $GITHUB_ENV # echo "CUDA=${{ matrix.cuda }}" >> $GITHUB_ENV
echo "N_GPUS=${{ matrix.num_gpus }}" >> $GITHUB_ENV # echo "N_GPUS=${{ matrix.num_gpus }}" >> $GITHUB_ENV
- name: Run tests job on Modal # - name: Run tests job on Modal
run: | # run: |
modal run cicd.tests # modal run cicd.tests
docker-e2e-tests: docker-e2e-tests:
if: github.repository_owner == 'axolotl-ai-cloud' if: github.repository_owner == 'axolotl-ai-cloud'
# this job needs to be run on self-hosted GPU runners... # this job needs to be run on self-hosted GPU runners...
runs-on: [self-hosted, modal] runs-on: [self-hosted, modal]
timeout-minutes: 90 timeout-minutes: 90
needs: [pre-commit, pytest, docker-e2e-tests-1st] # needs: [pre-commit, pytest, docker-e2e-tests-1st]
needs: [pre-commit, pytest]
strategy: strategy:
fail-fast: false fail-fast: false