Skip to content

Commit 2962577

Browse files
aaronsteersdevin-ai-integration[bot]github-actions[bot]
authored
chore: cleanup remaining airbyte-ci references in docs, poe-tasks, devcontainer, and misc files (#75953)
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 25897cb commit 2962577

File tree

17 files changed

+40
-90
lines changed

17 files changed

+40
-90
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"jdkDistro": "open",
1111
"gradleVersion": "7.5.1"
1212
},
13-
// Python needed for `airbyte-ci` CLI
1413
"ghcr.io/devcontainers/features/python:1": {
1514
"installGradle": true,
1615
"version": "3.10",
@@ -57,8 +56,7 @@
5756
},
5857
// Mark the root directory as 'safe' for git.
5958
"initializeCommand": "git config --add safe.directory /workspaces/airbyte",
60-
// Install Gradle, `airbyte-ci` CLI, and Dagger (installed via airbyte-ci --help)
61-
"postCreateCommand": "make tools.airbyte-ci-dev.install",
59+
"postCreateCommand": "uv tool install airbyte-cdk",
6260
"containerEnv": {
6361
// Deterministic Poetry virtual env location: `./.venv`
6462
"POETRY_VIRTUALENVS_IN_PROJECT": "true"

.devcontainer/java-connectors-generic/devcontainer.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"jdkDistro": "open",
1212
"gradleVersion": "7.5.1"
1313
},
14-
// Python needed for `airbyte-ci` CLI
1514
"ghcr.io/devcontainers/features/python:1": {
1615
"installGradle": true,
1716
"version": "3.10",
@@ -42,8 +41,8 @@
4241
// Mark the root directory as 'safe' for git.
4342
"initializeCommand": "git config --add safe.directory /workspaces/airbyte",
4443

45-
// Install `airbyte-ci` and Gradle
46-
"postCreateCommand": "make tools.airbyte-ci-dev.install && ./gradlew --version",
44+
// Install dependencies and warm up Gradle
45+
"postCreateCommand": "uv tool install airbyte-cdk && ./gradlew --version",
4746

4847
"containerEnv": {
4948
// Deterministic Poetry virtual env location: `./.venv`

.devcontainer/python-connectors-generic/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
// Mark the root directory as 'safe' for git.
5050
"initializeCommand": "git config --add safe.directory /workspaces/airbyte",
5151

52-
// Setup airbyte-ci on the container:
53-
"postCreateCommand": "make tools.airbyte-ci-dev.install",
52+
// Install the Airbyte CDK:
53+
"postCreateCommand": "uv tool install airbyte-cdk",
5454

5555
"containerEnv": {
5656
// Deterministic Poetry virtual env location: `./.venv`

airbyte-integrations/connectors/destination-mysql/src/test-integration/kotlin/io/airbyte/integrations/destination/mysql/typing_deduping/AbstractMysqlTypingDedupingTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ abstract class AbstractMysqlTypingDedupingTest : JdbcTypingDedupingTest(SQLDiale
9494
private lateinit var containerizedConfig: ObjectNode
9595
/**
9696
* The config with host/port accessible from the host's network. (technically, this is still
97-
* within the airbyte-ci container, but `containerizedConfig` is intended for containers in
98-
* the docker-in-docker matryoshka doll)
97+
* within the CI container, but `containerizedConfig` is intended for containers in the
98+
* docker-in-docker matryoshka doll)
9999
*/
100100
private lateinit var bareMetalConfig: ObjectNode
101101

airbyte-integrations/connectors/destination-mysql/src/testFixtures/kotlin/io/airbyte/integrations/destination/mysql/MysqlTestDatabase.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class MysqlTestDatabase(container: MySQLContainer<*>) :
3131

3232
override fun inContainerBootstrapCmd(): Stream<Stream<String>> {
3333
// Besides setting up user and privileges, we also need to create a soft link otherwise
34-
// airbyte-ci on github runner would not be able to connect to DB, because the sock file
34+
// CI on github runner would not be able to connect to DB, because the sock file
3535
// does not
3636
// exist.
3737
return Stream.of(

airbyte-integrations/connectors/source-microsoft-lists/metadata.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ data:
2727
releaseStage: alpha
2828
supportLevel: community
2929
connectorTestSuitesOptions:
30-
# no-op for now but will get enabled when the capability is added to airbyte-ci
30+
# no-op for now but will get enabled when the capability is added to CI
3131
- suite: integrationTests
3232
testSecrets:
3333
- name: SECRET_SOURCE-MICROSOFT-LISTS_CREDS

buildSrc/src/main/groovy/airbyte-bulk-connector.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,7 @@ class AirbyteBulkConnectorPlugin implements Plugin<Project> {
203203
outputs.upToDateWhen { false }
204204
}
205205

206-
// For historical reasons (i.e. airbyte-ci), this task is called integrationTestJava.
207-
// airbyte-ci only wants to run a task with exactly that name.
206+
// For historical reasons, this task is called integrationTestJava.
208207
// There's intentionally no equivalent to run integrationTestNonDocker + integrationTestLegacy.
209208
// It's an actual Test task (rather than just depending on two sub-tasks integrationTestDocker + integrationTestLegacy)
210209
// so that gradle args (e.g. `--tests`) work as expected.

docs/community/contributing-to-airbyte/resources/qa-checks.md

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
# Airbyte connectors QA checks
22

33
<!--
4-
THIS FILE IS GENERATED BY THE CONNECTORS-QA CLI. DO NOT EDIT THIS FILE MANUALLY.
5-
IF YOU NEED TO EDIT IT, EDIT THE TEMPLATE: https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/connectors_qa/src/connectors_qa/templates/qa_checks.md.j2
6-
AND REGENERATE THE DOCS BY RUNNING `connectors-qa generate-documentation docs/community/contributing-to-airbyte/resources/qa-checks.md` FROM THE AIRBYTE REPO ROOT
4+
THIS FILE IS GENERATED BY THE CONNECTORS-QA CLI. DO NOT EDIT THIS FILE MANUALLY.
75
-->
86

97
This document is listing all the static-analysis checks that are performed on the Airbyte connectors.
@@ -54,7 +52,7 @@ _Applies to connector with any support level_
5452
_Applies to connector with 300 internal support level_
5553
_Applies to connector with any Airbyte usage level_
5654

57-
The user facing connector documentation should follow the guidelines defined in the [standard template](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/connectors_qa/src/connectors_qa/checks/documentation/templates/template.md.j2).
55+
The user facing connector documentation should follow the guidelines defined in the standard template.
5856

5957
This check expects the following order of headers in the documentation:
6058

@@ -143,7 +141,7 @@ _Applies to connector with any support level_
143141
_Applies to connector with 300 internal support level_
144142
_Applies to connector with any Airbyte usage level_
145143

146-
The user facing connector documentation should follow the guidelines defined in the [standard template](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/connectors_qa/src/connectors_qa/checks/documentation/templates/template.md.j2).
144+
The user facing connector documentation should follow the guidelines defined in the standard template.
147145

148146
Check verifies that CONNECTOR_NAME_FROM_METADATA header section content follows standard template:
149147

@@ -166,7 +164,7 @@ _Applies to connector with any support level_
166164
_Applies to connector with 300 internal support level_
167165
_Applies to connector with any Airbyte usage level_
168166

169-
The user facing connector documentation should follow the guidelines defined in the [standard template](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/connectors_qa/src/connectors_qa/checks/documentation/templates/template.md.j2).
167+
The user facing connector documentation should follow the guidelines defined in the standard template.
170168

171169
Check verifies that For Airbyte Cloud: header section content follows standard template:
172170

@@ -187,7 +185,7 @@ _Applies to connector with any support level_
187185
_Applies to connector with 300 internal support level_
188186
_Applies to connector with any Airbyte usage level_
189187

190-
The user facing connector documentation should follow the guidelines defined in the [standard template](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/connectors_qa/src/connectors_qa/checks/documentation/templates/template.md.j2).
188+
The user facing connector documentation should follow the guidelines defined in the standard template.
191189

192190
Check verifies that For Airbyte Open Source: header section content follows standard template:
193191

@@ -205,7 +203,7 @@ _Applies to connector with any support level_
205203
_Applies to connector with 300 internal support level_
206204
_Applies to connector with any Airbyte usage level_
207205

208-
The user facing connector documentation should follow the guidelines defined in the [standard template](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/connectors_qa/src/connectors_qa/checks/documentation/templates/template.md.j2).
206+
The user facing connector documentation should follow the guidelines defined in the standard template.
209207

210208
Check verifies that Supported sync modes header section content follows standard template:
211209

@@ -224,7 +222,7 @@ _Applies to connector with any support level_
224222
_Applies to connector with 300 internal support level_
225223
_Applies to connector with any Airbyte usage level_
226224

227-
The user facing connector documentation should follow the guidelines defined in the [standard template](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/connectors_qa/src/connectors_qa/checks/documentation/templates/template.md.j2).
225+
The user facing connector documentation should follow the guidelines defined in the standard template.
228226

229227
Check verifies that Tutorials header section content follows standard template:
230228

@@ -243,7 +241,7 @@ _Applies to connector with any support level_
243241
_Applies to connector with 300 internal support level_
244242
_Applies to connector with any Airbyte usage level_
245243

246-
The user facing connector documentation should follow the guidelines defined in the [standard template](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/connectors_qa/src/connectors_qa/checks/documentation/templates/template.md.j2).
244+
The user facing connector documentation should follow the guidelines defined in the standard template.
247245

248246
Check verifies that Changelog header section content follows standard template:
249247

docs/platform/connector-development/cdk-python/migration-to-base-image.md

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ N.B: This guide currently only applies to Python CDK connectors.
77

88
## Prerequisite
99

10-
[Install the airbyte-ci tool](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/pipelines/README.md#L1)
10+
Ensure you have the [Airbyte CDK](https://pypi.org/project/airbyte-cdk/) installed.
1111

1212
## Definition of a successful migration
1313

@@ -36,7 +36,7 @@ In other word, using the image digest (sha256), we have the guarantee that a bui
3636
3737
### What if my connector needs specific system dependencies?
3838
39-
Declaring the base image in the metadata.yaml file makes the Dockerfile obselete and the connector will be built using our internal build process declared [here](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/build_image/steps/python_connectors.py#L55).
39+
Declaring the base image in the metadata.yaml file makes the Dockerfile obsolete and the connector will be built using our internal build process.
4040
If your connector has specific system dependencies, or has to set environment variables, we have a pre/post build hook framework for that.
4141
4242
You can customize our build process by adding a `build_customization.py` module to your connector.
@@ -63,16 +63,6 @@ async def post_connector_install(connector_container: Container) -> Container:
6363
return await connector_container.with_env_variable("MY_POST_BUILD_ENV_VAR", "my_post_build_env_var_value")
6464
```
6565

66-
### Listing migrated / non migrated connectors:
66+
### Listing migrated / non migrated connectors
6767

68-
To list all migrated certified connectors you can ran:
69-
70-
```bash
71-
airbyte-ci connectors --support-level=certified --metadata-query="data.connectorBuildOptions.baseImage is not None" list
72-
```
73-
74-
To list all non migrated certified connectors you can ran:
75-
76-
```bash
77-
airbyte-ci connectors --metadata-query="data.supportLevel == 'certified' and 'connectorBuildOptions' not in data.keys()" list
78-
```
68+
You can check connector metadata files to see which connectors have migrated to the base image by looking for the `data.connectorBuildOptions.baseImage` key in their `metadata.yaml` files.

docs/platform/connector-development/connector-metadata-file.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,9 @@ To enable a test suite, add the suite name to the `connectorTestSuitesOptions` l
221221
alias: airbyte-connector-testing-secret-store
222222
```
223223

224-
##### Default paths and conventions
225-
226-
The [`airbyte-ci`](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/pipelines/README.md) tool will automatically locate specific test types based on established conventions and will automatically store secret files (when needed) in the established secrets directory - which should be already excluded from accidental git commits.
224+
##### Default paths and conventions
225+
226+
The CI pipeline will automatically locate specific test types based on established conventions and will automatically store secret files (when needed) in the established secrets directory - which should be already excluded from accidental git commits.
227227

228228
**Python connectors**
229229
Tests are discovered by Pytest and are expected to be located in:
@@ -232,7 +232,7 @@ Tests are discovered by Pytest and are expected to be located in:
232232

233233
**Java connectors**
234234
No specific directory is determined. Which test will run is determined by the Gradle configuration of the connector.
235-
`airbyt-ci` runs the `test` Gradle task for the `unitTests` suite and the `integrationTest` Gradle task for the `integrationTests` suite.
235+
CI runs the `test` Gradle task for the `unitTests` suite and the `integrationTest` Gradle task for the `integrationTests` suite.
236236

237237
**Acceptance tests**
238238

0 commit comments

Comments
 (0)