From 030ef76a06e10ac5436434bdf110af29f3199e31 Mon Sep 17 00:00:00 2001 From: Vojtech Trefny Date: Fri, 10 Jan 2025 12:38:41 +0100 Subject: [PATCH 1/3] ci: Change branch for Anaconda tests from 'master' to 'main' Anaconda renamed their default branch. --- .github/workflows/anaconda_tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/anaconda_tests.yml b/.github/workflows/anaconda_tests.yml index 34c90939b..472a8a5b2 100644 --- a/.github/workflows/anaconda_tests.yml +++ b/.github/workflows/anaconda_tests.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false env: - TARGET_BRANCH: 'master' + TARGET_BRANCH: 'main' steps: - name: Clone Anaconda repository @@ -34,7 +34,7 @@ jobs: run: | # Run anaconda-ci container with blivet and anaconda attached. # Steps in the container: - # - Download anaconda-ci:master container (Rawhide) + # - Download anaconda-ci:main container (Rawhide) # - Remove already existing blivet RPM in the container. # - Install dependencies for blivet. # - Install blivet to the container. From 41102170d73b3e7625aeae187e7727361f93ad58 Mon Sep 17 00:00:00 2001 From: Vojtech Trefny Date: Fri, 10 Jan 2025 13:13:36 +0100 Subject: [PATCH 2/3] ci: Use rpm instead of dnf to remove blivet in Anaconda tests DNF will also remove blivet-gui which is needed for the Anaconda tests. --- .github/workflows/anaconda_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/anaconda_tests.yml b/.github/workflows/anaconda_tests.yml index 472a8a5b2..0e9d0b2cb 100644 --- a/.github/workflows/anaconda_tests.yml +++ b/.github/workflows/anaconda_tests.yml @@ -41,7 +41,7 @@ jobs: # - Run Anaconda tests. podman run -i --rm -v ./blivet:/blivet:z -v ./anaconda:/anaconda:z quay.io/rhinstaller/anaconda-ci:$TARGET_BRANCH sh -c " \ set -xe; \ - dnf remove -y python3-blivet; \ + rpm -e --nodeps python3-blivet blivet-data; \ dnf install -y python3-blockdev libblockdev-plugins-all python3-bytesize libbytesize python3-pyparted python3-libmount parted libselinux-python3; \ cd /blivet; \ python3 ./setup.py install; \ From 927831327f8d47ac63ad9465998722415950e617 Mon Sep 17 00:00:00 2001 From: Vojtech Trefny Date: Fri, 10 Jan 2025 13:24:54 +0100 Subject: [PATCH 3/3] ci: Bump Ubuntu version for Anaconda tests to 24.04 --- .github/workflows/anaconda_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/anaconda_tests.yml b/.github/workflows/anaconda_tests.yml index 0e9d0b2cb..acb185858 100644 --- a/.github/workflows/anaconda_tests.yml +++ b/.github/workflows/anaconda_tests.yml @@ -9,7 +9,7 @@ permissions: jobs: unit-tests: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 30 strategy: fail-fast: false