From 506eb1ab6ce1b094f5e0fa99aefe07de7336c3ce Mon Sep 17 00:00:00 2001
From: hugues de keyzer <odoo@hugues.info>
Date: Fri, 22 Sep 2023 14:33:44 +0200
Subject: [PATCH] [FIX] fix ci tests failing

mark foodhub_product_fields as a rebel module as it makes some fields
required and make tests of other modules fail.
---
 .copier-answers.yml                  |  4 +++-
 .github/pull_request_template.md.rej |  5 -----
 .github/workflows/test.yml           | 10 +++++++++-
 3 files changed, 12 insertions(+), 7 deletions(-)
 delete mode 100644 .github/pull_request_template.md.rej

diff --git a/.copier-answers.yml b/.copier-answers.yml
index 6fb0aa54..642ea3e4 100644
--- a/.copier-answers.yml
+++ b/.copier-answers.yml
@@ -1,5 +1,5 @@
 # Do NOT update manually; changes here will be overwritten by Copier
-_commit: v2.1.8
+_commit: v2.1.10
 _src_path: https://github.com/coopiteasy/oca-addons-repo-template.git
 ci: GitHub
 dependency_installation_mode: OCA
@@ -11,10 +11,12 @@ github_enable_makepot: true
 github_enable_stale_action: true
 github_enforce_dev_status_compatibility: true
 include_wkhtmltopdf: false
+odoo_test_flavor: OCB
 odoo_version: 12.0
 org_name: Coop IT Easy SC
 org_slug: coopiteasy
 rebel_module_groups:
+- foodhub_copy_product_fields,foodhub_product_fields
 - provelo_custom
 repo_description: Custom modules for Coop IT Easy's clients.
 repo_name: cie-custom
diff --git a/.github/pull_request_template.md.rej b/.github/pull_request_template.md.rej
deleted file mode 100644
index d6624e0a..00000000
--- a/.github/pull_request_template.md.rej
+++ /dev/null
@@ -1,5 +0,0 @@
-diff a/.github/pull_request_template.md b/.github/pull_request_template.md	(rejected hunks)
-@@ -12,2 +12,3 @@
- - [ ] Credits/copyright have been changed correctly.
-+- [ ] Change log snippet is present.
- - [ ] (If a new module) Moving this to OCA has been considered.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 36f7a5b9..72e2a466 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -19,9 +19,17 @@ jobs:
       matrix:
         include:
           - container: ghcr.io/oca/oca-ci/py3.6-ocb12.0:latest
-            exclude: "provelo_custom"
+            include: "foodhub_copy_product_fields,foodhub_product_fields"
+            name: test with OCB
+            makepot: "true"
+          - container: ghcr.io/oca/oca-ci/py3.6-ocb12.0:latest
+            include: "provelo_custom"
+            name: test with OCB
             makepot: "true"
+          - container: ghcr.io/oca/oca-ci/py3.6-ocb12.0:latest
+            exclude: "foodhub_copy_product_fields,foodhub_product_fields,provelo_custom"
             name: test with OCB
+            makepot: "true"
     services:
       postgres:
         image: postgres:9.6