Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

.zuul, playbooks: Run the CI on Arch Linux #1588

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@
/images/arch @Foxboron
/images/rhel @debarshiray @olivergs
/images/ubuntu @Jmennius
/playbooks/arch @Foxboron
42 changes: 42 additions & 0 deletions .zuul.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,39 @@
pre-run: playbooks/setup-env-restricted.yaml
run: playbooks/unit-test.yaml

- job:
name: system-test-arch-commands-options
description: Run Toolbx's commands-options system tests on Arch Linux
timeout: 6300
nodeset:
nodes:
- name: arch
label: arch-linux
pre-run: playbooks/arch/setup.yaml
Copy link
Contributor

@danpawlik danpawlik Nov 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so if something will fail in pre-run, you might have RETRY_LIMIT.
Maybe try to do:

- job:
    name: system-test-arch-commands-options
    description: Run Toolbx's commands-options system tests on Arch Linux
    timeout: 6300
    nodeset:
      nodes:
        - name: arch
          label: arch-linux
    run:
      - playbooks/arch/setup.yaml
      - playbooks/system-test-commands-options.yaml

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was intentional to use pre-run for downloads that can fail due to passing network problems, outdated caches, etc..

We use zuul.attempts > 1 to decide if the DNF cache needs to be forcibly updated on Fedora Rawhide nodes, or to resolve problems arising from the DNF5 transition.

Downloading the Go modules is another thing that has proven to be flaky and benefits from this. It's still not 100% robust, but a lot more than what it used to be.

run: playbooks/system-test-commands-options.yaml

- job:
name: system-test-arch-runtime-environment-arch-fedora
description: Run Toolbx's (arch-fedora,runtime-environment) system tests on Arch Linux
timeout: 6300
nodeset:
nodes:
- name: arch
label: arch-linux
pre-run: playbooks/arch/setup.yaml
run: playbooks/system-test-runtime-environment-arch-fedora.yaml

- job:
name: system-test-arch-runtime-environment-ubuntu
description: Run Toolbx's (runtime-environment,ubuntu) system tests on Arch Linux
timeout: 6300
nodeset:
nodes:
- name: arch
label: arch-linux
pre-run: playbooks/arch/setup.yaml
run: playbooks/system-test-runtime-environment-ubuntu.yaml

- job:
name: system-test-fedora-rawhide-commands-options
description: Run Toolbx's commands-options system tests in Fedora Rawhide
Expand Down Expand Up @@ -183,6 +216,9 @@
- project:
periodic:
jobs:
- system-test-arch-commands-options
- system-test-arch-runtime-environment-arch-fedora
- system-test-arch-runtime-environment-ubuntu
- system-test-fedora-rawhide-commands-options
- system-test-fedora-rawhide-runtime-environment-arch-fedora
- system-test-fedora-rawhide-runtime-environment-ubuntu
Expand All @@ -200,6 +236,9 @@
- unit-test
- unit-test-migration-path-for-coreos-toolbox
- unit-test-restricted
- system-test-arch-commands-options
- system-test-arch-runtime-environment-arch-fedora
- system-test-arch-runtime-environment-ubuntu
- system-test-fedora-rawhide-commands-options
- system-test-fedora-rawhide-runtime-environment-arch-fedora
- system-test-fedora-rawhide-runtime-environment-ubuntu
Expand All @@ -217,6 +256,9 @@
- unit-test
- unit-test-migration-path-for-coreos-toolbox
- unit-test-restricted
- system-test-arch-commands-options
- system-test-arch-runtime-environment-arch-fedora
- system-test-arch-runtime-environment-ubuntu
- system-test-fedora-rawhide-commands-options
- system-test-fedora-rawhide-runtime-environment-arch-fedora
- system-test-fedora-rawhide-runtime-environment-ubuntu
Expand Down
65 changes: 65 additions & 0 deletions playbooks/arch/dependencies.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
#
# Copyright © 2024 Red Hat, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

- name: Install Arch Linux packages
become: yes
package:
name:
- apache
- bash-completion
- bats
- codespell
- crun
- fish
- flatpak
- gcc
- go
- go-md2man
- meson
- ninja
- openssl
- pkgconf
- podman
- shadow
- shellcheck
- skopeo
- systemd
- udisks2
update_cache: "{{ true if zuul.attempts > 1 else false }}"

- name: Download Go modules
command: go mod download -x
args:
chdir: '{{ zuul.project.src_dir }}/src'

- name: Initialize Git submodules
command: git submodule init
args:
chdir: '{{ zuul.project.src_dir }}'

- name: Update Git submodules
command: git submodule update
args:
chdir: '{{ zuul.project.src_dir }}'

- name: Check versions of crucial packages
command: pacman --query bash bats codespell conmon containers-common crun flatpak gcc glibc go go-md2man linux podman shadow shellcheck skopeo

- name: Show Podman version
command: podman version

- name: Show Podman related system information
command: podman info --debug
25 changes: 25 additions & 0 deletions playbooks/arch/setup.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#
# Copyright © 2021 – 2024 Red Hat, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

---
- hosts: all
tasks:
- include_tasks: dependencies.yaml

- name: Set up build directory
command: meson setup --fatal-meson-warnings builddir
args:
chdir: '{{ zuul.project.src_dir }}'
12 changes: 6 additions & 6 deletions test/system/102-list.bats
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ teardown() {
if [ "$system_id" = "fedora" ]; then
assert_line --index 1 --partial "registry.fedoraproject.org/fedora-toolbox:34"
assert_line --index 2 --partial "$default_image"
elif [ "$system_id" = "ubuntu" ]; then
elif [ "$system_id" = "arch" ] || [ "$system_id" = "ubuntu" ]; then
assert_line --index 1 --partial "$default_image"
assert_line --index 2 --partial "registry.fedoraproject.org/fedora-toolbox:34"
else
Expand All @@ -415,7 +415,7 @@ teardown() {

assert_success

if [ "$system_id" = "fedora" ]; then
if [ "$system_id" = "arch" ] || [ "$system_id" = "fedora" ]; then
assert_line --index 1 --partial "$default_container"
assert_line --index 2 --partial "non-default-one"
assert_line --index 3 --partial "non-default-two"
Expand All @@ -438,14 +438,14 @@ teardown() {
if [ "$system_id" = "fedora" ]; then
assert_line --index 1 --partial "registry.fedoraproject.org/fedora-toolbox:34"
assert_line --index 2 --partial "$default_image"
elif [ "$system_id" = "ubuntu" ]; then
elif [ "$system_id" = "arch" ] || [ "$system_id" = "ubuntu" ]; then
assert_line --index 1 --partial "$default_image"
assert_line --index 2 --partial "registry.fedoraproject.org/fedora-toolbox:34"
else
fail "Define output for $system_id"
fi

if [ "$system_id" = "fedora" ]; then
if [ "$system_id" = "arch" ] || [ "$system_id" = "fedora" ]; then
assert_line --index 5 --partial "$default_container"
assert_line --index 6 --partial "non-default-one"
assert_line --index 7 --partial "non-default-two"
Expand Down Expand Up @@ -484,7 +484,7 @@ teardown() {
if [ "$system_id" = "fedora" ]; then
assert_line --index 2 --partial "registry.fedoraproject.org/fedora-toolbox:34"
assert_line --index 3 --partial "$default_image"
elif [ "$system_id" = "ubuntu" ]; then
elif [ "$system_id" = "arch" ] || [ "$system_id" = "ubuntu" ]; then
assert_line --index 2 --partial "$default_image"
assert_line --index 3 --partial "registry.fedoraproject.org/fedora-toolbox:34"
else
Expand Down Expand Up @@ -514,7 +514,7 @@ teardown() {
if [ "$system_id" = "fedora" ]; then
assert_line --index 2 --partial "registry.fedoraproject.org/fedora-toolbox:34"
assert_line --index 3 --partial "$default_image"
elif [ "$system_id" = "ubuntu" ]; then
elif [ "$system_id" = "arch" ] || [ "$system_id" = "ubuntu" ]; then
assert_line --index 2 --partial "$default_image"
assert_line --index 3 --partial "registry.fedoraproject.org/fedora-toolbox:34"
else
Expand Down
56 changes: 49 additions & 7 deletions test/system/203-network.bats
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,13 @@ teardown() {
run --keep-empty-lines --separate-stderr "$TOOLBX" run readlink /etc/resolv.conf

assert_success
assert_line --index 0 "/run/host/etc/resolv.conf"

if [ "${lines[0]}" = "/run/host/run/systemd/resolve/stub-resolv.conf" ]; then
skip "host has absolute symlink"
else
assert_line --index 0 "/run/host/etc/resolv.conf"
fi

assert [ ${#lines[@]} -eq 1 ]

# shellcheck disable=SC2154
Expand All @@ -83,7 +89,13 @@ teardown() {
run --keep-empty-lines --separate-stderr "$TOOLBX" run --distro arch readlink /etc/resolv.conf

assert_success
assert_line --index 0 "/run/host/etc/resolv.conf"

if [ "${lines[0]}" = "/run/host/run/systemd/resolve/stub-resolv.conf" ]; then
skip "host has absolute symlink"
else
assert_line --index 0 "/run/host/etc/resolv.conf"
fi

assert [ ${#lines[@]} -eq 1 ]

# shellcheck disable=SC2154
Expand All @@ -97,7 +109,13 @@ teardown() {
run --keep-empty-lines --separate-stderr "$TOOLBX" run --distro fedora --release 34 readlink /etc/resolv.conf

assert_success
assert_line --index 0 "/run/host/etc/resolv.conf"

if [ "${lines[0]}" = "/run/host/run/systemd/resolve/stub-resolv.conf" ]; then
skip "host has absolute symlink"
else
assert_line --index 0 "/run/host/etc/resolv.conf"
fi

assert [ ${#lines[@]} -eq 1 ]

# shellcheck disable=SC2154
Expand All @@ -111,7 +129,13 @@ teardown() {
run --keep-empty-lines --separate-stderr "$TOOLBX" run --distro rhel --release 8.10 readlink /etc/resolv.conf

assert_success
assert_line --index 0 "/run/host/etc/resolv.conf"

if [ "${lines[0]}" = "/run/host/run/systemd/resolve/stub-resolv.conf" ]; then
skip "host has absolute symlink"
else
assert_line --index 0 "/run/host/etc/resolv.conf"
fi

assert [ ${#lines[@]} -eq 1 ]

# shellcheck disable=SC2154
Expand All @@ -125,7 +149,13 @@ teardown() {
run --keep-empty-lines --separate-stderr "$TOOLBX" run --distro ubuntu --release 16.04 readlink /etc/resolv.conf

assert_success
assert_line --index 0 "/run/host/etc/resolv.conf"

if [ "${lines[0]}" = "/run/host/run/systemd/resolve/stub-resolv.conf" ]; then
skip "host has absolute symlink"
else
assert_line --index 0 "/run/host/etc/resolv.conf"
fi

assert [ ${#lines[@]} -eq 1 ]

# shellcheck disable=SC2154
Expand All @@ -139,7 +169,13 @@ teardown() {
run --keep-empty-lines --separate-stderr "$TOOLBX" run --distro ubuntu --release 18.04 readlink /etc/resolv.conf

assert_success
assert_line --index 0 "/run/host/etc/resolv.conf"

if [ "${lines[0]}" = "/run/host/run/systemd/resolve/stub-resolv.conf" ]; then
skip "host has absolute symlink"
else
assert_line --index 0 "/run/host/etc/resolv.conf"
fi

assert [ ${#lines[@]} -eq 1 ]

# shellcheck disable=SC2154
Expand All @@ -153,7 +189,13 @@ teardown() {
run --keep-empty-lines --separate-stderr "$TOOLBX" run --distro ubuntu --release 20.04 readlink /etc/resolv.conf

assert_success
assert_line --index 0 "/run/host/etc/resolv.conf"

if [ "${lines[0]}" = "/run/host/run/systemd/resolve/stub-resolv.conf" ]; then
skip "host has absolute symlink"
else
assert_line --index 0 "/run/host/etc/resolv.conf"
fi

assert [ ${#lines[@]} -eq 1 ]

# shellcheck disable=SC2154
Expand Down