Commit 0f5c438d authored by Daniele Venzano's avatar Daniele Venzano

Fix IP address for API testing

Remove staging build in CI
parent 636b4916
......@@ -64,9 +64,6 @@ api-test:
- postgres:9.5
image: zoerepo/${ZOE_TEST_IMAGE}
script:
- echo 'admin,admin,admin' > zoepass.csv
- pwd
- ls
- bash ./run_integration_tests.sh
mirror-github:
......@@ -80,43 +77,3 @@ mirror-github:
- 'echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
script:
- ssh -A ubuntu@${STAGING_IP} /home/ubuntu/mirror-github.sh
docs:
stage: deploy
image: zoerepo/${ZOE_TEST_IMAGE}
before_script:
- which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )
- eval $(ssh-agent -s)
- ssh-add <(echo "$SSH_PRIVATE_KEY")
- mkdir -p ~/.ssh
- 'echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
- apt-get update -y && apt-get install rsync -y
script:
- sh ./build_docs.sh
- rsync -avz docs/_build/html/ ubuntu@${STAGING_IP}:${WEB_STAGING_PATH}/docs
environment:
name: staging
only:
- master
zoe:
stage: deploy
image: zoerepo/${ZOE_TEST_IMAGE}
before_script:
- which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )
- eval $(ssh-agent -s)
- ssh-add <(echo "$SSH_PRIVATE_KEY")
- mkdir -p ~/.ssh
- 'echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
- apt-get update -y && apt-get install rsync -y
script:
- ssh ubuntu@${STAGING_IP} sudo chown -R ubuntu:ubuntu /srv/zoe/*
- rsync -avz --delete . ubuntu@${STAGING_IP}:${ZOE_STAGING_PATH}
- ssh ubuntu@${STAGING_IP} sudo pip install --upgrade -r /srv/zoe/requirements.txt
- ssh ubuntu@${STAGING_IP} /home/ubuntu/clean_zoe_db.sh
- ssh ubuntu@${STAGING_IP} sudo supervisorctl restart zoe-api
- ssh ubuntu@${STAGING_IP} sudo supervisorctl restart zoe-master
environment:
name: staging
only:
- master
......@@ -4,6 +4,6 @@ tls_cert: /certs/cert.pem
tls_key: /certs/key.pem
tls_ca: /certs/ca.pem
[container-router]
docker_address: 192.168.46.31:2375
external_address: 192.168.46.31
[gitlab-builder]
docker_address: 192.168.45.4:2375
external_address: 192.168.45.4
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment