From 1b0e3ae89ddf12437c7674aecf3329d7a8bc0896 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Fri, 17 Apr 2020 17:01:21 +0200
Subject: [PATCH] Try fixing the variable exclusion
---
.gitlab-ci-template.yml | 4 ++--
crontabs.yml | 21 ---------------------
2 files changed, 2 insertions(+), 23 deletions(-)
delete mode 100644 crontabs.yml
diff --git a/.gitlab-ci-template.yml b/.gitlab-ci-template.yml
index 3ed3db4..8e45b85 100644
--- a/.gitlab-ci-template.yml
+++ b/.gitlab-ci-template.yml
@@ -10,7 +10,7 @@ stages:
- chat
except:
- schedules
-
+
.default_settings_cron: &default_settings_cron
stage: deploy
tags:
@@ -48,4 +48,4 @@ RenewLetsEncrypt:
- ascr role letsencrypt --tags=renew ${CHAT_INPUT} ${ANSIBLE_EXTRA_ARGS}
except:
variables:
- - $ANSIBLE_JOB_NAME != "RenewLetsEncrypt"
+ - $ANSIBLE_JOB_NAME && $ANSIBLE_JOB_NAME != "RenewLetsEncrypt"
diff --git a/crontabs.yml b/crontabs.yml
deleted file mode 100644
index 81f9f17..0000000
--- a/crontabs.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-.default_settings: &default_settings
- stage: deploy
- tags:
- - ansible
- variables:
- GIT_STRATEGY: none
- only:
- refs:
- - chat
- - schedules
- variables:
- - $ANSIBLE_JOB_NAME
- - $ANSIBLE_EXTRA_ARGS
-
-RenewLetsEncrypt:
- <<: *default_settings
- script:
- - ascr role letsencrypt --tags=renew ${CHAT_INPUT} ${ANSIBLE_EXTRA_ARGS}
- except:
- variables:
- - $ANSIBLE_JOB_NAME != "RenewLetsEncrypt"
--
GitLab