diff --git a/.github/workflows/test-command.yml b/.github/workflows/test-command.yml index 43d120122626..11f2214d9b83 100644 --- a/.github/workflows/test-command.yml +++ b/.github/workflows/test-command.yml @@ -152,8 +152,7 @@ jobs: retention-days: 3 - name: Run QA checks for ${{ github.event.inputs.connector }} id: qa_checks - # TODO: Disabled for on master until #22127 resolved - if: contains(github.ref, 'feat-qa-engine') + if: always() run: | run-qa-checks ${{ github.event.inputs.connector }} - name: Report Status diff --git a/tools/ci_connector_ops/ci_connector_ops/utils.py b/tools/ci_connector_ops/ci_connector_ops/utils.py index c2b367ce27ac..473baf2784e8 100644 --- a/tools/ci_connector_ops/ci_connector_ops/utils.py +++ b/tools/ci_connector_ops/ci_connector_ops/utils.py @@ -2,21 +2,15 @@ # Copyright (c) 2022 Airbyte, Inc., all rights reserved. # - from dataclasses import dataclass import logging from pathlib import Path from typing import Dict, Optional, Set, Tuple, List -import os import git import requests import yaml -# ensure we are at the repository root -os.chdir(os.path.dirname(os.path.abspath(__file__))) -os.chdir('../../..') - -AIRBYTE_REPO = git.Repo(".") +AIRBYTE_REPO = git.Repo(search_parent_directories=True) DIFFED_BRANCH = "origin/master" OSS_CATALOG_URL = "https://storage.googleapis.com/prod-airbyte-cloud-connector-metadata-service/oss_catalog.json" CONNECTOR_PATH_PREFIX = "airbyte-integrations/connectors" @@ -27,15 +21,12 @@ DESTINATION_DEFINITIONS_FILE_PATH = "airbyte-config/init/src/main/resources/seed/destination_definitions.yaml" DEFINITIONS_FILE_PATH = {"source": SOURCE_DEFINITIONS_FILE_PATH, "destination": DESTINATION_DEFINITIONS_FILE_PATH} - def download_catalog(catalog_url): response = requests.get(catalog_url) return response.json() - OSS_CATALOG = download_catalog(OSS_CATALOG_URL) - class ConnectorInvalidNameError(Exception): pass @@ -49,7 +40,6 @@ def read_definitions(definitions_file_path: str) -> Dict: def get_connector_name_from_path(path): return path.split("/")[2] - def get_changed_acceptance_test_config(diff_regex: Optional[str]=None) -> Set[str]: """Retrieve a list of connector names for which the acceptance_test_config file was changed in the current branch (compared to master). diff --git a/tools/status/report.sh b/tools/status/report.sh index b14f1194038e..5af90f378f88 100755 --- a/tools/status/report.sh +++ b/tools/status/report.sh @@ -15,10 +15,7 @@ CONNECTOR=$1 REPOSITORY=$2 RUN_ID=$3 TEST_OUTCOME=$4 - -# TODO: Disabled for on master until #22127 resolved -# QA_CHECKS_OUTCOME=$5 -QA_CHECKS_OUTCOME=success +QA_CHECKS_OUTCOME=$5 # Ensure connector is prefixed with connectors/ # TODO (ben): In the future we should just hard error if this is not the case