From 90a7b08ddc35d1cefde7d6c2cce5ff97c9399e26 Mon Sep 17 00:00:00 2001 From: Mark <mark@openappstack.net> Date: Mon, 29 Jun 2020 17:32:27 +0200 Subject: [PATCH] Change pipeline --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e5c2a35..fafffd7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -81,7 +81,7 @@ behave-integration: - all - --dangerous-force-http - --dangerous-allow-insecure-redirect-urls - - http://oauth:5000/callback + - http://oauth:5000/login/sso/authorized - name: open.greenhost.net:4567/openappstack/user-panel/backend:master alias: backend - name: ${CI_REGISTRY_IMAGE}/integration_test_app:${CI_COMMIT_REF_NAME} @@ -137,7 +137,7 @@ behave-integration: - /bin/bash user-panel/backend/utils/assign-role.bash ${TESTUSER_USERNAME} ${ROLE} backend:5000 # Wait for 60s for hydra to become available. Then create the oauth2 client object - while [[ $HYDRASTATUS -ne "200" && 60 -ge $TIMER ]]; do HYDRASTATUS=`curl http://hydra:4445/health/ready -o /dev/null -w "%{http_code}"` || TIMER=$TIMER+5 && sleep 5 ; done - - /bin/bash test/create-hydra-client.bash ${KEY} ${SECRET} http://hydra:4445 http://oauth:5000/callback + - /bin/bash test/create-hydra-client.bash ${KEY} ${SECRET} http://hydra:4445 http://oauth:5000/login/sso/authorized - cd test/integration_tests/test/behave/ - > python3 -m behave -- GitLab