From d41b629be3b419f375d5a0cdd6f245d85e3c43e0 Mon Sep 17 00:00:00 2001 From: Sivaram Singana Date: Sat, 10 Jan 2026 23:35:56 +0530 Subject: [PATCH] updated elastx_ubuntu20 to ubuntu24 (#12844) * Updated the job name to elastx_ubuntu24 and ci matrix and test file Signed-off-by: sivaram * remove unused OVH CI tf file (tf-ovh_ubuntu20-calico.yml) Signed-off-by: sivaram * remove ubuntu20 for pre-commit fix Signed-off-by: sivaram --------- Signed-off-by: sivaram --- .gitlab-ci/terraform.yml | 2 +- docs/developers/ci.md | 3 --- ...x_ubuntu20-calico.yml => tf-elastx_ubuntu24-calico.yml} | 0 tests/files/tf-ovh_ubuntu20-calico.yml | 7 ------- 4 files changed, 1 insertion(+), 11 deletions(-) rename tests/files/{tf-elastx_ubuntu20-calico.yml => tf-elastx_ubuntu24-calico.yml} (100%) delete mode 100644 tests/files/tf-ovh_ubuntu20-calico.yml diff --git a/.gitlab-ci/terraform.yml b/.gitlab-ci/terraform.yml index 57c0f4b4e..7092b5001 100644 --- a/.gitlab-ci/terraform.yml +++ b/.gitlab-ci/terraform.yml @@ -89,7 +89,7 @@ tf-elastx_cleanup: - ./scripts/openstack-cleanup/main.py allow_failure: true -tf-elastx_ubuntu20-calico: +tf-elastx_ubuntu24-calico: extends: .terraform_apply stage: deploy-part1 when: on_success diff --git a/docs/developers/ci.md b/docs/developers/ci.md index c0cfeabe9..b755ff602 100644 --- a/docs/developers/ci.md +++ b/docs/developers/ci.md @@ -17,7 +17,6 @@ flatcar4081 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | openeuler24 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | rockylinux10 | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | rockylinux9 | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | -ubuntu20 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | ubuntu22 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | ubuntu24 | :white_check_mark: | :white_check_mark: | :x: | :white_check_mark: | :x: | :white_check_mark: | :x: | @@ -36,7 +35,6 @@ flatcar4081 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | openeuler24 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | rockylinux10 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | rockylinux9 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -ubuntu20 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | ubuntu22 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | ubuntu24 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | @@ -55,6 +53,5 @@ flatcar4081 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | openeuler24 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | rockylinux10 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | rockylinux9 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -ubuntu20 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | ubuntu22 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | ubuntu24 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | diff --git a/tests/files/tf-elastx_ubuntu20-calico.yml b/tests/files/tf-elastx_ubuntu24-calico.yml similarity index 100% rename from tests/files/tf-elastx_ubuntu20-calico.yml rename to tests/files/tf-elastx_ubuntu24-calico.yml diff --git a/tests/files/tf-ovh_ubuntu20-calico.yml b/tests/files/tf-ovh_ubuntu20-calico.yml deleted file mode 100644 index d6fb9de04..000000000 --- a/tests/files/tf-ovh_ubuntu20-calico.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -sonobuoy_enabled: true -pkg_install_retries: 25 -retry_stagger: 10 - -# Ignore ping errors -ignore_assert_errors: true