From 7051bf46a50495b583c8fd376e42672acde34f5a Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Thu, 15 May 2025 15:56:50 +0300 Subject: [PATCH 1/8] ci: add e2e --- .gitea/workflows/e2e-tests.yaml | 50 +++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 .gitea/workflows/e2e-tests.yaml diff --git a/.gitea/workflows/e2e-tests.yaml b/.gitea/workflows/e2e-tests.yaml new file mode 100644 index 0000000..3590466 --- /dev/null +++ b/.gitea/workflows/e2e-tests.yaml @@ -0,0 +1,50 @@ +# ALR - Any Linux Repository +# Copyright (C) 2025 The ALR Authors +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +name: E2E + +on: + push: + branches: [ main ] + pull_request: + + +jobs: + tests: + runs-on: ubuntu-latest + + container: + image: altlinux.space/maks1ms/actions-container-runner:latest + options: --privileged + + steps: + - name: Checkout + uses: https://github.com/actions/checkout@v4 + + - name: Set up Go + uses: https://github.com/actions/setup-go@v5 + with: + go-version: '1.24' + + - name: Start Podman service + run: nohup podman system service -t 0 unix:/tmp/podman.sock & + + - name: Run E2E tests + env: + DOCKER_HOST: unix:/tmp/podman.sock + IGNORE_ROOT_CHECK: 1 + run: | + make e2e-test -- 2.49.1 From 798c84446c384275ad9ed42c477e1330e15e77d1 Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Fri, 16 May 2025 14:09:32 +0300 Subject: [PATCH 2/8] ci: use prebuilt images --- e2e-tests/common_test.go | 35 ++++++----------------- e2e-tests/images/Dockerfile.alpine | 4 --- e2e-tests/images/Dockerfile.alt-sisyphus | 6 ---- e2e-tests/images/Dockerfile.archlinux | 4 --- e2e-tests/images/Dockerfile.fedora-41 | 18 ------------ e2e-tests/images/Dockerfile.opensuse-leap | 4 --- e2e-tests/images/Dockerfile.redos-8 | 4 --- e2e-tests/images/Dockerfile.ubuntu-24.04 | 17 ----------- e2e-tests/issue_32_interactive_test.go | 4 +++ 9 files changed, 12 insertions(+), 84 deletions(-) delete mode 100644 e2e-tests/images/Dockerfile.alpine delete mode 100644 e2e-tests/images/Dockerfile.alt-sisyphus delete mode 100644 e2e-tests/images/Dockerfile.archlinux delete mode 100644 e2e-tests/images/Dockerfile.fedora-41 delete mode 100644 e2e-tests/images/Dockerfile.opensuse-leap delete mode 100644 e2e-tests/images/Dockerfile.redos-8 delete mode 100644 e2e-tests/images/Dockerfile.ubuntu-24.04 diff --git a/e2e-tests/common_test.go b/e2e-tests/common_test.go index 88424c3..1cb04a3 100644 --- a/e2e-tests/common_test.go +++ b/e2e-tests/common_test.go @@ -25,7 +25,6 @@ import ( "io" "log" "os" - "os/exec" "testing" "time" @@ -121,29 +120,6 @@ var COMMON_SYSTEMS []string = []string{ "ubuntu-24.04", } -func init() { - for _, id := range ALL_SYSTEMS { - buildAlrTestImage(id) - } -} - -func buildAlrTestImage(id string) { - cmd := exec.Command( - "docker", - "build", - "-t", fmt.Sprintf("alr-testimage-%s", id), - "-f", fmt.Sprintf("images/Dockerfile.%s", id), - ".", - ) - cmd.Stdout = os.Stdout - cmd.Stderr = os.Stderr - err := cmd.Run() - if err != nil { - fmt.Println("Error:", err) - return - } -} - func dockerMultipleRun(t *testing.T, name string, ids []string, f func(t *testing.T, runnable e2e.Runnable)) { t.Run(name, func(t *testing.T) { for _, id := range ids { @@ -158,17 +134,22 @@ func dockerMultipleRun(t *testing.T, name string, ids []string, f func(t *testin e, err := e2e.New(e2e.WithVerbose(), e2e.WithName(fmt.Sprintf("alr-%s", truncatedHash))) assert.NoError(t, err) t.Cleanup(e.Close) - imageId := fmt.Sprintf("alr-testimage-%s", id) + imageId := fmt.Sprintf("ghcr.io/maks1ms/alr-e2e-test-image-%s", id) runnable := e.Runnable(dockerName).Init( e2e.StartOptions{ - Image: imageId, + Image: imageId, Volumes: []string{ - // "./alr:/usr/bin/alr", + "./alr:/tmp/alr", }, Privileged: true, }, ) assert.NoError(t, e2e.StartAndWaitReady(runnable)) + err = runnable.Exec(e2e.NewCommand("/bin/alr-test-setup", "alr-install")) + err = runnable.Exec(e2e.NewCommand("/bin/alr-test-setup", "passwordless-sudo-setup")) + if err != nil { + panic(err) + } f(t, runnable) }) } diff --git a/e2e-tests/images/Dockerfile.alpine b/e2e-tests/images/Dockerfile.alpine deleted file mode 100644 index 698d0fe..0000000 --- a/e2e-tests/images/Dockerfile.alpine +++ /dev/null @@ -1,4 +0,0 @@ -FROM alpine:latest -RUN adduser -s /bin/bash alr-user -USER alr-user -ENTRYPOINT ["tail", "-f", "/dev/null"] \ No newline at end of file diff --git a/e2e-tests/images/Dockerfile.alt-sisyphus b/e2e-tests/images/Dockerfile.alt-sisyphus deleted file mode 100644 index cc48dee..0000000 --- a/e2e-tests/images/Dockerfile.alt-sisyphus +++ /dev/null @@ -1,6 +0,0 @@ -FROM registry.altlinux.org/sisyphus/alt:latest -RUN apt-get update && apt-get install -y ca-certificates rpm-build -RUN useradd -m -s /bin/bash alr-user -USER alr-user -WORKDIR /home/alr-user -ENTRYPOINT ["tail", "-f", "/dev/null"] \ No newline at end of file diff --git a/e2e-tests/images/Dockerfile.archlinux b/e2e-tests/images/Dockerfile.archlinux deleted file mode 100644 index 37484ea..0000000 --- a/e2e-tests/images/Dockerfile.archlinux +++ /dev/null @@ -1,4 +0,0 @@ -FROM archlinux:latest -RUN useradd -m -s /bin/bash alr-user -USER alr-user -ENTRYPOINT ["tail", "-f", "/dev/null"] \ No newline at end of file diff --git a/e2e-tests/images/Dockerfile.fedora-41 b/e2e-tests/images/Dockerfile.fedora-41 deleted file mode 100644 index f91b28f..0000000 --- a/e2e-tests/images/Dockerfile.fedora-41 +++ /dev/null @@ -1,18 +0,0 @@ -FROM fedora:41 -RUN dnf install -y ca-certificates sudo rpm-build bindfs -RUN <> /etc/sudoers.d/user - chmod 0440 /etc/sudoers.d/user - - useradd -m -s /bin/bash alr - mkdir -p /var/cache/alr /etc/alr - chown alr:alr /var/cache/alr /etc/alr -EOF -COPY ./alr /usr/bin -RUN <> /etc/sudoers.d/user - chmod 0440 /etc/sudoers.d/user - - useradd -m -s /bin/bash alr - mkdir -p /var/cache/alr /etc/alr - chown alr:alr /var/cache/alr /etc/alr -EOF -COPY ./alr /usr/bin -RUN < Date: Fri, 16 May 2025 14:12:28 +0300 Subject: [PATCH 3/8] ci(e2e): add caching for podman images --- .gitea/workflows/e2e-tests.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/e2e-tests.yaml b/.gitea/workflows/e2e-tests.yaml index 3590466..1e553b0 100644 --- a/.gitea/workflows/e2e-tests.yaml +++ b/.gitea/workflows/e2e-tests.yaml @@ -28,7 +28,6 @@ jobs: container: image: altlinux.space/maks1ms/actions-container-runner:latest - options: --privileged steps: - name: Checkout @@ -39,6 +38,14 @@ jobs: with: go-version: '1.24' + - name: Cache Podman images + uses: actions/cache@v4 + with: + path: | + ~/.local/share/containers/storage + /var/lib/containers/storage + key: ${{ runner.os }}-primes + - name: Start Podman service run: nohup podman system service -t 0 unix:/tmp/podman.sock & -- 2.49.1 From 4e159abc9ff8dfe30bbf8a1920557447b6fe7c5c Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Fri, 16 May 2025 14:23:37 +0300 Subject: [PATCH 4/8] try fix --- .gitea/workflows/e2e-tests.yaml | 2 +- e2e-tests/common_test.go | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/e2e-tests.yaml b/.gitea/workflows/e2e-tests.yaml index 1e553b0..bd41341 100644 --- a/.gitea/workflows/e2e-tests.yaml +++ b/.gitea/workflows/e2e-tests.yaml @@ -51,7 +51,7 @@ jobs: - name: Run E2E tests env: - DOCKER_HOST: unix:/tmp/podman.sock + DOCKER_HOST: unix:///tmp/podman.sock IGNORE_ROOT_CHECK: 1 run: | make e2e-test diff --git a/e2e-tests/common_test.go b/e2e-tests/common_test.go index 1cb04a3..90b4fb1 100644 --- a/e2e-tests/common_test.go +++ b/e2e-tests/common_test.go @@ -146,6 +146,9 @@ func dockerMultipleRun(t *testing.T, name string, ids []string, f func(t *testin ) assert.NoError(t, e2e.StartAndWaitReady(runnable)) err = runnable.Exec(e2e.NewCommand("/bin/alr-test-setup", "alr-install")) + if err != nil { + panic(err) + } err = runnable.Exec(e2e.NewCommand("/bin/alr-test-setup", "passwordless-sudo-setup")) if err != nil { panic(err) -- 2.49.1 From 9d61197035da78052a3b596bee185a6bb2c5134a Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Fri, 16 May 2025 18:34:50 +0300 Subject: [PATCH 5/8] wip --- .gitea/workflows/e2e-tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/e2e-tests.yaml b/.gitea/workflows/e2e-tests.yaml index bd41341..1e553b0 100644 --- a/.gitea/workflows/e2e-tests.yaml +++ b/.gitea/workflows/e2e-tests.yaml @@ -51,7 +51,7 @@ jobs: - name: Run E2E tests env: - DOCKER_HOST: unix:///tmp/podman.sock + DOCKER_HOST: unix:/tmp/podman.sock IGNORE_ROOT_CHECK: 1 run: | make e2e-test -- 2.49.1 From 6bdad115f32701d0120a0bd07453898aa21937ef Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Fri, 16 May 2025 19:00:41 +0300 Subject: [PATCH 6/8] try fix --- .gitea/workflows/e2e-tests.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/e2e-tests.yaml b/.gitea/workflows/e2e-tests.yaml index 1e553b0..07ed2a5 100644 --- a/.gitea/workflows/e2e-tests.yaml +++ b/.gitea/workflows/e2e-tests.yaml @@ -47,11 +47,11 @@ jobs: key: ${{ runner.os }}-primes - name: Start Podman service - run: nohup podman system service -t 0 unix:/tmp/podman.sock & + run: nohup podman system service -t 0 unix:///tmp/podman.sock & - name: Run E2E tests env: - DOCKER_HOST: unix:/tmp/podman.sock + DOCKER_HOST: unix:///tmp/podman.sock IGNORE_ROOT_CHECK: 1 run: | make e2e-test -- 2.49.1 From 33ef8e6d96aa91dbbffc58da6f177cd5a7981047 Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Fri, 16 May 2025 19:03:25 +0300 Subject: [PATCH 7/8] try fix --- .gitea/workflows/e2e-tests.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitea/workflows/e2e-tests.yaml b/.gitea/workflows/e2e-tests.yaml index 07ed2a5..3615c5a 100644 --- a/.gitea/workflows/e2e-tests.yaml +++ b/.gitea/workflows/e2e-tests.yaml @@ -46,12 +46,10 @@ jobs: /var/lib/containers/storage key: ${{ runner.os }}-primes - - name: Start Podman service - run: nohup podman system service -t 0 unix:///tmp/podman.sock & - - name: Run E2E tests env: DOCKER_HOST: unix:///tmp/podman.sock IGNORE_ROOT_CHECK: 1 run: | + podman system service -t 0 unix:///tmp/podman.sock & make e2e-test -- 2.49.1 From decd314d2d2fdc078a1a4e5af92926947b8301c4 Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Fri, 16 May 2025 19:11:49 +0300 Subject: [PATCH 8/8] try fix --- .gitea/workflows/e2e-tests.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/e2e-tests.yaml b/.gitea/workflows/e2e-tests.yaml index 3615c5a..5ea2b44 100644 --- a/.gitea/workflows/e2e-tests.yaml +++ b/.gitea/workflows/e2e-tests.yaml @@ -32,6 +32,8 @@ jobs: steps: - name: Checkout uses: https://github.com/actions/checkout@v4 + with: + fetch-depth: 0 - name: Set up Go uses: https://github.com/actions/setup-go@v5 -- 2.49.1