From 2d22e4c8d80694432f99d2e912cb6a5053e3dc2e Mon Sep 17 00:00:00 2001
From: Bart Jaskulski <bjaskulski@protonmail.com>
Date: Thu, 12 Dec 2024 14:43:17 +0100
Subject: [PATCH] fix: split demo deployment as there are some issues with
variable overwrite
Signed-off-by: Bart Jaskulski <bjaskulski@protonmail.com>
---
includes/deploy/demo.yml | 51 ++++++++++++++++++++++++++--------------
1 file changed, 34 insertions(+), 17 deletions(-)
diff --git a/includes/deploy/demo.yml b/includes/deploy/demo.yml
index 033477b..a1d28f5 100644
--- a/includes/deploy/demo.yml
+++ b/includes/deploy/demo.yml
@@ -1,7 +1,5 @@
-deploy:demo:
+deploy:demo:wpdesk:
image: gitlab.wpdesk.dev:5050/wpdesk/docker-tests/amazon-svn-deploy:24.09
- variables:
- SSH_KEY: $GLOBAL_SSH_PRIV_KEY
environment:
name: $DEPLOY_SERVER
url: https://$DEPLOY_SERVER
@@ -16,8 +14,6 @@ deploy:demo:
- DEPLOY_SERVER:
- demo.wpdesk.org
- demo.wpdesk.pl
- - demo.octolize.com
- - stage.demo.octolize.com
- demo.flexibleinvoices.com
when: on_success
rules:
@@ -40,28 +36,49 @@ deploy:demo:
variables:
SSH_DSN: serwer296287@serwer296287.lh.pl:/home/platne/serwer296287/public_html/demo.wpdesk.org/wp-content/plugins
SSH_PORT: 40022
+ ## demo.flexibleinvoices.com
+ - if: $DEPLOY_SERVER == 'demo.flexibleinvoices.com'
+ variables:
+ SSH_DSN: serwer296287@serwer296287.lh.pl:/home/platne/serwer296287/public_html/demo.flexibleinvoices.com/wp-content/plugins
+ SSH_PORT: 40022
+ before_script:
+ - eval "$(ssh-agent -s)"
+ - chmod 600 "$GLOBAL_SSH_PRIV_KEY"
+ - ssh-add "$GLOBAL_SSH_PRIV_KEY"
+ - echo "$SSH_KNOWN_HOSTS" | tr -d '\r' > ~/.ssh/known_hosts
+ script:
+ - rsync -rlDe "ssh -p $SSH_PORT" --delete "$CI_PROJECT_DIR/release/$CI_PROJECT_NAME" $SSH_DSN
+ - 'curl -X POST --data-urlencode "payload={\"text\": \"Projekt <${CI_PROJECT_URL}|${CI_PROJECT_NAME}> zdeployowany do <${CI_ENVIRONMENT_URL}|${CI_ENVIRONMENT_NAME}> w wersji ${CI_COMMIT_REF_NAME}\", }" https://hooks.slack.com/services/${SLACK_AUTH}'
+
+deploy:demo:octolize:
+ extends: deploy:demo:wpdesk
+ parallel:
+ matrix:
+ - DEPLOY_SERVER:
+ - demo.octolize.com
+ - stage.demo.octolize.com
+ rules:
+ - if: $IS_LIBRARY || $IS_NPM_LIBRARY
+ when: never
+ # Run only for tagged deployments
+ - if: $CI_COMMIT_TAG == null
+ when: never
+ # Omit if server is not in deploy targets
+ - if: $DEPLOY_SERVER !~ $DEMO_DEPLOY_TARGETS
+ when: never
+ # Specific server overrides
## demo.octolize.com
- if: $DEPLOY_SERVER == 'demo.octolize.com'
variables:
SSH_DSN: wlgmnfabmq@s125.cyber-folks.pl:/home/wlgmnfabmq/domains/demo.octolize.com/public_html/wp-content/plugins
SSH_PORT: 222
- SSH_KEY: $DEMO_FS_SSH_KEY_FILE
## stage.demo.octolize.com
- if: $DEPLOY_SERVER == 'stage.demo.octolize.com'
variables:
SSH_DSN: wlgmnfabmq@s125.cyber-folks.pl:/home/wlgmnfabmq/domains/stage.demo.octolize.com/public_html/wp-content/plugins
SSH_PORT: 222
- SSH_KEY: $DEMO_FS_SSH_KEY_FILE
- ## demo.flexibleinvoices.com
- - if: $DEPLOY_SERVER == 'demo.flexibleinvoices.com'
- variables:
- SSH_DSN: serwer296287@serwer296287.lh.pl:/home/platne/serwer296287/public_html/demo.flexibleinvoices.com/wp-content/plugins
- SSH_PORT: 40022
before_script:
- eval "$(ssh-agent -s)"
- - chmod 600 "$SSH_KEY"
- - ssh-add "$SSH_KEY"
+ - chmod 600 "$DEMO_FS_SSH_KEY_FILE"
+ - ssh-add "$DEMO_FS_SSH_KEY_FILE"
- echo "$SSH_KNOWN_HOSTS" | tr -d '\r' > ~/.ssh/known_hosts
- script:
- - rsync -rlDe "ssh -p $SSH_PORT" --delete "$CI_PROJECT_DIR/release/$CI_PROJECT_NAME" $SSH_DSN
- - 'curl -X POST --data-urlencode "payload={\"text\": \"Projekt <${CI_PROJECT_URL}|${CI_PROJECT_NAME}> zdeployowany do <${CI_ENVIRONMENT_URL}|${CI_ENVIRONMENT_NAME}> w wersji ${CI_COMMIT_REF_NAME}\", }" https://hooks.slack.com/services/${SLACK_AUTH}'
--
GitLab