Merge pull request #383 from OpenSPP/fixing_build

Fixing build and tests

Author: kneckinator

.github/workflows/test.yml

@@ -38,15 +38,15 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - container: ghcr.io/oca/oca-ci/py3.10-odoo17.0:latest
+          - container: ghcr.io/openspp/oca-ci/py3.10-odoo17.0:latest
             name: test with Odoo
-          - container: ghcr.io/oca/oca-ci/py3.10-ocb17.0:latest
+          - container: ghcr.io/openspp/oca-ci/py3.10-ocb17.0:latest
             name: test with OCB
             makepot: "true"
             sonar: "true"
     services:
       postgres:
-        image: postgres:15.0
+        image: postgis/postgis:15-3.4
         env:
           POSTGRES_USER: odoo
           POSTGRES_PASSWORD: odoo
@@ -60,20 +60,32 @@ jobs:
 
       # Clone OpenG2P Registry repository
       - name: Clone OpenG2P Registry Repository
-        run: git clone https://github.com/OpenG2P/openg2p-registry.git --depth 1 --branch 17.0-fix-build
+        run: git clone https://github.com/OpenG2P/openg2p-registry.git --depth 1 --branch 17.0-develop
       # Clone OpenG2P Programs repository
       - name: Clone OpenG2P Programs Repository
-        run: git clone https://github.com/OpenG2P/openg2p-program.git --depth 1 --branch 17.0-fix-build
+        run: git clone https://github.com/OpenG2P/openg2p-program.git --depth 1 --branch 17.0-develop
       - name: Clone geospatial Repository
         run: git clone https://github.com/OpenSPP/geospatial.git --depth 1 --branch 17.0-mig-base_geoengine
+      - name: Clone Muk Addons Repository
+        run: git clone https://github.com/muk-it/odoo-modules.git --depth 1 --branch 17.0
       - name: Copy OpenG2P modules to addons directory
-        # exclude openg2p-registry/odoo-addon-base_rest as it is not migrated to 17.0
+        # exclude openg2p-program/odoo-addon-base_rest as it is not migrated to 17.0
         run: |
-          rm -rf openg2p-registry/*rest_api* openg2p-program/*rest_api* openg2p-program/g2p_payment_files openg2p-program/g2p_documents openg2p-program/g2p_program_documents
+          rm -rf openg2p-program/*rest_api* openg2p-program/g2p_documents
+          rm -rf odoo-modules/muk_web_enterprise_theme
           cp -r openg2p-registry/* ${ADDONS_DIR}/
           cp -r openg2p-program/* ${ADDONS_DIR}/
           cp -r geospatial/* ${ADDONS_DIR}/
+          # MUK Addons
+          cp -r odoo-modules/* ${ADDONS_DIR}/
+      - name: Add g2p-programs and odoo-test-helper to test-requirements.txt
+        run: |
+          echo "git+https://github.com/OpenG2P/[email protected]#subdirectory=g2p_programs" >> test-requirements.txt
+          echo "odoo-test-helper" >> test-requirements.txt
       - name: Install addons and dependencies
+        env:
+          SKIP_EXT_DEB_DEPENDENCIES: "true"
+          EXCLUDE_REGEX: "odoo-addon-g2p.*|odoo-addon-muk.*"
         run: oca_install_addons
       - name: Check licenses
         run: manifestoo -d . check-licenses
@@ -84,6 +96,8 @@ jobs:
       - name: Initialize test db
         run: oca_init_test_database
       - name: Run tests
+        env:
+          EXCLUDE: "g2p_bank,g2p_entitlement_differential,g2p_entitlement_in_kind,g2p_entitlement_voucher,g2p_payment_cash,g2p_payment_files,g2p_payment_g2p_connect,g2p_payment_interop_layer,g2p_payment_phee,g2p_payment_simple_mpesa,g2p_program_approval,g2p_program_assessment,g2p_program_autoenrol,g2p_program_cycleless,g2p_program_documents,g2p_program_registrant_info,g2p_program_reimbursement,g2p_programs,g2p_proxy_means_test,g2p_registry_addl_info,g2p_registry_base,g2p_registry_group,g2p_registry_individual,g2p_registry_membership,muk_product,muk_web_appsbar,muk_web_chatter,muk_web_colors,muk_web_dialog,muk_web_theme"
         run: oca_run_tests
       - uses: codecov/codecov-action@v1
       - name: Update .pot files

g2p_connect_demo/__manifest__.py

@@ -16,7 +16,7 @@
         "g2p_registry_group",
         "g2p_registry_membership",
         "g2p_programs",
-        "g2p_bank",
+        # "g2p_bank",
         "spp_custom_field",
         # "spp_custom_fields_ui",
         "g2p_entitlement_cash",

spp_change_request/tests/common.py

@@ -34,10 +34,11 @@ def setUpClass(cls):
         )
         return super().setUpClass()
 
-    def _create_registrant(self, vals):
-        self.assertTrue(isinstance(vals, dict), "Return vals should be a dict!")
+    @classmethod
+    def _create_registrant(cls, vals):
+        cls.assertTrue(isinstance(vals, dict), "Return vals should be a dict!")
         vals.update({"is_registrant": True})
-        return self.env["res.partner"].create(vals)
+        return cls.env["res.partner"].create(vals)
 
     @patch("odoo.addons.spp_change_request.models.change_request.ChangeRequestBase._selection_request_type_ref_id")
     def _create_change_request(self, mock_request_type_selection):

spp_custom_filter_ui/__manifest__.py

@@ -6,7 +6,7 @@
     "maintainers": ["nhatnm0612"],
     "website": "https://github.com/OpenSPP/openspp-modules",
     "license": "LGPL-3",
-    "depends": ["spp_custom_filter"],
+    "depends": ["spp_custom_filter", "g2p_registry_group", "g2p_programs"],
     "auto_install": False,
     "application": False,
 }

spp_demo/__manifest__.py

@@ -19,11 +19,11 @@
         "spp_custom_field",
         "spp_custom_field_recompute_daily",
         "spp_idpass",
-        "spp_helpdesk",
+        # "spp_helpdesk",
         "spp_area",
         "theme_openspp_muk",
         "spp_pos",
-        "spp_sms",
+        # "spp_sms",
         "queue_job",
     ],
     "external_dependencies": {"python": ["faker"]},