diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1d9d56398bc5695108f12571372e05e0029d24f0..0f12cc5aaff5088f9d1439dc79d2340449556e5f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -168,12 +168,12 @@ behave-integration: image: ${CI_REGISTRY_IMAGE}/integration_ci_test:${CI_COMMIT_REF_NAME} script: - echo "WAIT FOR SERVICES TO INITIALIZE" && sleep 20 - - /bin/sh user-panel/utils/create-user.sh ${TESTUSER_USERNAME} ${TESTUSER_PASSWORD} ${TESTUSER_EMAIL} backend 5000 - - /bin/sh user-panel/utils/create-user.sh ${TESTUSER_USERNAME2} ${TESTUSER_PASSWORD} ${TESTUSER_EMAIL2} backend 5000 - - /bin/sh user-panel/utils/create-application.sh ${KEY} backend 5000 - - /bin/sh user-panel/utils/create-role.sh ${ROLE} backend 5000 - - /bin/sh user-panel/utils/grant-access.sh ${TESTUSER_USERNAME} ${KEY} backend 5000 - - /bin/sh user-panel/utils/assign-role.sh ${TESTUSER_USERNAME} ${ROLE} backend 5000 + - user-panel/utils/create-user.bash ${TESTUSER_USERNAME} ${TESTUSER_PASSWORD} ${TESTUSER_EMAIL} backend:5000 + - user-panel/utils/create-user.bash ${TESTUSER_USERNAME2} ${TESTUSER_PASSWORD} ${TESTUSER_EMAIL2} backend:5000 + - user-panel/utils/create-application.bash ${KEY} backend:5000 + - user-panel/utils/create-role.bash ${ROLE} backend:5000 + - user-panel/utils/grant-access.bash ${TESTUSER_USERNAME} ${KEY} backend:5000 + - user-panel/utils/assign-role.bash ${TESTUSER_USERNAME} ${ROLE} backend:5000 - /bin/sh test/create-hydra-client.sh ${KEY} ${SECRET} hydra 4445 http://oauth:5000/callback - cd test/login_logout/test/behave/ - > diff --git a/login_provider/test/Dockerfile b/login_provider/test/Dockerfile index 56408b34a40885542598e6e8b26f23dc6946bbc4..361eaa59b63293f09174e4deb82b7201ecde1a0c 100644 --- a/login_provider/test/Dockerfile +++ b/login_provider/test/Dockerfile @@ -6,5 +6,6 @@ RUN apk --no-cache add \ chromium \ chromium-chromedriver \ python3-dev + bash RUN pip3 install behave behave_webdriver diff --git a/user-panel b/user-panel index 1ba28f459e1c5804432f7da7ad394895155f5a2a..7d94b3f4962fd0a70e10d5c0e19d48ca0ac81a5a 160000 --- a/user-panel +++ b/user-panel @@ -1 +1 @@ -Subproject commit 1ba28f459e1c5804432f7da7ad394895155f5a2a +Subproject commit 7d94b3f4962fd0a70e10d5c0e19d48ca0ac81a5a