From 5a2fcc56db76d7dff24c2e03422ac629dd9b6b7c Mon Sep 17 00:00:00 2001 From: Artem Goncharov Date: Wed, 31 Jul 2024 15:39:43 +0200 Subject: [PATCH] Accept github newhostkey in promote job. also use `git am` instead of `git apply` to immediately apply the page and not only to stage changes. Change-Id: I9602441bf561bc94b7d325a87a555250fcb2f232 --- playbooks/rust/propose-github.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/playbooks/rust/propose-github.yaml b/playbooks/rust/propose-github.yaml index 0a4bf9c..69214bc 100644 --- a/playbooks/rust/propose-github.yaml +++ b/playbooks/rust/propose-github.yaml @@ -33,6 +33,7 @@ - name: "Checkout target repository" ansible.builtin.git: + accept_newhostkey: true repo: "{{ rust_sdk_git_repo }}" dest: "{{ rust_project_dir }}" @@ -42,7 +43,7 @@ chdir: "{{ ansible_user_dir }}/openstack" - name: "Try to apply git patch" - ansible.builtin.command: "git apply --reject --ignore-space-change {{ git_patch_stat.stat.path }}" + ansible.builtin.command: "git am {{ git_patch_stat.stat.path }}" args: chdir: "{{ ansible_user_dir }}/openstack" register: "patch_applied"