From 9613ed8782314733c8ed0b2fef1f712312c1db03 Mon Sep 17 00:00:00 2001 From: Arthur Outhenin-Chalandre Date: Tue, 8 Aug 2023 09:50:12 +0200 Subject: [PATCH] Use supported version of fedora in CI (#10108) * tests: replace fedora35 with fedora37 Signed-off-by: Arthur Outhenin-Chalandre * tests: replace fedora36 with fedora38 Signed-off-by: Arthur Outhenin-Chalandre * docs: update fedora version in docs Signed-off-by: Arthur Outhenin-Chalandre * molecule: upgrade fedora version Signed-off-by: Arthur Outhenin-Chalandre * tests: upgrade fedora images for vagrant and kubevirt Signed-off-by: Arthur Outhenin-Chalandre * vagrant: workaround to fix private network ip address in fedora Fedora stop supporting syconfig network script so we added a workaround here https://github.com/hashicorp/vagrant/issues/12762#issuecomment-1535957837 to fix it. * netowrkmanager: do not configure dns if using systemd-resolved We should not configure dns if we point to systemd-resolved. Systemd-resolved is using NetworkManager to infer the upstream DNS server so if we set NetworkManager to 127.0.0.53 it will prevent systemd-resolved to get the correct network DNS server. Thus if we are in this case we just don't set this setting. Signed-off-by: Arthur Outhenin-Chalandre * image-builder: update centos7 image Signed-off-by: Arthur Outhenin-Chalandre * gitlab-ci: mark fedora packet jobs as allow failure Fedora networking is still broken on Packet, let's mark it as allow failure for now. Signed-off-by: Arthur Outhenin-Chalandre --------- Signed-off-by: Arthur Outhenin-Chalandre --- .gitlab-ci/packet.yml | 13 ++++++------ .gitlab-ci/vagrant.yml | 2 +- README.md | 2 +- Vagrantfile | 16 +++++++++++---- docs/ci.md | 12 +++++------ .../cri-o/molecule/default/molecule.yml | 2 +- .../tasks/0063-networkmanager-dns.yml | 2 ++ .../roles/kubevirt-images/defaults/main.yml | 20 +++++++++---------- .../roles/packet-ci/defaults/main.yml | 4 ++-- ...yml => packet_fedora37-calico-selinux.yml} | 2 +- ...> packet_fedora37-calico-swap-selinux.yml} | 2 +- ...ra35-crio.yml => packet_fedora37-crio.yml} | 2 +- ....yml => packet_fedora38-docker-calico.yml} | 2 +- ...e.yml => packet_fedora38-docker-weave.yml} | 2 +- ...e-ovn.yml => packet_fedora38-kube-ovn.yml} | 2 +- ...ter.rb => vagrant_fedora37-kube-router.rb} | 2 +- ...r.yml => vagrant_fedora37-kube-router.yml} | 2 +- 17 files changed, 50 insertions(+), 39 deletions(-) rename tests/files/{packet_fedora35-calico-selinux.yml => packet_fedora37-calico-selinux.yml} (96%) rename tests/files/{packet_fedora35-calico-swap-selinux.yml => packet_fedora37-calico-swap-selinux.yml} (96%) rename tests/files/{packet_fedora35-crio.yml => packet_fedora37-crio.yml} (96%) rename tests/files/{packet_fedora36-docker-calico.yml => packet_fedora38-docker-calico.yml} (96%) rename tests/files/{packet_fedora36-docker-weave.yml => packet_fedora38-docker-weave.yml} (89%) rename tests/files/{packet_fedora36-kube-ovn.yml => packet_fedora38-kube-ovn.yml} (79%) rename tests/files/{vagrant_fedora35-kube-router.rb => vagrant_fedora37-kube-router.rb} (95%) rename tests/files/{vagrant_fedora35-kube-router.yml => vagrant_fedora37-kube-router.yml} (80%) diff --git a/.gitlab-ci/packet.yml b/.gitlab-ci/packet.yml index b6246b6fa..ff5718f34 100644 --- a/.gitlab-ci/packet.yml +++ b/.gitlab-ci/packet.yml @@ -76,7 +76,7 @@ packet_ubuntu20-crio: stage: deploy-part2 when: manual -packet_fedora35-crio: +packet_fedora37-crio: extends: .packet_pr stage: deploy-part2 when: manual @@ -163,10 +163,11 @@ packet_almalinux8-docker: extends: .packet_pr when: on_success -packet_fedora36-docker-weave: +packet_fedora38-docker-weave: stage: deploy-part2 extends: .packet_pr when: on_success + allow_failure: true packet_opensuse-docker-cilium: stage: deploy-part2 @@ -211,19 +212,19 @@ packet_centos7-multus-calico: extends: .packet_pr when: manual -packet_fedora36-docker-calico: +packet_fedora38-docker-calico: stage: deploy-part2 extends: .packet_periodic when: on_success variables: RESET_CHECK: "true" -packet_fedora35-calico-selinux: +packet_fedora37-calico-selinux: stage: deploy-part2 extends: .packet_periodic when: on_success -packet_fedora35-calico-swap-selinux: +packet_fedora37-calico-swap-selinux: stage: deploy-part2 extends: .packet_pr when: manual @@ -238,7 +239,7 @@ packet_almalinux8-calico-nodelocaldns-secondary: extends: .packet_pr when: manual -packet_fedora36-kube-ovn: +packet_fedora38-kube-ovn: stage: deploy-part2 extends: .packet_periodic when: on_success diff --git a/.gitlab-ci/vagrant.yml b/.gitlab-ci/vagrant.yml index dba24bbb2..7992e6db6 100644 --- a/.gitlab-ci/vagrant.yml +++ b/.gitlab-ci/vagrant.yml @@ -57,7 +57,7 @@ vagrant_ubuntu20-kube-router-svc-proxy: extends: .vagrant when: manual -vagrant_fedora35-kube-router: +vagrant_fedora37-kube-router: stage: deploy-part2 extends: .vagrant when: on_success diff --git a/README.md b/README.md index 6dd69a77c..038ba07e3 100644 --- a/README.md +++ b/README.md @@ -145,7 +145,7 @@ vagrant up - **Debian** Bookworm, Bullseye, Buster - **Ubuntu** 20.04, 22.04 - **CentOS/RHEL** 7, [8, 9](docs/centos.md#centos-8) -- **Fedora** 35, 36 +- **Fedora** 37, 38 - **Fedora CoreOS** (see [fcos Note](docs/fcos.md)) - **openSUSE** Leap 15.x/Tumbleweed - **Oracle Linux** 7, [8, 9](docs/centos.md#centos-8) diff --git a/Vagrantfile b/Vagrantfile index 05b502ef0..7ba30f32e 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -10,7 +10,6 @@ Vagrant.require_version ">= 2.0.0" CONFIG = File.join(File.dirname(__FILE__), ENV['KUBESPRAY_VAGRANT_CONFIG'] || 'vagrant/config.rb') FLATCAR_URL_TEMPLATE = "https://%s.release.flatcar-linux.net/amd64-usr/current/flatcar_production_vagrant.json" -FEDORA35_MIRROR = "https://download.fedoraproject.org/pub/fedora/linux/releases/35/Cloud/x86_64/images/Fedora-Cloud-Base-Vagrant-35-1.2.x86_64.vagrant-libvirt.box" # Uniq disk UUID for libvirt DISK_UUID = Time.now.utc.to_i @@ -29,8 +28,8 @@ SUPPORTED_OS = { "almalinux8" => {box: "almalinux/8", user: "vagrant"}, "almalinux8-bento" => {box: "bento/almalinux-8", user: "vagrant"}, "rockylinux8" => {box: "generic/rocky8", user: "vagrant"}, - "fedora35" => {box: "fedora/35-cloud-base", user: "vagrant", box_url: FEDORA35_MIRROR}, - "fedora36" => {box: "fedora/36-cloud-base", user: "vagrant"}, + "fedora37" => {box: "fedora/37-cloud-base", user: "vagrant"}, + "fedora38" => {box: "fedora/38-cloud-base", user: "vagrant"}, "opensuse" => {box: "opensuse/Leap-15.4.x86_64", user: "vagrant"}, "opensuse-tumbleweed" => {box: "opensuse/Tumbleweed.x86_64", user: "vagrant"}, "oraclelinux" => {box: "generic/oracle7", user: "vagrant"}, @@ -208,7 +207,8 @@ Vagrant.configure("2") do |config| end ip = "#{$subnet}.#{i+100}" - node.vm.network :private_network, ip: ip, + node.vm.network :private_network, + :ip => ip, :libvirt__guest_ipv6 => 'yes', :libvirt__ipv6_address => "#{$subnet_ipv6}::#{i+100}", :libvirt__ipv6_prefix => "64", @@ -223,6 +223,14 @@ Vagrant.configure("2") do |config| node.vm.provision "shell", inline: "rm -f /etc/modprobe.d/local.conf" node.vm.provision "shell", inline: "sed -i '/net.ipv6.conf.all.disable_ipv6/d' /etc/sysctl.d/99-sysctl.conf /etc/sysctl.conf" end + # Hack for fedora37/38 to get the IP address of the second interface + if ["fedora37", "fedora38"].include? $os + config.vm.provision "shell", inline: <<-SHELL + nmcli conn modify 'Wired connection 2' ipv4.addresses $(cat /etc/sysconfig/network-scripts/ifcfg-eth1 | grep IPADDR | cut -d "=" -f2) + nmcli conn modify 'Wired connection 2' ipv4.method manual + service NetworkManager restart + SHELL + end # Disable firewalld on oraclelinux/redhat vms if ["oraclelinux","oraclelinux8","rhel7","rhel8","rockylinux8"].include? $os diff --git a/docs/ci.md b/docs/ci.md index f981a593a..c690b576c 100644 --- a/docs/ci.md +++ b/docs/ci.md @@ -12,8 +12,8 @@ centos7 | :white_check_mark: | :x: | :x: | :white_check_mark: | :x: | :white_ch debian10 | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: | :x: | :white_check_mark: | :x: | debian11 | :white_check_mark: | :x: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | debian12 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -fedora35 | :white_check_mark: | :x: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: | -fedora36 | :x: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: | :x: | +fedora37 | :white_check_mark: | :x: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: | +fedora38 | :x: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: | :x: | opensuse | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | rockylinux8 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | rockylinux9 | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | @@ -30,8 +30,8 @@ centos7 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | debian10 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | debian11 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | debian12 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -fedora35 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -fedora36 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +fedora37 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +fedora38 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | opensuse | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | rockylinux8 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | rockylinux9 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | @@ -48,8 +48,8 @@ centos7 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | debian10 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | debian11 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | debian12 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -fedora35 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | -fedora36 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: | +fedora37 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | +fedora38 | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: | opensuse | :x: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | rockylinux8 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | rockylinux9 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | diff --git a/roles/container-engine/cri-o/molecule/default/molecule.yml b/roles/container-engine/cri-o/molecule/default/molecule.yml index d8742e17f..99d44a3e5 100644 --- a/roles/container-engine/cri-o/molecule/default/molecule.yml +++ b/roles/container-engine/cri-o/molecule/default/molecule.yml @@ -26,7 +26,7 @@ platforms: provider_options: driver: kvm - name: fedora - box: fedora/36-cloud-base + box: fedora/38-cloud-base cpus: 2 memory: 2048 groups: diff --git a/roles/kubernetes/preinstall/tasks/0063-networkmanager-dns.yml b/roles/kubernetes/preinstall/tasks/0063-networkmanager-dns.yml index b80fe8f09..e155f0a18 100644 --- a/roles/kubernetes/preinstall/tasks/0063-networkmanager-dns.yml +++ b/roles/kubernetes/preinstall/tasks/0063-networkmanager-dns.yml @@ -7,6 +7,8 @@ value: "{{ nameserverentries }}" mode: '0600' backup: yes + when: + - nameserverentries != "127.0.0.53" or systemd_resolved_enabled.rc != 0 notify: Preinstall | update resolvconf for networkmanager - name: Set default dns if remove_default_searchdomains is false diff --git a/test-infra/image-builder/roles/kubevirt-images/defaults/main.yml b/test-infra/image-builder/roles/kubevirt-images/defaults/main.yml index 869934307..47d9bee41 100644 --- a/test-infra/image-builder/roles/kubevirt-images/defaults/main.yml +++ b/test-infra/image-builder/roles/kubevirt-images/defaults/main.yml @@ -20,17 +20,17 @@ images: converted: false tag: "latest" - fedora-35: - filename: Fedora-Cloud-Base-35-1.2.x86_64.qcow2 - url: https://download.fedoraproject.org/pub/fedora/linux/releases/35/Cloud/x86_64/images/Fedora-Cloud-Base-35-1.2.x86_64.qcow2 - checksum: sha256:fe84502779b3477284a8d4c86731f642ca10dd3984d2b5eccdf82630a9ca2de6 + fedora-37: + filename: Fedora-Cloud-Base-37-1.7.x86_64.qcow2 + url: https://download.fedoraproject.org/pub/fedora/linux/releases/37/Cloud/x86_64/images/Fedora-Cloud-Base-37-1.7.x86_64.qcow2 + checksum: sha256:b5b9bec91eee65489a5745f6ee620573b23337cbb1eb4501ce200b157a01f3a0 converted: true tag: "latest" - fedora-36: - filename: Fedora-Cloud-Base-36-1.5.x86_64.qcow2 - url: https://download.fedoraproject.org/pub/fedora/linux/releases/36/Cloud/x86_64/images/Fedora-Cloud-Base-36-1.5.x86_64.qcow2 - checksum: sha256:ca9e514cc2f4a7a0188e7c68af60eb4e573d2e6850cc65b464697223f46b4605 + fedora-38: + filename: Fedora-Cloud-Base-38-1.6.x86_64.qcow2 + url: https://download.fedoraproject.org/pub/fedora/linux/releases/38/Cloud/x86_64/images/Fedora-Cloud-Base-38-1.6.x86_64.qcow2 + checksum: sha256:d334670401ff3d5b4129fcc662cf64f5a6e568228af59076cc449a4945318482 converted: true tag: "latest" @@ -43,8 +43,8 @@ images: centos-7: filename: CentOS-7-x86_64-GenericCloud-2009.qcow2 - url: http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-2009.qcow2 - checksum: sha256:e38bab0475cc6d004d2e17015969c659e5a308111851b0e2715e84646035bdd3 + url: http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-2211.qcow2 + checksum: sha256:284aab2b23d91318f169ff464bce4d53404a15a0618ceb34562838c59af4adea converted: true tag: "latest" diff --git a/tests/cloud_playbooks/roles/packet-ci/defaults/main.yml b/tests/cloud_playbooks/roles/packet-ci/defaults/main.yml index 2e78a1f8a..aad35de0e 100644 --- a/tests/cloud_playbooks/roles/packet-ci/defaults/main.yml +++ b/tests/cloud_playbooks/roles/packet-ci/defaults/main.yml @@ -31,8 +31,8 @@ cloud_init: debian-10: "I2Nsb3VkLWNvbmZpZwogdXNlcnM6CiAgLSBuYW1lOiBrdWJlc3ByYXkKICAgIHN1ZG86IEFMTD0oQUxMKSBOT1BBU1NXRDpBTEwKICAgIHNoZWxsOiAvYmluL2Jhc2gKICAgIGxvY2tfcGFzc3dkOiBGYWxzZQogICAgaG9tZTogL2hvbWUva3ViZXNwcmF5CiAgICBzc2hfYXV0aG9yaXplZF9rZXlzOgogICAgICAtIHNzaC1yc2EgQUFBQUIzTnphQzF5YzJFQUFBQURBUUFCQUFBQkFRQ2FuVGkvZUt4MCt0SFlKQWVEaHErc0ZTMk9iVVAxL0k2OWY3aVYzVXRrS2xUMjBKZlcxZjZGZVh0LzA0VmYyN1dRcStOcXM2dkdCcUQ5UVhTWXVmK3QwL3M3RVBMalRlaTltZTFtcHFyK3VUZStLRHRUUDM5cGZEMy9lVkNhZUI3MjZHUDJGa2FEMEZ6cG1FYjY2TzNOcWh4T1E5Nkd4LzlYVHV3L0szbGxqNE9WRDZHcmpSM0I3YzRYdEVCc1pjWnBwTUovb0gxbUd5R1hkaDMxbVdRU3FBUk8vUDhVOEd3dDArSEdwVXdoL2hkeTN0K1NZb1RCMkd3VmIwem95Vnd0VnZmRFF6c204ZnEzYXY0S3ZlejhrWXVOREp2MDV4NGx2VVpnUjE1WkRSWHNBbmRoUXlxb1hkQ0xBZTArZWFLWHE5QmtXeEtGYjloUGUwQVVqamE1" debian-11: "I2Nsb3VkLWNvbmZpZwogdXNlcnM6CiAgLSBuYW1lOiBrdWJlc3ByYXkKICAgIHN1ZG86IEFMTD0oQUxMKSBOT1BBU1NXRDpBTEwKICAgIHNoZWxsOiAvYmluL2Jhc2gKICAgIGxvY2tfcGFzc3dkOiBGYWxzZQogICAgaG9tZTogL2hvbWUva3ViZXNwcmF5CiAgICBzc2hfYXV0aG9yaXplZF9rZXlzOgogICAgICAtIHNzaC1yc2EgQUFBQUIzTnphQzF5YzJFQUFBQURBUUFCQUFBQkFRQ2FuVGkvZUt4MCt0SFlKQWVEaHErc0ZTMk9iVVAxL0k2OWY3aVYzVXRrS2xUMjBKZlcxZjZGZVh0LzA0VmYyN1dRcStOcXM2dkdCcUQ5UVhTWXVmK3QwL3M3RVBMalRlaTltZTFtcHFyK3VUZStLRHRUUDM5cGZEMy9lVkNhZUI3MjZHUDJGa2FEMEZ6cG1FYjY2TzNOcWh4T1E5Nkd4LzlYVHV3L0szbGxqNE9WRDZHcmpSM0I3YzRYdEVCc1pjWnBwTUovb0gxbUd5R1hkaDMxbVdRU3FBUk8vUDhVOEd3dDArSEdwVXdoL2hkeTN0K1NZb1RCMkd3VmIwem95Vnd0VnZmRFF6c204ZnEzYXY0S3ZlejhrWXVOREp2MDV4NGx2VVpnUjE1WkRSWHNBbmRoUXlxb1hkQ0xBZTArZWFLWHE5QmtXeEtGYjloUGUwQVVqamE1" debian-12: "I2Nsb3VkLWNvbmZpZwogdXNlcnM6CiAgLSBuYW1lOiBrdWJlc3ByYXkKICAgIHN1ZG86IEFMTD0oQUxMKSBOT1BBU1NXRDpBTEwKICAgIHNoZWxsOiAvYmluL2Jhc2gKICAgIGxvY2tfcGFzc3dkOiBGYWxzZQogICAgaG9tZTogL2hvbWUva3ViZXNwcmF5CiAgICBzc2hfYXV0aG9yaXplZF9rZXlzOgogICAgICAtIHNzaC1yc2EgQUFBQUIzTnphQzF5YzJFQUFBQURBUUFCQUFBQkFRQ2FuVGkvZUt4MCt0SFlKQWVEaHErc0ZTMk9iVVAxL0k2OWY3aVYzVXRrS2xUMjBKZlcxZjZGZVh0LzA0VmYyN1dRcStOcXM2dkdCcUQ5UVhTWXVmK3QwL3M3RVBMalRlaTltZTFtcHFyK3VUZStLRHRUUDM5cGZEMy9lVkNhZUI3MjZHUDJGa2FEMEZ6cG1FYjY2TzNOcWh4T1E5Nkd4LzlYVHV3L0szbGxqNE9WRDZHcmpSM0I3YzRYdEVCc1pjWnBwTUovb0gxbUd5R1hkaDMxbVdRU3FBUk8vUDhVOEd3dDArSEdwVXdoL2hkeTN0K1NZb1RCMkd3VmIwem95Vnd0VnZmRFF6c204ZnEzYXY0S3ZlejhrWXVOREp2MDV4NGx2VVpnUjE1WkRSWHNBbmRoUXlxb1hkQ0xBZTArZWFLWHE5QmtXeEtGYjloUGUwQVVqamE1" - fedora-35: "I2Nsb3VkLWNvbmZpZwpzeXN0ZW1faW5mbzoKICBkaXN0cm86IGZlZG9yYQp1c2VyczoKIC0gbmFtZToga3ViZXNwcmF5CiAgIGdyb3Vwczogd2hlZWwKICAgc3VkbzogJ0FMTD0oQUxMKSBOT1BBU1NXRDpBTEwnCiAgIHNoZWxsOiAvYmluL2Jhc2gKICAgbG9ja19wYXNzd2Q6IEZhbHNlCiAgIGhvbWU6IC9ob21lL2t1YmVzcHJheQogICBzc2hfYXV0aG9yaXplZF9rZXlzOgogICAgIC0gc3NoLXJzYSBBQUFBQjNOemFDMXljMkVBQUFBREFRQUJBQUFCQVFDYW5UaS9lS3gwK3RIWUpBZURocStzRlMyT2JVUDEvSTY5ZjdpVjNVdGtLbFQyMEpmVzFmNkZlWHQvMDRWZjI3V1FxK05xczZ2R0JxRDlRWFNZdWYrdDAvczdFUExqVGVpOW1lMW1wcXIrdVRlK0tEdFRQMzlwZkQzL2VWQ2FlQjcyNkdQMkZrYUQwRnpwbUViNjZPM05xaHhPUTk2R3gvOVhUdXcvSzNsbGo0T1ZENkdyalIzQjdjNFh0RUJzWmNacHBNSi9vSDFtR3lHWGRoMzFtV1FTcUFSTy9QOFU4R3d0MCtIR3BVd2gvaGR5M3QrU1lvVEIyR3dWYjB6b3lWd3RWdmZEUXpzbThmcTNhdjRLdmV6OGtZdU5ESnYwNXg0bHZVWmdSMTVaRFJYc0FuZGhReXFvWGRDTEFlMCtlYUtYcTlCa1d4S0ZiOWhQZTBBVWpqYTU=" - fedora-36: "I2Nsb3VkLWNvbmZpZwpzeXN0ZW1faW5mbzoKICBkaXN0cm86IGZlZG9yYQp1c2VyczoKIC0gbmFtZToga3ViZXNwcmF5CiAgIGdyb3Vwczogd2hlZWwKICAgc3VkbzogJ0FMTD0oQUxMKSBOT1BBU1NXRDpBTEwnCiAgIHNoZWxsOiAvYmluL2Jhc2gKICAgbG9ja19wYXNzd2Q6IEZhbHNlCiAgIGhvbWU6IC9ob21lL2t1YmVzcHJheQogICBzc2hfYXV0aG9yaXplZF9rZXlzOgogICAgIC0gc3NoLXJzYSBBQUFBQjNOemFDMXljMkVBQUFBREFRQUJBQUFCQVFDYW5UaS9lS3gwK3RIWUpBZURocStzRlMyT2JVUDEvSTY5ZjdpVjNVdGtLbFQyMEpmVzFmNkZlWHQvMDRWZjI3V1FxK05xczZ2R0JxRDlRWFNZdWYrdDAvczdFUExqVGVpOW1lMW1wcXIrdVRlK0tEdFRQMzlwZkQzL2VWQ2FlQjcyNkdQMkZrYUQwRnpwbUViNjZPM05xaHhPUTk2R3gvOVhUdXcvSzNsbGo0T1ZENkdyalIzQjdjNFh0RUJzWmNacHBNSi9vSDFtR3lHWGRoMzFtV1FTcUFSTy9QOFU4R3d0MCtIR3BVd2gvaGR5M3QrU1lvVEIyR3dWYjB6b3lWd3RWdmZEUXpzbThmcTNhdjRLdmV6OGtZdU5ESnYwNXg0bHZVWmdSMTVaRFJYc0FuZGhReXFvWGRDTEFlMCtlYUtYcTlCa1d4S0ZiOWhQZTBBVWpqYTU=" + fedora-37: "I2Nsb3VkLWNvbmZpZwpzeXN0ZW1faW5mbzoKICBkaXN0cm86IGZlZG9yYQp1c2VyczoKIC0gbmFtZToga3ViZXNwcmF5CiAgIGdyb3Vwczogd2hlZWwKICAgc3VkbzogJ0FMTD0oQUxMKSBOT1BBU1NXRDpBTEwnCiAgIHNoZWxsOiAvYmluL2Jhc2gKICAgbG9ja19wYXNzd2Q6IEZhbHNlCiAgIGhvbWU6IC9ob21lL2t1YmVzcHJheQogICBzc2hfYXV0aG9yaXplZF9rZXlzOgogICAgIC0gc3NoLXJzYSBBQUFBQjNOemFDMXljMkVBQUFBREFRQUJBQUFCQVFDYW5UaS9lS3gwK3RIWUpBZURocStzRlMyT2JVUDEvSTY5ZjdpVjNVdGtLbFQyMEpmVzFmNkZlWHQvMDRWZjI3V1FxK05xczZ2R0JxRDlRWFNZdWYrdDAvczdFUExqVGVpOW1lMW1wcXIrdVRlK0tEdFRQMzlwZkQzL2VWQ2FlQjcyNkdQMkZrYUQwRnpwbUViNjZPM05xaHhPUTk2R3gvOVhUdXcvSzNsbGo0T1ZENkdyalIzQjdjNFh0RUJzWmNacHBNSi9vSDFtR3lHWGRoMzFtV1FTcUFSTy9QOFU4R3d0MCtIR3BVd2gvaGR5M3QrU1lvVEIyR3dWYjB6b3lWd3RWdmZEUXpzbThmcTNhdjRLdmV6OGtZdU5ESnYwNXg0bHZVWmdSMTVaRFJYc0FuZGhReXFvWGRDTEFlMCtlYUtYcTlCa1d4S0ZiOWhQZTBBVWpqYTU=" + fedora-38: "I2Nsb3VkLWNvbmZpZwpzeXN0ZW1faW5mbzoKICBkaXN0cm86IGZlZG9yYQp1c2VyczoKIC0gbmFtZToga3ViZXNwcmF5CiAgIGdyb3Vwczogd2hlZWwKICAgc3VkbzogJ0FMTD0oQUxMKSBOT1BBU1NXRDpBTEwnCiAgIHNoZWxsOiAvYmluL2Jhc2gKICAgbG9ja19wYXNzd2Q6IEZhbHNlCiAgIGhvbWU6IC9ob21lL2t1YmVzcHJheQogICBzc2hfYXV0aG9yaXplZF9rZXlzOgogICAgIC0gc3NoLXJzYSBBQUFBQjNOemFDMXljMkVBQUFBREFRQUJBQUFCQVFDYW5UaS9lS3gwK3RIWUpBZURocStzRlMyT2JVUDEvSTY5ZjdpVjNVdGtLbFQyMEpmVzFmNkZlWHQvMDRWZjI3V1FxK05xczZ2R0JxRDlRWFNZdWYrdDAvczdFUExqVGVpOW1lMW1wcXIrdVRlK0tEdFRQMzlwZkQzL2VWQ2FlQjcyNkdQMkZrYUQwRnpwbUViNjZPM05xaHhPUTk2R3gvOVhUdXcvSzNsbGo0T1ZENkdyalIzQjdjNFh0RUJzWmNacHBNSi9vSDFtR3lHWGRoMzFtV1FTcUFSTy9QOFU4R3d0MCtIR3BVd2gvaGR5M3QrU1lvVEIyR3dWYjB6b3lWd3RWdmZEUXpzbThmcTNhdjRLdmV6OGtZdU5ESnYwNXg0bHZVWmdSMTVaRFJYc0FuZGhReXFvWGRDTEFlMCtlYUtYcTlCa1d4S0ZiOWhQZTBBVWpqYTU=" opensuse-leap-15: "I2Nsb3VkLWNvbmZpZwogdXNlcnM6CiAgLSBuYW1lOiBrdWJlc3ByYXkKICAgIHN1ZG86IEFMTD0oQUxMKSBOT1BBU1NXRDpBTEwKICAgIHNoZWxsOiAvYmluL2Jhc2gKICAgIGxvY2tfcGFzc3dkOiBGYWxzZQogICAgaG9tZTogL2hvbWUva3ViZXNwcmF5CiAgICBzc2hfYXV0aG9yaXplZF9rZXlzOgogICAgICAtIHNzaC1yc2EgQUFBQUIzTnphQzF5YzJFQUFBQURBUUFCQUFBQkFRQ2FuVGkvZUt4MCt0SFlKQWVEaHErc0ZTMk9iVVAxL0k2OWY3aVYzVXRrS2xUMjBKZlcxZjZGZVh0LzA0VmYyN1dRcStOcXM2dkdCcUQ5UVhTWXVmK3QwL3M3RVBMalRlaTltZTFtcHFyK3VUZStLRHRUUDM5cGZEMy9lVkNhZUI3MjZHUDJGa2FEMEZ6cG1FYjY2TzNOcWh4T1E5Nkd4LzlYVHV3L0szbGxqNE9WRDZHcmpSM0I3YzRYdEVCc1pjWnBwTUovb0gxbUd5R1hkaDMxbVdRU3FBUk8vUDhVOEd3dDArSEdwVXdoL2hkeTN0K1NZb1RCMkd3VmIwem95Vnd0VnZmRFF6c204ZnEzYXY0S3ZlejhrWXVOREp2MDV4NGx2VVpnUjE1WkRSWHNBbmRoUXlxb1hkQ0xBZTArZWFLWHE5QmtXeEtGYjloUGUwQVVqamE1" rhel-server-7: "I2Nsb3VkLWNvbmZpZwpzeXN0ZW1faW5mbzoKICBkaXN0cm86IHJoZWwKdXNlcnM6CiAtIG5hbWU6IGt1YmVzcHJheQogICBncm91cHM6IHdoZWVsCiAgIHN1ZG86ICdBTEw9KEFMTCkgTk9QQVNTV0Q6QUxMJwogICBzaGVsbDogL2Jpbi9iYXNoCiAgIGxvY2tfcGFzc3dkOiBGYWxzZQogICBob21lOiAvaG9tZS9rdWJlc3ByYXkKICAgc3NoX2F1dGhvcml6ZWRfa2V5czoKICAgICAtIHNzaC1yc2EgQUFBQUIzTnphQzF5YzJFQUFBQURBUUFCQUFBQkFRQ2FuVGkvZUt4MCt0SFlKQWVEaHErc0ZTMk9iVVAxL0k2OWY3aVYzVXRrS2xUMjBKZlcxZjZGZVh0LzA0VmYyN1dRcStOcXM2dkdCcUQ5UVhTWXVmK3QwL3M3RVBMalRlaTltZTFtcHFyK3VUZStLRHRUUDM5cGZEMy9lVkNhZUI3MjZHUDJGa2FEMEZ6cG1FYjY2TzNOcWh4T1E5Nkd4LzlYVHV3L0szbGxqNE9WRDZHcmpSM0I3YzRYdEVCc1pjWnBwTUovb0gxbUd5R1hkaDMxbVdRU3FBUk8vUDhVOEd3dDArSEdwVXdoL2hkeTN0K1NZb1RCMkd3VmIwem95Vnd0VnZmRFF6c204ZnEzYXY0S3ZlejhrWXVOREp2MDV4NGx2VVpnUjE1WkRSWHNBbmRoUXlxb1hkQ0xBZTArZWFLWHE5QmtXeEtGYjloUGUwQVVqamE1Cgo=" amazon-linux-2: "I2Nsb3VkLWNvbmZpZwpzeXN0ZW1faW5mbzoKICBkaXN0cm86IHJoZWwKdXNlcnM6CiAtIG5hbWU6IGt1YmVzcHJheQogICBncm91cHM6IHdoZWVsCiAgIHN1ZG86ICdBTEw9KEFMTCkgTk9QQVNTV0Q6QUxMJwogICBzaGVsbDogL2Jpbi9iYXNoCiAgIGxvY2tfcGFzc3dkOiBGYWxzZQogICBob21lOiAvaG9tZS9rdWJlc3ByYXkKICAgc3NoX2F1dGhvcml6ZWRfa2V5czoKICAgICAtIHNzaC1yc2EgQUFBQUIzTnphQzF5YzJFQUFBQURBUUFCQUFBQkFRQ2FuVGkvZUt4MCt0SFlKQWVEaHErc0ZTMk9iVVAxL0k2OWY3aVYzVXRrS2xUMjBKZlcxZjZGZVh0LzA0VmYyN1dRcStOcXM2dkdCcUQ5UVhTWXVmK3QwL3M3RVBMalRlaTltZTFtcHFyK3VUZStLRHRUUDM5cGZEMy9lVkNhZUI3MjZHUDJGa2FEMEZ6cG1FYjY2TzNOcWh4T1E5Nkd4LzlYVHV3L0szbGxqNE9WRDZHcmpSM0I3YzRYdEVCc1pjWnBwTUovb0gxbUd5R1hkaDMxbVdRU3FBUk8vUDhVOEd3dDArSEdwVXdoL2hkeTN0K1NZb1RCMkd3VmIwem95Vnd0VnZmRFF6c204ZnEzYXY0S3ZlejhrWXVOREp2MDV4NGx2VVpnUjE1WkRSWHNBbmRoUXlxb1hkQ0xBZTArZWFLWHE5QmtXeEtGYjloUGUwQVVqamE1Cgo=" diff --git a/tests/files/packet_fedora35-calico-selinux.yml b/tests/files/packet_fedora37-calico-selinux.yml similarity index 96% rename from tests/files/packet_fedora35-calico-selinux.yml rename to tests/files/packet_fedora37-calico-selinux.yml index 62b1b13d9..2fbbd7bdc 100644 --- a/tests/files/packet_fedora35-calico-selinux.yml +++ b/tests/files/packet_fedora37-calico-selinux.yml @@ -1,6 +1,6 @@ --- # Instance settings -cloud_image: fedora-35 +cloud_image: fedora-37 mode: default # Kubespray settings diff --git a/tests/files/packet_fedora35-calico-swap-selinux.yml b/tests/files/packet_fedora37-calico-swap-selinux.yml similarity index 96% rename from tests/files/packet_fedora35-calico-swap-selinux.yml rename to tests/files/packet_fedora37-calico-swap-selinux.yml index c8f058eff..775c930b5 100644 --- a/tests/files/packet_fedora35-calico-swap-selinux.yml +++ b/tests/files/packet_fedora37-calico-swap-selinux.yml @@ -1,6 +1,6 @@ --- # Instance settings -cloud_image: fedora-35 +cloud_image: fedora-37 mode: default # Kubespray settings diff --git a/tests/files/packet_fedora35-crio.yml b/tests/files/packet_fedora37-crio.yml similarity index 96% rename from tests/files/packet_fedora35-crio.yml rename to tests/files/packet_fedora37-crio.yml index fa3302b5e..5f5e736a2 100644 --- a/tests/files/packet_fedora35-crio.yml +++ b/tests/files/packet_fedora37-crio.yml @@ -1,6 +1,6 @@ --- # Instance settings -cloud_image: fedora-35 +cloud_image: fedora-37 mode: default # Kubespray settings diff --git a/tests/files/packet_fedora36-docker-calico.yml b/tests/files/packet_fedora38-docker-calico.yml similarity index 96% rename from tests/files/packet_fedora36-docker-calico.yml rename to tests/files/packet_fedora38-docker-calico.yml index 14ea6689a..8d1a9a44c 100644 --- a/tests/files/packet_fedora36-docker-calico.yml +++ b/tests/files/packet_fedora38-docker-calico.yml @@ -1,6 +1,6 @@ --- # Instance settings -cloud_image: fedora-36 +cloud_image: fedora-38 mode: default # Kubespray settings diff --git a/tests/files/packet_fedora36-docker-weave.yml b/tests/files/packet_fedora38-docker-weave.yml similarity index 89% rename from tests/files/packet_fedora36-docker-weave.yml rename to tests/files/packet_fedora38-docker-weave.yml index f9ecc298b..66bcdb12a 100644 --- a/tests/files/packet_fedora36-docker-weave.yml +++ b/tests/files/packet_fedora38-docker-weave.yml @@ -1,6 +1,6 @@ --- # Instance settings -cloud_image: fedora-36 +cloud_image: fedora-38 mode: default # Kubespray settings diff --git a/tests/files/packet_fedora36-kube-ovn.yml b/tests/files/packet_fedora38-kube-ovn.yml similarity index 79% rename from tests/files/packet_fedora36-kube-ovn.yml rename to tests/files/packet_fedora38-kube-ovn.yml index 7028aaa30..bc4ab5b52 100644 --- a/tests/files/packet_fedora36-kube-ovn.yml +++ b/tests/files/packet_fedora38-kube-ovn.yml @@ -1,6 +1,6 @@ --- # Instance settings -cloud_image: fedora-36 +cloud_image: fedora-38 mode: default # Kubespray settings diff --git a/tests/files/vagrant_fedora35-kube-router.rb b/tests/files/vagrant_fedora37-kube-router.rb similarity index 95% rename from tests/files/vagrant_fedora35-kube-router.rb rename to tests/files/vagrant_fedora37-kube-router.rb index 752ac7f06..54bcd75fa 100644 --- a/tests/files/vagrant_fedora35-kube-router.rb +++ b/tests/files/vagrant_fedora37-kube-router.rb @@ -1,6 +1,6 @@ $num_instances = 2 $vm_memory ||= 2048 -$os = "fedora35" +$os = "fedora37" $kube_master_instances = 1 $etcd_instances = 1 diff --git a/tests/files/vagrant_fedora35-kube-router.yml b/tests/files/vagrant_fedora37-kube-router.yml similarity index 80% rename from tests/files/vagrant_fedora35-kube-router.yml rename to tests/files/vagrant_fedora37-kube-router.yml index 258499489..2cee42120 100644 --- a/tests/files/vagrant_fedora35-kube-router.yml +++ b/tests/files/vagrant_fedora37-kube-router.yml @@ -1,6 +1,6 @@ --- # Instance settings -cloud_image: fedora-35 +cloud_image: fedora-37 mode: default # Kubespray settings