Skip to content

Commit

Permalink
Merge branch 'master' into ipv6_address_update
Browse files Browse the repository at this point in the history
  • Loading branch information
Dmitriy Usachev committed Nov 19, 2024
2 parents b9b6030 + 59752eb commit 393f5c7
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 4 deletions.
16 changes: 12 additions & 4 deletions .github/workflows/run-partial-tests.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
name: tests/run-partial-tests.sh
run-name: tests/run-partial-tests.sh${{ github.event_name == 'workflow_dispatch' && ! inputs.full && format(' Dockerfile.{0} with {1}', inputs.os, inputs.docker) || ' all' }} @ ${{ inputs.runs-on == '' && 'ubuntu-24.04' || inputs.runs-on }}

on:
schedule:
Expand All @@ -19,10 +20,17 @@ on:
options:
- docker
- podman
runs-on:
description: Host Ubuntu version
type: choice
options:
- ubuntu-24.04
- ubuntu-22.04
- ubuntu-20.04

jobs:
gen-matrix:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
timeout-minutes: 5
outputs:
matrix: ${{ steps.dispatch-matrix.outputs.matrix }}${{ steps.default-matrix.outputs.matrix }}
Expand All @@ -46,7 +54,7 @@ jobs:
if: github.event_name == 'workflow_dispatch' && ! inputs.full

test:
runs-on: ${{ matrix.runs-on || 'ubuntu-22.04' }}
runs-on: ${{ inputs.runs-on || 'ubuntu-24.04' }}
needs: [ gen-matrix ]
strategy:
fail-fast: false
Expand All @@ -56,9 +64,9 @@ jobs:
- uses: actions/checkout@v4
- name: Install podman 4.*
uses: ./.github/actions/install-podman-4
if: matrix.docker == 'podman' && matrix.runs-on != 'ubuntu-20.04'
if: matrix.docker == 'podman' && inputs.runs-on == 'ubuntu-22.04'
- uses: ./.github/actions/docker-cgroups-ubuntu-22
if: matrix.docker == 'docker' && matrix.runs-on != 'ubuntu-20.04'
if: matrix.docker == 'docker' && inputs.runs-on != 'ubuntu-20.04'
- name: For RHEL builds, use entitlements
if: ${{ startsWith(matrix.os, 'rhel-') }}
uses: ./.github/actions/podman-entitlement
Expand Down
6 changes: 6 additions & 0 deletions volume-data-list
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,21 @@
/var/log/httpd/
/var/log/ipa/
/var/log/ipaclient-install.log
/var/log/ipaclientsamba-install.log
/var/log/ipa-custodia.audit.log
/var/log/ipaepn.log
/var/log/ipa-migrate.log
/var/log/ipareplica-ca-install.log
/var/log/ipareplica-conncheck.log
/var/log/ipareplica-install.log
/var/log/ipaserver-adtrust-install.log
/var/log/ipaserver-dns-install.log
/var/log/ipaserver-enable-sid.log
/var/log/ipaserver-install.log
/var/log/ipaserver-kra-install.log
/var/log/ipa-server-configure-first.log
/var/log/ipa-server-run.log
/var/log/ipatrust-enable-agent.log
/var/log/ipaupgrade.log
/var/log/kadmind.log
/var/log/krb5kdc.log
Expand Down

0 comments on commit 393f5c7

Please sign in to comment.