From 7d2eab81180b0a5f573f7eacc7204b9334beefd8 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Tue, 1 Mar 2022 17:14:53 +0100
Subject: [PATCH] Further improve settings for extra tests from GitLab
---
disabled.yml | 5 +++++
lakedrops-execute.yml | 11 +++--------
lakedrops.yml | 6 +++---
3 files changed, 11 insertions(+), 11 deletions(-)
create mode 100644 disabled.yml
diff --git a/disabled.yml b/disabled.yml
new file mode 100644
index 0000000..20175df
--- /dev/null
+++ b/disabled.yml
@@ -0,0 +1,5 @@
+# Dummy file only, can be overwritten by projects.
+
+.client-tasks:
+ only:
+ - master
diff --git a/lakedrops-execute.yml b/lakedrops-execute.yml
index 1a79148..f6c655e 100644
--- a/lakedrops-execute.yml
+++ b/lakedrops-execute.yml
@@ -2,6 +2,9 @@ include:
- project: gitlab-ci-cd/drupal
ref: master
file: /test-and-deploy.yml
+ - project: $LAKEDROPS_CI_PROJECT
+ ref: $LAKEDROPS_CI_REF
+ file: $LAKEDROPS_CI_FILE
- project: gitlab-ci-cd/drupal
ref: master
file: /tests/lakedrops.yml
@@ -17,14 +20,6 @@ include:
- $INITIALINSTALL == "yes"
- $DISABLE_CI_TESTS == "1"
- $DISABLE_GITLAB_CI_TESTS == "1"
- - project: $LAKEDROPS_CI_PROJECT
- ref: $LAKEDROPS_CI_REF
- file: $LAKEDROPS_CI_FILE
- except:
- variables:
- - $LAKEDROPS_CI_PROJECT == "0"
- - $LAKEDROPS_CI_REF == "0"
- - $LAKEDROPS_CI_FILE == "0.yml"
Build Prod Site:
extends: '.build-prod'
diff --git a/lakedrops.yml b/lakedrops.yml
index e253541..9fc42b9 100644
--- a/lakedrops.yml
+++ b/lakedrops.yml
@@ -17,9 +17,9 @@ variables:
ENVIRONMENT_NAME: ${PROJECT_NAME}/$CI_COMMIT_REF_NAME
ENVIRONMENT_URL: https://www.example.com/$SITE_NAME
GITLAB_DOMAIN: gitlab.lakedrops.com
- LAKEDROPS_CI_PROJECT: 0
- LAKEDROPS_CI_REF: 0
- LAKEDROPS_CI_FILE: 0.yml
+ LAKEDROPS_CI_PROJECT: gitlab-ci-cd/drupal
+ LAKEDROPS_CI_REF: master
+ LAKEDROPS_CI_FILE: disabled.yml
LAKEDROPS_DEBUG: 0
NAMESPACES_CHECK_UPDATE: drupal/* bitegra/* lakedrops/*
PHP_MAJOR_VERSION: 7
--
GitLab