diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bd1f481a105b16ee5daefd14b2d110945adc61c1..5c3f9992ac88e154496821e67f8d64d0a7a8a7a5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -116,12 +116,12 @@ behave-integration: image: ${CI_REGISTRY_IMAGE}/integration_test:${CI_COMMIT_REF_NAME} script: - echo "WAIT FOR SERVICES TO INITIALIZE" && sleep 20 - - /bin/bash user-panel/utils/create-user.bash ${TESTUSER_USERNAME} ${TESTUSER_PASSWORD} ${TESTUSER_EMAIL} backend:5000 - - /bin/bash user-panel/utils/create-user.bash ${TESTUSER_USERNAME2} ${TESTUSER_PASSWORD} ${TESTUSER_EMAIL2} backend:5000 - - /bin/bash user-panel/utils/create-application.bash ${KEY} backend:5000 - - /bin/bash user-panel/utils/create-role.bash ${ROLE} backend:5000 - - /bin/bash user-panel/utils/grant-access.bash ${TESTUSER_USERNAME} ${KEY} backend:5000 - - /bin/bash user-panel/utils/assign-role.bash ${TESTUSER_USERNAME} ${ROLE} backend:5000 + - /bin/bash user-panel/backend/utils/create-user.bash ${TESTUSER_USERNAME} ${TESTUSER_PASSWORD} ${TESTUSER_EMAIL} backend:5000 + - /bin/bash user-panel/backend/utils/create-user.bash ${TESTUSER_USERNAME2} ${TESTUSER_PASSWORD} ${TESTUSER_EMAIL2} backend:5000 + - /bin/bash user-panel/backend/utils/create-application.bash ${KEY} backend:5000 + - /bin/bash user-panel/backend/utils/create-role.bash ${ROLE} backend:5000 + - /bin/bash user-panel/backend/utils/grant-access.bash ${TESTUSER_USERNAME} ${KEY} backend:5000 + - /bin/bash user-panel/backend/utils/assign-role.bash ${TESTUSER_USERNAME} ${ROLE} backend:5000 - /bin/bash test/create-hydra-client.bash ${KEY} ${SECRET} http://hydra:4445 http://oauth:5000/callback - cd test/login_logout/test/behave/ - > diff --git a/user-panel b/user-panel index f500daffd60bc427daff99415fad0016ebbe066a..b65ce8ad3ee18c2606c8f862f0f87fcb53b4d24b 160000 --- a/user-panel +++ b/user-panel @@ -1 +1 @@ -Subproject commit f500daffd60bc427daff99415fad0016ebbe066a +Subproject commit b65ce8ad3ee18c2606c8f862f0f87fcb53b4d24b