From b6cce7f632c11efd488f3e7018714266f2262705 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dirk=20M=C3=BCller?= Date: Fri, 10 Jan 2025 11:25:39 +0100 Subject: [PATCH] Add Ruby 3.4 testing (tumbleweed) --- bci_tester/data.py | 6 +++--- pyproject.toml | 2 +- tests/test_metadata.py | 6 ++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/bci_tester/data.py b/bci_tester/data.py index c8fea65d..79194ed9 100755 --- a/bci_tester/data.py +++ b/bci_tester/data.py @@ -617,11 +617,11 @@ def create_BCI( build_tag="bci/ruby:2.5", available_versions=["15.6"] ) -RUBY_33_CONTAINER = create_BCI( - build_tag="bci/ruby:3.3", available_versions=["tumbleweed"] +RUBY_34_CONTAINER = create_BCI( + build_tag="bci/ruby:3.4", available_versions=["tumbleweed"] ) -RUBY_CONTAINERS = [RUBY_25_CONTAINER, RUBY_33_CONTAINER] +RUBY_CONTAINERS = [RUBY_25_CONTAINER, RUBY_34_CONTAINER] _DOTNET_SKIP_ARCH_MARK = pytest.mark.skipif( LOCALHOST.system_info.arch != "x86_64", diff --git a/pyproject.toml b/pyproject.toml index f8a416ec..3e455425 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -138,7 +138,7 @@ markers = [ 'python_3.6', 'registry_2.8', 'ruby_2.5', - 'ruby_3.3', + 'ruby_3.4', 'rust_oldstable', 'rust_stable', 'tumbleweed_latest', diff --git a/tests/test_metadata.py b/tests/test_metadata.py index 5663365d..c78e2573 100644 --- a/tests/test_metadata.py +++ b/tests/test_metadata.py @@ -81,8 +81,7 @@ from bci_tester.data import POSTGRESQL_CONTAINERS from bci_tester.data import PROMETHEUS_CONTAINERS from bci_tester.data import PYTHON_CONTAINERS -from bci_tester.data import RUBY_25_CONTAINER -from bci_tester.data import RUBY_33_CONTAINER +from bci_tester.data import RUBY_CONTAINERS from bci_tester.data import RUST_CONTAINERS from bci_tester.data import SAC_PYTHON_CONTAINERS from bci_tester.data import SPACK_CONTAINERS @@ -155,8 +154,6 @@ def _get_container_label_prefix( "openjdk.devel", ImageType.LANGUAGE_STACK, ), - (RUBY_25_CONTAINER, "ruby", ImageType.LANGUAGE_STACK), - (RUBY_33_CONTAINER, "ruby", ImageType.LANGUAGE_STACK), (INIT_CONTAINER, "init", ImageType.OS), (PHP_8_APACHE, "php-apache", ImageType.LANGUAGE_STACK), (PHP_8_CLI, "php", ImageType.LANGUAGE_STACK), @@ -165,6 +162,7 @@ def _get_container_label_prefix( ] + [(c, "nodejs", ImageType.LANGUAGE_STACK) for c in NODEJS_CONTAINERS] + [(c, "python", ImageType.LANGUAGE_STACK) for c in PYTHON_CONTAINERS] + + [(c, "ruby", ImageType.LANGUAGE_STACK) for c in RUBY_CONTAINERS] + [ (c, "python", ImageType.SAC_LANGUAGE_STACK) for c in SAC_PYTHON_CONTAINERS