diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c44bc9d..9e64076 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,11 +26,8 @@ test-job: # This job runs in the test stage. script: - |+ echo Recherche de zones à tester - 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 ") - fi + files=$(find . -name "*.zone" -printf "%P ") + if [[ "$files" =~ .*"zone".* ]] then echo "Test des zones $files." @@ -53,11 +50,7 @@ deploy-job: # This job runs in the deploy stage. script: - |+ echo Recherche de zones à déployer - 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 ") - fi + files=$(find . -name "*.zone" -printf "%P ") - echo "Déploiement des zones $files..." - |+ @@ -77,11 +70,7 @@ check-job: # This job runs in the deploy stage. script: - |+ echo Recherche de zones déployées - 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 ") - fi + files=$(find . -name "*.zone" -printf "%P ") count=$(echo $files | tr "\n" " " | wc -w) linecount=$(( count * 5 + 3)) @@ -91,4 +80,4 @@ check-job: # This job runs in the deploy stage. - sudo grep named /var/log/syslog | tail -n $linecount | grep "reloading zones succeeded" || exit 5 - sudo grep named /var/log/syslog | tail -n $linecount | grep "all zones loaded" || exit 6 - sudo grep named /var/log/syslog | tail -n $linecount | grep "running" || exit 7 - - echo "Déploiement terminé." + - echo "Déploiement terminé." \ No newline at end of file