[PATCH 0/2] Fix for the 'testing, gdbstub and plugin updates' pull request

[PATCH 0/2] Fix for the 'testing, gdbstub and plugin updates' pull request

[Philippe Mathieu-Daudé]

Based-on: <20210525112431.22005-1-alex.bennee@linaro.org>
https://github.com/stsquad/qemu.git tags/pull-testing-and-misc-updates-250521=
-1

Philippe Mathieu-Daud=C3=A9 (2):
  !fixup gitlab: add special rule for the hexagon container
  gitlab-ci: Convert check-dco/check-patch jobs to the 'rules' syntax

 .gitlab-ci.d/containers.yml |  7 ++++---
 .gitlab-ci.yml              | 24 ++++++++++++++----------
 2 files changed, 18 insertions(+), 13 deletions(-)

--=20
2.26.3

[PATCH 1/2] !fixup gitlab: add special rule for the hexagon container

[Philippe Mathieu-Daudé]

Make the build-user-hexagon -> hexagon-cross-container optional
to avoid on mainstream CI [*]:

 'build-user-hexagon' job needs 'hexagon-cross-container' job
  but it was not added to the pipeline

[*] https://gitlab.com/qemu-project/qemu/-/pipelines/309137207

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 .gitlab-ci.d/containers.yml | 7 ++++---
 .gitlab-ci.yml              | 8 +++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml
index 088c7e68c3b..59803453d50 100644
--- a/.gitlab-ci.d/containers.yml
+++ b/.gitlab-ci.d/containers.yml
@@ -106,9 +106,6 @@ armhf-debian-cross-container:
 hexagon-cross-container:
   image: docker:stable
   stage: containers
-  except:
-    variables:
-      - $CI_PROJECT_NAMESPACE == 'qemu-project'
   variables:
     NAME: debian-hexagon-cross
     GIT_DEPTH: 1
@@ -127,6 +124,10 @@ hexagon-cross-container:
     - docker push "$TAG"
   after_script:
     - docker logout
+  rules:
+    - if: '$CI_PROJECT_NAMESPACE == "qemu-project"'
+      when: never
+    - when: on_success
 
 hppa-debian-cross-container:
   extends: .container_job_template
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b2f929c758b..2b89143f81f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -417,12 +417,14 @@ build-user-static:
     MAKE_CHECK_ARGS: check-tcg
 
 # Because the hexagon cross-compiler takes so long to build we don't rely
-# on the CI system to build it and hence this job has no dependency
-# declared. The image is manually uploaded.
+# on the CI system to build it. The image is manually uploaded.
 build-user-hexagon:
   extends: .native_build_job_template
   needs:
-    job: hexagon-cross-container
+    - job: hexagon-cross-container
+      # Only forks have the hexagon-cross-container job,
+      # keep it optional for mainstream.
+      optional: true
   variables:
     IMAGE: debian-hexagon-cross
     TARGETS: hexagon-linux-user
-- 
2.26.3

[PATCH 2/2] gitlab-ci: Convert check-dco/check-patch jobs to the 'rules' syntax

[Philippe Mathieu-Daudé]

Per GitLab documentation [*]:

  "rules replaces only/except and they can’t be used together
   in the same job."

Since the 'rules' syntax is more powerful and we are already using
it, convert the check-dco/check-patch jobs so no job use the 'only/
except' syntax.

[*] https://docs.gitlab.com/ee/ci/yaml/#rules

Inspired-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 .gitlab-ci.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2b89143f81f..83e077d095c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -786,12 +786,13 @@ check-patch:
   needs:
     job: amd64-centos8-container
   script: .gitlab-ci.d/check-patch.py
-  except:
-    variables:
-      - $CI_PROJECT_NAMESPACE == 'qemu-project' && $CI_COMMIT_BRANCH == 'master'
   variables:
     GIT_DEPTH: 1000
-  allow_failure: true
+  rules:
+    - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH == "master"'
+      when: never
+    - when: on_success
+      allow_failure: true
 
 check-dco:
   stage: build
@@ -799,11 +800,12 @@ check-dco:
   needs:
     job: amd64-centos8-container
   script: .gitlab-ci.d/check-dco.py
-  except:
-    variables:
-      - $CI_PROJECT_NAMESPACE == 'qemu-project' && $CI_COMMIT_BRANCH == 'master'
   variables:
     GIT_DEPTH: 1000
+  rules:
+    - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH == "master"'
+      when: never
+    - when: on_success
 
 build-libvhost-user:
   stage: build
-- 
2.26.3

Re: [PATCH 1/2] !fixup gitlab: add special rule for the hexagon container

[Willian Rampazzo]

On Tue, May 25, 2021 at 10:24 AM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>
> Make the build-user-hexagon -> hexagon-cross-container optional
> to avoid on mainstream CI [*]:
>
>  'build-user-hexagon' job needs 'hexagon-cross-container' job
>   but it was not added to the pipeline
>
> [*] https://gitlab.com/qemu-project/qemu/-/pipelines/309137207
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  .gitlab-ci.d/containers.yml | 7 ++++---
>  .gitlab-ci.yml              | 8 +++++---
>  2 files changed, 9 insertions(+), 6 deletions(-)
>

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

Re: [PATCH 2/2] gitlab-ci: Convert check-dco/check-patch jobs to the 'rules' syntax

[Willian Rampazzo]

On Tue, May 25, 2021 at 10:24 AM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>
> Per GitLab documentation [*]:
>
>   "rules replaces only/except and they can’t be used together
>    in the same job."
>
> Since the 'rules' syntax is more powerful and we are already using
> it, convert the check-dco/check-patch jobs so no job use the 'only/
> except' syntax.
>
> [*] https://docs.gitlab.com/ee/ci/yaml/#rules
>
> Inspired-by: Daniel P. Berrangé <berrange@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  .gitlab-ci.yml | 16 +++++++++-------
>  1 file changed, 9 insertions(+), 7 deletions(-)
>

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

Re: [PATCH 2/2] gitlab-ci: Convert check-dco/check-patch jobs to the 'rules' syntax

[Alex Bennée]

Philippe Mathieu-Daudé <f4bug@amsat.org> writes:

> Per GitLab documentation [*]:
>
>   "rules replaces only/except and they can’t be used together
>    in the same job."
>
> Since the 'rules' syntax is more powerful and we are already using
> it, convert the check-dco/check-patch jobs so no job use the 'only/
> except' syntax.
>
> [*] https://docs.gitlab.com/ee/ci/yaml/#rules
>
> Inspired-by: Daniel P. Berrangé <berrange@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Queued to testing/next, thanks.

-- 
Alex Bennée