Merge pull request #131 from yuravk/almalinux-ng-0.21.0

Sync with upstream version 0.21.0-4

.github/workflows/codespell.yml

@@ -3,10 +3,10 @@ name: Codespell
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     branches:
-      - master
+      - main
 
 jobs:
   codespell:

.github/workflows/differential-shellcheck.yml

@@ -4,7 +4,7 @@
 name: Differential ShellCheck
 on:
   pull_request:
-    branches: [master]
+    branches: [main]
 
 permissions:
   contents: read
@@ -17,7 +17,7 @@ jobs:
       security-events: write
       pull-requests: write
 
-    steps: 
+    steps:
       - name: Repository checkout
         uses: actions/checkout@v4
         with:

.github/workflows/pr-welcome-msg.yml

@@ -28,7 +28,7 @@ jobs:
             However, here are additional useful commands for packit:
             - **`/packit test`** to re-run manually the default tests
             - **`/packit retest-failed`** to re-run failed tests manually
-            - **`/packit test oamg/leapp#42`** to run tests with leapp builds for the leapp PR#42 (default is latest upstream - master - build)
+            - **`/packit test oamg/leapp#42`** to run tests with leapp builds for the leapp PR#42 (default is latest upstream - main - build)
 
             Note that first time contributors cannot run tests automatically - they need to be started by a reviewer.
 

.github/workflows/reuse-copr-build.yml

@@ -16,7 +16,7 @@ jobs:
   reusable_workflow_copr_build_job:
     # This job only runs for '/rerun' pull request comments by owner, member, or collaborator of the repo/organization.
     name: Build copr builds for tft tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     outputs:
       artifacts: ${{ steps.gen_artifacts.outputs.artifacts }}
     if: |

.github/workflows/tmt-tests.yml

@@ -12,7 +12,7 @@ jobs:
 
   call_workflow_tests_79to88_integration:
     needs: call_workflow_copr_build
-    uses: oamg/leapp/.github/workflows/reuse-tests-7to8.yml@master
+    uses: oamg/leapp/.github/workflows/reuse-tests-7to8.yml@main
     secrets: inherit
     with:
       copr_artifacts: ${{ needs.call_workflow_copr_build.outputs.artifacts }}
@@ -26,7 +26,7 @@ jobs:
 
   call_workflow_tests_79to86_integration:
     needs: call_workflow_copr_build
-    uses: oamg/leapp/.github/workflows/reuse-tests-7to8.yml@master
+    uses: oamg/leapp/.github/workflows/reuse-tests-7to8.yml@main
     secrets: inherit
     with:
       copr_artifacts: ${{ needs.call_workflow_copr_build.outputs.artifacts }}
@@ -40,7 +40,7 @@ jobs:
 
   call_workflow_tests_79to88_sst:
     needs: call_workflow_copr_build
-    uses: oamg/leapp/.github/workflows/reuse-tests-7to8.yml@master
+    uses: oamg/leapp/.github/workflows/reuse-tests-7to8.yml@main
     secrets: inherit
     with:
       copr_artifacts: ${{ needs.call_workflow_copr_build.outputs.artifacts }}
@@ -55,7 +55,7 @@ jobs:
 
   call_workflow_tests_7to8_aws:
     needs: call_workflow_copr_build
-    uses: oamg/leapp/.github/workflows/reuse-tests-7to8.yml@master
+    uses: oamg/leapp/.github/workflows/reuse-tests-7to8.yml@main
     secrets: inherit
     with:
       copr_artifacts: ${{ needs.call_workflow_copr_build.outputs.artifacts }}
@@ -71,7 +71,7 @@ jobs:
 
   call_workflow_tests_86to90_integration:
     needs: call_workflow_copr_build
-    uses: oamg/leapp/.github/workflows/reuse-tests-8to9.yml@master
+    uses: oamg/leapp/.github/workflows/reuse-tests-8to9.yml@main
     secrets: inherit
     with:
       copr_artifacts: ${{ needs.call_workflow_copr_build.outputs.artifacts }}
@@ -85,7 +85,7 @@ jobs:
 
   call_workflow_tests_88to92_integration:
     needs: call_workflow_copr_build
-    uses: oamg/leapp/.github/workflows/reuse-tests-8to9.yml@master
+    uses: oamg/leapp/.github/workflows/reuse-tests-8to9.yml@main
     secrets: inherit
     with:
       copr_artifacts: ${{ needs.call_workflow_copr_build.outputs.artifacts }}
@@ -101,7 +101,7 @@ jobs:
 
   call_workflow_tests_86to90_sst:
     needs: call_workflow_copr_build
-    uses: oamg/leapp/.github/workflows/reuse-tests-8to9.yml@master
+    uses: oamg/leapp/.github/workflows/reuse-tests-8to9.yml@main
     secrets: inherit
     with:
       copr_artifacts: ${{ needs.call_workflow_copr_build.outputs.artifacts }}
@@ -116,7 +116,7 @@ jobs:
 
   call_workflow_tests_86to90_aws:
     needs: call_workflow_copr_build
-    uses: oamg/leapp/.github/workflows/reuse-tests-8to9.yml@master
+    uses: oamg/leapp/.github/workflows/reuse-tests-8to9.yml@main
     secrets: inherit
     with:
       copr_artifacts: ${{ needs.call_workflow_copr_build.outputs.artifacts }}

.github/workflows/unit-tests.yml

@@ -2,10 +2,10 @@ name: Unit Tests
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     branches:
-      - master
+      - main
 
 jobs:
   test:
@@ -74,10 +74,10 @@ jobs:
           # NOTE(ivasilev) fetch-depth 0 is critical here as leapp deps discovery depends on specific substring in
           # commit message and default 1 option will get us just merge commit which has an unrelevant message.
           fetch-depth: '0'
-      # NOTE(ivasilev) master -> origin/master is used for leapp deps discovery in Makefile via git log master..HEAD
-      - name: Set master to origin/master
-        if: github.ref != 'refs/heads/master'
+      # NOTE(ivasilev) main -> origin/main is used for leapp deps discovery in Makefile via git log main..HEAD
+      - name: Set main to origin/main
+        if: github.ref != 'refs/heads/main'
         run: |
-          git branch -f master origin/master
+          git branch -f main origin/main
       - name: ${{matrix.scenarios.name}}
         run: script -e -c /bin/bash -c 'TERM=xterm podman build --security-opt=seccomp=unconfined -t leapp-tests -f utils/container-tests/Containerfile.${{matrix.scenarios.container}} utils/container-tests && PYTHON_VENV=${{matrix.scenarios.python}} REPOSITORIES=${{matrix.scenarios.repos}} podman run --security-opt=seccomp=unconfined --rm -ti -v ${PWD}:/payload --env=PYTHON_VENV --env=REPOSITORIES leapp-tests'