Merge branch 'main' of github.com:datacoves/datacoves_training into f…

…eature/JANEWHITAKERORRUM
datacoves · Nov 21, 2024 · 22c88bd · 22c88bd
2 parents 377b4a3 + a924a9c
commit 22c88bd
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 7 deletions.
diff --git a/.github/workflows/push-to-main.yml b/.github/workflows/push-to-main.yml
@@ -4,6 +4,7 @@ on:  # yamllint disable-line rule:truthy
   pull_request:
     types:
       - closed
+  push:
     branches:
       - main
     paths:
@@ -30,7 +31,7 @@ jobs:
   # Perform the deployment to Prod
   build:
     # Need to make sure that when the PR was closed, it was actually merged.
-    if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'main'
+    # if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'main'
 
     name: Deployment Script
     runs-on: ubuntu-latest

diff --git a/orchestrate/dags/sample_dag.py b/orchestrate/dags/sample_dag.py
@@ -8,17 +8,20 @@
     default_args={
         "start_date": datetime.datetime(2023, 1, 1, 0, 0),
         "owner": "Mayra Pena",
-        "email": "mayra@datacoves.com",
+        "email": "mayra@example.com",
         "email_on_failure": True,
+        "retries": 3,
+
     },
     description="Daily dbt run",
-    schedule_interval="0 12 * * *",
+    schedule="0 12 * * *",
     tags=["version_1"],
     catchup=False,
+
 )
 def sample_dag():
     run_dbt = DatacovesDbtOperator(
-        task_id="run_dbt", bash_command="dbt debug"
+        task_id="run_dbt", bash_command="dbt run - s country_codes"
     )
 
 

diff --git a/orchestrate/dags_yml_definitions/sample_dag.yml b/orchestrate/dags_yml_definitions/sample_dag.yml
@@ -1,5 +1,5 @@
 description: "Daily dbt run"
-schedule_interval: "0 12 * * *"
+schedule: "0 12 * * *"
 tags:
   - version_1
 default_args:
@@ -8,6 +8,7 @@ default_args:
   # Replace with the email of the recipient for failures
   email: [email protected]
   email_on_failure: true
+  retires: 3
 catchup: false
 
 nodes:

diff --git a/transform/.dbt_coves/templates/source_props.yml b/transform/.dbt_coves/templates/source_props.yml
@@ -4,6 +4,8 @@ sources:
   - name: {{ relation.schema }}
 {%- if source_database %}
     database: {{ source_database }}
+    tags:
+      - daily_run_airbyte
 {%- endif %}
     tables:
       - name: {{ relation.name }}

diff --git a/transform/.dbt_coves/templates/staging_model_props.yml b/transform/.dbt_coves/templates/staging_model_props.yml
@@ -2,7 +2,7 @@ version: 2
 
 models:
   - name: stg_{{relation.schema | lower }}_{{model | lower }}
-    description: 'TESTING'
+    description: ''
     columns:
 {%- for cols in nested.values() %}
   {%- for col in cols %}

diff --git a/transform/models/L1_staging/country_data/_country_data.yml b/transform/models/L1_staging/country_data/_country_data.yml
@@ -7,4 +7,4 @@ sources:
       - daily_run_airbyte
     tables:
       - name: COUNTRY_POPULATIONS
-        description: 'A country populations table.'
+        description: 'Raw population information from Github Datasets repository..'