From 7991ced0e90a921ae7982f9e000c5227c296bd0d Mon Sep 17 00:00:00 2001 From: Catherine Fritz <111930712+fivetran-catfritz@users.noreply.github.com> Date: Mon, 11 May 2026 18:17:38 -0500 Subject: [PATCH] Buildkite improvements --- .buildkite/hooks/pre-command | 25 -------- .buildkite/pipeline.yml | 74 ------------------------ .buildkite/scripts/run_models.sh | 25 -------- integration_tests/ci/sample.profiles.yml | 50 ---------------- integration_tests/ci/test_scenarios.yml | 28 +++++++++ integration_tests/dbt_project.yml | 73 ++++++++++++++++++++++- 6 files changed, 99 insertions(+), 176 deletions(-) delete mode 100644 .buildkite/hooks/pre-command delete mode 100644 .buildkite/pipeline.yml delete mode 100644 .buildkite/scripts/run_models.sh delete mode 100644 integration_tests/ci/sample.profiles.yml create mode 100644 integration_tests/ci/test_scenarios.yml diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command deleted file mode 100644 index 81b7b00..0000000 --- a/.buildkite/hooks/pre-command +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -set -e - -# Export secrets for Docker containers. -# Restrict exposing secrets only to the steps that need them -export GCLOUD_SERVICE_KEY=$(gcloud secrets versions access latest --secret="GCLOUD_SERVICE_KEY" --project="dbt-package-testing-363917") -export CI_POSTGRES_DBT_HOST=$(gcloud secrets versions access latest --secret="CI_POSTGRES_DBT_HOST" --project="dbt-package-testing-363917") -export CI_POSTGRES_DBT_USER=$(gcloud secrets versions access latest --secret="CI_POSTGRES_DBT_USER" --project="dbt-package-testing-363917") -export CI_POSTGRES_DBT_PASS=$(gcloud secrets versions access latest --secret="CI_POSTGRES_DBT_PASS" --project="dbt-package-testing-363917") -export CI_POSTGRES_DBT_DBNAME=$(gcloud secrets versions access latest --secret="CI_POSTGRES_DBT_DBNAME" --project="dbt-package-testing-363917") -export CI_REDSHIFT_DBT_DBNAME=$(gcloud secrets versions access latest --secret="CI_REDSHIFT_DBT_DBNAME" --project="dbt-package-testing-363917") -export CI_REDSHIFT_DBT_HOST=$(gcloud secrets versions access latest --secret="CI_REDSHIFT_DBT_HOST" --project="dbt-package-testing-363917") -export CI_REDSHIFT_DBT_PASS=$(gcloud secrets versions access latest --secret="CI_REDSHIFT_DBT_PASS" --project="dbt-package-testing-363917") -export CI_REDSHIFT_DBT_USER=$(gcloud secrets versions access latest --secret="CI_REDSHIFT_DBT_USER" --project="dbt-package-testing-363917") -export CI_SNOWFLAKE_DBT_ACCOUNT=$(gcloud secrets versions access latest --secret="CI_SNOWFLAKE_DBT_ACCOUNT" --project="dbt-package-testing-363917") -export CI_SNOWFLAKE_DBT_DATABASE=$(gcloud secrets versions access latest --secret="CI_SNOWFLAKE_DBT_DATABASE" --project="dbt-package-testing-363917") -export CI_SNOWFLAKE_DBT_PASS=$(gcloud secrets versions access latest --secret="CI_SNOWFLAKE_DBT_PASS" --project="dbt-package-testing-363917") -export CI_SNOWFLAKE_DBT_ROLE=$(gcloud secrets versions access latest --secret="CI_SNOWFLAKE_DBT_ROLE" --project="dbt-package-testing-363917") -export CI_SNOWFLAKE_DBT_USER=$(gcloud secrets versions access latest --secret="CI_SNOWFLAKE_DBT_USER" --project="dbt-package-testing-363917") -export CI_SNOWFLAKE_DBT_WAREHOUSE=$(gcloud secrets versions access latest --secret="CI_SNOWFLAKE_DBT_WAREHOUSE" --project="dbt-package-testing-363917") -export CI_DATABRICKS_DBT_HOST=$(gcloud secrets versions access latest --secret="CI_DATABRICKS_DBT_HOST" --project="dbt-package-testing-363917") -export CI_DATABRICKS_DBT_HTTP_PATH=$(gcloud secrets versions access latest --secret="CI_DATABRICKS_DBT_HTTP_PATH" --project="dbt-package-testing-363917") -export CI_DATABRICKS_DBT_TOKEN=$(gcloud secrets versions access latest --secret="CI_DATABRICKS_DBT_TOKEN" --project="dbt-package-testing-363917") -export CI_DATABRICKS_DBT_CATALOG=$(gcloud secrets versions access latest --secret="CI_DATABRICKS_DBT_CATALOG" --project="dbt-package-testing-363917") \ No newline at end of file diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml deleted file mode 100644 index 2603602..0000000 --- a/.buildkite/pipeline.yml +++ /dev/null @@ -1,74 +0,0 @@ -steps: - - label: ":postgres: Run Tests - Postgres" - key: "run-dbt-postgres" - plugins: - - docker#v3.13.0: - image: "python:3.10.13" - shell: [ "/bin/bash", "-e", "-c" ] - environment: - - "BASH_ENV=/tmp/.bashrc" - - "CI_POSTGRES_DBT_DBNAME" - - "CI_POSTGRES_DBT_HOST" - - "CI_POSTGRES_DBT_PASS" - - "CI_POSTGRES_DBT_USER" - commands: | - bash .buildkite/scripts/run_models.sh postgres - - - label: ":snowflake-db: Run Tests - Snowflake" - key: "run_dbt_snowflake" - plugins: - - docker#v3.13.0: - image: "python:3.10.13" - shell: [ "/bin/bash", "-e", "-c" ] - environment: - - "BASH_ENV=/tmp/.bashrc" - - "CI_SNOWFLAKE_DBT_ACCOUNT" - - "CI_SNOWFLAKE_DBT_DATABASE" - - "CI_SNOWFLAKE_DBT_PASS" - - "CI_SNOWFLAKE_DBT_ROLE" - - "CI_SNOWFLAKE_DBT_USER" - - "CI_SNOWFLAKE_DBT_WAREHOUSE" - commands: | - bash .buildkite/scripts/run_models.sh snowflake - - - label: ":gcloud: Run Tests - BigQuery" - key: "run_dbt_bigquery" - plugins: - - docker#v3.13.0: - image: "python:3.10.13" - shell: [ "/bin/bash", "-e", "-c" ] - environment: - - "BASH_ENV=/tmp/.bashrc" - - "GCLOUD_SERVICE_KEY" - commands: | - bash .buildkite/scripts/run_models.sh bigquery - - - label: ":amazon-redshift: Run Tests - Redshift" - key: "run_dbt_redshift" - plugins: - - docker#v3.13.0: - image: "python:3.10.13" - shell: [ "/bin/bash", "-e", "-c" ] - environment: - - "BASH_ENV=/tmp/.bashrc" - - "CI_REDSHIFT_DBT_DBNAME" - - "CI_REDSHIFT_DBT_HOST" - - "CI_REDSHIFT_DBT_PASS" - - "CI_REDSHIFT_DBT_USER" - commands: | - bash .buildkite/scripts/run_models.sh redshift - - - label: ":databricks: Run Tests - Databricks" - key: "run_dbt_databricks" - plugins: - - docker#v3.13.0: - image: "python:3.10.13" - shell: [ "/bin/bash", "-e", "-c" ] - environment: - - "BASH_ENV=/tmp/.bashrc" - - "CI_DATABRICKS_DBT_HOST" - - "CI_DATABRICKS_DBT_HTTP_PATH" - - "CI_DATABRICKS_DBT_TOKEN" - - "CI_DATABRICKS_DBT_CATALOG" - commands: | - bash .buildkite/scripts/run_models.sh databricks \ No newline at end of file diff --git a/.buildkite/scripts/run_models.sh b/.buildkite/scripts/run_models.sh deleted file mode 100644 index 28c6aac..0000000 --- a/.buildkite/scripts/run_models.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -set -euo pipefail - -apt-get update -apt-get install libsasl2-dev - -python3 -m venv venv -. venv/bin/activate -pip install --upgrade pip setuptools -pip install -r integration_tests/requirements.txt -mkdir -p ~/.dbt -cp integration_tests/ci/sample.profiles.yml ~/.dbt/profiles.yml - -db=$1 -echo `pwd` -cd integration_tests -dbt deps -dbt seed --target "$db" --full-refresh -dbt source freshness --target "$db" || echo "...Only verifying freshness runs..." -dbt run --target "$db" --full-refresh -dbt test --target "$db" -dbt run --vars '{apple_store__using_subscriptions: true, google_play__using_earnings: true, google_play__using_subscriptions: true}' --target "$db" --full-refresh -dbt test --vars '{apple_store__using_subscriptions: true, google_play__using_earnings: true, google_play__using_subscriptions: true}' --target "$db" -dbt run-operation fivetran_utils.drop_schemas_automation --target "$db" \ No newline at end of file diff --git a/integration_tests/ci/sample.profiles.yml b/integration_tests/ci/sample.profiles.yml deleted file mode 100644 index cda89da..0000000 --- a/integration_tests/ci/sample.profiles.yml +++ /dev/null @@ -1,50 +0,0 @@ - -# HEY! This file is used in the dbt package integrations tests with Buildkite. -# You should __NEVER__ check credentials into version control. Thanks for reading :) - -integration_tests: - target: redshift - outputs: - redshift: - type: redshift - host: "{{ env_var('CI_REDSHIFT_DBT_HOST') }}" - user: "{{ env_var('CI_REDSHIFT_DBT_USER') }}" - pass: "{{ env_var('CI_REDSHIFT_DBT_PASS') }}" - dbname: "{{ env_var('CI_REDSHIFT_DBT_DBNAME') }}" - port: 5439 - schema: app_reporting_integrations_test_9 - threads: 8 - bigquery: - type: bigquery - method: service-account-json - project: 'dbt-package-testing' - schema: app_reporting_integrations_test_9 - threads: 8 - keyfile_json: "{{ env_var('GCLOUD_SERVICE_KEY') | as_native }}" - snowflake: - type: snowflake - account: "{{ env_var('CI_SNOWFLAKE_DBT_ACCOUNT') }}" - user: "{{ env_var('CI_SNOWFLAKE_DBT_USER') }}" - password: "{{ env_var('CI_SNOWFLAKE_DBT_PASS') }}" - role: "{{ env_var('CI_SNOWFLAKE_DBT_ROLE') }}" - database: "{{ env_var('CI_SNOWFLAKE_DBT_DATABASE') }}" - warehouse: "{{ env_var('CI_SNOWFLAKE_DBT_WAREHOUSE') }}" - schema: app_reporting_integrations_test_9 - threads: 8 - postgres: - type: postgres - host: "{{ env_var('CI_POSTGRES_DBT_HOST') }}" - user: "{{ env_var('CI_POSTGRES_DBT_USER') }}" - pass: "{{ env_var('CI_POSTGRES_DBT_PASS') }}" - dbname: "{{ env_var('CI_POSTGRES_DBT_DBNAME') }}" - port: 5432 - schema: app_reporting_integrations_test_9 - threads: 8 - databricks: - catalog: "{{ env_var('CI_DATABRICKS_DBT_CATALOG') }}" - host: "{{ env_var('CI_DATABRICKS_DBT_HOST') }}" - http_path: "{{ env_var('CI_DATABRICKS_DBT_HTTP_PATH') }}" - schema: app_reporting_integrations_test_9 - threads: 8 - token: "{{ env_var('CI_DATABRICKS_DBT_TOKEN') }}" - type: databricks \ No newline at end of file diff --git a/integration_tests/ci/test_scenarios.yml b/integration_tests/ci/test_scenarios.yml new file mode 100644 index 0000000..c8bce5f --- /dev/null +++ b/integration_tests/ci/test_scenarios.yml @@ -0,0 +1,28 @@ +# Test scenarios configuration for app_reporting dbt package +# This file defines the different test scenarios to run during CI/CD + +# Required: The dbt variable name that controls which schema to use for testing +schema_variable_name: "app_reporting_schema" + +# Test scenarios - FIRST MUST BE DEFAULT WITH NO VARS +dbt_adapter_versions: + snowflake: ">=1.3.0,<2.0.0" + bigquery: ">=1.3.0,<2.0.0" + postgres: ">=1.3.0,<2.0.0" + redshift: ">=1.3.0,<2.0.0" + databricks: ">=1.6.0,<2.0.0" + +test_scenarios: + + # REQUIRED: Default scenario with no custom variables + - name: "Default" + vars: {} + include_incremental: false + + # Additional scenario with subscriptions and earnings enabled + - name: "subscriptions and earnings enabled" + vars: + apple_store__using_subscriptions: true + google_play__using_earnings: true + google_play__using_subscriptions: true + include_incremental: false \ No newline at end of file diff --git a/integration_tests/dbt_project.yml b/integration_tests/dbt_project.yml index e3315b9..27e2bf0 100644 --- a/integration_tests/dbt_project.yml +++ b/integration_tests/dbt_project.yml @@ -58,14 +58,83 @@ seeds: show: False app_reporting_integration_tests: +quote_columns: "{{ true if target.type == 'redshift' else false }}" - +column_types: - _fivetran_synced: timestamp + app_crash_daily: + +column_types: + _fivetran_synced: timestamp + app_session_standard_daily: + +column_types: + _fivetran_synced: timestamp + app_store_app: + +column_types: + _fivetran_synced: timestamp + app_store_discovery_and_engagement_standard_daily: + +column_types: + _fivetran_synced: timestamp + app_store_download_standard_daily: + +column_types: + _fivetran_synced: timestamp + app_store_installation_and_deletion_standard_daily: + +column_types: + _fivetran_synced: timestamp + earnings: + +column_types: + _fivetran_synced: timestamp + financial_stats_subscriptions_country: + +column_types: + _fivetran_synced: timestamp + sales_subscription_event_summary: + +column_types: + _fivetran_synced: timestamp + sales_subscription_summary: + +column_types: + _fivetran_synced: timestamp + stats_crashes_app_version: + +column_types: + _fivetran_synced: timestamp + stats_crashes_os_version: + +column_types: + _fivetran_synced: timestamp + stats_crashes_overview: + +column_types: + _fivetran_synced: timestamp + stats_installs_app_version: + +column_types: + _fivetran_synced: timestamp + stats_installs_country: + +column_types: + _fivetran_synced: timestamp + stats_installs_device: + +column_types: + _fivetran_synced: timestamp + stats_installs_os_version: + +column_types: + _fivetran_synced: timestamp stats_installs_overview: +column_types: + _fivetran_synced: timestamp active_device_installs: "{{ 'int64' if target.type == 'bigquery' else 'bigint' }}" stats_ratings_app_version: +column_types: + _fivetran_synced: timestamp app_version_code: "{{ 'int64' if target.type == 'bigquery' else 'bigint' }}" + stats_ratings_country: + +column_types: + _fivetran_synced: timestamp + stats_ratings_device: + +column_types: + _fivetran_synced: timestamp + stats_ratings_os_version: + +column_types: + _fivetran_synced: timestamp + stats_ratings_overview: + +column_types: + _fivetran_synced: timestamp + stats_store_performance_country: + +column_types: + _fivetran_synced: timestamp + stats_store_performance_traffic_source: + +column_types: + _fivetran_synced: timestamp flags: send_anonymous_usage_stats: False use_colors: True \ No newline at end of file