diff --git a/gitlab-ci-1.2.yml b/gitlab-ci-1.2.yml index c8fea6fd892aa9ec3aebb5de858e4178a7006f11..33afb8b182f52e3fecc779b62f4489b3e7301165 100644 --- a/gitlab-ci-1.2.yml +++ b/gitlab-ci-1.2.yml @@ -25,7 +25,7 @@ stages: include: - project: 'wpdesk/gitlab-ci' - ref: 'master' + ref: 'feat/demo-deploy' file: - '/includes/prepare.yml' - '/includes/translations.yml' diff --git a/includes/deploy/demo.yml b/includes/deploy/demo.yml index 7f54f65ac500ddf566cb88e9987bfeb7ffc82e47..81d836ce622a15fe3ff1ed6904451ff1245bf944 100644 --- a/includes/deploy/demo.yml +++ b/includes/deploy/demo.yml @@ -67,11 +67,8 @@ deploy:demo: - 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 to demo octolize: - <<: *job-deploy-template - before_script: - - echo "$DEMO_FS_SSH_KEY" | tr -d '\r' > ~/.ssh/id_rsa_demo_fs - - chmod 0600 ~/.ssh/id_rsa_demo_fs - - echo "$SSH_KNOWN_HOSTS" | tr -d '\r' > ~/.ssh/known_hosts - script: - - ssh-keyscan -H -p 222 s125.cyber-folks.pl >> ~/.ssh/known_hosts +# deploy to demo octolize: +# before_script: +# - echo "$DEMO_FS_SSH_KEY" | tr -d '\r' > ~/.ssh/id_rsa_demo_fs +# - chmod 0600 ~/.ssh/id_rsa_demo_fs +# - echo "$SSH_KNOWN_HOSTS" | tr -d '\r' > ~/.ssh/known_hosts