| Message ID | 20220707040310.4163682-11-jsnow@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Improve reliability of VM tests | expand |
On Thu, Jul 07, 2022 at 12:03:07AM -0400, John Snow wrote: > The fedora container has since been split apart, so there's no suitable > nearby target that would support "test-mingw" as it requires both x32 > and x64 support -- so either fedora-cross-win32 nor fedora-cross-win64 > would be truly suitable. > > Just remove this test as superfluous with our current CI infrastructure. > > Signed-off-by: John Snow <jsnow@redhat.com> > --- > tests/vm/centos | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/tests/vm/centos b/tests/vm/centos > index 3a527c47b3d..097a9ca14d3 100755 > --- a/tests/vm/centos > +++ b/tests/vm/centos > @@ -28,7 +28,6 @@ class CentosVM(basevm.BaseVM): > tar -xf $SRC_ARCHIVE; > 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; Well it could have been replaced with two: make docker-test-mingw@fedora-cross-win32 {verbose} J={jobs} NETWORK=1; make docker-test-mingw@fedora-cross-win64 {verbose} J={jobs} NETWORK=1; I don't mind either way though, and feel this is quite poiintless anyway, since mingw is trivial to test in containers Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> With regards, Daniel
On Thu, Jul 7, 2022 at 4:33 AM Daniel P. Berrangé <berrange@redhat.com> wrote: > > On Thu, Jul 07, 2022 at 12:03:07AM -0400, John Snow wrote: > > The fedora container has since been split apart, so there's no suitable > > nearby target that would support "test-mingw" as it requires both x32 > > and x64 support -- so either fedora-cross-win32 nor fedora-cross-win64 > > would be truly suitable. > > > > Just remove this test as superfluous with our current CI infrastructure. > > > > Signed-off-by: John Snow <jsnow@redhat.com> > > --- > > tests/vm/centos | 1 - > > 1 file changed, 1 deletion(-) > > > > diff --git a/tests/vm/centos b/tests/vm/centos > > index 3a527c47b3d..097a9ca14d3 100755 > > --- a/tests/vm/centos > > +++ b/tests/vm/centos > > @@ -28,7 +28,6 @@ class CentosVM(basevm.BaseVM): > > tar -xf $SRC_ARCHIVE; > > 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; > > Well it could have been replaced with two: > > make docker-test-mingw@fedora-cross-win32 {verbose} J={jobs} NETWORK=1; > make docker-test-mingw@fedora-cross-win64 {verbose} J={jobs} NETWORK=1; but "test-mingw" expects to see the dependencies from both win32 and win64, so I'd have to split the test-mingw target, and I am far off course from what I wanted to be doing as-is. > > I don't mind either way though, and feel this is quite poiintless > anyway, since mingw is trivial to test in containers > > Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> > Thanks :) --js > > With regards, > Daniel > -- > |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| > |: https://libvirt.org -o- https://fstop138.berrange.com :| > |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :| >
On Thu, Jul 07, 2022 at 11:48:35AM -0400, John Snow wrote: > On Thu, Jul 7, 2022 at 4:33 AM Daniel P. Berrangé <berrange@redhat.com> wrote: > > > > On Thu, Jul 07, 2022 at 12:03:07AM -0400, John Snow wrote: > > > The fedora container has since been split apart, so there's no suitable > > > nearby target that would support "test-mingw" as it requires both x32 > > > and x64 support -- so either fedora-cross-win32 nor fedora-cross-win64 > > > would be truly suitable. > > > > > > Just remove this test as superfluous with our current CI infrastructure. > > > > > > Signed-off-by: John Snow <jsnow@redhat.com> > > > --- > > > tests/vm/centos | 1 - > > > 1 file changed, 1 deletion(-) > > > > > > diff --git a/tests/vm/centos b/tests/vm/centos > > > index 3a527c47b3d..097a9ca14d3 100755 > > > --- a/tests/vm/centos > > > +++ b/tests/vm/centos > > > @@ -28,7 +28,6 @@ class CentosVM(basevm.BaseVM): > > > tar -xf $SRC_ARCHIVE; > > > 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; > > > > Well it could have been replaced with two: > > > > make docker-test-mingw@fedora-cross-win32 {verbose} J={jobs} NETWORK=1; > > make docker-test-mingw@fedora-cross-win64 {verbose} J={jobs} NETWORK=1; > > but "test-mingw" expects to see the dependencies from both win32 and > win64, so I'd have to split the test-mingw target, and I am far off > course from what I wanted to be doing as-is. Oh right, so we should really drop the 'test-mingw' bit entirely as we have nothing it can be used with now. Instead 'test-build' needs to honour $QEMU_CONFIGURE_OPTS, so we can do make docker-test-build@fedora-cross-win32 (or any of the non-x86 Linux cross containers) Separate pre-existing problem though, not related to your series. With regards, Daniel
diff --git a/tests/vm/centos b/tests/vm/centos index 3a527c47b3d..097a9ca14d3 100755 --- a/tests/vm/centos +++ b/tests/vm/centos @@ -28,7 +28,6 @@ class CentosVM(basevm.BaseVM): tar -xf $SRC_ARCHIVE; 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):
The fedora container has since been split apart, so there's no suitable nearby target that would support "test-mingw" as it requires both x32 and x64 support -- so either fedora-cross-win32 nor fedora-cross-win64 would be truly suitable. Just remove this test as superfluous with our current CI infrastructure. Signed-off-by: John Snow <jsnow@redhat.com> --- tests/vm/centos | 1 - 1 file changed, 1 deletion(-)