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.

Sign up for GitHub

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

playbooks, test/system: Drop the PODMAN and SKOPEO environment variables #1592

Merged
merged 3 commits into from
Nov 14, 2024
Merged

playbooks, test/system: Drop the PODMAN and SKOPEO environment variables #1592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2049199
playbooks: Restore the generation & installation of the Bash completions
debarshiray Nov 12, 2024
c11a03c
playbooks: Use pkgconfig(bash-completion) to install bash-completion.pc
debarshiray Nov 14, 2024
fbffd45
playbooks, test/system: Drop the PODMAN and SKOPEO environment variables
debarshiray Nov 11, 2024
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
4 changes: 2 additions & 2 deletions playbooks/dependencies-centos-9-stream.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
become: yes
package:
name:
- bash-completion
- flatpak-session-helper
- gcc
- golang
- httpd-tools
- meson
- ninja-build
- openssl
- pkgconfig(bash-completion)
- podman
- shadow-utils-subid-devel
- skopeo
Expand Down Expand Up @@ -54,7 +54,7 @@
chdir: '{{ zuul.project.src_dir }}'

- name: Check versions of crucial packages
command: rpm -qa ShellCheck bash bats codespell *kernel* gcc *glibc* golang golang-github-cpuguy83-md2man shadow-utils-subid-devel podman conmon containernetworking-plugins containers-common container-selinux crun fuse-overlayfs flatpak-session-helper skopeo
command: rpm -qa ShellCheck bash bash-completion bats codespell *kernel* gcc *glibc* golang golang-github-cpuguy83-md2man shadow-utils-subid-devel podman conmon containernetworking-plugins containers-common container-selinux crun fuse-overlayfs flatpak-session-helper skopeo

- name: Show podman versions
command: podman version
Expand Down
4 changes: 2 additions & 2 deletions playbooks/dependencies-fedora-restricted.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
package:
name:
- ShellCheck
- bash-completion
- codespell
- fish
- flatpak-session-helper
Expand All @@ -40,6 +39,7 @@
- golang-github-cpuguy83-md2man
- meson
- ninja-build
- pkgconfig(bash-completion)
- shadow-utils-subid-devel
- systemd
- udisks2
Expand Down Expand Up @@ -81,4 +81,4 @@
chdir: '{{ zuul.project.src_dir }}'

- name: Check versions of crucial packages
command: rpm -qa ShellCheck codespell *kernel* gcc *glibc* shadow-utils-subid-devel golang golang-github-cpuguy83-md2man flatpak-session-helper
command: rpm -qa ShellCheck bash-completion codespell *kernel* gcc *glibc* shadow-utils-subid-devel golang golang-github-cpuguy83-md2man flatpak-session-helper
4 changes: 2 additions & 2 deletions playbooks/dependencies-fedora.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
update_cache: "{{ true if zuul.attempts > 1 else false }}"
name:
- ShellCheck
- bash-completion
- bats
- codespell
- fish
Expand All @@ -32,6 +31,7 @@
- meson
- ninja-build
- openssl
- pkgconfig(bash-completion)
- podman
- shadow-utils-subid-devel
- skopeo
Expand All @@ -55,7 +55,7 @@
chdir: '{{ zuul.project.src_dir }}'

- name: Check versions of crucial packages
command: rpm -qa ShellCheck bash bats codespell *kernel* gcc *glibc* shadow-utils-subid-devel golang golang-github-cpuguy83-md2man podman conmon containernetworking-plugins containers-common container-selinux crun fuse-overlayfs flatpak-session-helper skopeo
command: rpm -qa ShellCheck bash bash-completion bats codespell *kernel* gcc *glibc* shadow-utils-subid-devel golang golang-github-cpuguy83-md2man podman conmon containernetworking-plugins containers-common container-selinux crun fuse-overlayfs flatpak-session-helper skopeo

- name: Show podman versions
command: podman version
Expand Down
1 change: 0 additions & 1 deletion playbooks/system-test-commands-options.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
- name: Run the commands-options system tests
command: bats --filter-tags commands-options ./test/system
environment:
PODMAN: '/usr/bin/podman'
TMPDIR: '/var/tmp'
TOOLBX: '/usr/local/bin/toolbox'
TOOLBX_TEST_SYSTEM_TAGS: 'arch-fedora,commands-options,custom-image,ubuntu'
Expand Down
1 change: 0 additions & 1 deletion playbooks/system-test-runtime-environment-arch-fedora.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
- name: Run the (arch-fedora,runtime-environment) system tests
command: bats --filter-tags arch-fedora,runtime-environment ./test/system
environment:
PODMAN: '/usr/bin/podman'
TMPDIR: '/var/tmp'
TOOLBX: '/usr/local/bin/toolbox'
TOOLBX_TEST_SYSTEM_TAGS: 'arch-fedora,runtime-environment'
Expand Down
1 change: 0 additions & 1 deletion playbooks/system-test-runtime-environment-ubuntu.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
- name: Run the (runtime-environment,ubuntu) system tests
command: bats --filter-tags runtime-environment,ubuntu ./test/system
environment:
PODMAN: '/usr/bin/podman'
TMPDIR: '/var/tmp'
TOOLBX: '/usr/local/bin/toolbox'
TOOLBX_TEST_SYSTEM_TAGS: 'runtime-environment,ubuntu'
Expand Down
14 changes: 7 additions & 7 deletions test/system/101-create.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ teardown() {
assert_output --partial "Created container: ubuntu-toolbox-16.04"
assert_output --partial "Enter with: toolbox enter ubuntu-toolbox-16.04"

run $PODMAN ps --all
run podman ps --all

assert_success
assert_output --regexp "Created[[:blank:]]+ubuntu-toolbox-16.04"
Expand All @@ -219,7 +219,7 @@ teardown() {
assert_output --partial "Created container: ubuntu-toolbox-18.04"
assert_output --partial "Enter with: toolbox enter ubuntu-toolbox-18.04"

run $PODMAN ps --all
run podman ps --all

assert_success
assert_output --regexp "Created[[:blank:]]+ubuntu-toolbox-18.04"
Expand All @@ -234,7 +234,7 @@ teardown() {
assert_output --partial "Created container: ubuntu-toolbox-20.04"
assert_output --partial "Enter with: toolbox enter ubuntu-toolbox-20.04"

run $PODMAN ps --all
run podman ps --all

assert_success
assert_output --regexp "Created[[:blank:]]+ubuntu-toolbox-20.04"
Expand All @@ -251,7 +251,7 @@ teardown() {
assert [ ${#lines[@]} -eq 2 ]
assert [ ${#stderr_lines[@]} -eq 0 ]

run $PODMAN ps --all
run podman ps --all

assert_success
assert_output --regexp "Created[[:blank:]]+$image"
Expand All @@ -268,7 +268,7 @@ teardown() {
assert [ ${#lines[@]} -eq 2 ]
assert [ ${#stderr_lines[@]} -eq 0 ]

run $PODMAN ps --all
run podman ps --all

assert_success
assert_output --regexp "Created[[:blank:]]+non-default"
Expand All @@ -285,7 +285,7 @@ teardown() {
assert [ ${#lines[@]} -eq 2 ]
assert [ ${#stderr_lines[@]} -eq 0 ]

run $PODMAN ps --all
run podman ps --all

assert_success
assert_output --regexp "Created[[:blank:]]+non-default"
Expand Down Expand Up @@ -842,7 +842,7 @@ teardown() {
local authfile="$BATS_TEST_TMPDIR/authfile"
local image="fedora-toolbox:34"

run $PODMAN login --authfile "$authfile" --username user --password user "$DOCKER_REG_URI"
run podman login --authfile "$authfile" --username user --password user "$DOCKER_REG_URI"
assert_success

run "$TOOLBX" --assumeyes create --image "$DOCKER_REG_URI/$image"
Expand Down
6 changes: 3 additions & 3 deletions test/system/102-list.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@ teardown() {
num_of_images="$(list_images)"
assert_equal "$num_of_images" 1

$PODMAN create --name busybox-container "$busybox_image"
podman create --name busybox-container "$busybox_image"

local num_of_containers
num_of_containers="$(list_containers)"
Expand All @@ -558,7 +558,7 @@ teardown() {
num_of_images="$(list_images)"
assert_equal "$num_of_images" 1

$PODMAN create --name busybox-container "$busybox_image"
podman create --name busybox-container "$busybox_image"

local num_of_containers
num_of_containers="$(list_containers)"
Expand All @@ -581,7 +581,7 @@ teardown() {
num_of_images="$(list_images)"
assert_equal "$num_of_images" 1

$PODMAN create --name busybox-container "$busybox_image"
podman create --name busybox-container "$busybox_image"

local num_of_containers
num_of_containers="$(list_containers)"
Expand Down
4 changes: 2 additions & 2 deletions test/system/104-run.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -842,11 +842,11 @@ teardown() {

local container="ancient"

run "$PODMAN" create --name "$container" "$default_image" true
run podman create --name "$container" "$default_image" true

assert_success

run $PODMAN ps --all
run podman ps --all

assert_success
assert_output --regexp "Created[[:blank:]]+$container"
Expand Down
Loading