| Message ID | 20210414221457.1653745-2-crosa@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Acceptance Tests: support choosing specific distro and version | expand |
On 4/14/21 7:14 PM, Cleber Rosa wrote: > This renames the attribute that holds the checksum for the image Linux > distribution image used. > > The current name of the attribute is not very descriptive. Also, in > preparation for making the distribution used configurable, which will > add distro related parameters, attributes and tags, let's make the > naming of those more uniform. > > Signed-off-by: Cleber Rosa <crosa@redhat.com> > --- > tests/acceptance/avocado_qemu/__init__.py | 4 ++-- > tests/acceptance/boot_linux.py | 8 ++++---- > 2 files changed, 6 insertions(+), 6 deletions(-) Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com> > > diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py > index 1062a851b9..aae1e5bbc9 100644 > --- a/tests/acceptance/avocado_qemu/__init__.py > +++ b/tests/acceptance/avocado_qemu/__init__.py > @@ -307,7 +307,7 @@ class LinuxTest(Test, LinuxSSHMixIn): > """ > > timeout = 900 > - chksum = None > + distro_checksum = None > username = 'root' > password = 'password' > > @@ -355,7 +355,7 @@ def download_boot(self): > try: > boot = vmimage.get( > 'fedora', arch=image_arch, version='31', > - checksum=self.chksum, > + checksum=self.distro_checksum, > algorithm='sha256', > cache_dir=self.cache_dirs[0], > snapshot_dir=self.workdir) > diff --git a/tests/acceptance/boot_linux.py b/tests/acceptance/boot_linux.py > index 314370fd1f..c7bc3a589e 100644 > --- a/tests/acceptance/boot_linux.py > +++ b/tests/acceptance/boot_linux.py > @@ -20,7 +20,7 @@ class BootLinuxX8664(LinuxTest): > :avocado: tags=arch:x86_64 > """ > > - chksum = 'e3c1b309d9203604922d6e255c2c5d098a309c2d46215d8fc026954f3c5c27a0' > + distro_checksum = 'e3c1b309d9203604922d6e255c2c5d098a309c2d46215d8fc026954f3c5c27a0' > > def test_pc_i440fx_tcg(self): > """ > @@ -66,7 +66,7 @@ class BootLinuxAarch64(LinuxTest): > :avocado: tags=machine:gic-version=2 > """ > > - chksum = '1e18d9c0cf734940c4b5d5ec592facaed2af0ad0329383d5639c997fdf16fe49' > + distro_checksum = '1e18d9c0cf734940c4b5d5ec592facaed2af0ad0329383d5639c997fdf16fe49' > > def add_common_args(self): > self.vm.add_args('-bios', > @@ -119,7 +119,7 @@ class BootLinuxPPC64(LinuxTest): > :avocado: tags=arch:ppc64 > """ > > - chksum = '7c3528b85a3df4b2306e892199a9e1e43f991c506f2cc390dc4efa2026ad2f58' > + distro_checksum = '7c3528b85a3df4b2306e892199a9e1e43f991c506f2cc390dc4efa2026ad2f58' > > def test_pseries_tcg(self): > """ > @@ -136,7 +136,7 @@ class BootLinuxS390X(LinuxTest): > :avocado: tags=arch:s390x > """ > > - chksum = '4caaab5a434fd4d1079149a072fdc7891e354f834d355069ca982fdcaf5a122d' > + distro_checksum = '4caaab5a434fd4d1079149a072fdc7891e354f834d355069ca982fdcaf5a122d' > > @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') > def test_s390_ccw_virtio_tcg(self):
Hi Cleber, On 4/15/21 12:14 AM, Cleber Rosa wrote: > This renames the attribute that holds the checksum for the image Linux > distribution image used. > > The current name of the attribute is not very descriptive. Also, in > preparation for making the distribution used configurable, which will user configurable > add distro related parameters, attributes and tags, let's make the > naming of those more uniform. > > Signed-off-by: Cleber Rosa <crosa@redhat.com> Reviewed-by: Eric Auger <eric.auger@redhat.com> Thanks Eric > --- > tests/acceptance/avocado_qemu/__init__.py | 4 ++-- > tests/acceptance/boot_linux.py | 8 ++++---- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py > index 1062a851b9..aae1e5bbc9 100644 > --- a/tests/acceptance/avocado_qemu/__init__.py > +++ b/tests/acceptance/avocado_qemu/__init__.py > @@ -307,7 +307,7 @@ class LinuxTest(Test, LinuxSSHMixIn): > """ > > timeout = 900 > - chksum = None > + distro_checksum = None > username = 'root' > password = 'password' > > @@ -355,7 +355,7 @@ def download_boot(self): > try: > boot = vmimage.get( > 'fedora', arch=image_arch, version='31', > - checksum=self.chksum, > + checksum=self.distro_checksum, > algorithm='sha256', > cache_dir=self.cache_dirs[0], > snapshot_dir=self.workdir) > diff --git a/tests/acceptance/boot_linux.py b/tests/acceptance/boot_linux.py > index 314370fd1f..c7bc3a589e 100644 > --- a/tests/acceptance/boot_linux.py > +++ b/tests/acceptance/boot_linux.py > @@ -20,7 +20,7 @@ class BootLinuxX8664(LinuxTest): > :avocado: tags=arch:x86_64 > """ > > - chksum = 'e3c1b309d9203604922d6e255c2c5d098a309c2d46215d8fc026954f3c5c27a0' > + distro_checksum = 'e3c1b309d9203604922d6e255c2c5d098a309c2d46215d8fc026954f3c5c27a0' > > def test_pc_i440fx_tcg(self): > """ > @@ -66,7 +66,7 @@ class BootLinuxAarch64(LinuxTest): > :avocado: tags=machine:gic-version=2 > """ > > - chksum = '1e18d9c0cf734940c4b5d5ec592facaed2af0ad0329383d5639c997fdf16fe49' > + distro_checksum = '1e18d9c0cf734940c4b5d5ec592facaed2af0ad0329383d5639c997fdf16fe49' > > def add_common_args(self): > self.vm.add_args('-bios', > @@ -119,7 +119,7 @@ class BootLinuxPPC64(LinuxTest): > :avocado: tags=arch:ppc64 > """ > > - chksum = '7c3528b85a3df4b2306e892199a9e1e43f991c506f2cc390dc4efa2026ad2f58' > + distro_checksum = '7c3528b85a3df4b2306e892199a9e1e43f991c506f2cc390dc4efa2026ad2f58' > > def test_pseries_tcg(self): > """ > @@ -136,7 +136,7 @@ class BootLinuxS390X(LinuxTest): > :avocado: tags=arch:s390x > """ > > - chksum = '4caaab5a434fd4d1079149a072fdc7891e354f834d355069ca982fdcaf5a122d' > + distro_checksum = '4caaab5a434fd4d1079149a072fdc7891e354f834d355069ca982fdcaf5a122d' > > @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') > def test_s390_ccw_virtio_tcg(self): >
On Wed, Apr 14, 2021 at 7:15 PM Cleber Rosa <crosa@redhat.com> wrote: > > This renames the attribute that holds the checksum for the image Linux > distribution image used. > > The current name of the attribute is not very descriptive. Also, in > preparation for making the distribution used configurable, which will > add distro related parameters, attributes and tags, let's make the > naming of those more uniform. > > Signed-off-by: Cleber Rosa <crosa@redhat.com> > --- > tests/acceptance/avocado_qemu/__init__.py | 4 ++-- > tests/acceptance/boot_linux.py | 8 ++++---- > 2 files changed, 6 insertions(+), 6 deletions(-) > Reviewed-by: Willian Rampazzo <willianr@redhat.com>
diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py index 1062a851b9..aae1e5bbc9 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -307,7 +307,7 @@ class LinuxTest(Test, LinuxSSHMixIn): """ timeout = 900 - chksum = None + distro_checksum = None username = 'root' password = 'password' @@ -355,7 +355,7 @@ def download_boot(self): try: boot = vmimage.get( 'fedora', arch=image_arch, version='31', - checksum=self.chksum, + checksum=self.distro_checksum, algorithm='sha256', cache_dir=self.cache_dirs[0], snapshot_dir=self.workdir) diff --git a/tests/acceptance/boot_linux.py b/tests/acceptance/boot_linux.py index 314370fd1f..c7bc3a589e 100644 --- a/tests/acceptance/boot_linux.py +++ b/tests/acceptance/boot_linux.py @@ -20,7 +20,7 @@ class BootLinuxX8664(LinuxTest): :avocado: tags=arch:x86_64 """ - chksum = 'e3c1b309d9203604922d6e255c2c5d098a309c2d46215d8fc026954f3c5c27a0' + distro_checksum = 'e3c1b309d9203604922d6e255c2c5d098a309c2d46215d8fc026954f3c5c27a0' def test_pc_i440fx_tcg(self): """ @@ -66,7 +66,7 @@ class BootLinuxAarch64(LinuxTest): :avocado: tags=machine:gic-version=2 """ - chksum = '1e18d9c0cf734940c4b5d5ec592facaed2af0ad0329383d5639c997fdf16fe49' + distro_checksum = '1e18d9c0cf734940c4b5d5ec592facaed2af0ad0329383d5639c997fdf16fe49' def add_common_args(self): self.vm.add_args('-bios', @@ -119,7 +119,7 @@ class BootLinuxPPC64(LinuxTest): :avocado: tags=arch:ppc64 """ - chksum = '7c3528b85a3df4b2306e892199a9e1e43f991c506f2cc390dc4efa2026ad2f58' + distro_checksum = '7c3528b85a3df4b2306e892199a9e1e43f991c506f2cc390dc4efa2026ad2f58' def test_pseries_tcg(self): """ @@ -136,7 +136,7 @@ class BootLinuxS390X(LinuxTest): :avocado: tags=arch:s390x """ - chksum = '4caaab5a434fd4d1079149a072fdc7891e354f834d355069ca982fdcaf5a122d' + distro_checksum = '4caaab5a434fd4d1079149a072fdc7891e354f834d355069ca982fdcaf5a122d' @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') def test_s390_ccw_virtio_tcg(self):
This renames the attribute that holds the checksum for the image Linux distribution image used. The current name of the attribute is not very descriptive. Also, in preparation for making the distribution used configurable, which will add distro related parameters, attributes and tags, let's make the naming of those more uniform. Signed-off-by: Cleber Rosa <crosa@redhat.com> --- tests/acceptance/avocado_qemu/__init__.py | 4 ++-- tests/acceptance/boot_linux.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-)