Test commit

Tecnativa · Oct 7, 2024 · 2cb6407 · 2cb6407
1 parent 277e46c
commit 2cb6407
Show file tree

Hide file tree

Showing 24 changed files with 24 additions and 24 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -59,7 +59,7 @@ jobs:
       # Other variables to configure tests and execution environment
       DOCKER_BUILDKIT: 1
       PG_VERSIONS: ${{ matrix.pg_version }}
-      ODOO_MINOR: ${{ matrix.odoo_version }}
+      DOCKER_TAG: ${{ matrix.odoo_version }}
     steps:
       # Prepare
       - uses: actions/checkout@v4

diff --git a/tests/scaffoldings/addons_env/docker-compose.yaml b/tests/scaffoldings/addons_env/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
       context: ./
       args:
         COMPILE: "false"
-        ODOO_VERSION: $ODOO_MINOR
+        ODOO_VERSION: ${ODOO_MINOR}
         WITHOUT_DEMO: "false"
     tty: true
     depends_on:

diff --git a/tests/scaffoldings/addons_env_double/docker-compose.yaml b/tests/scaffoldings/addons_env_double/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
       context: ./
       args:
         COMPILE: "false"
-        ODOO_VERSION: $ODOO_MINOR
+        ODOO_VERSION: ${ODOO_MINOR}
         WITHOUT_DEMO: "false"
     tty: true
     depends_on:

diff --git a/tests/scaffoldings/addons_env_ou/docker-compose.yaml b/tests/scaffoldings/addons_env_ou/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
       context: ./
       args:
         COMPILE: "false"
-        ODOO_VERSION: $ODOO_MINOR
+        ODOO_VERSION: ${ODOO_MINOR}
         WITHOUT_DEMO: "false"
     tty: true
     depends_on:

diff --git a/tests/scaffoldings/aggregate_permissions/docker-compose.yaml b/tests/scaffoldings/aggregate_permissions/docker-compose.yaml
@@ -7,7 +7,7 @@ services:
         AGGREGATE: "false"
         CLEAN: "false"
         COMPILE: "false"
-        ODOO_VERSION: $ODOO_MINOR
+        ODOO_VERSION: ${ODOO_MINOR}
         PIP_INSTALL_ODOO: "false"
     environment:
       PYTHONOPTIMIZE: ""

diff --git a/tests/scaffoldings/dependencies/docker-compose.yaml b/tests/scaffoldings/dependencies/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
       context: ./
       args:
         COMPILE: "false"
-        ODOO_VERSION: $ODOO_MINOR
+        ODOO_VERSION: ${ODOO_MINOR}
         WITHOUT_DEMO: "false"
     tty: true
     depends_on:

diff --git a/tests/scaffoldings/dependencies_base_search_fuzzy/docker-compose.yaml b/tests/scaffoldings/dependencies_base_search_fuzzy/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
       context: ./
       args:
         COMPILE: "false"
-        ODOO_VERSION: $ODOO_MINOR
+        ODOO_VERSION: ${ODOO_MINOR}
         WITHOUT_DEMO: "false"
     tty: true
     depends_on:

diff --git a/tests/scaffoldings/dependencies_ge_16/docker-compose.yaml b/tests/scaffoldings/dependencies_ge_16/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
       context: ./
       args:
         COMPILE: "false"
-        ODOO_VERSION: $ODOO_MINOR
+        ODOO_VERSION: ${ODOO_MINOR}
         WITHOUT_DEMO: "false"
     tty: true
     depends_on:

diff --git a/tests/scaffoldings/dotd/docker-compose.yaml b/tests/scaffoldings/dotd/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
       context: ./
       args:
         LOG_LEVEL: DEBUG
-        ODOO_VERSION: $ODOO_MINOR
+        ODOO_VERSION: ${ODOO_MINOR}
     tty: true
     environment:
       PGUSER: another_odoo

diff --git a/tests/scaffoldings/dotd_ge_16/docker-compose.yaml b/tests/scaffoldings/dotd_ge_16/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
       context: ./
       args:
         LOG_LEVEL: DEBUG
-        ODOO_VERSION: $ODOO_MINOR
+        ODOO_VERSION: ${ODOO_MINOR}
     tty: true
     environment:
       PGUSER: another_odoo

diff --git a/tests/scaffoldings/entrypoint/docker-compose.yaml b/tests/scaffoldings/entrypoint/docker-compose.yaml
@@ -6,7 +6,7 @@ services:
       args:
         # compile causes the creation of __pycache__ in entrypoint.d for this test
         COMPILE: "true"
-        ODOO_VERSION: $ODOO_MINOR
+        ODOO_VERSION: ${ODOO_MINOR}
         WITHOUT_DEMO: "false"
     tty: true
     depends_on:

diff --git a/tests/scaffoldings/geoip/docker-compose.yaml b/tests/scaffoldings/geoip/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
       context: ./
       args:
         COMPILE: "false"
-        ODOO_VERSION: $ODOO_MINOR
+        ODOO_VERSION: ${ODOO_MINOR}
         PIP_INSTALL_ODOO: "false"
         WITHOUT_DEMO: "false"
 

diff --git a/tests/scaffoldings/geoip_devel/docker-compose.yaml b/tests/scaffoldings/geoip_devel/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
       context: ./
       args:
         COMPILE: "false"
-        ODOO_VERSION: $ODOO_MINOR
+        ODOO_VERSION: ${ODOO_MINOR}
         PIP_INSTALL_ODOO: "false"
         WITHOUT_DEMO: "false"
 

diff --git a/tests/scaffoldings/postgres_client_version/docker-compose.yaml b/tests/scaffoldings/postgres_client_version/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
       context: ./
       args:
         COMPILE: "false"
-        ODOO_VERSION: $ODOO_MINOR
+        ODOO_VERSION: ${ODOO_MINOR}
         PIP_INSTALL_ODOO: "false"
         WITHOUT_DEMO: "false"
         DB_VERSION: ${DB_VERSION}

diff --git a/tests/scaffoldings/repo_merge/docker-compose.yaml b/tests/scaffoldings/repo_merge/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
       context: ./
       args:
         COMPILE: "false"
-        ODOO_VERSION: $ODOO_MINOR
+        ODOO_VERSION: ${ODOO_MINOR}
         PIP_INSTALL_ODOO: "false" # ensure build.d/700-odoo-install does not fail
         WITHOUT_DEMO: "false"
     environment:

diff --git a/tests/scaffoldings/repo_merge/setup-devel.yaml b/tests/scaffoldings/repo_merge/setup-devel.yaml
@@ -7,7 +7,7 @@ services:
         AGGREGATE: "false"
         CLEAN: "false"
         COMPILE: "false"
-        ODOO_VERSION: $ODOO_MINOR
+        ODOO_VERSION: ${ODOO_MINOR}
         PIP_INSTALL_ODOO: "false"
     environment:
       PYTHONOPTIMIZE: ""

diff --git a/tests/scaffoldings/settings/docker-compose.yaml b/tests/scaffoldings/settings/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
       context: ./
       args:
         LOG_LEVEL: DEBUG
-        ODOO_VERSION: $ODOO_MINOR
+        ODOO_VERSION: ${ODOO_MINOR}
     tty: true
     environment:
       EMAIL_FROM: [email protected]

diff --git a/tests/scaffoldings/smallest/docker-compose.yaml b/tests/scaffoldings/smallest/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
       context: ./
       args:
         COMPILE: "false"
-        ODOO_VERSION: $ODOO_MINOR
+        ODOO_VERSION: ${ODOO_MINOR}
         WITHOUT_DEMO: "false"
     tty: true
     depends_on:

diff --git a/tests/scaffoldings/symlinks/docker-compose.yaml b/tests/scaffoldings/symlinks/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
       context: ./
       args:
         COMPILE: "false"
-        ODOO_VERSION: $ODOO_MINOR
+        ODOO_VERSION: ${ODOO_MINOR}
         WITHOUT_DEMO: "false"
     tty: true
     depends_on:

diff --git a/tests/scaffoldings/test_artifacts/docker-compose.yaml b/tests/scaffoldings/test_artifacts/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
       context: ./
       args:
         COMPILE: "false"
-        ODOO_VERSION: $ODOO_MINOR
+        ODOO_VERSION: ${ODOO_MINOR}
         WITHOUT_DEMO: "false"
         # enable creating test artifact directories with correct permissions
         UID: "${UID:-1000}"

diff --git a/tests/scaffoldings/uids_1001/docker-compose.yaml b/tests/scaffoldings/uids_1001/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
       context: ./
       args:
         COMPILE: "false"
-        ODOO_VERSION: $ODOO_MINOR
+        ODOO_VERSION: ${ODOO_MINOR}
         PIP_INSTALL_ODOO: "false"
         WITHOUT_DEMO: "false"
         UID: 1001

diff --git a/tests/scaffoldings/uids_998/docker-compose.yaml b/tests/scaffoldings/uids_998/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
       context: ./
       args:
         COMPILE: "false"
-        ODOO_VERSION: $ODOO_MINOR
+        ODOO_VERSION: ${ODOO_MINOR}
         PIP_INSTALL_ODOO: "false"
         WITHOUT_DEMO: "false"
         UID: 998

diff --git a/tests/scaffoldings/uids_default/docker-compose.yaml b/tests/scaffoldings/uids_default/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
       context: ./
       args:
         COMPILE: "false"
-        ODOO_VERSION: $ODOO_MINOR
+        ODOO_VERSION: ${ODOO_MINOR}
         WITHOUT_DEMO: "false"
 
     tty: true

diff --git a/tests/scaffoldings/uids_mac_os/docker-compose.yaml b/tests/scaffoldings/uids_mac_os/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
       context: ./
       args:
         COMPILE: "false"
-        ODOO_VERSION: $ODOO_MINOR
+        ODOO_VERSION: ${ODOO_MINOR}
         PIP_INSTALL_ODOO: "false"
         WITHOUT_DEMO: "false"
         UID: 501