mbox

[PULL,0/6] testing updates

Message ID 20221221144019.2149905-1-alex.bennee@linaro.org
State New
Headers show

Pull-request

https://gitlab.com/stsquad/qemu.git tags/pull-testing-next-211222-1

Message

Alex Bennée Dec. 21, 2022, 2:40 p.m. UTC
The following changes since commit 8540a1f69578afb3b37866b1ce5bec46a9f6efbc:

  Merge tag 'hppa-fixes-pull-request' of https://github.com/hdeller/qemu-hppa into staging (2022-12-20 15:32:27 +0000)

are available in the Git repository at:

  https://gitlab.com/stsquad/qemu.git tags/pull-testing-next-211222-1

for you to fetch changes up to 7a8ec48480c116db93e0d91688be1dcf34147795:

  gitlab-ci: Disable docs and GUIs for the build-tci and build-tcg-disabled jobs (2022-12-21 11:19:05 +0000)

----------------------------------------------------------------
testing updates:

  - fix minor shell-ism that can break check-tcg
  - turn off verbose logging on custom runners
  - make configure echo call in CI
  - fix unused variable in linux-test
  - add binary compiler docker image for hexagon
  - disable doc and gui builds for tci and disable-tcg builds

----------------------------------------------------------------
Alex Bennée (3):
      gitlab: turn off verbose logging for make check on custom runners
      configure: repeat ourselves for the benefit of CI
      tests/tcg: fix unused variable in linux-test

Mukilan Thiyagarajan (2):
      configure: Fix check-tcg not executing any tests
      tests/docker: use prebuilt toolchain for debian-hexagon-cross

Thomas Huth (1):
      gitlab-ci: Disable docs and GUIs for the build-tci and build-tcg-disabled jobs

 configure                                          |  11 +-
 tests/tcg/multiarch/linux/linux-test.c             |   6 +-
 .gitlab-ci.d/buildtest.yml                         |  10 +-
 .gitlab-ci.d/container-cross.yml                   |  19 +--
 .gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml |  12 +-
 .../custom-runners/ubuntu-22.04-aarch32.yml        |   2 +-
 .../custom-runners/ubuntu-22.04-aarch64.yml        |  12 +-
 MAINTAINERS                                        |   1 -
 tests/docker/Makefile.include                      |   4 -
 .../debian-hexagon-cross.d/build-toolchain.sh      | 141 ---------------------
 .../docker/dockerfiles/debian-hexagon-cross.docker |  53 +++-----
 11 files changed, 47 insertions(+), 224 deletions(-)
 delete mode 100755 tests/docker/dockerfiles/debian-hexagon-cross.d/build-toolchain.sh

Comments

Peter Maydell Dec. 22, 2022, 11:14 a.m. UTC | #1
On Wed, 21 Dec 2022 at 14:40, Alex Bennée <alex.bennee@linaro.org> wrote:
>
> The following changes since commit 8540a1f69578afb3b37866b1ce5bec46a9f6efbc:
>
>   Merge tag 'hppa-fixes-pull-request' of https://github.com/hdeller/qemu-hppa into staging (2022-12-20 15:32:27 +0000)
>
> are available in the Git repository at:
>
>   https://gitlab.com/stsquad/qemu.git tags/pull-testing-next-211222-1
>
> for you to fetch changes up to 7a8ec48480c116db93e0d91688be1dcf34147795:
>
>   gitlab-ci: Disable docs and GUIs for the build-tci and build-tcg-disabled jobs (2022-12-21 11:19:05 +0000)
>
> ----------------------------------------------------------------
> testing updates:
>
>   - fix minor shell-ism that can break check-tcg
>   - turn off verbose logging on custom runners
>   - make configure echo call in CI
>   - fix unused variable in linux-test
>   - add binary compiler docker image for hexagon
>   - disable doc and gui builds for tci and disable-tcg builds
>

Gitlab's CI marks this with a "yaml invalid" tag:
https://gitlab.com/qemu-project/qemu/-/pipelines/729324088

and the error:
'build-user-hexagon' job needs 'hexagon-cross-container' job, but
'hexagon-cross-container' is not in any previous stage

thanks
-- PMM
Mukilan Thiyagarajan Dec. 22, 2022, 11:35 a.m. UTC | #2
I believe the error is caused by the QEMU_JOB_ONLY_FORKS: 1 line
which needs to be removed from the definition of hexagon-cross-container.

Alex, Peter, 

Shall I raise a patch to remove this line? Should the patch be
created against the testing/next branch?

Thanks,
Mukilan

-----Original Message-----
From: qemu-devel-bounces+quic_mthiyaga=quicinc.com@nongnu.org <qemu-devel-bounces+quic_mthiyaga=quicinc.com@nongnu.org> On Behalf Of Peter Maydell
Sent: Thursday, December 22, 2022 4:45 PM
To: Alex Bennée <alex.bennee@linaro.org>
Cc: qemu-devel@nongnu.org
Subject: Re: [PULL 0/6] testing updates

WARNING: This email originated from outside of Qualcomm. Please be wary of any links or attachments, and do not enable macros.

On Wed, 21 Dec 2022 at 14:40, Alex Bennée <alex.bennee@linaro.org> wrote:
>
> The following changes since commit 8540a1f69578afb3b37866b1ce5bec46a9f6efbc:
>
>   Merge tag 'hppa-fixes-pull-request' of 
> https://github.com/hdeller/qemu-hppa into staging (2022-12-20 15:32:27 
> +0000)
>
> are available in the Git repository at:
>
>   https://gitlab.com/stsquad/qemu.git tags/pull-testing-next-211222-1
>
> for you to fetch changes up to 7a8ec48480c116db93e0d91688be1dcf34147795:
>
>   gitlab-ci: Disable docs and GUIs for the build-tci and 
> build-tcg-disabled jobs (2022-12-21 11:19:05 +0000)
>
> ----------------------------------------------------------------
> testing updates:
>
>   - fix minor shell-ism that can break check-tcg
>   - turn off verbose logging on custom runners
>   - make configure echo call in CI
>   - fix unused variable in linux-test
>   - add binary compiler docker image for hexagon
>   - disable doc and gui builds for tci and disable-tcg builds
>

Gitlab's CI marks this with a "yaml invalid" tag:
https://gitlab.com/qemu-project/qemu/-/pipelines/729324088

and the error:
'build-user-hexagon' job needs 'hexagon-cross-container' job, but 'hexagon-cross-container' is not in any previous stage

thanks
-- PMM
Alex Bennée Dec. 22, 2022, 8:31 p.m. UTC | #3
Peter Maydell <peter.maydell@linaro.org> writes:

> On Wed, 21 Dec 2022 at 14:40, Alex Bennée <alex.bennee@linaro.org> wrote:
>>
>> The following changes since commit 8540a1f69578afb3b37866b1ce5bec46a9f6efbc:
>>
>>   Merge tag 'hppa-fixes-pull-request' of
>> https://github.com/hdeller/qemu-hppa into staging (2022-12-20
>> 15:32:27 +0000)
>>
>> are available in the Git repository at:
>>
>>   https://gitlab.com/stsquad/qemu.git tags/pull-testing-next-211222-1
>>
>> for you to fetch changes up to 7a8ec48480c116db93e0d91688be1dcf34147795:
>>
>>   gitlab-ci: Disable docs and GUIs for the build-tci and
>> build-tcg-disabled jobs (2022-12-21 11:19:05 +0000)
>>
>> ----------------------------------------------------------------
>> testing updates:
>>
>>   - fix minor shell-ism that can break check-tcg
>>   - turn off verbose logging on custom runners
>>   - make configure echo call in CI
>>   - fix unused variable in linux-test
>>   - add binary compiler docker image for hexagon
>>   - disable doc and gui builds for tci and disable-tcg builds
>>
>
> Gitlab's CI marks this with a "yaml invalid" tag:
> https://gitlab.com/qemu-project/qemu/-/pipelines/729324088
>
> and the error:
> 'build-user-hexagon' job needs 'hexagon-cross-container' job, but
> 'hexagon-cross-container' is not in any previous stage

Ahh and doesn't show up on my run:

  https://gitlab.com/stsquad/qemu/-/pipelines/728840940

I guess because it is qemu-project only.

>
> thanks
> -- PMM
Alex Bennée Dec. 22, 2022, 8:32 p.m. UTC | #4
"Mukilan Thiyagarajan (QUIC)" <quic_mthiyaga@quicinc.com> writes:

> I believe the error is caused by the QEMU_JOB_ONLY_FORKS: 1 line
> which needs to be removed from the definition of hexagon-cross-container.
>
> Alex, Peter, 
>
> Shall I raise a patch to remove this line? Should the patch be
> created against the testing/next branch?

Just show the patch here and I'll manually re-spin.

>
> Thanks,
> Mukilan
>
> -----Original Message-----
> From: qemu-devel-bounces+quic_mthiyaga=quicinc.com@nongnu.org
> <qemu-devel-bounces+quic_mthiyaga=quicinc.com@nongnu.org> On Behalf Of
> Peter Maydell
> Sent: Thursday, December 22, 2022 4:45 PM
> To: Alex Bennée <alex.bennee@linaro.org>
> Cc: qemu-devel@nongnu.org
> Subject: Re: [PULL 0/6] testing updates
>
> WARNING: This email originated from outside of Qualcomm. Please be
> wary of any links or attachments, and do not enable macros.
>
> On Wed, 21 Dec 2022 at 14:40, Alex Bennée <alex.bennee@linaro.org> wrote:
>>
>> The following changes since commit 8540a1f69578afb3b37866b1ce5bec46a9f6efbc:
>>
>>   Merge tag 'hppa-fixes-pull-request' of 
>> https://github.com/hdeller/qemu-hppa into staging (2022-12-20 15:32:27 
>> +0000)
>>
>> are available in the Git repository at:
>>
>>   https://gitlab.com/stsquad/qemu.git tags/pull-testing-next-211222-1
>>
>> for you to fetch changes up to 7a8ec48480c116db93e0d91688be1dcf34147795:
>>
>>   gitlab-ci: Disable docs and GUIs for the build-tci and 
>> build-tcg-disabled jobs (2022-12-21 11:19:05 +0000)
>>
>> ----------------------------------------------------------------
>> testing updates:
>>
>>   - fix minor shell-ism that can break check-tcg
>>   - turn off verbose logging on custom runners
>>   - make configure echo call in CI
>>   - fix unused variable in linux-test
>>   - add binary compiler docker image for hexagon
>>   - disable doc and gui builds for tci and disable-tcg builds
>>
>
> Gitlab's CI marks this with a "yaml invalid" tag:
> https://gitlab.com/qemu-project/qemu/-/pipelines/729324088
>
> and the error:
> 'build-user-hexagon' job needs 'hexagon-cross-container' job, but 'hexagon-cross-container' is not in any previous stage
>
> thanks
> -- PMM
Mukilan Thiyagarajan Dec. 23, 2022, 5:04 a.m. UTC | #5
Thank you, Alex!

Here is the patch to fix the issue. I've also removed
the comment which is no longer applicable.

Regards,
Mukilan

---
 .gitlab-ci.d/container-cross.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml
index 5486dc43c6..e0d75d5824 100644
--- a/.gitlab-ci.d/container-cross.yml
+++ b/.gitlab-ci.d/container-cross.yml
@@ -34,14 +34,11 @@ armhf-debian-cross-container:
   variables:
     NAME: debian-armhf-cross
 
-# We never want to build hexagon in the CI system and by default we
-# always want to refer to the master registry where it lives.
 hexagon-cross-container:
   extends: .container_job_template
   stage: containers
   variables:
     NAME: debian-hexagon-cross
-    QEMU_JOB_ONLY_FORKS: 1
 
 hppa-debian-cross-container:
   extends: .container_job_template