From 34ba4b6dac97062b1f4cb7d72a8adb66d2019c46 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 16 Aug 2022 09:40:06 +0200 Subject: [PATCH] ci OBS: replace Fedora 34 by 36 We've already done that on OBS side, which is probably why it's failing. --- .gitlab-ci.yml | 12 ++++++------ distro/tests/{fedora34 => fedora36}/Vagrantfile | 4 ++-- distro/tests/{fedora34 => fedora36}/ansible.cfg | 0 3 files changed, 8 insertions(+), 8 deletions(-) rename distro/tests/{fedora34 => fedora36}/Vagrantfile (86%) rename distro/tests/{fedora34 => fedora36}/ansible.cfg (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index baa09aca7..0275510e1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -683,19 +683,19 @@ obs:debian11:x86_64: DISTROTEST_NAME: debian11 DISTROTEST_REPO: Debian_11 -obs:fedora34:x86_64: +obs:fedora35:x86_64: <<: *distrotest variables: OBS_REPO: knot-resolver-latest - DISTROTEST_NAME: fedora34 - DISTROTEST_REPO: Fedora_34 + DISTROTEST_NAME: fedora35 + DISTROTEST_REPO: Fedora_35 -obs:fedora35:x86_64: +obs:fedora36:x86_64: <<: *distrotest variables: OBS_REPO: knot-resolver-latest - DISTROTEST_NAME: fedora35 - DISTROTEST_REPO: Fedora_35 + DISTROTEST_NAME: fedora36 + DISTROTEST_REPO: Fedora_36 obs:leap15:x86_64: <<: *distrotest diff --git a/distro/tests/fedora34/Vagrantfile b/distro/tests/fedora36/Vagrantfile similarity index 86% rename from distro/tests/fedora34/Vagrantfile rename to distro/tests/fedora36/Vagrantfile index 3203239e4..56659e59a 100644 --- a/distro/tests/fedora34/Vagrantfile +++ b/distro/tests/fedora36/Vagrantfile @@ -5,10 +5,10 @@ Vagrant.configure(2) do |config| - config.vm.box = "fedora/34-cloud-base" + config.vm.box = "fedora/36-cloud-base" config.vm.synced_folder ".", "/vagrant", disabled: true - config.vm.define "fedora34_knot-resolver" do |machine| + config.vm.define "fedora36_knot-resolver" do |machine| machine.vm.provision "ansible" do |ansible| ansible.playbook = "../knot-resolver-pkgtest.yaml" ansible.extra_vars = { diff --git a/distro/tests/fedora34/ansible.cfg b/distro/tests/fedora36/ansible.cfg similarity index 100% rename from distro/tests/fedora34/ansible.cfg rename to distro/tests/fedora36/ansible.cfg -- 2.47.3