FOSS merge-train fails for stable branches due to caching and VERSION
When the preparation MR for 13.10.2 was merged into 13-10-stable-ee
, it triggered a FOSS merge train job that failed: https://ops.gitlab.net/gitlab-org/merge-train/-/jobs/3519410
>>> Updating existing clone of gitlab-org/gitlab
Warning: Permanently added the ECDSA host key for IP address '172.65.251.78' to the list of known hosts.
error: Your local changes to the following files would be overwritten by checkout:
VERSION
Please commit your changes or stash them before you switch branches.
Aborting
At which point I cleared the runner caches, and retried, allowing it to pass: https://ops.gitlab.net/gitlab-org/merge-train/-/pipelines/539047
But we need to remove this manual step. I'm having trouble following what's actually causing this.
The foss merge restores VERSION
from Git, but at that point is it restoring the FOSS file, or the EE file?
The fact that the next run fails at >>> Updating existing clone of gitlab-org/gitlab
leads me to believe we're mistakenly tainting the EE cache with the FOSS VERSION
file from a previous run where that file was restored. Or maybe it's the exact inverse of that?