From c3b8390bcf34e6eb354ee37010fc083facb98877 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 16 Aug 2022 09:46:29 +0200 Subject: [PATCH] ci OBS: replace Ubuntu 21.10 by 22.04 21.10 isn't supported anymore, which is probably why it's failing. --- .gitlab-ci.yml | 6 +++--- distro/tests/{ubuntu2110 => ubuntu2204}/Vagrantfile | 4 ++-- distro/tests/{ubuntu2110 => ubuntu2204}/ansible.cfg | 0 3 files changed, 5 insertions(+), 5 deletions(-) rename distro/tests/{ubuntu2110 => ubuntu2204}/Vagrantfile (86%) rename distro/tests/{ubuntu2110 => ubuntu2204}/ansible.cfg (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0275510e1..071b33bfe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -722,12 +722,12 @@ obs:ubuntu2004:x86_64: DISTROTEST_NAME: ubuntu2004 DISTROTEST_REPO: xUbuntu_20.04 -obs:ubuntu2110:x86_64: +obs:ubuntu2204:x86_64: <<: *distrotest variables: OBS_REPO: knot-resolver-latest - DISTROTEST_NAME: ubuntu2110 - DISTROTEST_REPO: xUbuntu_21.10 + DISTROTEST_NAME: ubuntu2204 + DISTROTEST_REPO: xUbuntu_22.04 .packagingtest: &packagingtest stage: pkgtest diff --git a/distro/tests/ubuntu2110/Vagrantfile b/distro/tests/ubuntu2204/Vagrantfile similarity index 86% rename from distro/tests/ubuntu2110/Vagrantfile rename to distro/tests/ubuntu2204/Vagrantfile index 441db2711..e2b97507a 100644 --- a/distro/tests/ubuntu2110/Vagrantfile +++ b/distro/tests/ubuntu2204/Vagrantfile @@ -5,10 +5,10 @@ Vagrant.configure(2) do |config| - config.vm.box = "generic/ubuntu2110" + config.vm.box = "generic/ubuntu2204" config.vm.synced_folder ".", "/vagrant", disabled: true - config.vm.define "ubuntu2110_knot-resolver" do |machine| + config.vm.define "ubuntu2204_knot-resolver" do |machine| machine.vm.provision "ansible" do |ansible| ansible.playbook = "../knot-resolver-pkgtest.yaml" ansible.extra_vars = { diff --git a/distro/tests/ubuntu2110/ansible.cfg b/distro/tests/ubuntu2204/ansible.cfg similarity index 100% rename from distro/tests/ubuntu2110/ansible.cfg rename to distro/tests/ubuntu2204/ansible.cfg -- 2.47.2