set composer bucket env in workflow

navikt · Oct 31, 2023 · 87c07d7 · 87c07d7
1 parent b1a879b
commit 87c07d7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -72,7 +72,7 @@ jobs:
 
           dataverk_airflow_tag=$(gcloud artifacts docker images list "$DATAVERK_AIRFLOW_IMAGE" --include-tags --sort-by=~Update_Time --limit=1 --format=json | jq -rc '.[0].tags')
           echo "KNADA_AIRFLOW_OPERATOR_IMAGE=ghcr.io/navikt/knada-images/dataverk-airflow:$dataverk_airflow_tag" >> $GITHUB_ENV
-      - name: Run tests
+      - name: Run tests Knada
         env:
           AIRFLOW_CONN_SQLITE_DEFAULT: sqlite://?mode=ro
           KNADA_TEAM_SECRET: secret
@@ -83,6 +83,16 @@ jobs:
         run: |
           airflow dags reserialize
           airflow dags test DataverkAirflowKnada
+      - name: Run tests Composer
+        env:
+          AIRFLOW_CONN_SQLITE_DEFAULT: sqlite://?mode=ro
+          KNADA_TEAM_SECRET: secret
+          NAMESPACE: default
+          K8S_IMAGE_PULL_SECRETS: ghcr-creds
+          MARKEDSPLASSEN_HOST: data.ekstern.dev.nav.no
+          INTEGRATION_TEST: "true"
+          GCS_BUCKET: "dataverk-airflow-tests"
+        run: |
           airflow dags test DataverkAirflowComposer
       - name: Verify successful dag tests
         run: |

diff --git a/tests-integration/composer.py b/tests-integration/composer.py
@@ -5,9 +5,6 @@
 from airflow.models import Variable
 from dataverk_airflow import python_operator, notebook_operator, quarto_operator
 
-# Env variable for GCP bucket is automatically set for composer instances
-# For the test we must set it manually
-os.environ["GCS_BUCKET"] = "dataverk-airflow-tests"
 
 with DAG('DataverkAirflowComposer', start_date=datetime(2023, 2, 15), schedule=None) as dag:
     py_op = python_operator(