From e6d412eae3349a78eca4f1632536cace94e69c53 Mon Sep 17 00:00:00 2001 From: Davin Chia Date: Wed, 21 Apr 2021 12:15:41 +0800 Subject: [PATCH] Release 0.21.0-alpha. (#3001) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Remove no longer needed test setup. * Bump version: 0.20.0-alpha → 0.21.0-alpha --- .bumpversion.cfg | 2 +- .env | 2 +- .../main/java/io/airbyte/migrate/Migrations.java | 4 +++- .../airbyte/test/acceptance/AcceptanceTests.java | 15 --------------- docs/tutorials/upgrading-airbyte.md | 2 +- tools/bin/acceptance_test.sh | 5 ----- 6 files changed, 6 insertions(+), 24 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 5ff43a9b16aa..236d51ba89d8 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.20.0-alpha +current_version = 0.21.0-alpha commit = True tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\-[a-z]+)? diff --git a/.env b/.env index 827fecef50c5..5eb954fa1dd8 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -VERSION=0.20.0-alpha +VERSION=0.21.0-alpha DATABASE_USER=docker DATABASE_PASSWORD=docker DATABASE_DB=airbyte diff --git a/airbyte-migration/src/main/java/io/airbyte/migrate/Migrations.java b/airbyte-migration/src/main/java/io/airbyte/migrate/Migrations.java index c3c0177525fb..2102fde29951 100644 --- a/airbyte-migration/src/main/java/io/airbyte/migrate/Migrations.java +++ b/airbyte-migration/src/main/java/io/airbyte/migrate/Migrations.java @@ -43,6 +43,7 @@ public class Migrations { private static final Migration MIGRATION_V_0_18_0 = new MigrationV0_18_0(MIGRATION_V_0_17_0); private static final Migration MIGRATION_V_0_19_0 = new NoOpMigration(MIGRATION_V_0_18_0, "0.19.0-alpha"); private static final Migration MIGRATION_V_0_20_0 = new MigrationV0_20_0(MIGRATION_V_0_19_0); + private static final Migration MIGRATION_V_0_21_0 = new NoOpMigration(MIGRATION_V_0_20_0, "0.21.0-alpha"); // all migrations must be added to the list in the order that they should be applied. public static final List MIGRATIONS = ImmutableList.of( @@ -53,6 +54,7 @@ public class Migrations { MIGRATION_V_0_17_0, MIGRATION_V_0_18_0, MIGRATION_V_0_19_0, - MIGRATION_V_0_20_0); + MIGRATION_V_0_20_0, + MIGRATION_V_0_21_0); } diff --git a/airbyte-tests/src/acceptanceTests/java/io/airbyte/test/acceptance/AcceptanceTests.java b/airbyte-tests/src/acceptanceTests/java/io/airbyte/test/acceptance/AcceptanceTests.java index a396acfa01ad..2f2c7a6ced6b 100644 --- a/airbyte-tests/src/acceptanceTests/java/io/airbyte/test/acceptance/AcceptanceTests.java +++ b/airbyte-tests/src/acceptanceTests/java/io/airbyte/test/acceptance/AcceptanceTests.java @@ -56,7 +56,6 @@ import io.airbyte.api.client.model.DestinationCreate; import io.airbyte.api.client.model.DestinationDefinitionIdRequestBody; import io.airbyte.api.client.model.DestinationDefinitionSpecificationRead; -import io.airbyte.api.client.model.DestinationDefinitionUpdate; import io.airbyte.api.client.model.DestinationIdRequestBody; import io.airbyte.api.client.model.DestinationRead; import io.airbyte.api.client.model.DestinationSyncMode; @@ -69,7 +68,6 @@ import io.airbyte.api.client.model.SourceCreate; import io.airbyte.api.client.model.SourceDefinitionIdRequestBody; import io.airbyte.api.client.model.SourceDefinitionSpecificationRead; -import io.airbyte.api.client.model.SourceDefinitionUpdate; import io.airbyte.api.client.model.SourceIdRequestBody; import io.airbyte.api.client.model.SourceRead; import io.airbyte.api.client.model.SyncMode; @@ -162,19 +160,6 @@ public void setup() throws ApiException { // seed database. PostgreSQLContainerHelper.runSqlScript(MountableFile.forClasspathResource("postgres_init.sql"), sourcePsql); - - // TODO(davin): Temporary use the dev image for schema tests. This will be removed once the version - // is released. The namespace change requires source, destination and normalization to all use the - // namespace field. - final var updateSrc = new SourceDefinitionUpdate() - .sourceDefinitionId(UUID.fromString("decd338e-5647-4c0b-adf4-da0e75f5a750")) // Postgres - .dockerImageTag("dev"); - apiClient.getSourceDefinitionApi().updateSourceDefinition(updateSrc); - - final var updateDst = new DestinationDefinitionUpdate() - .destinationDefinitionId(UUID.fromString("25c5221d-dce2-4163-ade9-739ef790f503")) // Postgres - .dockerImageTag("dev"); - apiClient.getDestinationDefinitionApi().updateDestinationDefinition(updateDst); } @AfterEach diff --git a/docs/tutorials/upgrading-airbyte.md b/docs/tutorials/upgrading-airbyte.md index 3efa067ff89b..06d399e94707 100644 --- a/docs/tutorials/upgrading-airbyte.md +++ b/docs/tutorials/upgrading-airbyte.md @@ -39,7 +39,7 @@ If you inadvertently upgrade to a version of Airbyte that is not compatible with Here's an example of what might look like with the values filled in. It assumes that the downloaded `airbyte_archive.tar.gz` is in `/tmp`. ```bash -docker run --rm -v /tmp:/config airbyte/migration:0.20.0-alpha --\ +docker run --rm -v /tmp:/config airbyte/migration:0.21.0-alpha --\ --input /config/airbyte_archive.tar.gz\ --output /config/airbyte_archive_migrated.tar.gz ``` diff --git a/tools/bin/acceptance_test.sh b/tools/bin/acceptance_test.sh index f109457375a7..8ed14f93c781 100755 --- a/tools/bin/acceptance_test.sh +++ b/tools/bin/acceptance_test.sh @@ -21,10 +21,5 @@ trap "echo 'docker-compose logs:' && docker-compose logs -t --tail 150 && docker echo "Waiting for services to begin" sleep 10 # TODO need a better way to wait -# This is temporary -echo "Build the necessary Postgres images" -./gradlew :airbyte-integrations:connectors:source-postgres:build -./gradlew :airbyte-integrations:connectors:destination-postgres:build - echo "Running e2e tests via gradle" ./gradlew --no-daemon :airbyte-tests:acceptanceTests --rerun-tasks --scan