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

Jump to bottom

Rename CONTAINER_RUNTIME to CONTAINER_RUNTIMES #389

Merged
merged 1 commit into from
Nov 16, 2023
Merged

Rename CONTAINER_RUNTIME to CONTAINER_RUNTIMES #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions job_groups/alp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

.containers_host_podman: &containers_host_podman
REGISTRY: '3.71.98.16:5000'
CONTAINER_RUNTIME: podman
CONTAINER_RUNTIMES: podman

.networking: &networking
EXTRA: 'networking'
Expand Down Expand Up @@ -80,7 +80,7 @@
LTP_COMMAND_FILE: 'containers'

.k3s: &k3s
CONTAINER_RUNTIME: 'k3s'
CONTAINER_RUNTIMES: 'k3s'

defaults:
x86_64:
Expand Down
2 changes: 1 addition & 1 deletion job_groups/alp_bedrock.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

.containers_host_podman: &containers_host_podman
REGISTRY: '3.71.98.16:5000'
CONTAINER_RUNTIME: podman
CONTAINER_RUNTIMES: podman

.networking: &networking
EXTRA: 'networking'
Expand Down
4 changes: 2 additions & 2 deletions job_groups/alp_micro.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

.containers_host_podman: &containers_host_podman
REGISTRY: '3.71.98.16:5000'
CONTAINER_RUNTIME: podman
CONTAINER_RUNTIMES: podman

.networking: &networking
EXTRA: 'networking'
Expand Down Expand Up @@ -80,7 +80,7 @@
LTP_COMMAND_FILE: 'containers'

.k3s: &k3s
CONTAINER_RUNTIME: 'k3s'
CONTAINER_RUNTIMES: 'k3s'

.selinux_settings: &selinux_settings
ENABLE_SELINUX: '1'
Expand Down
6 changes: 3 additions & 3 deletions job_groups/opensuse_leap_15.3_images.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ scenarios:
KEEP_GRUB_TIMEOUT: '1'
DESKTOP: 'textmode'
VIDEOMODE: 'text'
CONTAINER_RUNTIME: 'podman'
CONTAINER_RUNTIMES: 'podman'
CONTAINER_IMAGE_TO_TEST: 'registry.opensuse.org/opensuse/leap/15.3/images/totest/containers/opensuse/leap:15.3'
- container_image_on_ubuntu_host:
testsuite: container-image
Expand Down Expand Up @@ -214,7 +214,7 @@ scenarios:
EXTRABOOTPARAMS: quiet
REGISTRY: 3.71.98.16:5000
NUMDISKS: '2'
CONTAINER_RUNTIME: "podman,docker"
CONTAINER_RUNTIMES: "podman,docker"
# Max size isn't that strict
EXCLUDE_MODULES: "diskusage"
- jeos-container_image:
Expand All @@ -223,7 +223,7 @@ scenarios:
DESKTOP: textmode
EXTRABOOTPARAMS: quiet
REGISTRY: 3.71.98.16:5000
CONTAINER_RUNTIME: "podman,docker"
CONTAINER_RUNTIMES: "podman,docker"
CONTAINERS_UNTESTED_IMAGES: '1'
EXCLUDE_MODULES: "diskusage"
CONTAINER_IMAGE_TO_TEST: 'registry.opensuse.org/opensuse/leap/15.3/images/totest/containers/opensuse/leap:15.3'
Expand Down
10 changes: 5 additions & 5 deletions job_groups/opensuse_leap_15.4_images.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ scenarios:
KEEP_GRUB_TIMEOUT: '1'
DESKTOP: 'textmode'
VIDEOMODE: 'text'
CONTAINER_RUNTIME: 'podman'
CONTAINER_RUNTIMES: 'podman'
CONTAINER_IMAGE_TO_TEST: 'registry.opensuse.org/opensuse/leap/15.4/images/totest/containers/opensuse/leap:15.4'
- container_image_on_ubuntu_host:
testsuite: container-image
Expand Down Expand Up @@ -261,13 +261,13 @@ scenarios:
- extra_tests_textmode_podman_containers:
testsuite: extra_tests_textmode_containers
settings:
CONTAINER_RUNTIME: 'podman'
CONTAINER_RUNTIMES: 'podman'
CONTAINER_IMAGE_TO_TEST: 'registry.opensuse.org/opensuse/leap:15.4'
CONTAINER_IMAGE_VERSIONS: '15.4'
- extra_tests_textmode_docker_containers:
testsuite: extra_tests_textmode_containers
settings:
CONTAINER_RUNTIME: 'docker'
CONTAINER_RUNTIMES: 'docker'
CONTAINER_IMAGE_TO_TEST: 'registry.opensuse.org/opensuse/leap:15.4'
CONTAINER_IMAGE_VERSIONS: '15.4'
- install_offline
Expand All @@ -293,7 +293,7 @@ scenarios:
EXTRABOOTPARAMS: quiet
REGISTRY: 3.71.98.16:5000
NUMDISKS: '2'
CONTAINER_RUNTIME: "podman,docker"
CONTAINER_RUNTIMES: "podman,docker"
# Max size isn't that strict
EXCLUDE_MODULES: "diskusage"
- jeos-container_image:
Expand All @@ -302,7 +302,7 @@ scenarios:
DESKTOP: textmode
EXTRABOOTPARAMS: quiet
REGISTRY: 3.71.98.16:5000
CONTAINER_RUNTIME: "podman,docker"
CONTAINER_RUNTIMES: "podman,docker"
CONTAINERS_UNTESTED_IMAGES: '1'
CONTAINER_IMAGE_TO_TEST: 'registry.opensuse.org/opensuse/leap/15.4/images/totest/containers/opensuse/leap:15.4'
EXCLUDE_MODULES: "diskusage"
Expand Down
6 changes: 3 additions & 3 deletions job_groups/opensuse_leap_15.4_updates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,21 +150,21 @@ scenarios:
- extra_tests_textmode_podman_containers:
testsuite: extra_tests_textmode_containers
settings:
CONTAINER_RUNTIME: 'podman'
CONTAINER_RUNTIMES: 'podman'
START_AFTER_TEST: 'create_hdd_leap_textmode_autoyast'
HDD_1: '%DISTRI%-%VERSION%-%ARCH%-%BUILD%-%DESKTOP%_ay@%MACHINE%.qcow2'
- extra_tests_textmode_kubectl_containers:
testsuite: extra_tests_textmode_containers
settings:
CONTAINER_RUNTIME: 'kubectl'
CONTAINER_RUNTIMES: 'kubectl'
START_AFTER_TEST: 'create_hdd_leap_textmode_autoyast'
HDD_1: '%DISTRI%-%VERSION%-%ARCH%-%BUILD%-%DESKTOP%_ay@%MACHINE%.qcow2'
K3S_SYMLINK: 'skip'
K8S_CLIENT: 'kubernetes1.24-client'
- extra_tests_textmode_docker_containers:
testsuite: extra_tests_textmode_containers
settings:
CONTAINER_RUNTIME: 'docker'
CONTAINER_RUNTIMES: 'docker'
START_AFTER_TEST: 'create_hdd_leap_textmode_autoyast'
HDD_1: '%DISTRI%-%VERSION%-%ARCH%-%BUILD%-%DESKTOP%_ay@%MACHINE%.qcow2'
- create_hdd_transactional_server:
Expand Down
6 changes: 3 additions & 3 deletions job_groups/opensuse_leap_15.5_images.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ scenarios:
KEEP_GRUB_TIMEOUT: '1'
DESKTOP: 'textmode'
VIDEOMODE: 'text'
CONTAINER_RUNTIME: 'podman'
CONTAINER_RUNTIMES: 'podman'
CONTAINER_IMAGE_TO_TEST: 'registry.opensuse.org/opensuse/leap/15.5/images/totest/containers/opensuse/leap:15.5'
- container_image_on_ubuntu_host:
testsuite: container-image
Expand Down Expand Up @@ -230,7 +230,7 @@ scenarios:
EXTRABOOTPARAMS: quiet
REGISTRY: 3.71.98.16:5000
NUMDISKS: '2'
CONTAINER_RUNTIME: "podman,docker"
CONTAINER_RUNTIMES: "podman,docker"
# Max size isn't that strict
EXCLUDE_MODULES: "diskusage"
- jeos-container_image:
Expand All @@ -239,7 +239,7 @@ scenarios:
DESKTOP: textmode
EXTRABOOTPARAMS: quiet
REGISTRY: 3.71.98.16:5000
CONTAINER_RUNTIME: "podman,docker"
CONTAINER_RUNTIMES: "podman,docker"
CONTAINERS_UNTESTED_IMAGES: '1'
CONTAINER_IMAGE_TO_TEST: 'registry.opensuse.org/opensuse/leap/15.5/images/totest/containers/opensuse/leap:15.5'
EXCLUDE_MODULES: "diskusage"
Expand Down
6 changes: 3 additions & 3 deletions job_groups/opensuse_leap_15.5_updates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,21 +131,21 @@ scenarios:
- extra_tests_textmode_podman_containers:
testsuite: extra_tests_textmode_containers
settings:
CONTAINER_RUNTIME: 'podman'
CONTAINER_RUNTIMES: 'podman'
START_AFTER_TEST: 'create_hdd_leap_textmode_autoyast'
HDD_1: '%DISTRI%-%VERSION%-%ARCH%-%BUILD%-%DESKTOP%_ay@%MACHINE%.qcow2'
- extra_tests_textmode_kubectl_containers:
testsuite: extra_tests_textmode_containers
settings:
CONTAINER_RUNTIME: 'kubectl'
CONTAINER_RUNTIMES: 'kubectl'
START_AFTER_TEST: 'create_hdd_leap_textmode_autoyast'
HDD_1: '%DISTRI%-%VERSION%-%ARCH%-%BUILD%-%DESKTOP%_ay@%MACHINE%.qcow2'
K3S_SYMLINK: 'skip'
K8S_CLIENT: 'kubernetes1.24-client'
- extra_tests_textmode_docker_containers:
testsuite: extra_tests_textmode_containers
settings:
CONTAINER_RUNTIME: 'docker'
CONTAINER_RUNTIMES: 'docker'
START_AFTER_TEST: 'create_hdd_leap_textmode_autoyast'
HDD_1: '%DISTRI%-%VERSION%-%ARCH%-%BUILD%-%DESKTOP%_ay@%MACHINE%.qcow2'
- create_hdd_transactional_server:
Expand Down
6 changes: 3 additions & 3 deletions job_groups/opensuse_leap_15.6_images.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ scenarios:
KEEP_GRUB_TIMEOUT: '1'
DESKTOP: 'textmode'
VIDEOMODE: 'text'
CONTAINER_RUNTIME: 'podman'
CONTAINER_RUNTIMES: 'podman'
CONTAINER_IMAGE_TO_TEST: 'registry.opensuse.org/opensuse/leap/15.6/images/totest/containers/opensuse/leap:15.6'
- container_image_on_ubuntu_host:
testsuite: container-image
Expand Down Expand Up @@ -230,7 +230,7 @@ scenarios:
EXTRABOOTPARAMS: quiet
REGISTRY: 3.71.98.16:5000
NUMDISKS: '2'
CONTAINER_RUNTIME: "podman,docker"
CONTAINER_RUNTIMES: "podman,docker"
# Max size isn't that strict
EXCLUDE_MODULES: "diskusage"
- jeos-container_image:
Expand All @@ -239,7 +239,7 @@ scenarios:
DESKTOP: textmode
EXTRABOOTPARAMS: quiet
REGISTRY: 3.71.98.16:5000
CONTAINER_RUNTIME: "podman,docker"
CONTAINER_RUNTIMES: "podman,docker"
CONTAINERS_UNTESTED_IMAGES: '1'
CONTAINER_IMAGE_TO_TEST: 'registry.opensuse.org/opensuse/leap/15.6/images/totest/containers/opensuse/leap:15.6'
EXCLUDE_MODULES: "diskusage"
Expand Down
8 changes: 4 additions & 4 deletions job_groups/opensuse_leap_15.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,13 +167,13 @@ scenarios:
- extra_tests_textmode_podman_containers:
testsuite: extra_tests_textmode_containers
settings:
CONTAINER_RUNTIME: 'podman'
CONTAINER_RUNTIMES: 'podman'
CONTAINER_IMAGE_TO_TEST: 'registry.opensuse.org/opensuse/leap:15.4'
CONTAINER_IMAGE_VERSIONS: '15.4'
- extra_tests_textmode_docker_containers:
testsuite: extra_tests_textmode_containers
settings:
CONTAINER_RUNTIME: 'docker'
CONTAINER_RUNTIMES: 'docker'
CONTAINER_IMAGE_TO_TEST: 'registry.opensuse.org/opensuse/leap:15.4'
CONTAINER_IMAGE_VERSIONS: '15.4'
- upgrade_Leap_42.2_gnome:
Expand Down Expand Up @@ -557,13 +557,13 @@ scenarios:
- extra_tests_textmode_podman_containers:
testsuite: extra_tests_textmode_containers
settings:
CONTAINER_RUNTIME: 'podman'
CONTAINER_RUNTIMES: 'podman'
CONTAINER_IMAGE_TO_TEST: 'registry.opensuse.org/opensuse/leap:15.4'
CONTAINER_IMAGE_VERSIONS: '15.4'
- extra_tests_textmode_docker_containers:
testsuite: extra_tests_textmode_containers
settings:
CONTAINER_RUNTIME: 'docker'
CONTAINER_RUNTIMES: 'docker'
CONTAINER_IMAGE_TO_TEST: 'registry.opensuse.org/opensuse/leap:15.4'
CONTAINER_IMAGE_VERSIONS: '15.4'
- autoyast_minimal:
Expand Down
2 changes: 1 addition & 1 deletion job_groups/opensuse_leap_micro_5.2_image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<<: *image_settings
SKIP_DOCKER_IMAGE_TESTS: '1'
REGISTRY: '3.71.98.16:5000'
CONTAINER_RUNTIME: 'podman'
CONTAINER_RUNTIMES: 'podman'
CONTAINER_IMAGE_VERSIONS: '15.2,15.3'
YAML_SCHEDULE: ''

Expand Down
2 changes: 1 addition & 1 deletion job_groups/opensuse_leap_micro_5.x_image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<<: *image_settings
SKIP_DOCKER_IMAGE_TESTS: '1'
REGISTRY: '3.71.98.16:5000'
CONTAINER_RUNTIME: 'podman'
CONTAINER_RUNTIMES: 'podman'
CONTAINER_IMAGE_VERSIONS: '15.4,15.5'

.selfinstall_settings: &selfinstall_settings
Expand Down
18 changes: 9 additions & 9 deletions job_groups/opensuse_tumbleweed.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
- gnome:
machine: 64bit
priority: 45
# - gnome:

Check warning on line 168 in job_groups/opensuse_tumbleweed.yaml

View workflow job for this annotation

GitHub Actions / static-check 

168:1 [comments-indentation] comment not indented like content
# machine: 64bit_cirrus
# priority: 45
- minimalx:
Expand Down Expand Up @@ -275,34 +275,34 @@
- containers_host_docker:
testsuite: extra_tests_textmode_containers
settings:
CONTAINER_RUNTIME: 'docker'
CONTAINER_RUNTIMES: 'docker'
- containers_host_podman:
testsuite: extra_tests_textmode_containers
settings:
CONTAINER_RUNTIME: 'podman'
CONTAINER_RUNTIMES: 'podman'
K3S_INSTALL_UPSTREAM: '1'
- containers_host_containerd:
testsuite: extra_tests_textmode_containers
settings:
CONTAINER_RUNTIME: 'containerd_crictl,containerd_nerdctl'
CONTAINER_RUNTIMES: 'containerd_crictl,containerd_nerdctl'
- containers_host_helm:
testsuite: extra_tests_textmode_containers
settings:
CONTAINER_RUNTIME: 'helm'
CONTAINER_RUNTIMES: 'helm'
K3S_INSTALL_UPSTREAM: '1'
- containers_host_kubectl:
testsuite: extra_tests_textmode_containers
settings:
CONTAINER_RUNTIME: 'kubectl'
CONTAINER_RUNTIMES: 'kubectl'
K3S_INSTALL_UPSTREAM: '1'
- containers_hpc_apptainer:
testsuite: extra_tests_textmode_containers
settings:
CONTAINER_RUNTIME: 'apptainer'
CONTAINER_RUNTIMES: 'apptainer'
- containers_image:
testsuite: extra_tests_textmode_containers
settings:
CONTAINER_RUNTIME: 'docker,podman'
CONTAINER_RUNTIMES: 'docker,podman'
K3S_INSTALL_UPSTREAM: '1'
CONTAINERS_UNTESTED_IMAGES: '1'
CONTAINER_IMAGE_TO_TEST: registry.opensuse.org/opensuse/factory/totest/containers/opensuse/tumbleweed
Expand Down Expand Up @@ -885,7 +885,7 @@
DESKTOP: textmode
AUTOYAST: 'autoyast_opensuse/create_hdd/create_hdd_textmode_x86_64_uefi.xml'
- sys-param-check
# - virt-guest-installation-kvm:

Check warning on line 888 in job_groups/opensuse_tumbleweed.yaml

View workflow job for this annotation

GitHub Actions / static-check 

888:1 [comments-indentation] comment not indented like content
# machine: 64bit-ipmi
# - virt-guest-installation-xen:
# machine: 64bit-ipmi
Expand Down Expand Up @@ -1043,7 +1043,7 @@
CONTAINERS_UNTESTED_IMAGES: '1'
CONTAINER_IMAGE_TO_TEST: 'registry.opensuse.org/opensuse/factory/totest/containers/opensuse/tumbleweed'
CONTAINERS_NO_SUSE_OS: "1"
CONTAINER_RUNTIME: "podman"
CONTAINER_RUNTIMES: "podman"
REGISTRY: '3.71.98.16:5000'
- containers_tw_image_on_ubuntu_host:
testsuite: null
Expand All @@ -1058,7 +1058,7 @@
CONTAINERS_UNTESTED_IMAGES: '1'
CONTAINER_IMAGE_TO_TEST: 'registry.opensuse.org/opensuse/factory/totest/containers/opensuse/tumbleweed'
CONTAINERS_NO_SUSE_OS: "1"
CONTAINER_RUNTIME: "podman,docker"
CONTAINER_RUNTIMES: "podman,docker"
REGISTRY: '3.71.98.16:5000'
- cryptlvm:
machine: 64bit
Expand Down
14 changes: 7 additions & 7 deletions job_groups/opensuse_tumbleweed_aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,34 +229,34 @@ scenarios:
- containers_host_docker:
testsuite: extra_tests_textmode_containers
settings:
CONTAINER_RUNTIME: 'docker'
CONTAINER_RUNTIMES: 'docker'
- containers_host_helm:
testsuite: extra_tests_textmode_containers
settings:
CONTAINER_RUNTIME: 'helm'
CONTAINER_RUNTIMES: 'helm'
K3S_INSTALL_UPSTREAM: '1'
- containers_host_kubectl:
testsuite: extra_tests_textmode_containers
settings:
CONTAINER_RUNTIME: 'kubectl'
CONTAINER_RUNTIMES: 'kubectl'
K3S_INSTALL_UPSTREAM: '1'
- containers_host_podman:
testsuite: extra_tests_textmode_containers
settings:
CONTAINER_RUNTIME: 'podman'
CONTAINER_RUNTIMES: 'podman'
K3S_INSTALL_UPSTREAM: '1'
- containers_host_containerd:
testsuite: extra_tests_textmode_containers
settings:
CONTAINER_RUNTIME: 'containerd_crictl,containerd_nerdctl'
CONTAINER_RUNTIMES: 'containerd_crictl,containerd_nerdctl'
- containers_hpc_apptainer:
testsuite: extra_tests_textmode_containers
settings:
CONTAINER_RUNTIME: 'apptainer'
CONTAINER_RUNTIMES: 'apptainer'
- containers_image:
testsuite: extra_tests_textmode_containers
settings:
CONTAINER_RUNTIME: 'docker,podman'
CONTAINER_RUNTIMES: 'docker,podman'
CONTAINERS_UNTESTED_IMAGES: '1'
CONTAINER_IMAGE_TO_TEST: registry.opensuse.org/opensuse/factory/arm/totest/containers/opensuse/tumbleweed
K3S_INSTALL_UPSTREAM: '1'
Expand Down
4 changes: 2 additions & 2 deletions job_groups/opensuse_tumbleweed_powerpc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ scenarios:
- containers_host_docker:
testsuite: extra_tests_textmode_containers
settings:
CONTAINER_RUNTIME: 'docker'
CONTAINER_RUNTIMES: 'docker'
- containers_host_podman:
testsuite: extra_tests_textmode_containers
settings:
CONTAINER_RUNTIME: 'podman'
CONTAINER_RUNTIMES: 'podman'
- extra_tests_filesystem
- yast2_ncurses:
settings:
Expand Down
2 changes: 1 addition & 1 deletion job_groups/staging_projects.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ scenarios:
testsuite: container-host
machine: 64bit-2G-HD40G
settings:
CONTAINER_RUNTIME: podman
CONTAINER_RUNTIMES: podman
CONTAINER_IMAGE_TO_TEST: registry.opensuse.org/opensuse/factory/totest/containers/opensuse/tumbleweed
opensuse-*-Staging-DVD-x86_64:
- textmode:
Expand Down