diff --git a/lakedrops-execute.yml b/lakedrops-execute.yml index f6c655ec0a3d72aadc59ed3bfe2155ae18e367c4..986999e106e3801678b51e970707aedb6eea16ef 100644 --- a/lakedrops-execute.yml +++ b/lakedrops-execute.yml @@ -42,5 +42,8 @@ Build Theme: Deploy: extends: '.deployartefact' +DeployNG: + extends: '.deployartefact-ng' + Reset Locales: extends: '.resetlocales' diff --git a/test-and-deploy.yml b/test-and-deploy.yml index f76c4070db77f13c4e4df1fd5a55d593c6e7331e..96a609b34b6c1cee0da33b9778475d17f88b7db5 100644 --- a/test-and-deploy.yml +++ b/test-and-deploy.yml @@ -349,6 +349,7 @@ Debug: cache: {} rules: - if: '$DISABLE_DEPLOYMENT != "1"' + - if: '$DISABLE_DEPLOYMENT_REMOTE != "1"' dependencies: - 'Build Theme' @@ -366,6 +367,27 @@ Debug: cache: {} rules: - if: '$DISABLE_DEPLOYMENT != "1"' + - if: '$DISABLE_DEPLOYMENT_REMOTE != "1"' + dependencies: + - 'Build Prod Site' + - 'Build Theme' + +.deployartefact-ng: + stage: deploy + tags: + - ansiblelocal + image: registry.lakedrops.com/ansible-inventories/localhost:latest + variables: + GIT_STRATEGY: none + environment: + name: ${ENVIRONMENT_NAME} + url: ${ENVIRONMENT_URL} + script: + - ascr drupal-deploy-ng ${CI_PROJECT_ID} ${CI_PROJECT_PATH_SLUG} ${CI_COMMIT_BRANCH} --extra-vars="DRUPAL_ARTEFACT_SRC=${PWD}" --extra-vars="SKIP_CONFIG_IMPORT=${SKIPCONFIGIMPORT}" ${CAE} + cache: {} + rules: + - if: '$DISABLE_DEPLOYMENT != "1"' + - if: '$DISABLE_DEPLOYMENT_REMOTE != "0"' dependencies: - 'Build Prod Site' - 'Build Theme'