Skip to content

Commit 0571d18

Browse files
authored
airbyte-ci: re-enable connector dependency upload on publish (#36962)
1 parent 865c106 commit 0571d18

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

airbyte-ci/connectors/pipelines/README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ flowchart TD
302302
| `--code-tests-only` | True | False | Skip any tests not directly related to code updates. For instance, metadata checks, version bump checks, changelog verification, etc. Use this setting to help focus on code quality during development. |
303303
| `--concurrent-cat` | False | False | Make CAT tests run concurrently using pytest-xdist. Be careful about source or destination API rate limits. |
304304
| `--<step-id>.<extra-parameter>=<extra-parameter-value>` | True | | You can pass extra parameters for specific test steps. More details in the extra parameters section below |
305-
| `--ci-requirements` | False | | | Output the CI requirements as a JSON payload. It is used to determine the CI runner to use.
305+
| `--ci-requirements` | False | | | Output the CI requirements as a JSON payload. It is used to determine the CI runner to use.
306306

307307
Note:
308308

@@ -649,6 +649,7 @@ E.G.: running Poe tasks on the modified internal packages of the current branch:
649649

650650
| Version | PR | Description |
651651
| ------- | ---------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------- |
652+
| 4.7.2 | [#36962](https://github.com/airbytehq/airbyte/pull/36962) | Re-enable connector dependencies upload on publish. |
652653
| 4.7.1 | [#36961](https://github.com/airbytehq/airbyte/pull/36961) | Temporarily disable python connectors dependencies upload until we find a schema the data team can work with. |
653654
| 4.7.0 | [#36892](https://github.com/airbytehq/airbyte/pull/36892) | Upload Python connectors dependencies list to GCS on publish. |
654655
| 4.6.5 | [#36722](https://github.com/airbytehq/airbyte/pull/36527) | Fix incorrect pipeline names |

airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/publish/pipeline.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class ConnectorDependenciesMetadata(BaseModel):
8484
connector_repository: str
8585
connector_version: str
8686
connector_definition_id: str
87-
dependencies: Dict[str, str]
87+
dependencies: List[Dict[str, str]]
8888
generation_time: datetime = datetime.utcnow()
8989

9090

@@ -100,7 +100,9 @@ async def _run(self, built_containers_per_platform: Dict[Platform, Container]) -
100100
], "This step can only run for Python connectors."
101101
built_container = built_containers_per_platform[LOCAL_BUILD_PLATFORM]
102102
pip_freeze_output = await built_container.with_exec(["pip", "freeze"], skip_entrypoint=True).stdout()
103-
dependencies = {line.split("==")[0]: line.split("==")[1] for line in pip_freeze_output.splitlines() if "==" in line}
103+
dependencies = [
104+
{"package_name": line.split("==")[0], "version": line.split("==")[1]} for line in pip_freeze_output.splitlines() if "==" in line
105+
]
104106
connector_technical_name = self.context.connector.technical_name
105107
connector_version = self.context.metadata["dockerImageTag"]
106108
dependencies_metadata = ConnectorDependenciesMetadata(
@@ -365,11 +367,9 @@ def create_connector_report(results: List[StepResult]) -> ConnectorReport:
365367
if build_connector_results.status is not StepStatus.SUCCESS:
366368
return create_connector_report(results)
367369

368-
# Temporarily disabling it until we find the correct schema that the data team can ingest
369-
370-
# if context.connector.language in [ConnectorLanguage.PYTHON, ConnectorLanguage.LOW_CODE]:
371-
# upload_dependencies_step = await UploadDependenciesToMetadataService(context).run(build_connector_results.output)
372-
# results.append(upload_dependencies_step)
370+
if context.connector.language in [ConnectorLanguage.PYTHON, ConnectorLanguage.LOW_CODE]:
371+
upload_dependencies_step = await UploadDependenciesToMetadataService(context).run(build_connector_results.output)
372+
results.append(upload_dependencies_step)
373373

374374
built_connector_platform_variants = list(build_connector_results.output.values())
375375
push_connector_image_results = await PushConnectorImageToRegistry(context).run(built_connector_platform_variants)

airbyte-ci/connectors/pipelines/pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
44

55
[tool.poetry]
66
name = "pipelines"
7-
version = "4.7.1"
7+
version = "4.7.2"
88
description = "Packaged maintained by the connector operations team to perform CI for connectors' pipelines"
99
authors = ["Airbyte <[email protected]>"]
1010

0 commit comments

Comments
 (0)