CBD-5454: Fix for older packages in RPM-based distributions

Extend test scenarios to check for existence of older packages.

Change-Id: I03b7d1ed1cde02da98fb6e10196310d2db21e567
Reviewed-on: https://review.couchbase.org/c/build-tools/+/193963
Tested-by: Chris Hillery <[email protected]>
Reviewed-by: Ming Ho <[email protected]>

Author: ceejatec

repo_manage/couchbase-release/couchbase-release-build

@@ -7,11 +7,41 @@ import pathlib
 import shutil
 import sys
 import yaml
-from typing import Any, Dict, List, Union
+from typing import Any, Dict, List, Tuple, Union
 from util import enable_run_trace, pushd, render_template, run
 
 SCRIPT_DIR: pathlib.Path = pathlib.Path(__file__).resolve().parent
 
+
+
+class TestSpec:
+    def __init__(
+        self, baseimage: str, format: str, testver1: str, testver2: str
+    ):
+        self.baseimage: str = baseimage
+        self.format: str = format
+        self.testver1: str = testver1
+        self.testver2: str = testver2
+
+    def context_for(self, arch: str):
+        """
+        Return a template context for this arch
+        """
+
+        context: Dict[str, str] = {}
+        context["baseimage"] = self.baseimage
+
+        # Older versions available only on amd64
+        if arch == "arm64":
+            context["testver1"] = "7.1.2"
+            context["testver2"] = "7.1.4"
+        else:
+            context["testver1"] = self.testver1
+            context["testver2"] = self.testver1
+
+        return context
+
+
 class CouchbaseReleaseBuilder:
 
     def __init__(
@@ -28,6 +58,24 @@ class CouchbaseReleaseBuilder:
         self.build_dir: pathlib.Path = self.script_dir / "build"
         shutil.rmtree(self.build_dir, ignore_errors=True)
         self.build_dir.mkdir(exist_ok = True)
+        self.testspecs: List[TestSpec] = []
+        self.init_testspecs()
+
+
+    def init_testspecs(self):
+        """
+        Initializes the set of testspecs to run
+        """
+
+        self.testspecs.append(TestSpec("centos:7", "rpm", "6.5.2", "7.1.1"))
+        self.testspecs.append(TestSpec("almalinux:8", "rpm", "6.6.1", "7.1.0"))
+        self.testspecs.append(TestSpec("almalinux:9", "rpm", "7.2.0", "7.2.0"))
+        self.testspecs.append(TestSpec("amazonlinux:2", "rpm", "6.6.2", "7.0.4"))
+        self.testspecs.append(TestSpec("amazonlinux:2023", "rpm", "7.2.0", "7.2.0"))
+        self.testspecs.append(TestSpec("debian:10", "deb", "6.6.3", "7.1.1"),)
+        self.testspecs.append(TestSpec("debian:11", "deb", "7.1.1", "7.1.3"),)
+        self.testspecs.append(TestSpec("ubuntu:20.04", "deb", "6.6.5", "7.0.5"),)
+        self.testspecs.append(TestSpec("ubuntu:22.04", "deb", "7.1.0", "7.1.1"),)
 
 
     def context_for(self, target: str) -> Dict[str, Union[str, pathlib.Path]]:
@@ -143,50 +191,40 @@ class CouchbaseReleaseBuilder:
 
 
     def run_test(
-        self, target: str, baseimage: str, format: str, arch: str
+        self, target: str, testspec: TestSpec, arch: str
     ) -> None:
         """
         Builds a local Docker image to test the created
         couchbase-release packages
         """
 
-        logging.info(f"Running test build for {target} - {baseimage}")
+        logging.info(f"Running test build for {target} - {testspec.baseimage}")
         context = self.context_for(target)
-        context["baseimage"] = baseimage
+        context.update(testspec.context_for(arch))
         render_template(
-            self.script_dir / "test" / f"Dockerfile.{format}.j2",
+            self.script_dir / "test" / f"Dockerfile.{testspec.format}.j2",
             self.build_dir / "Dockerfile",
             context
         )
         with pushd(self.build_dir):
-            run(
-                f"docker buildx build --platform {arch} --pull --no-cache ."
-            )
-            run(
-                "docker buildx prune -f"
-            )
+            try:
+                run(
+                    f"docker buildx build --platform {arch} --pull --no-cache ."
+                )
+            finally:
+                run(
+                    "docker buildx prune -f"
+                )
 
 
     def test_target(self, target: str) -> None:
         """
         Runs tests for created installers across defined set of OSes
         """
 
-        for arch in ["amd64", "arm64"]:
-            for baseimage in [
-                "almalinux:8",
-                "almalinux:9",
-                "amazonlinux:2",
-                "amazonlinux:2023"
-            ]:
-                self.run_test(target, baseimage, "rpm", arch)
-            for baseimage in [
-                "debian:10",
-                "debian:11",
-                "ubuntu:20.04",
-                "ubuntu:22.04"
-            ]:
-                self.run_test(target, baseimage, "deb", arch)
+        for testspec in self.testspecs:
+            for arch in ["arm64", "amd64"]:
+                self.run_test(target, testspec, arch)
 
 
     def test(self, targets: List[str]) -> None:

repo_manage/couchbase-release/rpm/couchbase-release.spec.in

@@ -32,7 +32,7 @@ if [ -f /etc/os-release ]; then
   . /etc/os-release
 fi
 
-MAJVER=$(echo "$VERSION" | sed -e 's/\..*//')
+MAJVER=$(echo "$VERSION_ID" | sed -e 's/\..*//')
 
 if [ "${ID}" = "amzn" ]; then
     DISTRO="${ID}${MAJVER}"

repo_manage/couchbase-release/test/Dockerfile.deb.j2

@@ -6,4 +6,11 @@ RUN set -x \
     && apt-get update \
     && apt-get install -y /tmp/${DEBFILE} \
     && apt-get update \
-    && apt-cache search couchbase | grep couchbase-server
+    && apt list -a couchbase-server | grep couchbase-server | tee /tmp/output.txt
+
+{% if target == "release" %}
+RUN set -x \
+    && fgrep {{ testver1 }} /tmp/output.txt \
+    && fgrep {{ testver2 }} /tmp/output.txt \
+    && fgrep 7.2.0 /tmp/output.txt
+{% endif %}

repo_manage/couchbase-release/test/Dockerfile.rpm.j2

@@ -4,4 +4,11 @@ ARG RPMFILE=couchbase-{{ target }}-{{ version }}-{{ bld_num }}.noarch.rpm
 COPY ${RPMFILE} /tmp
 RUN set -x \
     && yum install -y /tmp/${RPMFILE} \
-    && yum search --showduplicates -y couchbase | grep couchbase-server
+    && yum search --showduplicates -y couchbase-server | grep couchbase-server | tee /tmp/output.txt
+
+{% if target == "release" %}
+RUN set -x \
+    && fgrep {{ testver1 }} /tmp/output.txt \
+    && fgrep {{ testver2 }} /tmp/output.txt \
+    && fgrep 7.2.0 /tmp/output.txt
+{% endif %}