From 32e85ec05ed35f6688a539a5e770e04f9278708d Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Sun, 20 Dec 2020 12:40:07 +0100 Subject: [PATCH 1/2] 0.3.6.2 - Use warning logging level for BuilderSkippedException's - Change working directory before running ansible --- gitlab-ci/deploy.yml | 1 + src/newsreader/news/collection/reddit.py | 3 +++ 2 files changed, 4 insertions(+) diff --git a/gitlab-ci/deploy.yml b/gitlab-ci/deploy.yml index 561b2be..cac8d48 100644 --- a/gitlab-ci/deploy.yml +++ b/gitlab-ci/deploy.yml @@ -14,6 +14,7 @@ deploy: - echo "$DEPLOY_KEY" > deployment/deploy_key && chmod 0600 deployment/deploy_key - echo "$VAULT_PASSWORD" > deployment/vault script: + - cd deployment - > ansible-playbook deployment/playbook.yml --inventory deployment/inventory.yml diff --git a/src/newsreader/news/collection/reddit.py b/src/newsreader/news/collection/reddit.py index e249376..bbd94e3 100644 --- a/src/newsreader/news/collection/reddit.py +++ b/src/newsreader/news/collection/reddit.py @@ -135,6 +135,9 @@ class RedditBuilder(PostBuilder): except BuilderDuplicateException: logger.warning("Skipping duplicate post") continue + except BuilderSkippedException as e: + logger.warning(e.message) + continue except BuilderException: logger.exception("Failed building post") continue From 01f86399b23c9323333c1d96f31de21b4cf91e7f Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Sun, 20 Dec 2020 12:48:12 +0100 Subject: [PATCH 2/2] 0.3.6.3 - Update deploy job --- gitlab-ci/deploy.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gitlab-ci/deploy.yml b/gitlab-ci/deploy.yml index cac8d48..9328d02 100644 --- a/gitlab-ci/deploy.yml +++ b/gitlab-ci/deploy.yml @@ -9,14 +9,14 @@ deploy: before_script: - pip install ansible --quiet - git clone https://git.fudiggity.nl/ansible/newsreader.git deployment --branch master - - ansible-galaxy install -r deployment/roles/requirements.yml - - mkdir /root/.ssh && echo "$DEPLOY_HOST_KEY" > /root/.ssh/known_hosts - - echo "$DEPLOY_KEY" > deployment/deploy_key && chmod 0600 deployment/deploy_key - - echo "$VAULT_PASSWORD" > deployment/vault - script: - cd deployment + - ansible-galaxy install -r roles/requirements.yml + - mkdir /root/.ssh && echo "$DEPLOY_HOST_KEY" > /root/.ssh/known_hosts + - echo "$DEPLOY_KEY" > deploy_key && chmod 0600 deploy_key + - echo "$VAULT_PASSWORD" > vault + script: - > - ansible-playbook deployment/playbook.yml - --inventory deployment/inventory.yml - --private-key deployment/deploy_key - --vault-password-file deployment/vault + ansible-playbook playbook.yml + --inventory inventory.yml + --private-key deploy_key + --vault-password-file vault