Skip to content
Merged
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
31 changes: 0 additions & 31 deletions .github/workflows/arch-images-pr.yaml

This file was deleted.

43 changes: 0 additions & 43 deletions .github/workflows/arch-images.yaml

This file was deleted.

61 changes: 0 additions & 61 deletions .github/workflows/ubuntu-images.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/ubuntu-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ name: ubuntu-tests
on:
pull_request:
branches:
- main
- release-0.0.99.5
schedule:
- cron: '0 0 * * *'

Expand Down
42 changes: 17 additions & 25 deletions .zuul.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
---
- job:
name: unit-test
branches: release-0.0.99.5
description: Run Toolbx's unit tests declared in Meson
timeout: 1800
nodeset:
Expand All @@ -28,6 +29,7 @@

- job:
name: unit-test-migration-path-for-coreos-toolbox
branches: release-0.0.99.5
description: Run Toolbx's unit tests declared in Meson when built with -Dmigration_path_for_coreos_toolbox
timeout: 600
nodeset:
Expand All @@ -39,6 +41,7 @@

- job:
name: unit-test-restricted
branches: release-0.0.99.5
description: Run Toolbx's unit tests declared in Meson in a restricted build environment
timeout: 1800
nodeset:
Expand All @@ -50,6 +53,7 @@

- job:
name: system-test-fedora-rawhide
branches: release-0.0.99.5
description: Run Toolbx's system tests in Fedora Rawhide
timeout: 10800
nodeset:
Expand All @@ -60,60 +64,48 @@
run: playbooks/system-test.yaml

- job:
name: system-test-fedora-42
description: Run Toolbx's system tests in Fedora 42
name: system-test-fedora-43
branches: release-0.0.99.5
description: Run Toolbx's system tests in Fedora 43
timeout: 9000
nodeset:
nodes:
- name: fedora-42
label: cloud-fedora-42
- name: fedora-43
label: cloud-fedora-43
pre-run: playbooks/setup-env.yaml
run: playbooks/system-test.yaml

- job:
name: system-test-fedora-41
description: Run Toolbx's system tests in Fedora 41
timeout: 9000
nodeset:
nodes:
- name: fedora-41
label: cloud-fedora-41
pre-run: playbooks/setup-env.yaml
run: playbooks/system-test.yaml

- job:
name: system-test-fedora-40
description: Run Toolbx's system tests in Fedora 40
name: system-test-fedora-42
branches: release-0.0.99.5
description: Run Toolbx's system tests in Fedora 42
timeout: 9000
nodeset:
nodes:
- name: fedora-40
label: cloud-fedora-40
- name: fedora-42
label: cloud-fedora-42
pre-run: playbooks/setup-env.yaml
run: playbooks/system-test.yaml

- project:
periodic:
jobs:
- system-test-fedora-rawhide
- system-test-fedora-43
- system-test-fedora-42
- system-test-fedora-41
- system-test-fedora-40
check:
jobs:
- unit-test
- unit-test-migration-path-for-coreos-toolbox
- unit-test-restricted
- system-test-fedora-rawhide
- system-test-fedora-43
- system-test-fedora-42
- system-test-fedora-41
- system-test-fedora-40
gate:
jobs:
- unit-test
- unit-test-migration-path-for-coreos-toolbox
- unit-test-restricted
- system-test-fedora-rawhide
- system-test-fedora-43
- system-test-fedora-42
- system-test-fedora-41
- system-test-fedora-40
14 changes: 7 additions & 7 deletions test/system/101-create.bats
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# shellcheck shell=bats
#
# Copyright © 2019 – 2023 Red Hat, Inc.
# Copyright © 2019 – 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.
Expand Down Expand Up @@ -139,18 +139,18 @@ teardown() {
assert_output --regexp "Created[[:blank:]]+fedora-toolbox-34"
}

@test "create: RHEL 8.7" {
pull_distro_image rhel 8.7
@test "create: RHEL 8.10" {
pull_distro_image rhel 8.10

run "$TOOLBOX" --assumeyes create --distro rhel --release 8.7
run "$TOOLBOX" --assumeyes create --distro rhel --release 8.10

assert_success
assert_output --partial "Created container: rhel-toolbox-8.7"
assert_output --partial "Enter with: toolbox enter rhel-toolbox-8.7"
assert_output --partial "Created container: rhel-toolbox-8.10"
assert_output --partial "Enter with: toolbox enter rhel-toolbox-8.10"

run podman ps -a

assert_output --regexp "Created[[:blank:]]+rhel-toolbox-8.7"
assert_output --regexp "Created[[:blank:]]+rhel-toolbox-8.10"
}

@test "create: Ubuntu 16.04" {
Expand Down
14 changes: 7 additions & 7 deletions test/system/102-list.bats
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# shellcheck shell=bats
#
# Copyright © 2019 – 2023 Red Hat, Inc.
# Copyright © 2019 – 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.
Expand Down Expand Up @@ -215,8 +215,8 @@ teardown() {
assert [ ${#stderr_lines[@]} -eq 0 ]
}

@test "list: RHEL 8.7 image" {
pull_distro_image rhel 8.7
@test "list: RHEL 8.10 image" {
pull_distro_image rhel 8.10

local num_of_images
num_of_images="$(list_images)"
Expand All @@ -225,7 +225,7 @@ teardown() {
run --keep-empty-lines --separate-stderr "$TOOLBOX" list

assert_success
assert_line --index 1 --partial "registry.access.redhat.com/ubi8/toolbox:8.7"
assert_line --index 1 --partial "registry.access.redhat.com/ubi8/toolbox:8.10"

if check_bats_version 1.10.0; then
assert [ ${#lines[@]} -eq 2 ]
Expand All @@ -236,8 +236,8 @@ teardown() {
assert [ ${#stderr_lines[@]} -eq 0 ]
}

@test "list: RHEL 8.7 image (using --images)" {
pull_distro_image rhel 8.7
@test "list: RHEL 8.10 image (using --images)" {
pull_distro_image rhel 8.10

local num_of_images
num_of_images="$(list_images)"
Expand All @@ -246,7 +246,7 @@ teardown() {
run --keep-empty-lines --separate-stderr "$TOOLBOX" list --images

assert_success
assert_line --index 1 --partial "registry.access.redhat.com/ubi8/toolbox:8.7"
assert_line --index 1 --partial "registry.access.redhat.com/ubi8/toolbox:8.10"

if check_bats_version 1.10.0; then
assert [ ${#lines[@]} -eq 2 ]
Expand Down
8 changes: 4 additions & 4 deletions test/system/104-run.bats
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# shellcheck shell=bats
#
# Copyright © 2021 – 2023 Red Hat, Inc.
# 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.
Expand Down Expand Up @@ -91,10 +91,10 @@ teardown() {
assert [ ${#stderr_lines[@]} -eq 0 ]
}

@test "run: Smoke test with RHEL 8.7" {
create_distro_container rhel 8.7 rhel-toolbox-8.7
@test "run: Smoke test with RHEL 8.10" {
create_distro_container rhel 8.10 rhel-toolbox-8.10

run --separate-stderr "$TOOLBOX" run --distro rhel --release 8.7 true
run --separate-stderr "$TOOLBOX" run --distro rhel --release 8.10 true

assert_success
assert [ ${#lines[@]} -eq 0 ]
Expand Down
Loading