Browse Source

Fix message passing failure

master
Sean Johnson 3 years ago
parent
commit
22d9c3292d
WARNING! Although there is a key with this ID in the database it does not verify this commit! This commit is SUSPICIOUS.
GPG Key ID: 9FA15B87469EA850
  1. 2
      ci/pipeline.yml
  2. 4
      saltbox/orchestrator/templates/orch_update_fileserver.j2
  3. 3
      saltbox/reactor/templates/telegram_notify.j2

2
ci/pipeline.yml

@ -11,7 +11,7 @@ meta:
headers:
X-Salt-Secret: "((saltbox.webhook_secret))"
X-Salt-Project: "{project}"
X-Salt-Git-SHA: "-@{project}/.git/ref"
X-Salt-Git-SHA: "-@{project}/.git/short_ref"
X-Salt-Git-Committer: "-@{project}/.git/committer"
X-Salt-Git-Commit-Message: "-@{project}/.git/commit_message"
X-Salt-Build-Pipeline-Name: "{BUILD_PIPELINE_NAME}"

4
saltbox/orchestrator/templates/orch_update_fileserver.j2

@ -98,7 +98,7 @@ telegram notification:
Fileserver update completed! Triggered by commit `{{ last_commit_sha }}` by `{{ committer }}` on `{{ project_trigger }}`.
Built via pipeline `{{ build_pipeline_name }}`, job `{{ build_job_name }}`.
https://concourse.dev.maio.me/teams/main/pipelines/{{ build_pipeline_name }}/jobs/{{ build_job_name }}/builds/{{ build_id }}
===
---
Commit {{ last_commit_sha }} by {{ committer }}:
{{ commit_message }}
{{ commit_message }}
{% endraw %}

3
saltbox/reactor/templates/telegram_notify.j2

@ -8,6 +8,7 @@ notify_telegram:
- tgt: 'roles:salt_master'
- tgt_type: grain
- args:
- message: {{ '{{ message }}' }}
- message: |
{{ '{{ message | indent(width=10, first=true) }}' }}
- chat_id: {{ telegram.chat_id | yaml_squote }}
- token: {{ telegram.token | yaml_squote }}

Loading…
Cancel
Save