From f42e5819dee9a74304d48dc335f387b4541a0ced Mon Sep 17 00:00:00 2001 From: Jordi Kroon Date: Thu, 18 Jan 2024 11:21:59 +0100 Subject: [PATCH] feat(rebranding): migrate tde to oym --- .gitlab-ci.yml | 32 ++++++++++++++++---------------- stage-deploy/deployer.yml | 3 ++- stage-post-deploy/release.yml | 2 +- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 692d8f4..8fa7bfb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,26 +1,26 @@ --- include: - - "https://raw.githubusercontent.com/tdeNL/tde-gitlab-deploy-templates/master/config/variables.yml" + - "https://raw.githubusercontent.com/onyourmarks-agency/oym-gitlab-deploy-templates/master/config/variables.yml" - - "https://raw.githubusercontent.com/tdeNL/tde-gitlab-deploy-templates/master/stage-build/assets.yml" - - "https://raw.githubusercontent.com/tdeNL/tde-gitlab-deploy-templates/master/stage-build/vendors.yml" + - "https://raw.githubusercontent.com/onyourmarks-agency/oym-gitlab-deploy-templates/master/stage-build/assets.yml" + - "https://raw.githubusercontent.com/onyourmarks-agency/oym-gitlab-deploy-templates/master/stage-build/vendors.yml" - - "https://raw.githubusercontent.com/tdeNL/tde-gitlab-deploy-templates/master/stage-test/phpcs.yml" - - "https://raw.githubusercontent.com/tdeNL/tde-gitlab-deploy-templates/master/stage-test/eslint.yml" - - "https://raw.githubusercontent.com/tdeNL/tde-gitlab-deploy-templates/master/stage-test/prettier.yml" - - "https://raw.githubusercontent.com/tdeNL/tde-gitlab-deploy-templates/master/stage-test/stylelint.yml" + - "https://raw.githubusercontent.com/onyourmarks-agency/oym-gitlab-deploy-templates/master/stage-test/phpcs.yml" + - "https://raw.githubusercontent.com/onyourmarks-agency/oym-gitlab-deploy-templates/master/stage-test/eslint.yml" + - "https://raw.githubusercontent.com/onyourmarks-agency/oym-gitlab-deploy-templates/master/stage-test/prettier.yml" + - "https://raw.githubusercontent.com/onyourmarks-agency/oym-gitlab-deploy-templates/master/stage-test/stylelint.yml" - - "https://raw.githubusercontent.com/tdeNL/tde-gitlab-deploy-templates/master/stage-deploy/deployer.yml" - - "https://raw.githubusercontent.com/tdeNL/tde-gitlab-deploy-templates/master/stage-post-deploy/supervisord.yml" - - "https://raw.githubusercontent.com/tdeNL/tde-gitlab-deploy-templates/master/stage-post-deploy/release.yml" + - "https://raw.githubusercontent.com/onyourmarks-agency/oym-gitlab-deploy-templates/master/stage-deploy/deployer.yml" + - "https://raw.githubusercontent.com/onyourmarks-agency/oym-gitlab-deploy-templates/master/stage-post-deploy/supervisord.yml" + - "https://raw.githubusercontent.com/onyourmarks-agency/oym-gitlab-deploy-templates/master/stage-post-deploy/release.yml" - - "https://raw.githubusercontent.com/tdeNL/tde-gitlab-deploy-templates/master/stage-static-cache/static-html.yml" - - "https://raw.githubusercontent.com/tdeNL/tde-gitlab-deploy-templates/master/stage-static-cache/static-json.yml" + - "https://raw.githubusercontent.com/onyourmarks-agency/oym-gitlab-deploy-templates/master/stage-static-cache/static-html.yml" + - "https://raw.githubusercontent.com/onyourmarks-agency/oym-gitlab-deploy-templates/master/stage-static-cache/static-json.yml" - - "https://raw.githubusercontent.com/tdeNL/tde-gitlab-deploy-templates/master/stage-proxy-cache/varnish.yml" + - "https://raw.githubusercontent.com/onyourmarks-agency/oym-gitlab-deploy-templates/master/stage-proxy-cache/varnish.yml" variables: - SSH_STAGING: "tde@server.tdebv.nl" - SSH_PRODUCTION: "tde@server.tdebv.nl" + SSH_STAGING: "SERVER.instance.onyourmarks.tech" + SSH_PRODUCTION: "SERVER.instance.onyourmarks.tech" SERVER_FOLDER_STAGING: "project.tld" - SERVER_FOLDER_PRODUCTION: "project.tdebv.nl" + SERVER_FOLDER_PRODUCTION: "PROJECT.staging.SERVER.instance.onyourmarks.tech" diff --git a/stage-deploy/deployer.yml b/stage-deploy/deployer.yml index 445a44d..975f2b1 100644 --- a/stage-deploy/deployer.yml +++ b/stage-deploy/deployer.yml @@ -2,7 +2,7 @@ .deploy_global_template: &deploy_global stage: deploy when: manual - image: $CI_REGISTRY/tdenl/tde-public/tde-docker-deploy-image:$PHP_VERSION + image: $CI_REGISTRY/onyourmarks/public/oym-docker-deploy-image:$PHP_VERSION allow_failure: false cache: - key: 'asset_build-$CI_COMMIT_REF_NAME-build' @@ -29,6 +29,7 @@ action: start before_script: - !reference [.ssh_host_connection, before_script] + - 'wget https://getcomposer.org/download/2.6.5/composer.phar' script: - '[[ -f $PRODUCTION_ENV_FILE ]] && sed -i "s/\$VAR_COMMIT_ID/$CI_COMMIT_SHORT_SHA/" $PRODUCTION_ENV_FILE' - '[[ -f $STAGING_ENV_FILE ]] && sed -i "s/\$VAR_COMMIT_ID/$CI_COMMIT_SHORT_SHA/" $STAGING_ENV_FILE' diff --git a/stage-post-deploy/release.yml b/stage-post-deploy/release.yml index d70ea8e..be86cc2 100644 --- a/stage-post-deploy/release.yml +++ b/stage-post-deploy/release.yml @@ -2,7 +2,7 @@ release:production: stage: post-deploy image: registry.gitlab.com/gitlab-org/release-cli:latest - allow_failure: false + allow_failure: true variables: GIT_STRATEGY: none needs: