Skip to content
Snippets Groups Projects
Commit 707251dc authored by Wojciech Barcik's avatar Wojciech Barcik
Browse files

Add all-in-one job, disable others

Rebased onto current develop
parent 022c075e
No related branches found
No related tags found
No related merge requests found
This commit is part of merge request !390. Comments created here will be created in the context of that merge request.
...@@ -15,7 +15,7 @@ variables: ...@@ -15,7 +15,7 @@ variables:
GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_COMMIT_REF_SLUG/$CI_CONCURRENT_ID/project-name GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_COMMIT_REF_SLUG/$CI_CONCURRENT_ID/project-name
HIVEMIND_SOURCE_HIVED_URL: $HIVEMIND_SOURCE_HIVED_URL HIVEMIND_SOURCE_HIVED_URL: $HIVEMIND_SOURCE_HIVED_URL
HIVEMIND_DB_NAME: "hive_$CI_COMMIT_REF_SLUG" HIVEMIND_DB_NAME: "hive_${CI_COMMIT_REF_SLUG}"
HIVEMIND_HTTP_PORT: $((HIVEMIND_HTTP_PORT + CI_CONCURRENT_ID)) HIVEMIND_HTTP_PORT: $((HIVEMIND_HTTP_PORT + CI_CONCURRENT_ID))
# Configured at gitlab repository settings side # Configured at gitlab repository settings side
POSTGRES_USER: $HIVEMIND_POSTGRES_USER POSTGRES_USER: $HIVEMIND_POSTGRES_USER
......
This diff is collapsed.
...@@ -4,6 +4,10 @@ services: ...@@ -4,6 +4,10 @@ services:
python-3.6-dev: python-3.6-dev:
# Run container this way:
# docker-compose -f docker-compose-ci.yml run --rm python-3.6-dev bash
# This opens terminal inside container. Project directory is mounted
# into container.
image: hivemind/python:3.6-dev image: hivemind/python:3.6-dev
build: build:
context: . context: .
...@@ -18,7 +22,6 @@ services: ...@@ -18,7 +22,6 @@ services:
# # See https://docs.docker.com/engine/security/seccomp/ # # See https://docs.docker.com/engine/security/seccomp/
# - seccomp:unconfined # - seccomp:unconfined
shm_size: 2g shm_size: 2g
# command: ["tail", "-f", "/dev/null"]
volumes: volumes:
# Sockets of postgres servers on dockers. # Sockets of postgres servers on dockers.
- "postgres-10-run:/var/run/postgres-10" - "postgres-10-run:/var/run/postgres-10"
......
...@@ -6,7 +6,7 @@ pip install tox ...@@ -6,7 +6,7 @@ pip install tox
export HIVEMIND_ADDRESS=$1 export HIVEMIND_ADDRESS=$1
export HIVEMIND_PORT=$2 export HIVEMIND_PORT=$2
ITERATIONS=$3 ITERATIONS=${3:-5}
JOBS=${4:-auto} JOBS=${4:-auto}
export TAVERN_DISABLE_COMPARATOR=true export TAVERN_DISABLE_COMPARATOR=true
......
...@@ -2,7 +2,11 @@ ...@@ -2,7 +2,11 @@
set -e set -e
pip install tox # Existence of file `tox-installed` means that a preceding script
# has installed tox already.
if [ ! -f "tox-installed" ]; then
pip install tox
fi
export HIVEMIND_ADDRESS=$1 export HIVEMIND_ADDRESS=$1
export HIVEMIND_PORT=$2 export HIVEMIND_PORT=$2
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment