Skip to content
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
17 changes: 0 additions & 17 deletions .github/workflows/examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,23 +117,6 @@ jobs:
with:
repository: ${{ github.event_name == 'schedule' && 'mlflow/mlflow' || github.event.inputs.repository }}
ref: ${{ github.event.inputs.ref }}
- name: Check diff
id: check-diff
if: github.event_name == 'pull_request'
run: |
REPO="${{ github.repository }}"
PR_NUMBER="${{ github.event.pull_request.number }}"
CHANGED_FILES=$(python dev/list_changed_files.py --repository $REPO --pr-num $PR_NUMBER | grep "Dockerfile\|\.dockerignore" || true);
DOCKER_CHANGED=$([[ ! -z "$CHANGED_FILES" ]] && echo "true" || echo "false")
echo -e "CHANGED_FILES:\nCHANGED_FILES"
echo "DOCKER_CHANGED: $DOCKER_CHANGED"
echo "docker_changed=$DOCKER_CHANGED" >> $GITHUB_OUTPUT

- name: Run docker tests
if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || steps.check-diff.outputs.docker_changed == 'true' }}
run: |
docker build -t mlflow_test_build . && docker images | grep mlflow_test_build

- name: Show disk usage
run: |
df -h
26 changes: 0 additions & 26 deletions Dockerfile

This file was deleted.

5 changes: 2 additions & 3 deletions mlflow/R/mlflow/Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# Our internal Jenkins job can't build an image from rocker/r-ver:>=4.2.2 (which is based on Ubuntu 22.04).
FROM rocker/r-ver:4.2.1
FROM rocker/r-ver:4.4.2

WORKDIR /mlflow/mlflow/R/mlflow
RUN apt-get update -y
RUN apt-get install lsb-release git wget libxml2-dev libgit2-dev -y
RUN apt-get install lsb-release git wget libxml2-dev libgit2-dev libcurl4-openssl-dev libuv1 -y

# Install miniforge
RUN wget https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh -O ~/miniforge.sh
Expand Down
11 changes: 5 additions & 6 deletions tests/server/auth/test_auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -363,15 +363,15 @@ def test_create_and_delete_registered_model(client, monkeypatch):
assert rm.name == "test_model"


def _wait(url: str):
def _wait(url: str, timeout: int = 10) -> None:
t = time.time()
while time.time() - t < 5:
while time.time() - t < timeout:
try:
if requests.get(f"{url}/health").ok:
yield
return
except requests.exceptions.ConnectionError:
pass
time.sleep(1)
time.sleep(0.5)

pytest.fail("Server did not start")

Expand Down Expand Up @@ -412,8 +412,7 @@ def test_proxy_log_artifacts(monkeypatch, tmp_path):
) as prc:
try:
url = f"http://{host}:{port}"
for _ in _wait(url):
break
_wait(url)

mlflow.set_tracking_uri(url)
client = MlflowClient(url)
Expand Down
Loading