diff --git a/.gitlab-ci-template.yml b/.gitlab-ci-template.yml index 3ed3db402622e54b979e6804f783f41ec1b221fd..8e45b8564b561eb47339159df08f97b711575df3 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 81f9f177ac34ba1c7cd2c58bde097df5dbd63606..0000000000000000000000000000000000000000 --- 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"