Skip to content

Commit

Permalink
Merge pull request #742 from roboflow/fix/fix_integration_tests
Browse files Browse the repository at this point in the history
Fix integration tests before release
  • Loading branch information
PawelPeczek-Roboflow authored Oct 11, 2024
2 parents 0a5be32 + 2dd1c4f commit aa034a6
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 18 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/docker.cpu.slim.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ on:
types: [created]
push:
branches: [main]
pull_request:
branches: [main]
workflow_dispatch:
inputs:
force_push:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/docker.cpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ name: Build and Push CPU Container
on:
release:
types: [created]
pull_request:
branches: [main]
push:
branches: [main]
workflow_dispatch:
Expand Down
17 changes: 5 additions & 12 deletions .github/workflows/integration_tests_inference_server_x86.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@ name: INTEGRATION TESTS - Inference Server CPU x86

on:
push:
branches: [main]
branches: [ main ]
workflow_dispatch:

jobs:
build:
if: ${{ !github.event.act }}
runs-on:
labels: depot-ubuntu-22.04-8
group: public-depot
group: group8core
timeout-minutes: 35

steps:
Expand All @@ -19,21 +18,15 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Login to Docker Hub
uses: docker/login-action@v3
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: 🛎️ Checkout
uses: actions/checkout@v4
uses: actions/checkout@v3
with:
ref: ${{ github.head_ref }}
- name: 📦 Cache Python packages
uses: actions/cache@v3
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ matrix.python-version }}-${{ hashFiles('requirements/**') }}
restore-keys: |
${{ runner.os }}-pip-${{ matrix.python-version }}-

- name: 🦾 Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
2 changes: 1 addition & 1 deletion tests/inference/hosted_platform_tests/test_workflows.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ def test_get_versions_of_execution_engine(object_detection_service_url: str) ->
# then
response.raise_for_status()
response_data = response.json()
assert response_data["versions"] == ["1.1.2"]
assert response_data["versions"] == ["1.2.0"]


FUNCTION = """
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,7 @@ def test_get_versions_of_execution_engine(server_url: str) -> None:
# then
response.raise_for_status()
response_data = response.json()
assert response_data["versions"] == ["1.1.2"]
assert response_data["versions"] == ["1.2.0"]


def test_getting_block_schema_using_get_endpoint(server_url) -> None:
Expand Down

0 comments on commit aa034a6

Please sign in to comment.