From 568896742b0828d923cb211deea9f1f59fd7c5ab Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Fri, 7 Oct 2022 15:47:12 +0200 Subject: [PATCH] Remove ubuntu 20.04 tests Signed-off-by: Evan Lezar --- .common-ci.yml | 5 +---- .gitlab-ci.yml | 28 ---------------------------- 2 files changed, 1 insertion(+), 32 deletions(-) diff --git a/.common-ci.yml b/.common-ci.yml index 4d98e01b..0891f67e 100644 --- a/.common-ci.yml +++ b/.common-ci.yml @@ -262,10 +262,7 @@ release:staging-ubuntu20.04: - .release:staging - .dist-ubuntu20.04 needs: - - test-toolkit-ubuntu20.04 - - test-containerd-ubuntu20.04 - - test-crio-ubuntu20.04 - - test-docker-ubuntu20.04 + - image-ubuntu20.04 release:staging-packaging: extends: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c691656f..3b028ed6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -371,31 +371,3 @@ test-docker-ubuntu18.04: needs: - image-ubuntu18.04 -test-toolkit-ubuntu20.04: - extends: - - .test:toolkit - - .dist-ubuntu20.04 - needs: - - image-ubuntu20.04 - -test-containerd-ubuntu20.04: - extends: - - .test:containerd - - .dist-ubuntu20.04 - needs: - - image-ubuntu20.04 - -test-crio-ubuntu20.04: - extends: - - .test:crio - - .dist-ubuntu20.04 - needs: - - image-ubuntu20.04 - -test-docker-ubuntu20.04: - extends: - - .test:docker - - .dist-ubuntu20.04 - needs: - - image-ubuntu20.04 -