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
4 changes: 2 additions & 2 deletions ci/ray_ci/anyscale_docker_container.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import os
import subprocess

from ray_release.configs.global_config import get_global_config

from ci.ray_ci.container import (
_AZURE_REGISTRY_NAME,
_DOCKER_AZURE_REGISTRY,
Expand All @@ -11,6 +9,8 @@
)
from ci.ray_ci.docker_container import DockerContainer

from ray_release.configs.global_config import get_global_config


class AnyscaleDockerContainer(DockerContainer):
"""
Expand Down
5 changes: 3 additions & 2 deletions ci/ray_ci/automation/determine_microcheck_step_ids.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
import os

import click

from ci.ray_ci.utils import ci_init

from ray_release.test import (
LINUX_TEST_PREFIX,
MACOS_TEST_PREFIX,
WINDOWS_TEST_PREFIX,
Test,
)

from ci.ray_ci.utils import ci_init

BAZEL_WORKSPACE_DIR = os.environ.get("BUILD_WORKSPACE_DIRECTORY", "")


Expand Down
5 changes: 3 additions & 2 deletions ci/ray_ci/automation/determine_microcheck_tests.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
from typing import Dict, List, Set

import click

from ci.ray_ci.utils import ci_init, logger

from ray_release.configs.global_config import get_global_config
from ray_release.result import ResultStatus
from ray_release.test import Test
from ray_release.test_automation.ci_state_machine import CITestStateMachine

from ci.ray_ci.utils import ci_init, logger

# The s3 prefix for the tests that run on Linux. It comes from the bazel prefix rule
# linux:// with the character "/" replaced by "_" for s3 compatibility
LINUX_TEST_PREFIX = "linux:__"
Expand Down
3 changes: 2 additions & 1 deletion ci/ray_ci/automation/test_db_bot.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import os

import click
from ray_release.configs.global_config import get_global_config

from ci.ray_ci.tester_container import TesterContainer
from ci.ray_ci.utils import ci_init, logger

from ray_release.configs.global_config import get_global_config


@click.command()
@click.argument("team", required=True, type=str)
Expand Down
5 changes: 3 additions & 2 deletions ci/ray_ci/automation/test_determine_microcheck_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
from typing import List

import pytest
from ray_release.result import ResultStatus
from ray_release.test import Test, TestResult

from ci.ray_ci.automation.determine_microcheck_tests import (
_get_failed_commits,
Expand All @@ -15,6 +13,9 @@
)
from ci.ray_ci.utils import ci_init

from ray_release.result import ResultStatus
from ray_release.test import Test, TestResult

ci_init()

DB = {}
Expand Down
5 changes: 3 additions & 2 deletions ci/ray_ci/automation/weekly_green_metric.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@

import boto3
import click
from ray_release.test_automation.state_machine import TestStateMachine
from ray_release.util import get_write_state_machine_aws_bucket

from ci.ray_ci.utils import ci_init, logger

from ray_release.test_automation.state_machine import TestStateMachine
from ray_release.util import get_write_state_machine_aws_bucket

AWS_WEEKLY_GREEN_METRIC = "ray_weekly_green_metric"


Expand Down
11 changes: 6 additions & 5 deletions ci/ray_ci/bisect/bisect_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,18 @@
import os

import click
from ray_release.test import (
Test,
TestType,
)
from ray_release.test_automation.ci_state_machine import CITestStateMachine

from ci.ray_ci.bisect.bisector import Bisector
from ci.ray_ci.bisect.generic_validator import GenericValidator
from ci.ray_ci.bisect.macos_validator import MacOSValidator
from ci.ray_ci.utils import ci_init, logger

from ray_release.test import (
Test,
TestType,
)
from ray_release.test_automation.ci_state_machine import CITestStateMachine

# This is the directory where the ray repository is mounted in the container
RAYCI_CHECKOUT_DIR_MOUNT = "/ray"

Expand Down
4 changes: 2 additions & 2 deletions ci/ray_ci/bisect/bisector.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import subprocess
from typing import List, Optional

from ray_release.test import Test

from ci.ray_ci.bisect.validator import Validator
from ci.ray_ci.utils import logger

from ray_release.test import Test


class Bisector:
def __init__(
Expand Down
7 changes: 4 additions & 3 deletions ci/ray_ci/bisect/generic_validator.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import time

from pybuildkite.buildkite import Buildkite
from ray_release.aws import get_secret_token
from ray_release.configs.global_config import get_global_config
from ray_release.test import Test

from ci.ray_ci.bisect.validator import Validator
from ci.ray_ci.utils import logger

from ray_release.aws import get_secret_token
from ray_release.configs.global_config import get_global_config
from ray_release.test import Test

BUILDKITE_ORGANIZATION = "ray-project"
BUILDKITE_POSTMERGE_PIPELINE = "postmerge"
BUILDKITE_BUILD_RUNNING_STATE = [
Expand Down
4 changes: 2 additions & 2 deletions ci/ray_ci/bisect/macos_validator.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import os
import subprocess

from ci.ray_ci.bisect.validator import Validator

from ray_release.bazel import bazel_runfile
from ray_release.test import Test

from ci.ray_ci.bisect.validator import Validator

TEST_SCRIPT = "ci/ray_ci/bisect/macos_validator.sh"


Expand Down
3 changes: 2 additions & 1 deletion ci/ray_ci/bisect/test_bisector.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
from unittest import mock

import pytest
from ray_release.test import Test

from ci.ray_ci.bisect.bisector import Bisector
from ci.ray_ci.bisect.macos_validator import MacOSValidator
from ci.ray_ci.bisect.validator import Validator

from ray_release.test import Test


class MockValidator(Validator):
def __init__(self, return_value: bool) -> None:
Expand Down
3 changes: 2 additions & 1 deletion ci/ray_ci/bisect/test_generic_validator.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
from unittest import mock

import pytest
from ray_release.test import Test

from ci.ray_ci.bisect.generic_validator import WAIT, GenericValidator

from ray_release.test import Test

START = time.time()


Expand Down
3 changes: 2 additions & 1 deletion ci/ray_ci/doc/build_cache.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
from typing import Set

import boto3
from ray_release.util import get_write_state_machine_aws_bucket

from ci.ray_ci.utils import logger

from ray_release.util import get_write_state_machine_aws_bucket

AWS_CACHE_KEY = "doc_build"
ENVIRONMENT_PICKLE = "_build/doctrees/environment.pickle"

Expand Down
3 changes: 2 additions & 1 deletion ci/ray_ci/doc/cmd_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
import subprocess

import click
from ray_release.configs.global_config import get_global_config

from ci.ray_ci.doc.build_cache import BuildCache
from ci.ray_ci.utils import ci_init, logger

from ray_release.configs.global_config import get_global_config


@click.command()
@click.option(
Expand Down
5 changes: 3 additions & 2 deletions ci/ray_ci/pipeline/scheduler.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import click
from ray_release.aws import get_secret_token
from ray_release.configs.global_config import get_global_config

from ci.ray_ci.pipeline.gap_filling_scheduler import GapFillingScheduler
from ci.ray_ci.utils import ci_init, logger

from ray_release.aws import get_secret_token
from ray_release.configs.global_config import get_global_config


@click.command()
@click.argument("buildkite_organization", type=str)
Expand Down
4 changes: 2 additions & 2 deletions ci/ray_ci/ray_docker_container.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import os
from typing import List, Optional

from ray_release.configs.global_config import get_global_config

from ci.ray_ci.configs import DEFAULT_ARCHITECTURE, PYTHON_VERSIONS
from ci.ray_ci.container import _DOCKER_ECR_REPO
from ci.ray_ci.docker_container import RAY_REPO_MAP, DockerContainer, RayType
from ci.ray_ci.utils import RAY_VERSION, docker_pull

from ray_release.configs.global_config import get_global_config


class RayDockerContainer(DockerContainer):
"""
Expand Down
3 changes: 2 additions & 1 deletion ci/ray_ci/test_anyscale_docker_container.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
from unittest import mock

import pytest
from ray_release.configs.global_config import get_global_config

from ci.ray_ci.anyscale_docker_container import AnyscaleDockerContainer
from ci.ray_ci.container import (
Expand All @@ -14,6 +13,8 @@
)
from ci.ray_ci.test_base import RayCITestBase

from ray_release.configs.global_config import get_global_config


class TestAnyscaleDockerContainer(RayCITestBase):
cmds = []
Expand Down
3 changes: 2 additions & 1 deletion ci/ray_ci/test_linux_tester_container.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@
from unittest import mock

import pytest
from ray_release.configs.global_config import get_global_config

from ci.ray_ci.container import _DOCKER_ECR_REPO
from ci.ray_ci.linux_tester_container import LinuxTesterContainer
from ci.ray_ci.tester_container import RUN_PER_FLAKY_TEST
from ci.ray_ci.utils import chunk_into_n, ci_init

from ray_release.configs.global_config import get_global_config

ci_init()


Expand Down
3 changes: 2 additions & 1 deletion ci/ray_ci/test_ray_docker_container.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
from unittest import mock

import pytest
from ray_release.configs.global_config import get_global_config

from ci.ray_ci.configs import DEFAULT_PYTHON_VERSION
from ci.ray_ci.container import _DOCKER_ECR_REPO
Expand All @@ -14,6 +13,8 @@
from ci.ray_ci.test_base import RayCITestBase
from ci.ray_ci.utils import RAY_VERSION

from ray_release.configs.global_config import get_global_config


class TestRayDockerContainer(RayCITestBase):
cmds = []
Expand Down
3 changes: 2 additions & 1 deletion ci/ray_ci/test_tester.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
from unittest import mock

import pytest
from ray_release.test import Test, TestState

from ci.ray_ci.linux_tester_container import LinuxTesterContainer
from ci.ray_ci.tester import (
Expand All @@ -19,6 +18,8 @@
)
from ci.ray_ci.windows_tester_container import WindowsTesterContainer

from ray_release.test import Test, TestState


def _stub_test(val: dict) -> Test:
test = Test(
Expand Down
3 changes: 2 additions & 1 deletion ci/ray_ci/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
from unittest import mock

import pytest
from ray_release.test import Test

from ci.ray_ci.utils import (
chunk_into_n,
Expand All @@ -14,6 +13,8 @@
get_flaky_test_names,
)

from ray_release.test import Test


def test_chunk_into_n() -> None:
assert chunk_into_n([1, 2, 3, 4, 5], 2) == [[1, 2, 3], [4, 5]]
Expand Down
3 changes: 2 additions & 1 deletion ci/ray_ci/tester.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

import click
import yaml
from ray_release.test import Test, TestState

from ci.ray_ci.builder_container import BuilderContainer
from ci.ray_ci.configs import (
Expand All @@ -19,6 +18,8 @@
from ci.ray_ci.utils import ci_init, ecr_docker_login
from ci.ray_ci.windows_tester_container import WindowsTesterContainer

from ray_release.test import Test, TestState

CUDA_COPYRIGHT = """
==========
== CUDA ==
Expand Down
6 changes: 3 additions & 3 deletions ci/ray_ci/tester_container.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
from os import listdir, path
from typing import List, Optional, Tuple

from ci.ray_ci.container import Container
from ci.ray_ci.utils import chunk_into_n, logger, shard_tests

from ray_release.configs.global_config import get_global_config
from ray_release.test import Test, TestResult
from ray_release.test_automation.ci_state_machine import CITestStateMachine

from ci.ray_ci.container import Container
from ci.ray_ci.utils import chunk_into_n, logger, shard_tests

# We will run each flaky test this number of times per CI job independent of pass/fail.
RUN_PER_FLAKY_TEST = 1

Expand Down
5 changes: 3 additions & 2 deletions ci/ray_ci/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@
from typing import List

import boto3

import ci.ray_ci.bazel_sharding as bazel_sharding

from ray_release.bazel import bazel_runfile
from ray_release.configs.global_config import init_global_config
from ray_release.test import Test, TestState

import ci.ray_ci.bazel_sharding as bazel_sharding

GLOBAL_CONFIG_FILE = (
os.environ.get("RAYCI_GLOBAL_CONFIG") or "ci/ray_ci/oss_config.yaml"
)
Expand Down
Loading