Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions base-images/airflow/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.cern.ch/docker.io/apache/airflow:slim-3.1.8-python3.12 AS base
FROM registry.cern.ch/docker.io/apache/airflow:slim-3.1.8-python3.12 AS dev
USER root
RUN apt-get update && apt-get install -y \
build-essential \
Expand All @@ -25,8 +25,5 @@ RUN pip install --no-cache-dir -r requirements.txt
RUN pip install --no-cache-dir -r requirements-test.txt
RUN rm requirements.txt requirements-test.txt requirements-airflow.txt constraints.txt

FROM base AS dev
COPY base-images/airflow/plugins/ /opt/airflow/plugins/

FROM dev AS prod
COPY dags/ /opt/airflow/dags/
44 changes: 0 additions & 44 deletions base-images/airflow/plugins/global_dag_logger.py

This file was deleted.

2 changes: 1 addition & 1 deletion docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
---
x-airflow-common: &airflow-common
build:
target: ${BUILD_TARGET:-base}
target: ${BUILD_TARGET:-dev}
dockerfile: base-images/airflow/Dockerfile
pull_policy: never
environment: &airflow-common-env
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/oup/test_oup_pull_ftp.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def dag():

def test_dag_loaded(dag):
assert dag is not None
assert len(dag.tasks) == 4
assert len(dag.tasks) == 3


def test_dag_run(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ def springer_data_files_in_s3():

def test_dag_loaded(dag):
assert dag is not None
assert len(dag.tasks) == 8
assert len(dag.tasks) == 7


publisher = "Springer"
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/springer/test_springer_dag_pull_sftp.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def dag():

def test_dag_loaded(dag):
assert dag is not None
assert len(dag.tasks) == 4
assert len(dag.tasks) == 3


def test_dag_run(dag):
Expand Down
2 changes: 1 addition & 1 deletion tests/units/clean/test_clean.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def dag():

def test_dag_loaded(dag):
assert dag is not None
assert len(dag.tasks) == 2
assert len(dag.tasks) == 1


@freeze_time("2023-09-20")
Expand Down
Loading