Merge pull request #408 from Tecnativa/remove-old-images-from-ci

Remove images bellow v11 from CI
Tecnativa · Apr 12, 2021 · 1c8d05a · 1c8d05a
2 parents 9154e39 + 1ad4dfc
commit 1c8d05a
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 341 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -39,15 +39,6 @@ jobs:
           - "13.0"
           - "12.0"
           - "11.0"
-          - "10.0"
-        # Test older Odoo versions with older Postgres versions
-        include:
-          - odoo_version: "9.0"
-            pg_version: "11"
-          - odoo_version: "8.0"
-            pg_version: "10"
-          - odoo_version: "7.0"
-            pg_version: "9.6"
     env:
       # Indicates what's the equivalent to tecnativa/doodba:latest image
       LATEST_RELEASE: "14.0"

diff --git a/10.0.Dockerfile b/10.0.Dockerfile
diff --git a/7.0.Dockerfile b/7.0.Dockerfile
diff --git a/8.0.Dockerfile b/8.0.Dockerfile
diff --git a/9.0.Dockerfile b/9.0.Dockerfile
diff --git a/bin-deprecated/install.sh b/bin-deprecated/install.sh
diff --git a/bin/config-generate b/bin/config-generate
@@ -25,9 +25,7 @@ except ImportError:
     parser = RawConfigParser()
 
 ODOO_VERSION = os.environ.get("ODOO_VERSION")
-TARGET_FILE = os.environ.get("OPENERP_SERVER", "/opt/odoo/auto/odoo.conf")
-if ODOO_VERSION not in {"8.0", "9.0"}:
-    TARGET_FILE = os.environ.get("ODOO_RC", TARGET_FILE)
+TARGET_FILE = os.environ.get("ODOO_RC", "/opt/odoo/auto/odoo.conf")
 CONFIG_DIRS = ("/opt/odoo/common/conf.d", "/opt/odoo/custom/conf.d")
 CONFIG_FILES = []
 

diff --git a/build.d/700-odoo-install b/build.d/700-odoo-install
@@ -7,29 +7,11 @@ log INFO Installing Odoo from $src
 # For development you could want to avoid installing Odoo to speed up build
 if [ "$PIP_INSTALL_ODOO" == true ]; then
     args="--no-cache-dir"
-    # Odoo <= v8 dependencies could crash at install, so we don't use them
-    if [ "$ODOO_VERSION" == "7.0" -o "$ODOO_VERSION" == "8.0" ]; then
-        args="$args --no-deps"
-    fi
     pip install $args --editable $src
-
-    # Make versions 7.0 to 9.0 have an `odoo` executable
-    if [ "$ODOO_VERSION" == "7.0" ]; then
-        ln -s /usr/local/bin/openerp-server $dst
-    elif [ "$ODOO_VERSION" == "8.0" -o "$ODOO_VERSION" == "9.0" ]; then
-        ln -s $dst.py $dst
-    fi
 else
     log WARNING Blindly symlinking odoo executable
     bin=$src/odoo-bin
     # Cannot check for scripts existence and link all: they probably do not
     # exist yet at build time! Just check Odoo version and act properly.
-    if [ "$ODOO_VERSION" == "7.0" ]; then
-        bin=$src/openerp-server
-        ln -s /opt/odoo/custom/src/odoo/openerp-server /usr/local/bin/
-    elif [ "$ODOO_VERSION" == "8.0" -o "$ODOO_VERSION" == "9.0" ]; then
-        bin=$src/odoo.py
-        ln -s /opt/odoo/custom/src/odoo/openerp-{gevent,server} /usr/local/bin/
-    fi
     ln -s $bin $dst
 fi
diff --git a/lib/doodbalib/__init__.py b/lib/doodbalib/__init__.py
@@ -42,8 +42,6 @@
 ODOO_DIR = os.path.join(SRC_DIR, "odoo")
 ODOO_VERSION = os.environ["ODOO_VERSION"]
 MANIFESTS = ("__manifest__.py", "__openerp__.py")
-if ODOO_VERSION in {"8.0", "9.0"}:
-    MANIFESTS = MANIFESTS[1:]
 
 # Customize logging for build
 logger = logging.getLogger("doodba")