diff --git a/airbyte-ci/connectors/metadata_service/lib/metadata_service/registry_entry.py b/airbyte-ci/connectors/metadata_service/lib/metadata_service/registry_entry.py index 3c15ba74d08..612637849dc 100644 --- a/airbyte-ci/connectors/metadata_service/lib/metadata_service/registry_entry.py +++ b/airbyte-ci/connectors/metadata_service/lib/metadata_service/registry_entry.py @@ -533,7 +533,9 @@ def generate_and_persist_registry_entry( # For latest versions that are disabled, delete any existing registry entry to remove it from the registry if ( - "-rc" not in metadata_dict["data"]["dockerImageTag"] and "-dev" not in metadata_dict["data"]["dockerImageTag"] + "-rc" not in metadata_dict["data"]["dockerImageTag"] + and "-dev" not in metadata_dict["data"]["dockerImageTag"] + and "-preview" not in metadata_dict["data"]["dockerImageTag"] ) and not metadata_dict["data"]["registryOverrides"][registry_type]["enabled"]: logger.info( f"{registry_type} is not enabled: deleting existing {registry_type} registry entry for {metadata_dict['data']['dockerRepository']} at latest path." diff --git a/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/test/steps/python_connectors.py b/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/test/steps/python_connectors.py index 817630b5a80..5bb2f962f3c 100644 --- a/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/test/steps/python_connectors.py +++ b/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/test/steps/python_connectors.py @@ -25,7 +25,7 @@ from pipelines.helpers.utils import raise_if_not_user from pipelines.models.steps import STEP_PARAMS, Step, StepResult # Pin the PyAirbyte version to avoid updates from breaking CI -PYAIRBYTE_VERSION = "0.20.2" +PYAIRBYTE_VERSION = "0.35.1" class PytestStep(Step, ABC): diff --git a/airbyte-ci/connectors/pipelines/tests/test_tests/test_python_connectors.py b/airbyte-ci/connectors/pipelines/tests/test_tests/test_python_connectors.py index 9a634b3402e..ada4a7a4e52 100644 --- a/airbyte-ci/connectors/pipelines/tests/test_tests/test_python_connectors.py +++ b/airbyte-ci/connectors/pipelines/tests/test_tests/test_python_connectors.py @@ -111,7 +111,6 @@ class TestUnitTests: ] -@pytest.mark.skip(reason="PyAirbyte validation tests failing due to CDK module import issues in test environment") class TestPyAirbyteValidationTests: @pytest.fixture def compatible_connector(self): @@ -157,7 +156,8 @@ class TestPyAirbyteValidationTests: result = await PyAirbyteValidation(context_for_valid_connector)._run(mocker.MagicMock()) assert isinstance(result, StepResult) assert result.status == StepStatus.SUCCESS - assert "Getting `spec` output from connector..." in result.stdout + # Verify the connector name appears in output (stable across PyAirbyte versions) + assert context_for_valid_connector.connector.technical_name in (result.stdout + result.stderr) async def test__run_validation_skip_unpublished_connector( self,