Browse Source

X-Salt-Git-SHA is actually X-Salt-Git-Sha

master
Sean Johnson 3 years ago
parent
commit
47736e11bf
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. 22
      saltbox/orchestrator/templates/reactor_update_fileserver.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/short_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}"

22
saltbox/orchestrator/templates/reactor_update_fileserver.j2

@ -10,7 +10,7 @@
{% set remote_addr = headers.get("Remote-Addr") %}
{% set project_trigger = headers.get("X-Salt-Project") %}
{% set committer = headers.get("X-Salt-Git-Committer") %}
{% set commit_sha = headers.get("X-Salt-Git-SHA") %}
{% set commit_sha = headers.get("X-Salt-Git-Sha") %}
{% set commit_message = headers.get("X-Salt-Git-Commit-Message") %}
{% set build_pipeline = headers.get("X-Salt-Build-Pipeline-Name") %}
{% set build_job = headers.get("X-Salt-Build-Job-Name") %}
@ -25,16 +25,16 @@ orchestrate_update_fileserver:
- mods: orchestrate.update_fileserver
- pillar:
telegram: {{ telegram | json }}
remote_addr: {{ "{{ remote_addr }}" }}
update_git_pillar: {{ "{{ update_git_pillar }}" }}
remote_addr: {{ "{{ remote_addr | yaml_dquote }}" }}
update_git_pillar: {{ "{{ update_git_pillar | yaml_dquote }}" }}
triggered_by:
project: {{ "{{ project_trigger }}" }}
last_commit_sha: {{ "{{ commit_sha }}" }}
committer: {{ "{{ committer }}" }}
commit_message: {{ "{{ commit_message }}" }}
project: {{ "{{ project_trigger | yaml_dquote }}" }}
last_commit_sha: {{ "{{ commit_sha | yaml_dquote }}" }}
committer: {{ "{{ committer | yaml_dquote }}" }}
commit_message: {{ "{{ commit_message | yaml_dquote }}" }}
build:
pipeline_name: {{ "{{ build_pipeline }}" }}
job_name: {{ "{{ build_job }}" }}
name: {{ "{{ build_name }}" }}
id: {{ "{{ build_id }}" }}
pipeline_name: {{ "{{ build_pipeline | yaml_dquote }}" }}
job_name: {{ "{{ build_job | yaml_dquote }}" }}
name: {{ "{{ build_name | yaml_dquote }}" }}
id: {{ "{{ build_id | yaml_dquote }}" }}
{{ "{% endif %}" }}

Loading…
Cancel
Save