diff mbox series

[v2,08/12] tests/vm: convert centos VM recipe to CentOS 8

Message ID 20210514120415.1368922-9-berrange@redhat.com (mailing list archive)
State New, archived
Headers show
Series Wave goodbye to RHEL 7 vintage distros | expand

Commit Message

Daniel P. Berrangé May 14, 2021, 12:04 p.m. UTC
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 tests/vm/centos | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

Comments

Willian Rampazzo May 14, 2021, 5:31 p.m. UTC | #1
On Fri, May 14, 2021 at 9:05 AM Daniel P. Berrangé <berrange@redhat.com> wrote:
>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>  tests/vm/centos | 17 ++++++++---------
>  1 file changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/tests/vm/centos b/tests/vm/centos
> index efe3dbbb36..5c7bc1c1a9 100755
> --- a/tests/vm/centos
> +++ b/tests/vm/centos
> @@ -26,24 +26,23 @@ class CentosVM(basevm.BaseVM):
>          export SRC_ARCHIVE=/dev/vdb;
>          sudo chmod a+r $SRC_ARCHIVE;
>          tar -xf $SRC_ARCHIVE;
> -        make docker-test-block@centos7 {verbose} J={jobs} NETWORK=1;
> -        make docker-test-quick@centos7 {verbose} J={jobs} NETWORK=1;
> +        make docker-test-block@centos8 {verbose} J={jobs} NETWORK=1;
> +        make docker-test-quick@centos8 {verbose} J={jobs} NETWORK=1;
>          make docker-test-mingw@fedora  {verbose} J={jobs} NETWORK=1;
>      """
>
>      def build_image(self, img):
> -        cimg = self._download_with_cache("https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1802.qcow2.xz")
> +        cimg = self._download_with_cache("https://cloud.centos.org/centos/8/x86_64/images/CentOS-8-GenericCloud-8.3.2011-20201204.2.x86_64.qcow2")

I wonder why they didn't keep the compressed option for download.

Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Daniel P. Berrangé May 17, 2021, 9:03 a.m. UTC | #2
On Fri, May 14, 2021 at 02:31:50PM -0300, Willian Rampazzo wrote:
> On Fri, May 14, 2021 at 9:05 AM Daniel P. Berrangé <berrange@redhat.com> wrote:
> >
> > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> > ---
> >  tests/vm/centos | 17 ++++++++---------
> >  1 file changed, 8 insertions(+), 9 deletions(-)
> >
> > diff --git a/tests/vm/centos b/tests/vm/centos
> > index efe3dbbb36..5c7bc1c1a9 100755
> > --- a/tests/vm/centos
> > +++ b/tests/vm/centos
> > @@ -26,24 +26,23 @@ class CentosVM(basevm.BaseVM):
> >          export SRC_ARCHIVE=/dev/vdb;
> >          sudo chmod a+r $SRC_ARCHIVE;
> >          tar -xf $SRC_ARCHIVE;
> > -        make docker-test-block@centos7 {verbose} J={jobs} NETWORK=1;
> > -        make docker-test-quick@centos7 {verbose} J={jobs} NETWORK=1;
> > +        make docker-test-block@centos8 {verbose} J={jobs} NETWORK=1;
> > +        make docker-test-quick@centos8 {verbose} J={jobs} NETWORK=1;
> >          make docker-test-mingw@fedora  {verbose} J={jobs} NETWORK=1;
> >      """
> >
> >      def build_image(self, img):
> > -        cimg = self._download_with_cache("https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1802.qcow2.xz")
> > +        cimg = self._download_with_cache("https://cloud.centos.org/centos/8/x86_64/images/CentOS-8-GenericCloud-8.3.2011-20201204.2.x86_64.qcow2")
> 
> I wonder why they didn't keep the compressed option for download.

Yeah, its pretty annoying to have a download that is 1.2 GB in size
instead of 260 MB :-(

BTW, if you notice a slightly older CentOS 8 image there that is
only 680 MB in size, don't get too excited because the image is
majorly broken. Many files are 0 bytes in size including "make"
so its unusable for QEMU :-(

> Reviewed-by: Willian Rampazzo <willianr@redhat.com>
> 

Regards,
Daniel
diff mbox series

Patch

diff --git a/tests/vm/centos b/tests/vm/centos
index efe3dbbb36..5c7bc1c1a9 100755
--- a/tests/vm/centos
+++ b/tests/vm/centos
@@ -26,24 +26,23 @@  class CentosVM(basevm.BaseVM):
         export SRC_ARCHIVE=/dev/vdb;
         sudo chmod a+r $SRC_ARCHIVE;
         tar -xf $SRC_ARCHIVE;
-        make docker-test-block@centos7 {verbose} J={jobs} NETWORK=1;
-        make docker-test-quick@centos7 {verbose} J={jobs} NETWORK=1;
+        make docker-test-block@centos8 {verbose} J={jobs} NETWORK=1;
+        make docker-test-quick@centos8 {verbose} J={jobs} NETWORK=1;
         make docker-test-mingw@fedora  {verbose} J={jobs} NETWORK=1;
     """
 
     def build_image(self, img):
-        cimg = self._download_with_cache("https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1802.qcow2.xz")
+        cimg = self._download_with_cache("https://cloud.centos.org/centos/8/x86_64/images/CentOS-8-GenericCloud-8.3.2011-20201204.2.x86_64.qcow2")
         img_tmp = img + ".tmp"
-        sys.stderr.write("Extracting the image...\n")
-        subprocess.check_call(["ln", "-f", cimg, img_tmp + ".xz"])
-        subprocess.check_call(["xz", "--keep", "-dvf", img_tmp + ".xz"])
+        subprocess.check_call(["ln", "-f", cimg, img_tmp])
         self.exec_qemu_img("resize", img_tmp, "50G")
         self.boot(img_tmp, extra_args = ["-cdrom", self.gen_cloud_init_iso()])
         self.wait_ssh()
         self.ssh_root_check("touch /etc/cloud/cloud-init.disabled")
-        self.ssh_root_check("yum update -y")
-        self.ssh_root_check("yum install -y docker make ninja-build git python3")
-        self.ssh_root_check("systemctl enable docker")
+        self.ssh_root_check("dnf update -y")
+        self.ssh_root_check("dnf install -y dnf-plugins-core")
+        self.ssh_root_check("dnf config-manager --set-enabled powertools")
+        self.ssh_root_check("dnf install -y podman make ninja-build git python3")
         self.ssh_root("poweroff")
         self.wait()
         os.rename(img_tmp, img)