Merge pull request #389 from pablo-herranz/poo134354_rename-CONTAINER…

…_RUNTIME Rename CONTAINER_RUNTIME to CONTAINER_RUNTIMES
os-autoinst · Nov 16, 2023 · 6b0f25a · 6b0f25a
2 parents ae87a55 + 0d3a177
commit 6b0f25a
Show file tree

Hide file tree

Showing 16 changed files with 50 additions and 50 deletions.
diff --git a/job_groups/alp.yaml b/job_groups/alp.yaml
@@ -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'
@@ -80,7 +80,7 @@
   LTP_COMMAND_FILE: 'containers'
 
 .k3s: &k3s
-  CONTAINER_RUNTIME: 'k3s'
+  CONTAINER_RUNTIMES: 'k3s'
 
 defaults:
   x86_64:

diff --git a/job_groups/alp_bedrock.yaml b/job_groups/alp_bedrock.yaml
@@ -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'

diff --git a/job_groups/alp_micro.yaml b/job_groups/alp_micro.yaml
@@ -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'
@@ -80,7 +80,7 @@
   LTP_COMMAND_FILE: 'containers'
 
 .k3s: &k3s
-  CONTAINER_RUNTIME: 'k3s'
+  CONTAINER_RUNTIMES: 'k3s'
 
 .selinux_settings: &selinux_settings
   ENABLE_SELINUX: '1'

diff --git a/job_groups/opensuse_leap_15.3_images.yaml b/job_groups/opensuse_leap_15.3_images.yaml
@@ -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
@@ -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:
@@ -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'

diff --git a/job_groups/opensuse_leap_15.4_images.yaml b/job_groups/opensuse_leap_15.4_images.yaml
@@ -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
@@ -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
@@ -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:
@@ -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"

diff --git a/job_groups/opensuse_leap_15.4_updates.yaml b/job_groups/opensuse_leap_15.4_updates.yaml
@@ -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:

diff --git a/job_groups/opensuse_leap_15.5_images.yaml b/job_groups/opensuse_leap_15.5_images.yaml
@@ -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
@@ -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:
@@ -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"

diff --git a/job_groups/opensuse_leap_15.5_updates.yaml b/job_groups/opensuse_leap_15.5_updates.yaml
@@ -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:

diff --git a/job_groups/opensuse_leap_15.6_images.yaml b/job_groups/opensuse_leap_15.6_images.yaml
@@ -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
@@ -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:
@@ -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"

diff --git a/job_groups/opensuse_leap_15.yaml b/job_groups/opensuse_leap_15.yaml
@@ -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:
@@ -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:

diff --git a/job_groups/opensuse_leap_micro_5.2_image.yaml b/job_groups/opensuse_leap_micro_5.2_image.yaml
@@ -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: ''
 

diff --git a/job_groups/opensuse_leap_micro_5.x_image.yaml b/job_groups/opensuse_leap_micro_5.x_image.yaml
@@ -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

diff --git a/job_groups/opensuse_tumbleweed.yaml b/job_groups/opensuse_tumbleweed.yaml
@@ -275,34 +275,34 @@ 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'
             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
@@ -1043,7 +1043,7 @@ scenarios:
             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
@@ -1058,7 +1058,7 @@ scenarios:
             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

diff --git a/job_groups/opensuse_tumbleweed_aarch64.yaml b/job_groups/opensuse_tumbleweed_aarch64.yaml
@@ -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'

diff --git a/job_groups/opensuse_tumbleweed_powerpc.yaml b/job_groups/opensuse_tumbleweed_powerpc.yaml
@@ -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:

diff --git a/job_groups/staging_projects.yaml b/job_groups/staging_projects.yaml
@@ -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: