Skip to content
Snippets Groups Projects
Commit 9d5e57f7 authored by Christian Boettcher's avatar Christian Boettcher
Browse files

deploy proper env vars

parent 85c4a076
Branches
Tags
No related merge requests found
Pipeline #131173 passed
...@@ -22,6 +22,8 @@ variables: ...@@ -22,6 +22,8 @@ variables:
TESTING_NAME: airflow-testing TESTING_NAME: airflow-testing
TESTING_URL: https://zam10115.zam.kfa-juelich.de TESTING_URL: https://zam10115.zam.kfa-juelich.de
TESTING_DOMAIN: zam10115.zam.kfa-juelich.de TESTING_DOMAIN: zam10115.zam.kfa-juelich.de
METADATA_URL: https://zam10045.zam.kfa-juelich.de:7000/oauth2/.well-known/openid-configuration
TESTING_OAUTH_ID: ff3f5a29-d210-4be2-a6d4-93c4fc755bfe
# before script copied from gitlab docs # before script copied from gitlab docs
...@@ -101,7 +103,7 @@ full-deploy-testing: ...@@ -101,7 +103,7 @@ full-deploy-testing:
- ssh -oStrictHostKeyChecking=accept-new airflow@$TESTING_IP "docker volume create --name=persistent_postgres-db-volume" - ssh -oStrictHostKeyChecking=accept-new airflow@$TESTING_IP "docker volume create --name=persistent_postgres-db-volume"
- ssh -oStrictHostKeyChecking=accept-new airflow@$TESTING_IP "docker volume create --name=persistent_certs" - ssh -oStrictHostKeyChecking=accept-new airflow@$TESTING_IP "docker volume create --name=persistent_certs"
- ssh -oStrictHostKeyChecking=accept-new airflow@$TESTING_IP 'sed -i "s_eflows-airflow:latest_eflows-airflow:testing_g" /home/airflow/data-logistics-service/dockers/docker-compose.yaml' - ssh -oStrictHostKeyChecking=accept-new airflow@$TESTING_IP 'sed -i "s_eflows-airflow:latest_eflows-airflow:testing_g" /home/airflow/data-logistics-service/dockers/docker-compose.yaml'
- ssh -oStrictHostKeyChecking=accept-new airflow@$PTESTING_IP "sudo /home/airflow/data-logistics-service/scripts/deployment.sh /home/airflow /home/airflow/data-logistics-service $TESTING_DOMAIN $AIRFLOW__SECRETS__BACKEND $AIRFLOW__SECRETS__BACKEND_KWARGS $AIRFLOW_FERNET_KEY $DAG_GIT_URL $SSO_CLIENT_SECRET" - ssh -oStrictHostKeyChecking=accept-new airflow@$PTESTING_IP "sudo /home/airflow/data-logistics-service/scripts/deployment.sh /home/airflow /home/airflow/data-logistics-service $TESTING_DOMAIN $AIRFLOW__SECRETS__BACKEND $AIRFLOW__SECRETS__BACKEND_KWARGS $AIRFLOW_FERNET_KEY $DAG_GIT_URL $TESTING_OAUTH_ID $SSO_CLIENT_SECRET $METADATA_URL"
- echo "Done" - echo "Done"
light-deploy-testing: light-deploy-testing:
...@@ -114,7 +116,7 @@ light-deploy-testing: ...@@ -114,7 +116,7 @@ light-deploy-testing:
script: script:
- ssh -oStrictHostKeyChecking=accept-new airflow@$TESTING_IP "cd /home/airflow/data-logistics-service && git stash && git stash clear && git checkout main && git checkout -f $CI_COMMIT_TAG && git pull --all" - ssh -oStrictHostKeyChecking=accept-new airflow@$TESTING_IP "cd /home/airflow/data-logistics-service && git stash && git stash clear && git checkout main && git checkout -f $CI_COMMIT_TAG && git pull --all"
- ssh -oStrictHostKeyChecking=accept-new airflow@$TESTING_IP 'sed -i "s_eflows-airflow:latest_eflows-airflow:testing_g" /home/airflow/data-logistics-service/dockers/docker-compose.yaml' - ssh -oStrictHostKeyChecking=accept-new airflow@$TESTING_IP 'sed -i "s_eflows-airflow:latest_eflows-airflow:testing_g" /home/airflow/data-logistics-service/dockers/docker-compose.yaml'
- ssh -oStrictHostKeyChecking=accept-new airflow@$TESTING_IP "sudo /home/airflow/data-logistics-service/scripts/deployment.sh /home/airflow /home/airflow/data-logistics-service $TESTING_DOMAIN $AIRFLOW__SECRETS__BACKEND $AIRFLOW__SECRETS__BACKEND_KWARGS $AIRFLOW_FERNET_KEY $DAG_GIT_URL $SSO_CLIENT_SECRET" - ssh -oStrictHostKeyChecking=accept-new airflow@$TESTING_IP "sudo /home/airflow/data-logistics-service/scripts/deployment.sh /home/airflow /home/airflow/data-logistics-service $TESTING_DOMAIN $AIRFLOW__SECRETS__BACKEND $AIRFLOW__SECRETS__BACKEND_KWARGS $AIRFLOW_FERNET_KEY $DAG_GIT_URL $TESTING_OAUTH_ID $SSO_CLIENT_SECRET $METADATA_URL"
......
...@@ -58,6 +58,9 @@ x-airflow-common: ...@@ -58,6 +58,9 @@ x-airflow-common:
AIRFLOW__API__AUTH_BACKEND: 'airflow.api.auth.backend.basic_auth' AIRFLOW__API__AUTH_BACKEND: 'airflow.api.auth.backend.basic_auth'
AIRFLOW__SECRETS__BACKEND_KWARGS: ${AIRFLOW__SECRETS__BACKEND_KWARGS} AIRFLOW__SECRETS__BACKEND_KWARGS: ${AIRFLOW__SECRETS__BACKEND_KWARGS}
AIRFLOW__SECRETS__BACKEND: ${AIRFLOW__SECRETS__BACKEND} AIRFLOW__SECRETS__BACKEND: ${AIRFLOW__SECRETS__BACKEND}
OAUTH_CLIENT_ID: ${OAUTH_CLIENT_ID}
OAUTH_METADATA_URL: ${OAUTH_METADATA_URL}
OAUTH_CLIENT_SECRET: ${OAUTH_CLIENT_SECRET}
# _PIP_ADDITIONAL_REQUIREMENTS: ${_PIP_ADDITIONAL_REQUIREMENTS:-} # _PIP_ADDITIONAL_REQUIREMENTS: ${_PIP_ADDITIONAL_REQUIREMENTS:-}
volumes: volumes:
- ./dags:/opt/airflow/dags - ./dags:/opt/airflow/dags
......
...@@ -34,6 +34,7 @@ class UnityIntegrationView(AppBuilderBaseView): ...@@ -34,6 +34,7 @@ class UnityIntegrationView(AppBuilderBaseView):
@unity.route('/login') @unity.route('/login')
def login(): def login():
redirect_uri = url_for('unity.authorize', _external=True) redirect_uri = url_for('unity.authorize', _external=True)
log.debug("Redirect uri is " + str(redirect_uri))
return oauth.unity.authorize_redirect(redirect_uri) return oauth.unity.authorize_redirect(redirect_uri)
@unity.route('/authorize') @unity.route('/authorize')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment