diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a2b0fdb..cbf25bd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,9 +35,12 @@ test-job: # This job runs in the test stage. echo "Test des zones $files." for file in $files - do - domain=$(echo $file | sed "s/.zone//g") - /usr/sbin/named-checkzone "$domain" "$file" + do + if [[ "$file" =~ .*"zone".* ]] + then + domain=$(echo $file | sed "s/.zone//g") + /usr/sbin/named-checkzone "$domain" "$file" || exit 2 + fi done else echo "Pas de fichier de zone à tester" @@ -49,11 +52,10 @@ deploy-job: # This job runs in the deploy stage. script: - |+ echo Recherche de zones à déployer - if [ ! -z "$CI_RELOAD" ] + files=$(git diff-tree --no-commit-id --name-only -r $CI_COMMIT_SHA) + if [[ ! -z "$CI_RELOAD" || "$files" =~ .*"gitlab-ci.yml".* ]] then - files=$(find . -name "*.zone" -printf %P) - else - files=$(git diff-tree --no-commit-id --name-only -r $CI_COMMIT_SHA) + files=$(find . -name "*.zone" -printf "%P ") fi - echo "Déploiement des zones $files..."