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

Pinning tox ci #211

Merged
merged 2 commits into from
Dec 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 13 additions & 3 deletions .github/workflows/arm64_local_os.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
name: arm64_local_os
# runs Integration Tests on Local OS on an ARM64 Machine
# take 2
on:
workflow_dispatch:
inputs:
image_to_test:
required: false
# This is the name of the docker image that is built by the build script:
default: marqo_docker_0
description: >
This is optional. If left as the default value "marqo_docker_0", the docker image built from this branch is tested.
Otherwise, the specified docker image is tested. For example "marqoai/marqo:test"
push:
branches:
mainline
Expand Down Expand Up @@ -62,7 +69,7 @@ jobs:
- name: Install Dependencies
run: |
#pip install -r requirements.txt
pip install tox
pip install tox==3.26
pip install flake8

# TODO: linting here
Expand All @@ -81,7 +88,10 @@ jobs:
echo 'export MARQO_API_TESTS_ROOT="${{ github.workspace }}"' >> conf

- name: Run Integration Tests - ARM64 local_os
run: tox -e py3-arm64_local_os
run: |
export MQ_API_TEST_BRANCH="${GITHUB_REF##*/}"
export MQ_API_TEST_IMG="${{ github.event.inputs.image_to_test }}"
tox -e py3-arm64_local_os

Stop-Runner:
name: Stop self-hosted EC2 runner
Expand Down
14 changes: 12 additions & 2 deletions .github/workflows/cuda_dind_os_CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@ name: cuda_dind_os_CI

on:
workflow_dispatch:
inputs:
image_to_test:
required: false
default: marqo_docker_0
description: >
This is optional. If left as the default value "marqo_docker_0", the docker image built from this branch is tested.
Otherwise, the specified docker image is tested. For example "marqoai/marqo:test"
push:
branches:
mainline
Expand Down Expand Up @@ -62,7 +69,7 @@ jobs:
- name: Install Dependencies
run: |
#pip install -r requirements.txt
pip install tox
pip install tox==3.26
pip install flake8

# TODO: linting here
Expand All @@ -81,7 +88,10 @@ jobs:
echo 'export MARQO_API_TESTS_ROOT="${{ github.workspace }}"' >> conf

- name: Run CUDA Integration Tests - dind_os
run: tox -e py3-cuda_dind_os
run: |
export MQ_API_TEST_BRANCH="${GITHUB_REF##*/}"
export MQ_API_TEST_IMG="${{ github.event.inputs.image_to_test }}"
tox -e py3-cuda_dind_os

Stop-Runner:
name: Stop self-hosted EC2 runner
Expand Down
14 changes: 12 additions & 2 deletions .github/workflows/dind_os_CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@ name: dind_os_CI

on:
workflow_dispatch:
inputs:
image_to_test:
required: false
default: marqo_docker_0
description: >
This is optional. If left as the default value "marqo_docker_0", the docker image built from this branch is tested.
Otherwise, the specified docker image is tested. For example "marqoai/marqo:test"
push:
branches:
mainline
Expand Down Expand Up @@ -60,7 +67,7 @@ jobs:
- name: Install Dependencies
run: |
#pip install -r requirements.txt
pip install tox
pip install tox==3.26
pip install flake8

# linting here
Expand All @@ -79,7 +86,10 @@ jobs:
echo 'export MARQO_API_TESTS_ROOT="${{ github.workspace }}"' >> conf

- name: Run Integration Tests - dind_os
run: tox -e py3-dind_os
run: |
export MQ_API_TEST_BRANCH="${GITHUB_REF##*/}"
export MQ_API_TEST_IMG="${{ github.event.inputs.image_to_test }}"
tox -e py3-dind_os

Stop-Runner:
name: Stop self-hosted EC2 runner
Expand Down
14 changes: 12 additions & 2 deletions .github/workflows/local_os_CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@ name: local_os_CI

on:
workflow_dispatch:
inputs:
image_to_test:
required: false
default: marqo_docker_0
description: >
This is optional. If left as the default value "marqo_docker_0", the docker image built from this branch is tested.
Otherwise, the specified docker image is tested. For example "marqoai/marqo:test"
push:
branches:
mainline
Expand Down Expand Up @@ -60,7 +67,7 @@ jobs:
- name: Install Dependencies
run: |
#pip install -r requirements.txt
pip install tox
pip install tox==3.26
pip install flake8

# TODO: linting here
Expand All @@ -79,7 +86,10 @@ jobs:
echo 'export MARQO_API_TESTS_ROOT="${{ github.workspace }}"' >> conf

- name: Run Integration Tests - local_os
run: tox -e py3-local_os
run: |
export MQ_API_TEST_BRANCH="${GITHUB_REF##*/}"
export MQ_API_TEST_IMG="${{ github.event.inputs.image_to_test }}"
tox -e py3-local_os

Stop-Runner:
name: Stop self-hosted EC2 runner
Expand Down
14 changes: 12 additions & 2 deletions .github/workflows/s2search_CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@ name: s2search_CI

on:
workflow_dispatch:
inputs:
image_to_test:
required: false
default: marqo_docker_0
description: >
This is optional. If left as the default value "marqo_docker_0", the docker image built from this branch is tested.
Otherwise, the specified docker image is tested. For example "marqoai/marqo:test"
push:
branches:
mainline
Expand Down Expand Up @@ -60,7 +67,7 @@ jobs:
- name: Install Dependencies
run: |
#pip install -r requirements.txt
pip install tox
pip install tox==3.26
pip install flake8

# linting here
Expand All @@ -81,7 +88,10 @@ jobs:
echo 'export S2SEARCH_URL="${{ secrets.S2SEARCH_URL }}"' >> conf

- name: Run Integration Tests - s2search
run: tox -e py3-s2search
run: |
export MQ_API_TEST_BRANCH="${GITHUB_REF##*/}"
export MQ_API_TEST_IMG="${{ github.event.inputs.image_to_test }}"
tox -e py3-s2search

Stop-Runner:
name: Stop self-hosted EC2 runner
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/unit_test_CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
- name: Install Dependencies
run: |
#pip install -r requirements.txt
pip install tox
pip install tox==3.26
pip install flake8

# TODO: Figure out how to make linting work on self-hosted runner
Expand Down Expand Up @@ -97,7 +97,9 @@ jobs:
echo 'export MARQO_API_TESTS_ROOT="${{ github.workspace }}"' >> conf

- name: Run Unit Tests
run: tox -e py3-local_os_unit_tests_w_requirements
run: |
export MQ_API_TEST_BRANCH="${GITHUB_REF##*/}"
tox -e py3-local_os_unit_tests_w_requirements

Stop-Runner:
name: Stop self-hosted EC2 runner
Expand All @@ -119,4 +121,4 @@ jobs:
mode: stop
github-token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
label: ${{ needs.start-runner.outputs.label }}
ec2-instance-id: ${{ needs.start-runner.outputs.ec2-instance-id }}
ec2-instance-id: ${{ needs.start-runner.outputs.ec2-instance-id }}