[FIX] Fix tests that rely on repo_merge

git-aggregator 4.0 default fast-forward behavior overrides the git
configuration in 099-create-fake-odoo.
Replace it with 099-create-fake-odo to create a fake odoo repo with two
branches.

tests/__init__.py

@@ -716,8 +716,8 @@ def test_repo_merge_aggregate_permissions(self):
                     UID=str(os.getuid()),
                     GID=str(os.getgid()),
                 ),
-                # prepare repos.yaml to be non fast forward
-                ("/opt/odoo/custom/build.d/099-git_merge_no_ff",),
+                # create a fake odoo git repo to ensure a merge commit is created
+                ("/opt/odoo/custom/build.d/099-create-fake-odoo",),
                 # autoaggregate as odoo:odoo to check if merges also work
                 ("autoaggregate",),
                 (

tests/scaffoldings/repo_merge/custom/build.d/099-create-fake-odoo

@@ -0,0 +1,18 @@
+#!/bin/bash
+mkdir /tmp/fake-odoo
+cd /tmp/fake-odoo
+
+git init
+touch odoo-bin
+git add odoo-bin
+git commit -m odoo-bin
+
+git checkout -b branch1
+touch 1.txt
+git add 1.txt
+git commit -m 1.txt
+
+git checkout -b branch2 HEAD~1
+touch 2.txt
+git add 2.txt
+git commit -m 2.txt

tests/scaffoldings/repo_merge/custom/src/repos.yaml

@@ -3,10 +3,7 @@
   defaults:
     depth: $DEPTH_MERGE
   remotes:
-    ocb: https://github.com/OCA/OCB.git
-  target: ocb $ODOO_VERSION
+    local: /tmp/fake-odoo
   merges:
-    # $ODOO_VERSION^1 gets replaced by commit sha that is one behind $ODOO_VERSION in OCB repo by 099-git_merge_no_ff
-    # in this test, to force gitaggregate creating a merge request
-    - ocb $ODOO_VERSION^1
-    - ocb $ODOO_VERSION
+    - local branch1
+    - local branch2

tests/scaffoldings/repo_merge/docker-compose.yaml

@@ -6,6 +6,7 @@ services:
       args:
         COMPILE: "false"
         ODOO_VERSION: $ODOO_MINOR
+        PIP_INSTALL_ODOO: "false" # ensure build.d/700-odoo-install does not fail
         WITHOUT_DEMO: "false"
     environment:
       PYTHONOPTIMIZE: ""