From aecde04a4acddc47cf9aabe024db6626ed45d1c2 Mon Sep 17 00:00:00 2001 From: Jan Pazdziora Date: Sun, 31 Mar 2024 16:33:55 +0200 Subject: [PATCH] Test the tests/run-partial-tests.sh on all images. --- .github/actions/install-podman-4/action.yaml | 21 ++++++ .github/workflows/build-test.yaml | 15 +---- .github/workflows/run-partial-tests.yaml | 69 ++++++++++++++++++++ 3 files changed, 92 insertions(+), 13 deletions(-) create mode 100644 .github/actions/install-podman-4/action.yaml create mode 100644 .github/workflows/run-partial-tests.yaml diff --git a/.github/actions/install-podman-4/action.yaml b/.github/actions/install-podman-4/action.yaml new file mode 100644 index 00000000..802b17bc --- /dev/null +++ b/.github/actions/install-podman-4/action.yaml @@ -0,0 +1,21 @@ +name: Install podman 4.* +runs: + using: composite + steps: + - run: if dpkg -l golang-github-containers-image ; then sudo apt-get remove -y golang-github-containers-image ; fi + shell: bash -euxo pipefail {0} + - run: | + curl -fsSL https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_$(lsb_release -rs)/Release.key \ + | gpg --dearmor \ + | sudo tee /etc/apt/keyrings/devel_kubic_libcontainers_unstable.gpg > /dev/null + shell: bash -euxo pipefail {0} + - run: | + echo \ + "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/devel_kubic_libcontainers_unstable.gpg] \ + https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_$(lsb_release -rs)/ /" \ + | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list > /dev/null + shell: bash -euxo pipefail {0} + - run: sudo apt-get update -y + shell: bash -euxo pipefail {0} + - run: sudo apt-get install -y podman skopeo + shell: bash -euxo pipefail {0} diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml index 6ab63c93..ef0c3530 100644 --- a/.github/workflows/build-test.yaml +++ b/.github/workflows/build-test.yaml @@ -25,21 +25,10 @@ jobs: docker: podman timeout-minutes: 15 steps: + - uses: actions/checkout@v4 - name: Install podman 4.* - run: | - sudo apt-get remove -y golang-github-containers-image \ - && sudo mkdir -p /etc/apt/keyrings \ - && curl -fsSL https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_$(lsb_release -rs)/Release.key \ - | gpg --dearmor \ - | sudo tee /etc/apt/keyrings/devel_kubic_libcontainers_unstable.gpg > /dev/null \ - && echo \ - "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/devel_kubic_libcontainers_unstable.gpg] \ - https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_$(lsb_release -rs)/ /" \ - | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list > /dev/null \ - && sudo apt-get update -y \ - && sudo apt-get install -y podman skopeo + uses: ./.github/actions/install-podman-4 if: matrix.docker == 'podman' - - uses: actions/checkout@v4 - name: Separate git work tree with just the files needed for build run: git worktree add --no-checkout ../minimize-for-build - name: Populate with the Dockerfile diff --git a/.github/workflows/run-partial-tests.yaml b/.github/workflows/run-partial-tests.yaml new file mode 100644 index 00000000..6a820e84 --- /dev/null +++ b/.github/workflows/run-partial-tests.yaml @@ -0,0 +1,69 @@ +name: tests/run-partial-tests.sh + +on: + schedule: + - cron: '42 3 1,15 * *' + workflow_dispatch: + inputs: + full: + description: Full set of tests + required: true + type: boolean + default: false + os: + description: OS / Dockerfile + type: string + docker: + description: docker or podman + type: choice + options: + - docker + - podman + +jobs: + gen-matrix: + runs-on: ubuntu-22.04 + timeout-minutes: 5 + outputs: + matrix: ${{ steps.dispatch-matrix.outputs.matrix }}${{ steps.default-matrix.outputs.matrix }} + steps: + - id: default-matrix + run: | + echo "matrix={'os': [ 'fedora-rawhide', 'fedora-39', 'fedora-38', 'centos-9-stream', 'centos-8-stream', 'rocky-9', 'rocky-8', 'almalinux-9', 'almalinux-8' ], \ + 'docker': [ 'docker', 'podman' ], \ + 'include': [ \ + { 'os': 'centos-7', 'docker': 'docker', 'runs-on': 'ubuntu-20.04', 'cgroup-unified-ignore': '1', 'protected_regular': 'unset' }, \ + { 'os': 'rhel-9', 'docker': 'podman' }, \ + { 'os': 'rhel-8', 'docker': 'podman' } \ + ] \ + }" | tee -a $GITHUB_OUTPUT + if: github.event_name != 'workflow_dispatch' || inputs.full + - id: dispatch-matrix + run: | + echo "matrix={'os': [ '${{ inputs.os }}' ], 'docker': [ '${{ inputs.docker }}' ]}" | tee -a $GITHUB_OUTPUT + if: github.event_name == 'workflow_dispatch' && ! inputs.full + + test: + runs-on: ${{ matrix.runs-on || 'ubuntu-22.04' }} + needs: [ gen-matrix ] + strategy: + fail-fast: false + matrix: ${{ fromJSON(needs.gen-matrix.outputs.matrix) }} + timeout-minutes: 15 + steps: + - uses: actions/checkout@v4 + - name: Install podman 4.* + uses: ./.github/actions/install-podman-4 + if: matrix.docker == 'podman' && matrix.runs-on != 'ubuntu-20.04' + - uses: ./.github/actions/docker-cgroups-ubuntu-22 + if: matrix.docker == 'docker' && matrix.runs-on != 'ubuntu-20.04' + - run: sudo sysctl fs.protected_regular=0 + if: ${{ matrix.protected_regular == 'unset' }} + - name: For RHEL builds, use entitlements + if: ${{ startsWith(matrix.os, 'rhel-') }} + uses: ./.github/actions/podman-entitlement + with: + org: ${{ secrets.REDHAT_ORG }} + activationkey: ${{ secrets.REDHAT_ACTIVATIONKEY }} + - name: Run partial tests + run: CGROUP_UNIFIED_IGNORE=${{ matrix.cgroup-unified-ignore }} docker=${{ matrix.docker }} tests/run-partial-tests.sh Dockerfile.${{ matrix.os }}