Disable flaggy basic auth tests

burakince · Dec 15, 2024 · 4fd8ae6 · 4fd8ae6
1 parent 47adbde
commit 4fd8ae6
Show file tree

Hide file tree

Showing 11 changed files with 300 additions and 20 deletions.
diff --git a/docker-compose.aws-mysql-test.yaml b/docker-compose.aws-mysql-test.yaml
@@ -11,20 +11,32 @@ services:
     ports:
       - "9000:9000"
       - "9001:9001"
+    healthcheck:
+      test: ["CMD-SHELL", "curl -fsS http://localhost:9000/minio/health/live || exit 1"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 15s
     networks:
       - aws_mysql_test_nw
 
   mysql:
     image: "mysql:${MYSQL_VERSION}"
     container_name: mlflow-aws-mysql-db
     environment:
-      MYSQL_ROOT_PASSWORD: password
+      MYSQL_ROOT_PASSWORD: rootpassword
       MYSQL_DATABASE: mlflow
       MYSQL_USER: mlflow
       MYSQL_PASSWORD: password
       MYSQL_TCP_PORT: 3306
     ports:
       - "3306:3306"
+    healthcheck:
+      test: ["CMD-SHELL", "mysqladmin ping -h localhost -u root -prootpassword || exit 1"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 15s
     networks:
       - aws_mysql_test_nw
 
@@ -43,8 +55,10 @@ services:
     networks:
       - aws_mysql_test_nw
     depends_on:
-      - minio
-      - mysql
+      minio:
+        condition: service_healthy
+      mysql:
+        condition: service_healthy
 
 networks:
   aws_mysql_test_nw:

diff --git a/docker-compose.aws-postgres-test.yaml b/docker-compose.aws-postgres-test.yaml
@@ -11,6 +11,12 @@ services:
     ports:
       - "9000:9000"
       - "9001:9001"
+    healthcheck:
+      test: ["CMD-SHELL", "curl -fsS http://localhost:9000/minio/health/live || exit 1"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 15s
     networks:
       - aws_pg_test_nw
 
@@ -22,6 +28,12 @@ services:
       POSTGRES_USER: postgres
     ports:
       - "5432:5432"
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres -d postgres"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+    restart: always
     networks:
       - aws_pg_test_nw
 
@@ -45,8 +57,10 @@ services:
     networks:
       - aws_pg_test_nw
     depends_on:
-      - minio
-      - postgres
+      minio:
+        condition: service_healthy
+      postgres:
+        condition: service_healthy
 
 networks:
   aws_pg_test_nw:

diff --git a/docker-compose.azure-mysql-test.yaml b/docker-compose.azure-mysql-test.yaml
@@ -16,6 +16,12 @@ services:
     ports:
       - "10000:10000"
       - "10001:10001"
+    healthcheck:
+      test: ["CMD-SHELL", "nc -z localhost 10000 || exit 1"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 15s
     volumes:
       - ./test-containers/azurite/create-container.js:/create-container.js
       - ./test-containers/azurite/run.sh:/run.sh
@@ -26,13 +32,19 @@ services:
     image: "mysql:${MYSQL_VERSION}"
     container_name: mlflow-azure-mysql-db
     environment:
-      MYSQL_ROOT_PASSWORD: password
+      MYSQL_ROOT_PASSWORD: rootpassword
       MYSQL_DATABASE: mlflow
       MYSQL_USER: mlflow
       MYSQL_PASSWORD: password
       MYSQL_TCP_PORT: 3306
     ports:
       - "3306:3306"
+    healthcheck:
+      test: ["CMD-SHELL", "mysqladmin ping -h localhost -u root -prootpassword || exit 1"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 15s
     networks:
       - azure_mysql_test_nw
 
@@ -49,8 +61,10 @@ services:
     networks:
       - azure_mysql_test_nw
     depends_on:
-      - azurite
-      - mysql
+      azurite:
+        condition: service_healthy
+      mysql:
+        condition: service_healthy
 
 networks:
   azure_mysql_test_nw:

diff --git a/docker-compose.azure-postgres-test.yaml b/docker-compose.azure-postgres-test.yaml
@@ -16,6 +16,12 @@ services:
     ports:
       - "10000:10000"
       - "10001:10001"
+    healthcheck:
+      test: ["CMD-SHELL", "nc -z localhost 10000 || exit 1"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 15s
     volumes:
       - ./test-containers/azurite/create-container.js:/create-container.js
       - ./test-containers/azurite/run.sh:/run.sh
@@ -30,6 +36,12 @@ services:
       POSTGRES_USER: postgres
     ports:
       - "5432:5432"
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres -d postgres"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+    restart: always
     networks:
       - azure_pg_test_nw
 
@@ -51,8 +63,10 @@ services:
     networks:
       - azure_pg_test_nw
     depends_on:
-      - azurite
-      - postgres
+      azurite:
+        condition: service_healthy
+      postgres:
+        condition: service_healthy
 
 networks:
   azure_pg_test_nw:

diff --git a/docker-compose.basic-auth-mysql-test.yaml b/docker-compose.basic-auth-mysql-test.yaml
@@ -0,0 +1,71 @@
+services:
+  minio:
+    container_name: minio-mysql-test
+    hostname: minio
+    image: minio/minio:${MINIO_VERSION}
+    entrypoint: sh
+    command: -c 'mkdir -p /data/mlflow && minio server /data --console-address ":9001"'
+    environment:
+      MINIO_ROOT_USER: minioadmin
+      MINIO_ROOT_PASSWORD: minioadmin
+    ports:
+      - "9000:9000"
+      - "9001:9001"
+    networks:
+      - basic_auth_mysql_test_nw
+
+  mysql:
+    image: "mysql:${MYSQL_VERSION}"
+    container_name: mlflow-basic-auth-mysql-db
+    environment:
+      MYSQL_ROOT_PASSWORD: password
+      MYSQL_DATABASE: mlflow
+      MYSQL_USER: mlflow
+      MYSQL_PASSWORD: password
+      MYSQL_TCP_PORT: 3306
+    ports:
+      - "3306:3306"
+    networks:
+      - basic_auth_mysql_test_nw
+
+  usersdb:
+    image: "mysql:${MYSQL_VERSION}"
+    container_name: mlflow-basic-auth-users-mysql-db
+    environment:
+      MYSQL_ROOT_PASSWORD: userspassword
+      MYSQL_DATABASE: users
+      MYSQL_USER: users
+      MYSQL_PASSWORD: userspassword
+      MYSQL_TCP_PORT: 3306
+    ports:
+      - "3307:3306"
+    networks:
+      - basic_auth_mysql_test_nw
+
+  mlflow:
+    container_name: mlflow-basic-auth-mysql-test
+    build:
+      context: .
+      dockerfile: Dockerfile
+    command: "mlflow server --backend-store-uri=mysql+pymysql://mlflow:password@mysql:3306/mlflow --default-artifact-root=s3://mlflow/ --host=0.0.0.0 --port=8080 --app-name basic-auth"
+    environment:
+      MLFLOW_S3_ENDPOINT_URL: http://minio:9000
+      AWS_ACCESS_KEY_ID: minioadmin
+      AWS_SECRET_ACCESS_KEY: minioadmin
+      MLFLOW_AUTH_CONFIG_PATH: /mlflow/basic_auth.ini
+      ALEMBIC_LOG_LEVEL: DEBUG
+      FLASK_ENV: development
+      DEBUG: True
+    ports:
+      - "8080:8080"
+    networks:
+      - basic_auth_mysql_test_nw
+    volumes:
+      - ./test-containers/basic-auth/mysql/basic_auth.ini:/mlflow/basic_auth.ini
+    depends_on:
+      - minio
+      - mysql
+
+networks:
+  basic_auth_mysql_test_nw:
+    driver: bridge
diff --git a/docker-compose.basic-auth-postgres-test.yaml b/docker-compose.basic-auth-postgres-test.yaml
@@ -11,6 +11,12 @@ services:
     ports:
       - "9000:9000"
       - "9001:9001"
+    healthcheck:
+      test: ["CMD-SHELL", "curl -fsS http://localhost:9000/minio/health/live || exit 1"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 15s
     networks:
       - basic_auth_pg_test_nw
 
@@ -23,6 +29,12 @@ services:
       POSTGRES_DB: mlflow
     ports:
       - "5432:5432"
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres -d mlflow"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+    restart: always
     networks:
       - basic_auth_pg_test_nw
 
@@ -35,6 +47,12 @@ services:
       POSTGRES_DB: users
     ports:
       - "5433:5432"
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres -d users"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+    restart: always
     networks:
       - basic_auth_pg_test_nw
 
@@ -54,16 +72,23 @@ services:
       PGUSER: postgres
       PGPASSWORD: postgres
       MLFLOW_AUTH_CONFIG_PATH: /mlflow/basic_auth.ini
+      ALEMBIC_LOG_LEVEL: DEBUG
+      FLASK_ENV: development
+      DEBUG: True
+      GUNICORN_CMD_ARGS: --log-level debug
     ports:
       - "8080:8080"
     networks:
       - basic_auth_pg_test_nw
     volumes:
       - ./test-containers/basic-auth/postgres/basic_auth.ini:/mlflow/basic_auth.ini
     depends_on:
-      - minio
-      - postgres
-      - usersdb
+      minio:
+        condition: service_healthy
+      postgres:
+        condition: service_healthy
+      usersdb:
+        condition: service_healthy
 
 networks:
   basic_auth_pg_test_nw:

diff --git a/docker-compose.gcp-mysql-test.yaml b/docker-compose.gcp-mysql-test.yaml
@@ -3,23 +3,35 @@ services:
     container_name: gcs-mysql-test
     hostname: gcs
     image: fsouza/fake-gcs-server:${FAKE_GCS_SERVER_VERSION}
-    entrypoint: sh -c "mkdir -p /data/mlflow && /bin/fake-gcs-server -data /data -scheme http"
+    entrypoint: sh -c "apk add --no-cache curl && mkdir -p /data/mlflow && /bin/fake-gcs-server -data /data -scheme http"
     ports:
       - "4443:4443"
+    healthcheck:
+      test: ["CMD-SHELL", "curl -fsS http://localhost:4443/storage/v1/b || exit 1"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 15s
     networks:
       - gcp_mysql_test_nw
 
   mysql:
     image: "mysql:${MYSQL_VERSION}"
     container_name: mlflow-azure-mysql-db
     environment:
-      MYSQL_ROOT_PASSWORD: password
+      MYSQL_ROOT_PASSWORD: rootpassword
       MYSQL_DATABASE: mlflow
       MYSQL_USER: mlflow
       MYSQL_PASSWORD: password
       MYSQL_TCP_PORT: 3306
     ports:
       - "3306:3306"
+    healthcheck:
+      test: ["CMD-SHELL", "mysqladmin ping -h localhost -u root -prootpassword || exit 1"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 15s
     networks:
       - gcp_mysql_test_nw
 
@@ -37,8 +49,10 @@ services:
     networks:
       - gcp_mysql_test_nw
     depends_on:
-      - gcs
-      - mysql
+      gcs:
+        condition: service_healthy
+      mysql:
+        condition: service_healthy
 
 networks:
   gcp_mysql_test_nw: