From 41fee62be9e28a835095c1c9654f2479632ac4f3 Mon Sep 17 00:00:00 2001 From: erohmensing Date: Wed, 15 May 2024 16:49:06 -0500 Subject: [PATCH 1/4] fix invalid test step options --- .../pipelines/pipelines/airbyte_ci/connectors/consts.py | 4 ---- .../pipelines/pipelines/helpers/execution/run_steps.py | 5 ++++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/consts.py b/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/consts.py index 5c9708fdad18..b094d5c00be8 100644 --- a/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/consts.py +++ b/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/consts.py @@ -12,14 +12,10 @@ class CONNECTOR_TEST_STEP_ID(str, Enum): BUILD_NORMALIZATION = "build_normalization" BUILD_TAR = "build_tar" BUILD = "build" - CHECK_BASE_IMAGE = "check_base_image" - CHECK_PYTHON_REGISTRY_PUBLISH_CONFIGURATION = "check_python_registry_publish_configuration" INTEGRATION = "integration" AIRBYTE_LIB_VALIDATION = "airbyte_lib_validation" - METADATA_VALIDATION = "metadata_validation" QA_CHECKS = "qa_checks" UNIT = "unit" - VERSION_FOLLOW_CHECK = "version_follow_check" VERSION_INC_CHECK = "version_inc_check" TEST_ORCHESTRATOR = "test_orchestrator" DEPLOY_ORCHESTRATOR = "deploy_orchestrator" diff --git a/airbyte-ci/connectors/pipelines/pipelines/helpers/execution/run_steps.py b/airbyte-ci/connectors/pipelines/pipelines/helpers/execution/run_steps.py index 845f5d2c38a2..25858476700e 100644 --- a/airbyte-ci/connectors/pipelines/pipelines/helpers/execution/run_steps.py +++ b/airbyte-ci/connectors/pipelines/pipelines/helpers/execution/run_steps.py @@ -208,7 +208,10 @@ def _filter_skipped_steps(steps_to_evaluate: STEP_TREE, skip_steps: List[str], r else: steps_to_run.append(step_to_eval) - + if not steps_to_run: + raise InvalidStepConfiguration( + "No steps were queued to run. You may have skipped all steps, or selected --only on an invalid step." + ) return steps_to_run, results From 2b2f1f03ac6d1b5aa70e28ef7af3315e6f25b3bd Mon Sep 17 00:00:00 2001 From: erohmensing Date: Thu, 16 May 2024 10:00:28 -0500 Subject: [PATCH 2/4] bump version --- airbyte-ci/connectors/pipelines/README.md | 3 ++- airbyte-ci/connectors/pipelines/pyproject.toml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/airbyte-ci/connectors/pipelines/README.md b/airbyte-ci/connectors/pipelines/README.md index 6dba7e43959a..df2965786f2e 100644 --- a/airbyte-ci/connectors/pipelines/README.md +++ b/airbyte-ci/connectors/pipelines/README.md @@ -744,7 +744,8 @@ E.G.: running Poe tasks on the modified internal packages of the current branch: ## Changelog | Version | PR | Description | -| ------- | ---------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------- | +|---------|------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------| +| 4.13.2 | [#38246](https://github.com/airbytehq/airbyte/pull/38246) | Remove invalid connector test step options. | | 4.13.1 | [#38020](https://github.com/airbytehq/airbyte/pull/38020) | Add `auto_merge` as an internal package to test. | | 4.13.0 | [#32715](https://github.com/airbytehq/airbyte/pull/32715) | Tag connector metadata with git info | | 4.12.7 | [#37787](https://github.com/airbytehq/airbyte/pull/37787) | Remove requirements on dockerhub credentials to run QA checks. | diff --git a/airbyte-ci/connectors/pipelines/pyproject.toml b/airbyte-ci/connectors/pipelines/pyproject.toml index 444b4e2c110a..8360acf19696 100644 --- a/airbyte-ci/connectors/pipelines/pyproject.toml +++ b/airbyte-ci/connectors/pipelines/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "pipelines" -version = "4.13.1" +version = "4.13.2" description = "Packaged maintained by the connector operations team to perform CI for connectors' pipelines" authors = ["Airbyte "] From a9db74ed0dc6fedbdd5fe82201b03171eeb7063b Mon Sep 17 00:00:00 2001 From: erohmensing Date: Fri, 17 May 2024 10:46:43 -0500 Subject: [PATCH 3/4] remove exception --- .../pipelines/pipelines/helpers/execution/run_steps.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/airbyte-ci/connectors/pipelines/pipelines/helpers/execution/run_steps.py b/airbyte-ci/connectors/pipelines/pipelines/helpers/execution/run_steps.py index 25858476700e..ee3d51760e5c 100644 --- a/airbyte-ci/connectors/pipelines/pipelines/helpers/execution/run_steps.py +++ b/airbyte-ci/connectors/pipelines/pipelines/helpers/execution/run_steps.py @@ -208,10 +208,6 @@ def _filter_skipped_steps(steps_to_evaluate: STEP_TREE, skip_steps: List[str], r else: steps_to_run.append(step_to_eval) - if not steps_to_run: - raise InvalidStepConfiguration( - "No steps were queued to run. You may have skipped all steps, or selected --only on an invalid step." - ) return steps_to_run, results From 1b7e6345a70dc81edd8a6351a2d254dac7052b85 Mon Sep 17 00:00:00 2001 From: erohmensing Date: Fri, 17 May 2024 10:47:48 -0500 Subject: [PATCH 4/4] format --- .../pipelines/pipelines/helpers/execution/run_steps.py | 1 + 1 file changed, 1 insertion(+) diff --git a/airbyte-ci/connectors/pipelines/pipelines/helpers/execution/run_steps.py b/airbyte-ci/connectors/pipelines/pipelines/helpers/execution/run_steps.py index ee3d51760e5c..845f5d2c38a2 100644 --- a/airbyte-ci/connectors/pipelines/pipelines/helpers/execution/run_steps.py +++ b/airbyte-ci/connectors/pipelines/pipelines/helpers/execution/run_steps.py @@ -208,6 +208,7 @@ def _filter_skipped_steps(steps_to_evaluate: STEP_TREE, skip_steps: List[str], r else: steps_to_run.append(step_to_eval) + return steps_to_run, results