diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cacaaac4d8b77ca7c342fbafbc345f1d76de758f..207132f5c80c1bb63b73b7147bc0016bb38b5f84 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ variables: OLD_PROD_NAME: old-airflow-production PRODUCTION_NAME: airflow-production PRODUCTION_URL: https://datalogistics.eflows4hpc.eu - TESTING_DOMAIN: datalogistics.eflows4hpc.eu + PRODUCTION_DOMAIN: datalogistics.eflows4hpc.eu AIRFLOW_TESTUSER: "airflow" AIRFLOW__SECRETS__BACKEND_KWARGS: $TESTING_AIRFLOW__SECRETS__BACKEND_KWARGS AIRFLOW__SECRETS__BACKEND: datacat_integration.secrets.DatacatSecretsBackend @@ -49,13 +49,13 @@ test: - pip install nose==1.3.7 - airflow connections add --conn-uri https://b2share-testing.fz-juelich.de/ default_b2share script: - - ls - - pwd - - cp dags/* /opt/airflow/dags/ - - airflow dags list - - airflow connections list - - airflow dags test testdag 2021-08-18 - - nosetests + - ls + - pwd + - cp dags/* /opt/airflow/dags/ + - airflow dags list + - airflow connections list + - airflow dags test testdag 2021-08-18 + - nosetests build-custom-image: diff --git a/scripts/deployment.sh b/scripts/deployment.sh index 5bf2bd6e0604f88daeacfda8e1406e2e7d099ac4..0af566c7a2e9570c0903d8cda9028495eb88fbe2 100755 --- a/scripts/deployment.sh +++ b/scripts/deployment.sh @@ -16,7 +16,7 @@ if [ -z ${3+x} ]; then unset AIRFLOW__SECRETS__BACKEND; else export AIRFLOW__SEC if [ -z ${3+x} ]; then unset AIRFLOW__SECRETS__BACKEND_KWARGS; else export AIRFLOW__SECRETS__BACKEND_KWARGS=$5; fi echo "DEBUG values: OLD_DIR=$OLD_DIR, ENTRYPOINT_DIR=$ENTRYPOINT and GIT_REPO=$GIT_REPO" -echo "DEBUG using secrets backend: $4" +echo "DEBUG using secrets backend: $AIRFLOW__SECRETS__BACKEND" echo "DEBUG backend args length: ${#AIRFLOW__SECRETS__BACKEND_KWARGS}" cd $ENTRYPOINT