Skip to content

Commit 1a794fe

Browse files
committed
CI testing
1 parent c1bf558 commit 1a794fe

4 files changed

Lines changed: 6 additions & 112 deletions

File tree

.github/workflows/test.yml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -101,20 +101,15 @@ jobs:
101101
echo "BEFORE=$git_status" >> $GITHUB_ENV
102102
echo "Repository status before tests: $git_status"
103103
104-
- name: Checkout server-api and patch Docker path
105-
shell: bash
106-
run: |
107-
git clone --depth 1 https://github.com/openml/server-api.git server-api
108-
sed -i 's|\.\./server-api|./server-api|g' docker-compose.yml
104+
- name: Clone Services
105+
run: git clone --depth 1 https://github.com/openml/services.git
109106

110-
- name: Start Docker Test Environment
111-
if: matrix.os == 'ubuntu-latest'
112-
shell: bash
107+
- name: Start Docker Services
108+
working-directory: ./services
113109
run: |
114-
sed -i 's/\r$//' docker/update.sh
115-
docker compose up -d
110+
sudo systemctl stop mysql.service
111+
docker compose --profile rest-api --profile minio --profile evaluation-engine up -d
116112
docker wait openml-test-setup-ci
117-
echo "OPENML_TEST_SERVER=local" >> $GITHUB_ENV
118113
119114
- name: Show installed dependencies
120115
run: python -m pip list

docker-compose.yml

Lines changed: 0 additions & 57 deletions
This file was deleted.

docker/update.sh

Lines changed: 0 additions & 31 deletions
This file was deleted.

tests/conftest.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -296,19 +296,6 @@ def with_test_cache(test_files_directory, request):
296296
if tmp_cache.exists():
297297
shutil.rmtree(tmp_cache)
298298

299-
@pytest.fixture(scope="session")
300-
def openml_test_config():
301-
"""
302-
Returns the URL for the test server.
303-
"""
304-
if os.environ.get("OPENML_TEST_SERVER") == "local":
305-
return {
306-
"v1": "http://localhost:9002/api/v1/",
307-
"v2": "http://localhost:9001/"
308-
}
309-
310-
raise ValueError("Use the environment variable OPENML_TEST_SERVER=local before running docker to run tests against a local OpenML server.")
311-
312299
@pytest.fixture
313300
def static_cache_dir():
314301
return Path(__file__).parent / "files"

0 commit comments

Comments
 (0)