zuul/zuul-jobs
Code Issues Proposed changes

Make prepare-workspace-git behavior more consistent

Browse Source 
This runs the same commands on the git repo regardless of whether
it was cloned or if the role found it there already.  Since the
purpose of the role is to mirror the workspace repos from the
executor to the remote node, this will produce more consistent
behavior.

Note that anyone somehow relying on, say, the origin being set
outside of this role may encounter a behavior change.  It is expected
that anyone manipulating a repo that is also managed by this role
would perform those manipulations idempotently after running this
role.

Change-Id: I428bf2980a526919d5b154c585943be92d4c1cfa
This commit is contained in:
James E. Blair 2024-07-23 17:19:26 -07:00
parent 78276a58c5
commit 51fe46231f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
roles/prepare-workspace-git/tasks/main.yaml
View File

@ -30,15 +30,15 @@
git init {{ zuul_workspace_root }}/{{ zj_project.src_dir }} git init {{ zuul_workspace_root }}/{{ zj_project.src_dir }}
fi fi
cd {{ zuul_workspace_root }}/{{ zj_project.src_dir }} cd {{ zuul_workspace_root }}/{{ zj_project.src_dir }}
git config --local --bool core.bare false
git remote -v | grep origin && git remote rm origin || true
git remote add origin file:///dev/null
fi fi
cd {{ zuul_workspace_root }}/{{ zj_project.src_dir }} cd {{ zuul_workspace_root }}/{{ zj_project.src_dir }}
git config --local --bool core.bare false
# Allow pushing to non-bare repo # Allow pushing to non-bare repo
git config --local receive.denyCurrentBranch ignore git config --local receive.denyCurrentBranch ignore
# Allow deleting current branch # Allow deleting current branch
git config --local receive.denyDeleteCurrent ignore git config --local receive.denyDeleteCurrent ignore
git remote -v | grep origin && git remote rm origin || true
git remote add origin file:///dev/null
with_items: "{{ _zuul_projects.values() }}" with_items: "{{ _zuul_projects.values() }}"
loop_control: loop_control:
loop_var: zj_project loop_var: zj_project

6
roles/test-prepare-workspace-git/tasks/main.yaml
View File

@ -30,15 +30,15 @@
git init {{ zuul_workspace_root }}/{{ zj_project.src_dir }} git init {{ zuul_workspace_root }}/{{ zj_project.src_dir }}
fi fi
cd {{ zuul_workspace_root }}/{{ zj_project.src_dir }} cd {{ zuul_workspace_root }}/{{ zj_project.src_dir }}
git config --local --bool core.bare false
git remote -v | grep origin && git remote rm origin || true
git remote add origin file:///dev/null
fi fi
cd {{ zuul_workspace_root }}/{{ zj_project.src_dir }} cd {{ zuul_workspace_root }}/{{ zj_project.src_dir }}
git config --local --bool core.bare false
# Allow pushing to non-bare repo # Allow pushing to non-bare repo
git config --local receive.denyCurrentBranch ignore git config --local receive.denyCurrentBranch ignore
# Allow deleting current branch # Allow deleting current branch
git config --local receive.denyDeleteCurrent ignore git config --local receive.denyDeleteCurrent ignore
git remote -v | grep origin && git remote rm origin || true
git remote add origin file:///dev/null
with_items: "{{ _zuul_projects.values() }}" with_items: "{{ _zuul_projects.values() }}"
loop_control: loop_control:
loop_var: zj_project loop_var: zj_project