Skip to content

Commit df0dfec

Browse files
authored
Revert "airbyte-ci: fix dagger log upload attempt when no gcp creds are available" (#37783)
1 parent 00f6442 commit df0dfec

File tree

4 files changed

+17
-19
lines changed

4 files changed

+17
-19
lines changed

airbyte-ci/connectors/pipelines/README.md

+12-11
Original file line numberDiff line numberDiff line change
@@ -743,18 +743,19 @@ E.G.: running Poe tasks on the modified internal packages of the current branch:
743743

744744
## Changelog
745745

746-
| Version | PR | Description |
747-
|---------| ---------------------------------------------------------- |----------------------------------------------------------------------------------------------------------------------------|
748-
| 4.12.2 | [#37778](https://github.com/airbytehq/airbyte/pull/37778) | Do not upload dagger log to GCP when no credentials are available. |
749-
| 4.12.1 | [#37765](https://github.com/airbytehq/airbyte/pull/37765) | Relax the required env var to run in CI and handle their absence gracefully. |
750-
| 4.12.0 | [#37690](https://github.com/airbytehq/airbyte/pull/37690) | Pass custom CI status name in `connectors test` |
751-
| 4.11.0 | [#37641](https://github.com/airbytehq/airbyte/pull/37641) | Updates to run regression tests in GitHub Actions. |
752-
| 4.10.5 | [#37641](https://github.com/airbytehq/airbyte/pull/37641) | Reintroduce changes from 4.10.0 with a fix. |
746+
| Version | PR | Description |
747+
| ------- | ---------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------- |
748+
| 4.12.3 | [#37783](https://github.com/airbytehq/airbyte/pull/37783) | Revert 4.12.2 |
749+
| 4.12.2 | [#37778](https://github.com/airbytehq/airbyte/pull/37778) | Do not upload dagger log to GCP when no credentials are available. |
750+
| 4.12.1 | [#37765](https://github.com/airbytehq/airbyte/pull/37765) | Relax the required env var to run in CI and handle their absence gracefully. |
751+
| 4.12.0 | [#37690](https://github.com/airbytehq/airbyte/pull/37690) | Pass custom CI status name in `connectors test` |
752+
| 4.11.0 | [#37641](https://github.com/airbytehq/airbyte/pull/37641) | Updates to run regression tests in GitHub Actions. |
753+
| 4.10.5 | [#37641](https://github.com/airbytehq/airbyte/pull/37641) | Reintroduce changes from 4.10.0 with a fix. |
753754
| 4.10.4 | [#37641](https://github.com/airbytehq/airbyte/pull/37641) | Temporarily revert changes from version 4.10.0 |
754-
| 4.10.3 | [#37615](https://github.com/airbytehq/airbyte/pull/37615) | Fix `KeyError` when running `migrate-to-poetry` |
755-
| 4.10.2 | [#37614](https://github.com/airbytehq/airbyte/pull/37614) | Fix `UnboundLocalError: local variable 'add_changelog_entry_result' referenced before assignment` in `migrate_to_base_image` |
756-
| 4.10.1 | [#37622](https://github.com/airbytehq/airbyte/pull/37622) | Temporarily disable regression tests in CI |
757-
| 4.10.0 | [#37616](https://github.com/airbytehq/airbyte/pull/37616) | Improve modified files comparison when the target branch is from a fork. |
755+
| 4.10.3 | [#37615](https://github.com/airbytehq/airbyte/pull/37615) | Fix `KeyError` when running `migrate-to-poetry` |
756+
| 4.10.2 | [#37614](https://github.com/airbytehq/airbyte/pull/37614) | Fix `UnboundLocalError: local variable 'add_changelog_entry_result' referenced before assignment` in `migrate_to_base_image` |
757+
| 4.10.1 | [#37622](https://github.com/airbytehq/airbyte/pull/37622) | Temporarily disable regression tests in CI |
758+
| 4.10.0 | [#37616](https://github.com/airbytehq/airbyte/pull/37616) | Improve modified files comparison when the target branch is from a fork. |
758759
| 4.9.0 | [#37440](https://github.com/airbytehq/airbyte/pull/37440) | Run regression tests with `airbyte-ci connectors test` |
759760
| 4.8.0 | [#37404](https://github.com/airbytehq/airbyte/pull/37404) | Accept a `git-repo-url` option on the `airbyte-ci` root command to checkout forked repo. |
760761
| 4.7.4 | [#37485](https://github.com/airbytehq/airbyte/pull/37485) | Allow java connectors to be written in kotlin. |

airbyte-ci/connectors/pipelines/pipelines/cli/dagger_pipeline_command.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,9 @@ async def invoke(self, ctx: click.Context) -> None:
5353
sys.exit(1)
5454
finally:
5555
if ctx.obj.get("dagger_logs_path"):
56-
main_logger.info(f"Dagger logs saved to {ctx.obj['dagger_logs_path']}")
57-
if ctx.obj["is_ci"] and ctx.obj["ci_gcs_credentials"] and ctx.obj["ci_report_bucket_name"]:
56+
if ctx.obj["is_local"]:
57+
main_logger.info(f"Dagger logs saved to {ctx.obj['dagger_logs_path']}")
58+
if ctx.obj["is_ci"]:
5859
gcs_uri, public_url = upload_to_gcs(
5960
ctx.obj["dagger_logs_path"], ctx.obj["ci_report_bucket_name"], dagger_logs_gcs_key, ctx.obj["ci_gcs_credentials"]
6061
)

airbyte-ci/connectors/pipelines/pipelines/models/contexts/pipeline_context.py

+1-5
Original file line numberDiff line numberDiff line change
@@ -187,11 +187,7 @@ def github_commit_status(self) -> dict:
187187
"""Build a dictionary used as kwargs to the update_commit_status_check function."""
188188
target_url: Optional[str] = self.gha_workflow_run_url
189189

190-
if (
191-
self.remote_storage_enabled
192-
and self.state not in [ContextState.RUNNING, ContextState.INITIALIZED]
193-
and isinstance(self.report, ConnectorReport)
194-
):
190+
if self.state not in [ContextState.RUNNING, ContextState.INITIALIZED] and isinstance(self.report, ConnectorReport):
195191
target_url = self.report.html_report_url
196192

197193
return {

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.12.2"
7+
version = "4.12.3"
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)