Loading .gitlab-ci.yml +70 −65 Original line number Diff line number Diff line Loading @@ -36,14 +36,16 @@ stages: DOCKER_HOST: tcp://docker:2375 SPRING_DATASOURCE_URL: jdbc:postgresql://docker:5432/redmic?currentSchema=app OAUTH_SERVER: http://docker:8081 SKIP_TESTS: 0 services: - ${DIND_IMAGE_NAME}:${DIND_IMAGE_TAG} before_script: - > if [ "${SKIP_TESTS}" -eq 0 ]; then mkdir -p sql; chmod -R 755 sql; docker network create test - > docker run -d --rm --name postgres \ -p 5432:5432 \ --network test \ Loading @@ -53,7 +55,6 @@ stages: -e POSTGRES_PASSWORD \ -v $(pwd)/sql:/sql \ postgres:${POSTGRES_IMAGE_TAG} - > curl -s --header "PRIVATE-TOKEN: ${GITLAB_TOKEN_READ_API}" \ -o sql/oauth_database_structure_test.sql \ "https://gitlab.com/api/v4/snippets/${OAUTH_DATABASE_STRUCTURE_TEST_SNIPPET_ID}/raw"; Loading @@ -66,7 +67,6 @@ stages: curl -s --header "PRIVATE-TOKEN: ${GITLAB_TOKEN_READ_API}" \ -o sql/user_database_data_test.sql \ "https://gitlab.com/api/v4/snippets/${USER_DATABASE_DATA_TEST_SNIPPET_ID}/raw" - > RETRIES=10; until docker exec postgres psql -h localhost \ -d redmic \ Loading Loading @@ -97,7 +97,6 @@ stages: -d redmic \ -U ${POSTGRES_USER} \ -f /sql/user_database_data_test.sql - > docker run -d --rm --name oauth \ -p 8081:8081 \ --network test \ Loading @@ -105,9 +104,15 @@ stages: -e SPRING_DATASOURCE_USERNAME \ -e SPRING_DATASOURCE_PASSWORD \ ${OAUTH_IMAGE_NAME}:${OAUTH_IMAGE_TAG} else echo "Skipping tests" fi; after_script: - rm -rf .m2/repository/es - docker stop oauth postgres if [ "${SKIP_TESTS}" -eq 0 ]; then rm -rf .m2/repository/es docker stop oauth postgres fi .docker-build: variables: Loading Loading
.gitlab-ci.yml +70 −65 Original line number Diff line number Diff line Loading @@ -36,14 +36,16 @@ stages: DOCKER_HOST: tcp://docker:2375 SPRING_DATASOURCE_URL: jdbc:postgresql://docker:5432/redmic?currentSchema=app OAUTH_SERVER: http://docker:8081 SKIP_TESTS: 0 services: - ${DIND_IMAGE_NAME}:${DIND_IMAGE_TAG} before_script: - > if [ "${SKIP_TESTS}" -eq 0 ]; then mkdir -p sql; chmod -R 755 sql; docker network create test - > docker run -d --rm --name postgres \ -p 5432:5432 \ --network test \ Loading @@ -53,7 +55,6 @@ stages: -e POSTGRES_PASSWORD \ -v $(pwd)/sql:/sql \ postgres:${POSTGRES_IMAGE_TAG} - > curl -s --header "PRIVATE-TOKEN: ${GITLAB_TOKEN_READ_API}" \ -o sql/oauth_database_structure_test.sql \ "https://gitlab.com/api/v4/snippets/${OAUTH_DATABASE_STRUCTURE_TEST_SNIPPET_ID}/raw"; Loading @@ -66,7 +67,6 @@ stages: curl -s --header "PRIVATE-TOKEN: ${GITLAB_TOKEN_READ_API}" \ -o sql/user_database_data_test.sql \ "https://gitlab.com/api/v4/snippets/${USER_DATABASE_DATA_TEST_SNIPPET_ID}/raw" - > RETRIES=10; until docker exec postgres psql -h localhost \ -d redmic \ Loading Loading @@ -97,7 +97,6 @@ stages: -d redmic \ -U ${POSTGRES_USER} \ -f /sql/user_database_data_test.sql - > docker run -d --rm --name oauth \ -p 8081:8081 \ --network test \ Loading @@ -105,9 +104,15 @@ stages: -e SPRING_DATASOURCE_USERNAME \ -e SPRING_DATASOURCE_PASSWORD \ ${OAUTH_IMAGE_NAME}:${OAUTH_IMAGE_TAG} else echo "Skipping tests" fi; after_script: - rm -rf .m2/repository/es - docker stop oauth postgres if [ "${SKIP_TESTS}" -eq 0 ]; then rm -rf .m2/repository/es docker stop oauth postgres fi .docker-build: variables: Loading