Merge pull request #365 from SUSE/stop_sp4

Stop testing SP4 based language/app containers
SUSE · Jan 2, 2024 · 5509c7b · 5509c7b
2 parents a93b3c4 + c32ab9b
commit 5509c7b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/bci_tester/data.py b/bci_tester/data.py
@@ -42,7 +42,7 @@
 )
 
 # Allowed os versions for Language and Application containers
-ALLOWED_NONBASE_OS_VERSIONS = ("15.4", "15.5", "15.6", "tumbleweed")
+ALLOWED_NONBASE_OS_VERSIONS = ("15.5", "15.6", "tumbleweed")
 
 # Allowed os versions for SLE_BCI repo checks
 ALLOWED_BCI_REPO_OS_VERSIONS = ("15.5", "15.6", "tumbleweed")
@@ -422,9 +422,6 @@ def create_BCI(
     OPENJDK_DEVEL_21_CONTAINER,
 ]
 
-NODEJS_16_CONTAINER = create_BCI(
-    build_tag="bci/nodejs:16", available_versions=["15.4"]
-)
 NODEJS_18_CONTAINER = create_BCI(
     build_tag="bci/nodejs:18", available_versions=["15.5"]
 )
@@ -433,7 +430,6 @@ def create_BCI(
 )
 
 NODEJS_CONTAINERS = [
-    NODEJS_16_CONTAINER,
     NODEJS_18_CONTAINER,
     NODEJS_20_CONTAINER,
 ]
@@ -442,7 +438,7 @@ def create_BCI(
     build_tag="bci/python:3.6", available_versions=["15.5"]
 )
 PYTHON310_CONTAINER = create_BCI(
-    build_tag="bci/python:3.10", available_versions=["15.4", "tumbleweed"]
+    build_tag="bci/python:3.10", available_versions=["tumbleweed"]
 )
 PYTHON311_CONTAINER = create_BCI(build_tag="bci/python:3.11")
 
@@ -561,7 +557,6 @@ def create_BCI(
         extra_environment_variables={"POSTGRES_PASSWORD": POSTGRES_PASSWORD},
     )
     for pg_ver, pg_versions in (
-        (14, ["15.4"]),
         (15, ["15.5", "15.6", "tumbleweed"]),
         (16, ["15.5", "15.6", "tumbleweed"]),
     )
@@ -625,7 +620,6 @@ def create_BCI(
     [
         BASE_CONTAINER,
         NGINX_CONTAINER,
-        NODEJS_16_CONTAINER,
         NODEJS_18_CONTAINER,
         NODEJS_20_CONTAINER,
         PCP_CONTAINER,

diff --git a/tests/test_metadata.py b/tests/test_metadata.py
@@ -45,7 +45,6 @@
 from bci_tester.data import MICRO_CONTAINER
 from bci_tester.data import MINIMAL_CONTAINER
 from bci_tester.data import NGINX_CONTAINER
-from bci_tester.data import NODEJS_16_CONTAINER
 from bci_tester.data import NODEJS_18_CONTAINER
 from bci_tester.data import NODEJS_20_CONTAINER
 from bci_tester.data import OPENJDK_11_CONTAINER
@@ -129,7 +128,6 @@ def _get_container_label_prefix(
             "openjdk.devel",
             ImageType.LANGUAGE_STACK,
         ),
-        (NODEJS_16_CONTAINER, "nodejs", ImageType.LANGUAGE_STACK),
         (NODEJS_18_CONTAINER, "nodejs", ImageType.LANGUAGE_STACK),
         (NODEJS_20_CONTAINER, "nodejs", ImageType.LANGUAGE_STACK),
         (PYTHON36_CONTAINER, "python", ImageType.LANGUAGE_STACK),