[PATCH 0/3] migration, ci: Tweaks to migration-compat jobs

[PATCH 0/3] migration, ci: Tweaks to migration-compat jobs

[Fabiano Rosas]

A couple of cleanups to the migration jobs, plus a fix for an issue
that may happen during the QEMU release.

Fabiano Rosas (3):
  ci: Re-enable python subtests in qtest migration suite
  ci: Fix build-previous-qemu when the version tag is absent
  ci: Reduce the size of artifacts for build-previous-qemu

 .gitlab-ci.d/buildtest.yml | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

-- 
2.35.3

[PATCH 1/3] ci: Re-enable python subtests in qtest migration suite

[Fabiano Rosas]

The migration compatibility tests have been running with the PYTHON
variable unset to avoid running a broken test. The faulty test has
since been removed, so we can enable the python tests once again.

Aside from the broken test, only one other test uses python and I have
been running it locally ever since, so this commit should not expose
any new bug.

Signed-off-by: Fabiano Rosas <farosas@suse.de>
---
 .gitlab-ci.d/buildtest.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
index 431bc07d8f..ccf69fb8dd 100644
--- a/.gitlab-ci.d/buildtest.yml
+++ b/.gitlab-ci.d/buildtest.yml
@@ -227,14 +227,6 @@ build-previous-qemu:
     # testing an old QEMU against new features/tests that it is not
     # compatible with.
     - cd build-previous
-    # Don't allow python-based tests to run. The
-    # vmstate-checker-script test has a race that causes it to fail
-    # sometimes. It cannot be fixed it because this job runs the test
-    # from the old QEMU version. The test will be removed on master,
-    # but this job will only see the change in the next release.
-    #
-    # TODO: remove this line after 9.2 release
-    - unset PYTHON
     # old to new
     - QTEST_QEMU_BINARY_SRC=./qemu-system-${TARGET}
           QTEST_QEMU_BINARY=../build/qemu-system-${TARGET} ./tests/qtest/migration-test
-- 
2.35.3

Re: [PATCH 1/3] ci: Re-enable python subtests in qtest migration suite

[Peter Xu]

On Wed, May 07, 2025 at 12:58:33PM -0300, Fabiano Rosas wrote:
> The migration compatibility tests have been running with the PYTHON
> variable unset to avoid running a broken test. The faulty test has
> since been removed, so we can enable the python tests once again.
> 
> Aside from the broken test, only one other test uses python and I have
> been running it locally ever since, so this commit should not expose
> any new bug.
> 
> Signed-off-by: Fabiano Rosas <farosas@suse.de>

Reviewed-by: Peter Xu <peterx@redhat.com>

-- 
Peter Xu

[PATCH 2/3] ci: Fix build-previous-qemu when the version tag is absent

[Fabiano Rosas]

Stefan reports that during QEMU release, pushing a series with the
VERSION bump commit, but not pushing the new git tag in the same
command will cause a failure of the build-previous-qemu job at the git
fetch step.

Since the job is intended to produce a build of the previous QEMU
version for consumption by the migration-compat-* jobs, there's no
reason to produce a build of the release commit because the migration
job would end up testing the release against itself.

Skip the job when VERSION contains the newly release version number.

I'm opting for 'exit 0' for both the build and the test jobs because
allow_failure would mask any real error in the jobs. It also avoids
having an orange ! on every release pipeline.

Reported-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
---
 .gitlab-ci.d/buildtest.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
index ccf69fb8dd..159bdde2e8 100644
--- a/.gitlab-ci.d/buildtest.yml
+++ b/.gitlab-ci.d/buildtest.yml
@@ -203,6 +203,11 @@ build-previous-qemu:
     GIT_FETCH_EXTRA_FLAGS: --prune --quiet
   before_script:
     - source scripts/ci/gitlab-ci-section
+    # Skip if this series contains the release bump commit. During the
+    # release process there might be a window of commits when the
+    # version tag is not yet present in the remote and git fetch would
+    # fail.
+    - if grep -q "\.0$" VERSION; then exit 0; fi
     - export QEMU_PREV_VERSION="$(sed 's/\([0-9.]*\)\.[0-9]*/v\1.0/' VERSION)"
     - git remote add upstream https://gitlab.com/qemu-project/qemu
     - git fetch upstream refs/tags/$QEMU_PREV_VERSION:refs/tags/$QEMU_PREV_VERSION
@@ -226,7 +231,8 @@ build-previous-qemu:
     # Use the migration-tests from the older QEMU tree. This avoids
     # testing an old QEMU against new features/tests that it is not
     # compatible with.
-    - cd build-previous
+    # Skip if build-previous-qemu has failed.
+    - cd build-previous || exit 0
     # old to new
     - QTEST_QEMU_BINARY_SRC=./qemu-system-${TARGET}
           QTEST_QEMU_BINARY=../build/qemu-system-${TARGET} ./tests/qtest/migration-test
-- 
2.35.3

Re: [PATCH 2/3] ci: Fix build-previous-qemu when the version tag is absent

[Peter Xu]

On Wed, May 07, 2025 at 12:58:34PM -0300, Fabiano Rosas wrote:
> Stefan reports that during QEMU release, pushing a series with the
> VERSION bump commit, but not pushing the new git tag in the same
> command will cause a failure of the build-previous-qemu job at the git
> fetch step.
> 
> Since the job is intended to produce a build of the previous QEMU
> version for consumption by the migration-compat-* jobs, there's no
> reason to produce a build of the release commit because the migration
> job would end up testing the release against itself.
> 
> Skip the job when VERSION contains the newly release version number.
> 
> I'm opting for 'exit 0' for both the build and the test jobs because
> allow_failure would mask any real error in the jobs. It also avoids
> having an orange ! on every release pipeline.
> 
> Reported-by: Stefan Hajnoczi <stefanha@redhat.com>
> Signed-off-by: Fabiano Rosas <farosas@suse.de>

This is better than before for sure:

Reviewed-by: Peter Xu <peterx@redhat.com>

Though nitpicks below.

> ---
>  .gitlab-ci.d/buildtest.yml | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
> index ccf69fb8dd..159bdde2e8 100644
> --- a/.gitlab-ci.d/buildtest.yml
> +++ b/.gitlab-ci.d/buildtest.yml
> @@ -203,6 +203,11 @@ build-previous-qemu:
>      GIT_FETCH_EXTRA_FLAGS: --prune --quiet
>    before_script:
>      - source scripts/ci/gitlab-ci-section
> +    # Skip if this series contains the release bump commit. During the
> +    # release process there might be a window of commits when the
> +    # version tag is not yet present in the remote and git fetch would
> +    # fail.
> +    - if grep -q "\.0$" VERSION; then exit 0; fi
>      - export QEMU_PREV_VERSION="$(sed 's/\([0-9.]*\)\.[0-9]*/v\1.0/' VERSION)"
>      - git remote add upstream https://gitlab.com/qemu-project/qemu
>      - git fetch upstream refs/tags/$QEMU_PREV_VERSION:refs/tags/$QEMU_PREV_VERSION
> @@ -226,7 +231,8 @@ build-previous-qemu:
>      # Use the migration-tests from the older QEMU tree. This avoids
>      # testing an old QEMU against new features/tests that it is not
>      # compatible with.
> -    - cd build-previous
> +    # Skip if build-previous-qemu has failed.

This is inaccurate?  As this job could only run if the dependent job
succeeded IIUC (aka, exit 0 means success).  Meanwhile..

> +    - cd build-previous || exit 0

.. It'll be nice if we could still fail this job if something wrong
happened in build-previous..

Maybe it's clearer we check .0 here too?  It's oneliner so we could dup it
I guess.  I wished the CI jobs can have nested "rules:"..

>      # old to new
>      - QTEST_QEMU_BINARY_SRC=./qemu-system-${TARGET}
>            QTEST_QEMU_BINARY=../build/qemu-system-${TARGET} ./tests/qtest/migration-test
> -- 
> 2.35.3
> 

-- 
Peter Xu

Re: [PATCH 2/3] ci: Fix build-previous-qemu when the version tag is absent

[Fabiano Rosas]

Peter Xu <peterx@redhat.com> writes:

> On Wed, May 07, 2025 at 12:58:34PM -0300, Fabiano Rosas wrote:
>> Stefan reports that during QEMU release, pushing a series with the
>> VERSION bump commit, but not pushing the new git tag in the same
>> command will cause a failure of the build-previous-qemu job at the git
>> fetch step.
>> 
>> Since the job is intended to produce a build of the previous QEMU
>> version for consumption by the migration-compat-* jobs, there's no
>> reason to produce a build of the release commit because the migration
>> job would end up testing the release against itself.
>> 
>> Skip the job when VERSION contains the newly release version number.
>> 
>> I'm opting for 'exit 0' for both the build and the test jobs because
>> allow_failure would mask any real error in the jobs. It also avoids
>> having an orange ! on every release pipeline.
>> 
>> Reported-by: Stefan Hajnoczi <stefanha@redhat.com>
>> Signed-off-by: Fabiano Rosas <farosas@suse.de>
>
> This is better than before for sure:
>
> Reviewed-by: Peter Xu <peterx@redhat.com>
>
> Though nitpicks below.
>
>> ---
>>  .gitlab-ci.d/buildtest.yml | 8 +++++++-
>>  1 file changed, 7 insertions(+), 1 deletion(-)
>> 
>> diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
>> index ccf69fb8dd..159bdde2e8 100644
>> --- a/.gitlab-ci.d/buildtest.yml
>> +++ b/.gitlab-ci.d/buildtest.yml
>> @@ -203,6 +203,11 @@ build-previous-qemu:
>>      GIT_FETCH_EXTRA_FLAGS: --prune --quiet
>>    before_script:
>>      - source scripts/ci/gitlab-ci-section
>> +    # Skip if this series contains the release bump commit. During the
>> +    # release process there might be a window of commits when the
>> +    # version tag is not yet present in the remote and git fetch would
>> +    # fail.
>> +    - if grep -q "\.0$" VERSION; then exit 0; fi
>>      - export QEMU_PREV_VERSION="$(sed 's/\([0-9.]*\)\.[0-9]*/v\1.0/' VERSION)"
>>      - git remote add upstream https://gitlab.com/qemu-project/qemu
>>      - git fetch upstream refs/tags/$QEMU_PREV_VERSION:refs/tags/$QEMU_PREV_VERSION
>> @@ -226,7 +231,8 @@ build-previous-qemu:
>>      # Use the migration-tests from the older QEMU tree. This avoids
>>      # testing an old QEMU against new features/tests that it is not
>>      # compatible with.
>> -    - cd build-previous
>> +    # Skip if build-previous-qemu has failed.
>
> This is inaccurate?  As this job could only run if the dependent job
> succeeded IIUC (aka, exit 0 means success).  Meanwhile..
>
>> +    - cd build-previous || exit 0
>
> .. It'll be nice if we could still fail this job if something wrong
> happened in build-previous..
>
> Maybe it's clearer we check .0 here too?  It's oneliner so we could dup it
> I guess.

Ok, let me respin...

> I wished the CI jobs can have nested "rules:"..
>

IIUC, we can't use rules because they're evaluated before the pipeline
starts, so the repo would not have been cloned yet.

>>      # old to new
>>      - QTEST_QEMU_BINARY_SRC=./qemu-system-${TARGET}
>>            QTEST_QEMU_BINARY=../build/qemu-system-${TARGET} ./tests/qtest/migration-test
>> -- 
>> 2.35.3
>> 

[PATCH 3/3] ci: Reduce the size of artifacts for build-previous-qemu

[Fabiano Rosas]

The build-previous-qemu job is intented to produce a build of the
previous QEMU release for consumption by the migration-compat-*
jobs. Keep only the pieces of the build that are necessary.

Signed-off-by: Fabiano Rosas <farosas@suse.de>
---
 .gitlab-ci.d/buildtest.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
index 159bdde2e8..a85c8cefa9 100644
--- a/.gitlab-ci.d/buildtest.yml
+++ b/.gitlab-ci.d/buildtest.yml
@@ -188,12 +188,11 @@ build-previous-qemu:
     when: on_success
     expire_in: 2 days
     paths:
-      - build-previous
-    exclude:
-      - build-previous/**/*.p
-      - build-previous/**/*.a.p
-      - build-previous/**/*.c.o
-      - build-previous/**/*.c.o.d
+      - build-previous/qemu-bundle
+      - build-previous/qemu-system-aarch64
+      - build-previous/qemu-system-x86_64
+      - build-previous/tests/qtest/migration-test
+      - build-previous/scripts
   needs:
     job: amd64-opensuse-leap-container
   variables:
-- 
2.35.3

Re: [PATCH 3/3] ci: Reduce the size of artifacts for build-previous-qemu

[Peter Xu]

On Wed, May 07, 2025 at 12:58:35PM -0300, Fabiano Rosas wrote:
> The build-previous-qemu job is intented to produce a build of the
> previous QEMU release for consumption by the migration-compat-*
> jobs. Keep only the pieces of the build that are necessary.
> 
> Signed-off-by: Fabiano Rosas <farosas@suse.de>

Reviewed-by: Peter Xu <peterx@redhat.com>

The other thing I'm thinking is maybe we could create migration.yml and
move all migration stuff over, having buildtest.yml include that..

-- 
Peter Xu