Commit d9824eb2 authored by Tommy Svendsen's avatar Tommy Svendsen
Browse files

DEICH-3487 attempting without koha cron starter

parent 9831003a
......@@ -196,6 +196,9 @@
- echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts
- chmod 644 ~/.ssh/known_hosts
- export APPLICATION_NAME=${APPLICATION_NAME}
script:
- make remote-deploy ssh_user=${SSH_USER} ssh_servers="${SSH_SERVERS}" CONTAINER=${APPLICATION_NAME}
- make remote-deploy-voting ssh_user=${SSH_USER} voting_node="${SSH_VOTING_SERVER}"
when: manual
#Deploy test
......@@ -207,9 +210,6 @@
SSH_SERVERS: $DEVTEST_SERVER
SSH_KNOWN_HOSTS: $DEVTEST_KNOWN_HOSTS
SSH_KEY: $DEPLOY_KEY
script:
- make remote-deploy ssh_user=${SSH_USER} ssh_servers="${SSH_SERVERS}" CONTAINER=${APPLICATION_NAME}
- make remote-docker-command CONTAINER=koha ssh_user=$DEPLOY_USER ssh_server=$DEVTEST_SERVER job_id=$CI_JOB_ID cmd=/koha/start-cron.sh
deploy-scheduled-test:
extends:
......@@ -311,7 +311,6 @@
variables:
APPLICATION_NAME: koha
after_script:
- make remote-docker-command CONTAINER=koha ssh_user=$DEPLOY_USER ssh_server=$DEVTEST_SERVER job_id=$CI_JOB_ID cmd=/koha/start-cron.sh
- *after
only:
changes: [ "Makefile", ".gitlab-ci.yml", "*.sh", "koha/**/*"]
......@@ -381,9 +380,6 @@
SSH_SERVERS: "${STAGING_SERVERS}"
SSH_KEY: $DEPLOY_KEY
SSH_VOTING_SERVER: ${STAGING_VOTING_SERVER}
script:
- make remote-deploy ssh_user=${SSH_USER} ssh_servers="${SSH_SERVERS}" CONTAINER=${APPLICATION_NAME}
- make remote-deploy-voting ssh_user=${SSH_USER} voting_node="${SSH_VOTING_SERVER}"
deploy-all-staging:
extends:
......
......@@ -120,7 +120,7 @@ remote-deploy: | check-ssh_user check-ssh_servers check-TAG
@for server in $(ssh_servers);\
do\
@echo "Deploying $(TAG) to server $$server" ; \
ssh $(ssh_user)@$$server "mkdir -p ./deployments/$(TAG)/deichman && rm -rf ./deployments/$(TAG)/config cp -rf \$$DEPLOYMENT_CONFIG_LOCATION/ ./deployments/$(TAG)/config"; \
ssh $(ssh_user)@$$server "mkdir -p ./deployments/$(TAG)/deichman && rm -rf ./deployments/$(TAG)/config && cp -rf \$$DEPLOYMENT_CONFIG_LOCATION/ ./deployments/$(TAG)/config"; \
scp docker-compose.yml $(ssh_user)@$$server:deployments/$(TAG)/docker-compose.yml; \
ssh $(ssh_user)@$$server "cd deployments/$(TAG)/deichman && TAG=$(TAG) DEPLOYMENT_CONFIG_LOCATION=./config docker-compose --env-file=../config/.env -f ../docker-compose.yml -f ../config/docker-compose.yml > docker-compose.yml && docker-compose pull && docker-compose up -d $(CONTAINER)"; \
done
......
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