Commit 03586e77 authored by Gmodena's avatar Gmodena
Browse files

Merge branch 'fix-python-makefile-import' into 'multi-project-dags-repo'

Fix deploy-local-build target

See merge request gmodena/platform-airflow-dags!14
parents 640393d4 3e0f1780
......@@ -29,16 +29,16 @@ install-dags:
rm -f ${ima_home}/${ima_venv_archive}
make -C ${ima_home} venv
cd ${ima_home}; make venv
cd ${ima_home}; make lint
test_dags: ${pip_requirements_test}
${DOCKER_CMD} bash -c "tox -e dags"
cd ${ima_home}; make mypy; make test
cd ${ima_home}; make test
archive: ima-venv
tar cvz --exclude=".*" -f ${gitlab_package_archive} .
......@@ -50,7 +50,7 @@ publish: archive
#curl -v --header "PRIVATE-TOKEN: ${GITLAB_PRIVATE_TOKEN}" --upload-file /tmp/platform-airflow-dags.tar.gz "${gitlab_ci_api_root}/projects/${gitlab_project_id}/packages/generic/platform-airflow-dags/${branch}-${short_commit_hash}/${gitlab_package_archive}"
# Test, assemble venvs, generate an archive locally and ship it to the airflow worker.
deploy-local-build: test archive
deploy-local-build: test-all archive
scp ${gitlab_package_archive} ${airflow_host}:
make install-dags
......@@ -15,7 +15,7 @@ CONDA_CMD := conda config --set pip_interop_enabled True; \
conda activate ${venv}
DOCKER_IMG := platform/miniconda3
DOCKERFILE := ../Dockerfile.conda
DOCKERFILE := ../Dockerfile.python
ifneq ($(SKIP_DOCKER),true)
CURRENT_DIR := $(shell pwd)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment