From nobody Fri May 17 08:39:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) client-ip=209.85.221.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1622063927; cv=none; d=zohomail.com; s=zohoarc; b=Iqi3USOhrAin/Kiw1IKOUvyaQj9mSR7Ax0srYz699gh7LCJCSB1S5klZKyo0xMsL3d2dzcdOCvrf09xZrWUBp2A4c59YKCEHkngHLEweMJK2kU/yK6WAeI1Dms5JswHshzxCzDh2ptFu6jKq9ZD+YwRmdhHKnP33xktfP3rlfTs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622063927; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=A1xwDYaxd6JVF19FGs2XehHjTnmolRlelitlWwSXhuc=; b=Epk6dvF71j/EdbpP1GYLTcXPWHYIVMleZTxcM0liyWX3tqRfoq+kU9kJfvzDrr7ILqveQEd1JTBZrFxLhvR/Rd9rtL6/WlY7pX/6KkJ45E+qsh0brtt428sZ587mHOQ4m7te9i1A+fFLXP1HQluubRndwOTuFy0ubaLiz1ETp1M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.zohomail.com with SMTPS id 1622063927856646.3013159055856; Wed, 26 May 2021 14:18:47 -0700 (PDT) Received: by mail-wr1-f54.google.com with SMTP id q5so2548854wrs.4 for ; Wed, 26 May 2021 14:18:47 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (235.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.235]) by smtp.gmail.com with ESMTPSA id u14sm7802902wmc.41.2021.05.26.14.18.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 14:18:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=A1xwDYaxd6JVF19FGs2XehHjTnmolRlelitlWwSXhuc=; b=cNwI2wrtS7BWA9T331flCjCfiewk+KOiHD15Y8i153eOQ6aubNv7msWG1yumrBhyVH 1Bkr4C4kC+rJhCbUJTDQH8aDjLyEx1M/UWE8AIyUEqN+YBxqgx4KAURjv6d/SxtdFMXT xgi6q40jCMbjQxaIUBPNpk+pe/JvkC82V9Rn7twnNA+k5hO2zVuogu5OpuzlplsYJoLc VWpupS/nFyel2STonunrT5oyssMeS9S+AfkqaR9fD8hdsGeAKVTyAd6plGBdq5rkf9jc ARTp6hM2FioDP0tSZ7u86u1SKAZ/h8geToTNk+wk+oTerlItOwKluAigdpvxVrrGO8zF 158Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=A1xwDYaxd6JVF19FGs2XehHjTnmolRlelitlWwSXhuc=; b=trXHQP3gZdJhV6p8rvik28/WW6Fktn8C2k0tWzHX1xVLc2hah/32Ilo6KQM+vHPXrp BrCye4XOBlSzUexuijsymFf+2AhEE2O0UrAFFFF/Jy6MxSpvORLsvsrBtZJG+YANuJlN zsYsUMs8G9VYlXAhqWjOXG3Z3Z+VdA2JwoTczbZUXY0XRbEVx6iUyPitLA9enz+lgU7B K3+A8TAElRSfIfXgN7R5wlDjlhjnvB9o2DYkhR1RVG2H8Aa9lLOnsikd/ywyrTiGnCOg /oowIXuM7yCHI6yF6v5gajEszgR5wrn4MPqfbbN6z+3LYXqkj9hygRatNxdO6SlPL2Ie eKfQ== X-Gm-Message-State: AOAM5302QYkZUVSAZtLBAtKpcUwdx73EW+atU6QTd3KvJs2xD0ajcphf bA6/9VwW428tpnBxisaJ3Hbu2tR7ZKvVpw== X-Google-Smtp-Source: ABdhPJxkmxNuvi9bBcf3ZWWkQKjuqx1QNSKYhCrQ8cA7leooS2vAnZEB2gxX9u0Psla4Yi/pC/RreA== X-Received: by 2002:a5d:6804:: with SMTP id w4mr35572390wru.363.1622063926062; Wed, 26 May 2021 14:18:46 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 01/19] gitlab: Replace YAML anchors by extends (acceptance_test_job) Date: Wed, 26 May 2021 23:18:20 +0200 Message-Id: <20210526211838.421716-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210526211838.421716-1-f4bug@amsat.org> References: <20210526211838.421716-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) From: Philippe Mathieu-Daud=C3=A9 'extends' is an alternative to using YAML anchors and is a little more flexible and readable. See: https://docs.gitlab.com/ee/ci/yaml/#extends Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Willian Rampazzo Message-Id: <20210519185504.2198573-2-f4bug@amsat.org> Signed-off-by: Thomas Huth --- .gitlab-ci.yml | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6a0d311cf40..d6e93369d6b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,7 +52,8 @@ include: # Avoid recompiling by hiding ninja with NINJA=3D":" - make NINJA=3D":" $MAKE_CHECK_ARGS =20 -.acceptance_template: &acceptance_definition +.acceptance_test_job_template: + extends: .native_test_job_template cache: key: "${CI_JOB_NAME}-cache" paths: @@ -108,14 +109,13 @@ check-system-alpine: MAKE_CHECK_ARGS: check =20 acceptance-system-alpine: - extends: .native_test_job_template + extends: .acceptance_test_job_template needs: - job: build-system-alpine artifacts: true variables: IMAGE: alpine MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition =20 build-system-ubuntu: extends: .native_build_job_template @@ -142,14 +142,13 @@ check-system-ubuntu: MAKE_CHECK_ARGS: check =20 acceptance-system-ubuntu: - extends: .native_test_job_template + extends: .acceptance_test_job_template needs: - job: build-system-ubuntu artifacts: true variables: IMAGE: ubuntu2004 MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition =20 build-system-debian: extends: .native_build_job_template @@ -176,14 +175,13 @@ check-system-debian: MAKE_CHECK_ARGS: check =20 acceptance-system-debian: - extends: .native_test_job_template + extends: .acceptance_test_job_template needs: - job: build-system-debian artifacts: true variables: IMAGE: debian-amd64 MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition =20 build-system-fedora: extends: .native_build_job_template @@ -211,14 +209,13 @@ check-system-fedora: MAKE_CHECK_ARGS: check =20 acceptance-system-fedora: - extends: .native_test_job_template + extends: .acceptance_test_job_template needs: - job: build-system-fedora artifacts: true variables: IMAGE: fedora MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition =20 build-system-centos: extends: .native_build_job_template @@ -246,14 +243,13 @@ check-system-centos: MAKE_CHECK_ARGS: check =20 acceptance-system-centos: - extends: .native_test_job_template + extends: .acceptance_test_job_template needs: - job: build-system-centos artifacts: true variables: IMAGE: centos8 MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition =20 build-system-opensuse: extends: .native_build_job_template @@ -279,14 +275,13 @@ check-system-opensuse: MAKE_CHECK_ARGS: check =20 acceptance-system-opensuse: - extends: .native_test_job_template + extends: .acceptance_test_job_template needs: - job: build-system-opensuse artifacts: true variables: IMAGE: opensuse-leap MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition =20 =20 build-disabled: @@ -535,14 +530,13 @@ check-cfi-aarch64: MAKE_CHECK_ARGS: check =20 acceptance-cfi-aarch64: - extends: .native_test_job_template + extends: .acceptance_test_job_template needs: - job: build-cfi-aarch64 artifacts: true variables: IMAGE: fedora MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition =20 build-cfi-ppc64-s390x: extends: .native_build_job_template @@ -572,14 +566,13 @@ check-cfi-ppc64-s390x: MAKE_CHECK_ARGS: check =20 acceptance-cfi-ppc64-s390x: - extends: .native_test_job_template + extends: .acceptance_test_job_template needs: - job: build-cfi-ppc64-s390x artifacts: true variables: IMAGE: fedora MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition =20 build-cfi-x86_64: extends: .native_build_job_template @@ -609,14 +602,13 @@ check-cfi-x86_64: MAKE_CHECK_ARGS: check =20 acceptance-cfi-x86_64: - extends: .native_test_job_template + extends: .acceptance_test_job_template needs: - job: build-cfi-x86_64 artifacts: true variables: IMAGE: fedora MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition =20 tsan-build: extends: .native_build_job_template --=20 2.26.3 From nobody Fri May 17 08:39:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) client-ip=209.85.128.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1622063932; cv=none; d=zohomail.com; s=zohoarc; b=Zz7VhF0mO6r1RkM1SCz/cByE1ONjWmQguScLJIZrB2bZET3HmWTOC/kb0HCauvDRUwPC+XmVqYOT4OCKLyeY53+LwlDwLzamqL2kM7j556mGWEBe7dVG6UysrPzDe5mxKHpq6/2EkwPEOubhhWqbRt1f1dSfKw3A0AIvKBQzUe8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622063932; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Y7R9KU2v40J4HPku0X26Zmix7Qt6Ns1y6ik1H3mrzsY=; b=AkvadNGlLyWKFXDARJswrAB96JAtCSoUidoUrcFkfIWpaN7HJYoLuqTzx/Q/P9uAJKy3/GgozMVTHQneTvhXXwSXPntIwjKSP5hIHtCLkbrVfSSXOplqvqk/WBx9nMjF3dCnpkmtUadaBnk7u0rp/7qu8LKCvnmKNXTdrfehTNA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mx.zohomail.com with SMTPS id 1622063932730275.45372906048; Wed, 26 May 2021 14:18:52 -0700 (PDT) Received: by mail-wm1-f42.google.com with SMTP id l18-20020a1c79120000b0290181c444b2d0so1289784wme.5 for ; Wed, 26 May 2021 14:18:52 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (235.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.235]) by smtp.gmail.com with ESMTPSA id l7sm262994wmq.22.2021.05.26.14.18.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 14:18:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Y7R9KU2v40J4HPku0X26Zmix7Qt6Ns1y6ik1H3mrzsY=; b=NDdkL0qirTCXNoqUBOIGHfeTEaR7oJk3JYbkRptjgFvzROBtE5GMwRIXloG13OG5sF q8va0AHWv5YuI8RgnlxfU9L4u+JWhyyuIW7Jb9/ASVaO1Fh5IXtvu52/c/3NVF9/juqy GvQyjFt3a7cmE5pxZsuTk+YGsuh1FjmyLHx6+hxIbUWHXCNApLiBEFm42joBik+bYROU nl13ume1Rj2NCnb8VU0mfPTZw/rTZXybVjZBWPGE9TFhZAGF6rTemrMzdyvRXDldvG96 0mvL3PazGVhqAmTTJHso4rupGrpTFgTklPYQBcWmwCFmSYLRR5sqEdqbVRPfICAOysGt CtsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Y7R9KU2v40J4HPku0X26Zmix7Qt6Ns1y6ik1H3mrzsY=; b=XtMteiAh4ilOdFqMQFFLjwJgEu6vDkEDku1xg4BvrA69sW/06IARxkGLwl0vIJNhAl pDt7UCItOrZIk72hSyttBMsJb/Y1ieXdtmEltmDBCys7Jx+Qtl//ba2S1vP78eoSpdSt +/z6dCGvn32YtOcdz6VKZdK8z3IrrNR/la/94PHNTTgufW5+GJtmfbC7If2J2x6tlXdO Nf1foAoV4R8yauyzwBopku++0CCgYGhEFxrPWqm8DU6QnGgoCSPQPYDhtt3dQyp/mzC8 Z2pq3OfS3TCdHnQLTabYge5C/ayByemgz80KaVyHiMCzBv1DlTAWn49y+1WkIQBCf8ci ZFOA== X-Gm-Message-State: AOAM532UuFyh2w/wgkESG//ifMuIy0Ue3izqEVCLrsRZhS5ZyqVRGubL 9lDi7ROdTUkHuumFxPmLCZM= X-Google-Smtp-Source: ABdhPJzigUGF7fOctFCngK5QZumFEICvPPQxrQbZhQOALWlFDB82l4JCfUoQApXtAOz0CPzkDmg+6A== X-Received: by 2002:a1c:f212:: with SMTP id s18mr5107047wmc.172.1622063931028; Wed, 26 May 2021 14:18:51 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Richard Henderson , Willian Rampazzo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta Subject: [PULL 02/19] gitlab: Rename ACCEL_CONFIGURE_OPTS to EXTRA_CONFIGURE_OPTS Date: Wed, 26 May 2021 23:18:21 +0200 Message-Id: <20210526211838.421716-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210526211838.421716-1-f4bug@amsat.org> References: <20210526211838.421716-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) From: Richard Henderson Suggested-by: Thomas Huth Signed-off-by: Richard Henderson Reviewed-by: Willian Rampazzo Message-Id: <20210502235727.1979457-26-richard.henderson@linaro.org> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.d/crossbuilds.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index e44e4b49a25..2198abb400e 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -16,7 +16,7 @@ # # Set the $ACCEL variable to select the specific accelerator (default to # KVM), and set extra options (such disabling other accelerators) via the -# $ACCEL_CONFIGURE_OPTS variable. +# $EXTRA_CONFIGURE_OPTS variable. .cross_accel_build_job: stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest @@ -26,7 +26,7 @@ - cd build - PKG_CONFIG_PATH=3D$PKG_CONFIG_PATH ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS - --disable-tools --enable-${ACCEL:-kvm} $ACCEL_CONFIGURE_OPTS + --disable-tools --enable-${ACCEL:-kvm} $EXTRA_CONFIGURE_OPTS - make -j$(expr $(nproc) + 1) all check-build =20 .cross_user_build_job: @@ -174,7 +174,7 @@ cross-s390x-kvm-only: job: s390x-debian-cross-container variables: IMAGE: debian-s390x-cross - ACCEL_CONFIGURE_OPTS: --disable-tcg + EXTRA_CONFIGURE_OPTS: --disable-tcg =20 cross-mips64el-kvm-only: extends: .cross_accel_build_job @@ -182,7 +182,7 @@ cross-mips64el-kvm-only: job: mips64el-debian-cross-container variables: IMAGE: debian-mips64el-cross - ACCEL_CONFIGURE_OPTS: --disable-tcg --target-list=3Dmips64el-softmmu + EXTRA_CONFIGURE_OPTS: --disable-tcg --target-list=3Dmips64el-softmmu =20 cross-win32-system: extends: .cross_system_build_job @@ -205,7 +205,7 @@ cross-amd64-xen-only: variables: IMAGE: debian-amd64-cross ACCEL: xen - ACCEL_CONFIGURE_OPTS: --disable-tcg --disable-kvm + EXTRA_CONFIGURE_OPTS: --disable-tcg --disable-kvm =20 cross-arm64-xen-only: extends: .cross_accel_build_job @@ -214,4 +214,4 @@ cross-arm64-xen-only: variables: IMAGE: debian-arm64-cross ACCEL: xen - ACCEL_CONFIGURE_OPTS: --disable-tcg --disable-kvm + EXTRA_CONFIGURE_OPTS: --disable-tcg --disable-kvm --=20 2.26.3 From nobody Fri May 17 08:39:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) client-ip=209.85.221.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1622063937; cv=none; d=zohomail.com; s=zohoarc; b=DlyHO66hPYzmUFvgiravI0Mq63DsJ9txlQdbiuDUa3h0pagEuYaGwHXdygYOX05CbAGSg8jEwwNei9wckITJEAR8Eoj47E1Cb1rahhF1hHnjjLRv7Uih9kl4O4NSUiEKa1NKLh7QghwTF8wTN9C6RCn4hLRZUfm25OiEEqlwQ4U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622063937; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=W1xtIIdcRklMtNBJaqxpAYm419XChwTUcQvEdXYlclE=; b=XPDopfcDO/gph90iXKrNyX+kOmJGvc8pZfCl2sJwd8XDG+RVuERbBOqildSJbCjV7i1cn4hGr6Q7dtSH0KRxi3skOOqETTVob/VjX/HdDGe+K1Oi1FuCbX7G6gsKbRR7wTWPuRjY8FsdKS/2VaY7TWa2eNREG5SU3RKL77fxLMQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.zohomail.com with SMTPS id 1622063937636805.2687550549997; Wed, 26 May 2021 14:18:57 -0700 (PDT) Received: by mail-wr1-f54.google.com with SMTP id x8so2534509wrq.9 for ; Wed, 26 May 2021 14:18:57 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (235.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.235]) by smtp.gmail.com with ESMTPSA id c15sm191442wro.21.2021.05.26.14.18.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 14:18:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=W1xtIIdcRklMtNBJaqxpAYm419XChwTUcQvEdXYlclE=; b=CmMhp2VH6NkRW+iZ0ra6sXs2nT4/pqhNCAojcgi8JNKB9rIf/lKX4ejSACkGzGAmOw Wdq46BmQVcKGte8er+ZnzQ046u2aqzc+ECNymz2v7K0zxV0DL6K6ZwHD8zOKpOF6666L DKo0NU2vFjXkzRb4ceCZzci34QOtar6V4z/yXe4t9IVfAzyKLRGKEkHn1xmCP3sv8LQM QLK84Uh/2wVKZp28yw3PByji/5kURdVCw0TiRFB/2/SMWYuCVeaeKzk2nIYtueBeFRP2 bcsdvF3vHihm19H6fU2fFXfdz7YEXKuj052OucbuQS8ZHgJqfzXFMr8TD2LZ4thFms1G /hCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=W1xtIIdcRklMtNBJaqxpAYm419XChwTUcQvEdXYlclE=; b=XVif4BCgQeRje/gpe4K3EjVkxS+DWxfkuaWf6QCWRcLaUJDG72myH67c/tRzV99URk qYibjExjetluOi0jsIJrITHekUxwCCvDkuDc4/vHnzNdlSziLzGmp6RS3uAHETHyCNu0 5kb3Dq5ijXV33OWMpRSUB3Naxqabyv4uNbVwgMPCF0CCl0cPeXXzEUzACAIy5KM6hlrP mk94hVDHnpQzNcNx4oJURsaldqnvLgDT1xHwE3IncZOk+J+uuOK3rUWJHSsU2xqtXr9A RGe1k40gO80wp6W4xK/XkdA0ErDhwqWIcOcmexqRinwpQ3tacxv+jkHe3qEgNqr4YxOe OjkA== X-Gm-Message-State: AOAM5318MyW0YEisrz14YzNZrXogwZWn7XIlaF3WG0L9f6b1QvILEy+8 AY8khXlZ+H4FQFPcAbWvZGQ= X-Google-Smtp-Source: ABdhPJx/sR9ywq6DYazP/O5Oa9ZWqubwkOsxVmqD40poUq54roeE+QiBvw/qK5m5i6PEQgSM05qiZA== X-Received: by 2002:adf:d081:: with SMTP id y1mr34041077wrh.179.1622063935837; Wed, 26 May 2021 14:18:55 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta Subject: [PULL 03/19] gitlab: Enable cross-i386 builds of TCI Date: Wed, 26 May 2021 23:18:22 +0200 Message-Id: <20210526211838.421716-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210526211838.421716-1-f4bug@amsat.org> References: <20210526211838.421716-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) From: Richard Henderson We're currently only testing TCI with a 64-bit host -- also test with a 32-bit host. Enable a selection of softmmu and user-only targets, 32-bit LE, 64-bit LE, 32-bit BE, as there are ifdefs for each. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Willian Rampazzo Acked-by: Thomas Huth Message-Id: <20210502235727.1979457-27-richard.henderson@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.d/crossbuilds.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index 2198abb400e..edf3a625633 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -27,7 +27,7 @@ - PKG_CONFIG_PATH=3D$PKG_CONFIG_PATH ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS --disable-tools --enable-${ACCEL:-kvm} $EXTRA_CONFIGURE_OPTS - - make -j$(expr $(nproc) + 1) all check-build + - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS =20 .cross_user_build_job: stage: build @@ -98,6 +98,15 @@ cross-i386-user: IMAGE: fedora-i386-cross MAKE_CHECK_ARGS: check =20 +cross-i386-tci: + extends: .cross_accel_build_job + timeout: 60m + variables: + IMAGE: fedora-i386-cross + ACCEL: tcg-interpreter + EXTRA_CONFIGURE_OPTS: --target-list=3Di386-softmmu,i386-linux-user,aar= ch64-softmmu,aarch64-linux-user,ppc-softmmu,ppc-linux-user + MAKE_CHECK_ARGS: check check-tcg + cross-mips-system: extends: .cross_system_build_job needs: --=20 2.26.3 From nobody Fri May 17 08:39:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) client-ip=209.85.221.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1622063942; cv=none; d=zohomail.com; s=zohoarc; b=oH78AH5E/TpW9xnnjiSqjY+pV5K8sIe836RcdYCqGi77P+wz/VIiHgilq16gX2ig9iprbQSkK1zxE5PmHxRbeXX4RZLeVMISMu9ISDyjdJhJT/CskMeubjlQniVnDyq/yDe3xFXpPbivxFVVes5OB59/qP6KbF3RjKVUl4bjANk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622063942; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wPWremnQeDbf5OKwcSsZMVVUeLqeVe3tozm8/BONWnc=; b=kvSIbRuBGWBUe7+Einzp7z3Iv3gcFQ02vK3PDm7F2k/Gt6K+mrYf2m9kD4FtNYeInee0ZDjUMWplZjh04oOUpBJzlk8ZooIFnhl1+ntW9ACo1JnQ2Y19m0sbgmu8zGkX2PoWu3/kL+uHhDf3ouS+yjHGMWNKyZ2zFFYezZ7896k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.zohomail.com with SMTPS id 1622063942654990.5078366228286; Wed, 26 May 2021 14:19:02 -0700 (PDT) Received: by mail-wr1-f43.google.com with SMTP id x7so2505195wrt.12 for ; Wed, 26 May 2021 14:19:02 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (235.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.235]) by smtp.gmail.com with ESMTPSA id m20sm8073513wmi.5.2021.05.26.14.18.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 14:19:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wPWremnQeDbf5OKwcSsZMVVUeLqeVe3tozm8/BONWnc=; b=WQoU7G/rEy3YKMInZMdagijCjD8TosqyKvf6GG/4Dm+9VhVFtaYESZFpb1z5ZLScfD klQUpuTdXZ+Df82c/dO6UPydjyv41+Unx/FwPIr1cQrwE9S10eLDLXNPAKhGY787xFDB L3H651tjf4y57KGykqILuKnZxqGGP2SSNPUGrXIrP2Yy8d2a04E+bK0UcaknaajMF1ZD Dy1uTiL19+qhMZNzYCBHaRy2PvTDslFdrzE5tzhOKeOwo4ezn3LYUoYJM6pRtGSVwrUF iBc2ca7fWBZIxmVNJHhHYjOf9oVzorp1hSSldurmH71VdeA3JE49K2kYESNF8eSm1bKj rHmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=wPWremnQeDbf5OKwcSsZMVVUeLqeVe3tozm8/BONWnc=; b=G5Vr0dHiCq2KDGCyXLCF/N56eulVZ6+NRtr0ApedRv+VkBUZC34Ow1NNumlOwk9jlc aH45hzTalNEiwHbxkwBlrTYej8wZs/5sf5uId89ahhjhykvgxKzIHQ2l1P3m2CyAHyN7 Iefw5A5uPFn+aosZCw8buAPyPJaarP+d6hDc2+5iwFdOX6HzcklVymUhNAt2Dy/U9wOh c6aP0yjAoT/lxrVBADbeTqVn1x0R9tF7oXj0AeF6MRxoPemBddlP+ZlF3WRWetgXLcQw 3d+yQTnWTD4rXiEZE2VfCQSlBl+NjY5qNVOto5CzyBEXUBbiAnf4xKfaf5yetYgd7mWC lXSA== X-Gm-Message-State: AOAM530cp/Dijfx99bJCruFnNoU3wMyRPbEb01/4uV7z4UJ7mVZU+BiS W0FfebqtXYjp4kZ1NZJ/iukmErwZvPgMkQ== X-Google-Smtp-Source: ABdhPJwksHf4gqMVUEnBod0YcLkWGVKCyxvvV66ocSxlXkt1k3pfzUbF4EzpPHfNc1lYAMyGjYnJXQ== X-Received: by 2002:a5d:4443:: with SMTP id x3mr26513wrr.62.1622063940897; Wed, 26 May 2021 14:19:00 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta Subject: [PULL 04/19] gitlab: Extract container job template to container-template.yml Date: Wed, 26 May 2021 23:18:23 +0200 Message-Id: <20210526211838.421716-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210526211838.421716-1-f4bug@amsat.org> References: <20210526211838.421716-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Extract the container job template to a new file (container-template.yml) to be able to reuse it without having to run all the jobs included, which are mainly useful for mainstream CI. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Willian Rampazzo Message-Id: <20210519185504.2198573-4-f4bug@amsat.org> Signed-off-by: Thomas Huth --- .gitlab-ci.d/container-template.yml | 21 +++++++++++++++++++++ .gitlab-ci.d/containers.yml | 23 ++--------------------- 2 files changed, 23 insertions(+), 21 deletions(-) create mode 100644 .gitlab-ci.d/container-template.yml diff --git a/.gitlab-ci.d/container-template.yml b/.gitlab-ci.d/container-t= emplate.yml new file mode 100644 index 00000000000..1baecd94606 --- /dev/null +++ b/.gitlab-ci.d/container-template.yml @@ -0,0 +1,21 @@ +.container_job_template: + image: docker:stable + stage: containers + services: + - docker:dind + before_script: + - export TAG=3D"$CI_REGISTRY_IMAGE/qemu/$NAME:latest" + - export COMMON_TAG=3D"$CI_REGISTRY/qemu-project/qemu/$NAME:latest" + - apk add python3 + - docker info + - docker login $CI_REGISTRY -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PA= SSWORD" + script: + - echo "TAG:$TAG" + - echo "COMMON_TAG:$COMMON_TAG" + - ./tests/docker/docker.py --engine docker build + -t "qemu/$NAME" -f "tests/docker/dockerfiles/$NAME.docker" + -r $CI_REGISTRY/qemu-project/qemu + - docker tag "qemu/$NAME" "$TAG" + - docker push "$TAG" + after_script: + - docker logout diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 7b7ca3790df..2b06763d73b 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -1,24 +1,5 @@ -.container_job_template: - image: docker:stable - stage: containers - services: - - docker:dind - before_script: - - export TAG=3D"$CI_REGISTRY_IMAGE/qemu/$NAME:latest" - - export COMMON_TAG=3D"$CI_REGISTRY/qemu-project/qemu/$NAME:latest" - - apk add python3 - - docker info - - docker login $CI_REGISTRY -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PA= SSWORD" - script: - - echo "TAG:$TAG" - - echo "COMMON_TAG:$COMMON_TAG" - - ./tests/docker/docker.py --engine docker build - -t "qemu/$NAME" -f "tests/docker/dockerfiles/$NAME.docker" - -r $CI_REGISTRY/qemu-project/qemu - - docker tag "qemu/$NAME" "$TAG" - - docker push "$TAG" - after_script: - - docker logout +include: + - local: '/.gitlab-ci.d/container-template.yml' =20 amd64-alpine-container: extends: .container_job_template --=20 2.26.3 From nobody Fri May 17 08:39:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) client-ip=209.85.128.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1622063947; cv=none; d=zohomail.com; s=zohoarc; b=dcOuH3s1y/DfypECIzDinpj6kn+XWYBdxv/rm2PIhK0AZyU/FBy1HeNLI3UGzLLkdDnYNSKeHsPIhH6PBppPaN3TW2y/06lwubzTsxBancJk6PJzumC4cekAZAH14lj9ohVIEfj7JLErTt5g3x1iftGEsjKQBzqEgkFQT7nQo6M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622063947; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cBfMctSwzMD1BVBFymvsetW6bsopBRXF+wcu6ORjgWo=; b=QinhMOYdKO9p109wdMJ59MUw6Rmp9qGNnyYO7KHGmMAig/xGrsS4J/J8XRgAzGCyNTWK17386XJRkH+ko2W0jCR3p1WO0yGwbr8QTYf6ELEzUSm8nzAAmSRyZ/XWk8LVrKRjRcC6bA/sk+ipg2fISsRRM7kKK6ZuEkwX5v8Pjfw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.zohomail.com with SMTPS id 1622063947371460.1047424239854; Wed, 26 May 2021 14:19:07 -0700 (PDT) Received: by mail-wm1-f45.google.com with SMTP id t206so1535075wmf.0 for ; Wed, 26 May 2021 14:19:06 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (235.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.235]) by smtp.gmail.com with ESMTPSA id y3sm183878wrh.28.2021.05.26.14.19.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 14:19:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cBfMctSwzMD1BVBFymvsetW6bsopBRXF+wcu6ORjgWo=; b=l94Yda6s+AfIgpyEW33agTmjV30LcQ7AM8NNR59J1KSxkFs7nLCfVvDK3yE1fmJZy+ 8loXXkolm3l8o6UFZefVXzYVeNPSD0OUFVoxohf2AMG+Q8/Nvpd1o1JCawvJMGnsQPur 9Nne0LkfEV7GnAcooRM2PIXwKMJJUFkMt1LiQz9497kJtOJBr2OKRs10dPSaZwHnu1sp 3sOkX0aZ98QlbEPISI5hh1e/D4TTnX/f7+rMnfM10wGAUQ0j5f08hi113YFzz0mp5zd3 m9LJYcAG0yFxY38QBFDJIXsz79cWuOcYkvtOaqPGwyzjXGKgAHAKKKl0AGFjPoR+6pJu rYtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=cBfMctSwzMD1BVBFymvsetW6bsopBRXF+wcu6ORjgWo=; b=j74sUVJUeEbyDLpHiUwHDGI/iwYMlZxkkdnIVTYmjJN1tOleTpMf9wlfvXb9fAFF6E 1EPellKSyKaTW9P1+QuQgySJj4XQ5lqGgTubBZlqVSD2omcxyEUz9dMUOsvU8JMTiPpU jSO4p/ovdWCF9ccuEM+s60ioPJHRXq/MGn1XHd2AVl2QQ3PEc+CMa54TviTn8zMYj0U5 D7NDyyN9rXnEAi2FfDHVP7tpjvpXnLcYGTRj4MU7w9hj/57YFy91bQ/HcaouP1HIxIis hxOP/GFJvlBEO+vHuGNbv85Nz7sgTsebT9YQfYotkc/P8Cjoo76Q7t2wObaMpuJBnKq1 ncnQ== X-Gm-Message-State: AOAM5310aDL1aLsS2Z5UtXxnC7umNL30U7T5rrMYFrBWBwIxU/pMceFl kifRZS6vL6NNO5SViQexBRg= X-Google-Smtp-Source: ABdhPJwe2z/Nbc3GX6FM0RwZeW6RoKYp0PbCIXrEHijIZtVls0j8Sz3qKkfza7I/ERyZkUL50i8kwg== X-Received: by 2002:a1c:a58c:: with SMTP id o134mr354854wme.2.1622063945633; Wed, 26 May 2021 14:19:05 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta Subject: [PULL 05/19] gitlab: Extract crossbuild job templates to crossbuild-template.yml Date: Wed, 26 May 2021 23:18:24 +0200 Message-Id: <20210526211838.421716-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210526211838.421716-1-f4bug@amsat.org> References: <20210526211838.421716-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Extract the crossbuild job templates to a new file (crossbuild-template.yml) to be able to reuse them without having to run all the jobs included, which are mainly useful for mainstream CI. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Willian Rampazzo Message-Id: <20210519185504.2198573-5-f4bug@amsat.org> Signed-off-by: Thomas Huth --- .gitlab-ci.d/crossbuild-template.yml | 41 ++++++++++++++++++++++++++ .gitlab-ci.d/crossbuilds.yml | 43 ++-------------------------- 2 files changed, 43 insertions(+), 41 deletions(-) create mode 100644 .gitlab-ci.d/crossbuild-template.yml diff --git a/.gitlab-ci.d/crossbuild-template.yml b/.gitlab-ci.d/crossbuild= -template.yml new file mode 100644 index 00000000000..1be541174c9 --- /dev/null +++ b/.gitlab-ci.d/crossbuild-template.yml @@ -0,0 +1,41 @@ +.cross_system_build_job: + stage: build + image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + timeout: 80m + script: + - mkdir build + - cd build + - PKG_CONFIG_PATH=3D$PKG_CONFIG_PATH + ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS + --disable-user --target-list-exclude=3D"arm-softmmu cris-softmmu + i386-softmmu microblaze-softmmu mips-softmmu mipsel-softmmu + mips64-softmmu ppc-softmmu sh4-softmmu xtensa-softmmu" + - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS + +# Job to cross-build specific accelerators. +# +# Set the $ACCEL variable to select the specific accelerator (default to +# KVM), and set extra options (such disabling other accelerators) via the +# $EXTRA_CONFIGURE_OPTS variable. +.cross_accel_build_job: + stage: build + image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + timeout: 30m + script: + - mkdir build + - cd build + - PKG_CONFIG_PATH=3D$PKG_CONFIG_PATH + ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS + --disable-tools --enable-${ACCEL:-kvm} $EXTRA_CONFIGURE_OPTS + - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS + +.cross_user_build_job: + stage: build + image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + script: + - mkdir build + - cd build + - PKG_CONFIG_PATH=3D$PKG_CONFIG_PATH + ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS + --disable-system + - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index edf3a625633..6b3865c9e83 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -1,44 +1,5 @@ -.cross_system_build_job: - stage: build - image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest - timeout: 80m - script: - - mkdir build - - cd build - - PKG_CONFIG_PATH=3D$PKG_CONFIG_PATH - ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS - --disable-user --target-list-exclude=3D"arm-softmmu cris-softmmu - i386-softmmu microblaze-softmmu mips-softmmu mipsel-softmmu - mips64-softmmu ppc-softmmu sh4-softmmu xtensa-softmmu" - - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS - -# Job to cross-build specific accelerators. -# -# Set the $ACCEL variable to select the specific accelerator (default to -# KVM), and set extra options (such disabling other accelerators) via the -# $EXTRA_CONFIGURE_OPTS variable. -.cross_accel_build_job: - stage: build - image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest - timeout: 30m - script: - - mkdir build - - cd build - - PKG_CONFIG_PATH=3D$PKG_CONFIG_PATH - ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS - --disable-tools --enable-${ACCEL:-kvm} $EXTRA_CONFIGURE_OPTS - - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS - -.cross_user_build_job: - stage: build - image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest - script: - - mkdir build - - cd build - - PKG_CONFIG_PATH=3D$PKG_CONFIG_PATH - ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS - --disable-system - - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS +include: + - local: '/.gitlab-ci.d/crossbuild-template.yml' =20 cross-armel-system: extends: .cross_system_build_job --=20 2.26.3 From nobody Fri May 17 08:39:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) client-ip=209.85.221.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1622063952; cv=none; d=zohomail.com; s=zohoarc; b=j+F9Nd0qrFc3+13q/v9V7p67qshwEamy9cDjaF5k6xTFT6aJdqCkjDjsifazFg7a6jKfNgPcZi/fK4H1w0ATIU+P1c2egx1JX7EGUAcvCCusQWAoxnslrrkedkT5edCM0tVy1AlYck/wcFefMOTCnQ8KsV+vaX8HUjXEx4YolAg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622063952; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8+qr5ghTZ8/md/Cpp+mmNlJo0+59nUM9neqzcD1eFCE=; b=iajvQGyEyWzeBmmahtWtsysJ7ePVx5xLrZceJAfVzJ7PbBVAL0qQR8ePNzbLKAh3Y3cuzwu9Ii6zmT/577TGQ1EB+rGVeSo7S6fSvohBc9OLLmJECyhfkYg0OqOQzBsHaJAFp4M+w46fmJH7OZQLsrrSR2fsk6Zg2lg4neubCg0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mx.zohomail.com with SMTPS id 1622063952295594.2344644727299; Wed, 26 May 2021 14:19:12 -0700 (PDT) Received: by mail-wr1-f42.google.com with SMTP id x8so2534931wrq.9 for ; Wed, 26 May 2021 14:19:11 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (235.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.235]) by smtp.gmail.com with ESMTPSA id s5sm154539wrw.95.2021.05.26.14.19.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 14:19:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8+qr5ghTZ8/md/Cpp+mmNlJo0+59nUM9neqzcD1eFCE=; b=QOWvW2OVBmvdqg4Vgtkt/3coigXLHJuCGx8fK/OHb979NvDDFwFJh3CKYr45Kq/hQa R95f9q89tSVPnXQDOH//21grUsc8aUnCn7ouESGYwx53OuG0LBm6t0nlzhKwP5qg3xQn 74KpkvAb56zlZqYyxq0L1R2RcOgFOYOVFNF2VfWrp/0092/S8WjqF8Ag6qxcKX1koIhO j461DyBrKKPLZVI34J4o4XE8ZOHV8ABke1fT+DN2ia+scQrgLdA0S4KAOhbHGIulRaBB pzwDjj4Yn8IqHj7p3uux2FPRdJUCFP+pT0d/MgQUF/4LrKKO3nXUOyOJzJZgRgWMn2Ae YtrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=8+qr5ghTZ8/md/Cpp+mmNlJo0+59nUM9neqzcD1eFCE=; b=J0XgPYVLxnuXdIz3DWxNGMCnxWCO4AAZjB6F9qTZJkEzjqom72pRcBgjSuJRMTjlHh amFR7pJfGNI8tpdi88upDSnmOOUBG35oQyhiQ/LrJPnQCPQT+24q+9NarGQ+rs05j41k gGBOyPAD5uazarVmteJerEoIb1yb+Stk3wFey+CHbhaYfkLHEkvpvuRPjIkB52ZPmgaJ ukC8LPNq8j7pb4aWZolhOkhuR72ZISOXz7t5L7sftLTOK0LXpUaM3dZYCJrHHtZYUGFU pFqZNu0VWSxOTIUoweHuqZ4EreCubfoaHBBqM7N3VCFZLQ3Vpn1JcOje6osAghhC6AGd 2I2g== X-Gm-Message-State: AOAM532AeOcfvRArLEeqQ9vDFfKW9lSPjuJ/S7sFSlllTxe2Py5YREAH GTlehK/VX8lYGa/ZmDJDi+M= X-Google-Smtp-Source: ABdhPJyBOcpEC5kTbplKZXiIfw4atSe8Jbcdhg2nTmnZ5zEJPyrAcyOIakECSR3uy8Ea9TI8ArSM/Q== X-Received: by 2002:adf:d231:: with SMTP id k17mr24718wrh.78.1622063950570; Wed, 26 May 2021 14:19:10 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta Subject: [PULL 06/19] gitlab: Extract DCO/style check jobs to static_checks.yml Date: Wed, 26 May 2021 23:18:25 +0200 Message-Id: <20210526211838.421716-7-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210526211838.421716-1-f4bug@amsat.org> References: <20210526211838.421716-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Extract the DCO / checkpatch jobs to a new file (static_checks.yml) to be able to run them without having to run all the jobs included in the default .gitlab-ci.yml, which are mainly useful for the mainstream CI. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Willian Rampazzo Message-Id: <20210519185504.2198573-6-f4bug@amsat.org> Signed-off-by: Thomas Huth --- .gitlab-ci.d/static_checks.yml | 24 ++++++++++++++++++++++++ .gitlab-ci.yml | 26 +------------------------- 2 files changed, 25 insertions(+), 25 deletions(-) create mode 100644 .gitlab-ci.d/static_checks.yml diff --git a/.gitlab-ci.d/static_checks.yml b/.gitlab-ci.d/static_checks.yml new file mode 100644 index 00000000000..f695627b7cd --- /dev/null +++ b/.gitlab-ci.d/static_checks.yml @@ -0,0 +1,24 @@ +check-patch: + stage: build + image: $CI_REGISTRY_IMAGE/qemu/centos8:latest + needs: + job: amd64-centos8-container + script: .gitlab-ci.d/check-patch.py + except: + variables: + - $CI_PROJECT_NAMESPACE =3D=3D 'qemu-project' && $CI_COMMIT_BRANCH = =3D=3D 'master' + variables: + GIT_DEPTH: 1000 + allow_failure: true + +check-dco: + stage: build + image: $CI_REGISTRY_IMAGE/qemu/centos8:latest + needs: + job: amd64-centos8-container + script: .gitlab-ci.d/check-dco.py + except: + variables: + - $CI_PROJECT_NAMESPACE =3D=3D 'qemu-project' && $CI_COMMIT_BRANCH = =3D=3D 'master' + variables: + GIT_DEPTH: 1000 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d6e93369d6b..03ff9884c30 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,6 +12,7 @@ include: - local: '/.gitlab-ci.d/opensbi.yml' - local: '/.gitlab-ci.d/containers.yml' - local: '/.gitlab-ci.d/crossbuilds.yml' + - local: '/.gitlab-ci.d/static_checks.yml' =20 .native_build_job_template: stage: build @@ -771,31 +772,6 @@ build-without-default-features: --target-list-exclude=3Darm-softmmu,i386-softmmu,mipsel-softmmu,mi= ps64-softmmu,ppc-softmmu MAKE_CHECK_ARGS: check-unit =20 -check-patch: - stage: build - image: $CI_REGISTRY_IMAGE/qemu/centos8:latest - needs: - job: amd64-centos8-container - script: .gitlab-ci.d/check-patch.py - except: - variables: - - $CI_PROJECT_NAMESPACE =3D=3D 'qemu-project' && $CI_COMMIT_BRANCH = =3D=3D 'master' - variables: - GIT_DEPTH: 1000 - allow_failure: true - -check-dco: - stage: build - image: $CI_REGISTRY_IMAGE/qemu/centos8:latest - needs: - job: amd64-centos8-container - script: .gitlab-ci.d/check-dco.py - except: - variables: - - $CI_PROJECT_NAMESPACE =3D=3D 'qemu-project' && $CI_COMMIT_BRANCH = =3D=3D 'master' - variables: - GIT_DEPTH: 1000 - build-libvhost-user: stage: build image: $CI_REGISTRY_IMAGE/qemu/fedora:latest --=20 2.26.3 From nobody Fri May 17 08:39:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) client-ip=209.85.128.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1622063957; cv=none; d=zohomail.com; s=zohoarc; b=MD3ShXwPI3tPYQWaoiOCLBcZaONSdHTtVkrr2Z5Yxw7DLRGKI1Exb+gWWW28MDr7lnwAllepWpuEr5+8qGwZ79kJhoeN9YGnhGHGXGaHRoyVMbJslDvL3q0pO165+vy1CZXFJcc0EjaXBIyDYwZguupOuYQrLhA++PbigFz1R2Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622063957; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=O0qzYaksasQ3pqmWVNp4q3+SWBxcqYet4JUBDANGEWA=; b=b+YmwxpGChC6sEZT3uthU6NCp1JWQOK9obRNK4P+naZf8kE7W5UL0qffuq9ofWUHoQ7ImsHiZVfmC6l/Jeexcj+7/Re24Ju4Qdw0HaQ1OCFoaFZfs7665skyL1BDE7YSUdABlwSKhCh7DMvA/TgnJP+s/BX3y1qFiyCgzKrbDD4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mx.zohomail.com with SMTPS id 1622063957173566.9381831554283; Wed, 26 May 2021 14:19:17 -0700 (PDT) Received: by mail-wm1-f54.google.com with SMTP id z130so1514579wmg.2 for ; Wed, 26 May 2021 14:19:16 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (235.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.235]) by smtp.gmail.com with ESMTPSA id 60sm201701wrq.14.2021.05.26.14.19.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 14:19:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=O0qzYaksasQ3pqmWVNp4q3+SWBxcqYet4JUBDANGEWA=; b=L3pwWRa1uboq3wYiooudLn74oUKCTXcS9c4DNoaHVNiEliicWCj1E2/P+nYbubfJXG 9fYRT26+gDwqqB5Gj5oBZ9R0+utAfTd439qQg+Bhptol1dPrhdzfR2bH3loQJicKeKkN Hx3YrTV1bCEBSlO8tk22aOu2FSYXDmk11HcGAjwsE9Bc/fzrukMQF81n99wfzM5PPtlz QuXHnMKvh9cKc7nrQycHrWhU6tzGSaBrmWIi9Qx6GKTQU93Dz6tnGo54o869Y11+k72S 7AlonnmS4sBNpTLZdrgwat5XQBY8xjcJix5GKOD6Y3zF1Le5flApnSzJfom18dYJTECH +Fyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=O0qzYaksasQ3pqmWVNp4q3+SWBxcqYet4JUBDANGEWA=; b=Hnn4BIFpR+hvrpKBtdnIIjZ3T7Z/rsxyZHx331d8I4lDoM9mBjVZ8xvvSwHhNK8J+z YKX8jYRAdwcn+y7wV/GSLA5WfinrxvRHEYPd6G+h87Akz31agXVpzQVgrrTMqSe+tPPf /VsDFpWmCeGzXekWYBl+VtVvM5EUaArtPI5gPkb/I3DCJv6cyQo6b5Qf+6w6fa9ITzVK 9a8dHhPWw1ParBImdfyyGAlo+T1OYPDEQCPWuAfEULlkUKRApR3ti8X8iVUIuSK9tJNR 84A16o2NI57P9K/WLM2K8odeUxfpRNLGCRcwdKhIvxugOXv0U+1DVMd7woGyWP2Jb/9+ ZUaw== X-Gm-Message-State: AOAM532LHcSOkWHnKbXpN4GatsF6ELUqk/SEWZCC83AKfrFfiTK0Jhoy vAEbFbeYtAiDx9uSyhr5H+E= X-Google-Smtp-Source: ABdhPJzcQYa+kmC/twyHeMbkY8gl7ZDf44C/KyZd5zRHvcJ/zLh6CRej5AZhMPItjGgqiLW8TN18LA== X-Received: by 2002:a1c:7713:: with SMTP id t19mr354200wmi.48.1622063955374; Wed, 26 May 2021 14:19:15 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta Subject: [PULL 07/19] gitlab: Extract build stages to stages.yml Date: Wed, 26 May 2021 23:18:26 +0200 Message-Id: <20210526211838.421716-8-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210526211838.421716-1-f4bug@amsat.org> References: <20210526211838.421716-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Extract the build stages used by our job templates to a new file (stages.yml) to be able to include it with the other templates, without having to run all the jobs included in the default .gitlab-ci.yml, which are mainly useful for mainstream CI. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Willian Rampazzo Message-Id: <20210519185504.2198573-7-f4bug@amsat.org> Signed-off-by: Thomas Huth --- .gitlab-ci.d/stages.yml | 8 ++++++++ .gitlab-ci.yml | 10 +--------- 2 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 .gitlab-ci.d/stages.yml diff --git a/.gitlab-ci.d/stages.yml b/.gitlab-ci.d/stages.yml new file mode 100644 index 00000000000..f50826018df --- /dev/null +++ b/.gitlab-ci.d/stages.yml @@ -0,0 +1,8 @@ +# Currently we have two build stages after our containers are built: +# - build (for traditional build and test or first stage build) +# - test (for test stages, using build artefacts from a build stage) +stages: + - containers + - containers-layer2 + - build + - test diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 03ff9884c30..f170065ac63 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,13 +1,5 @@ -# Currently we have two build stages after our containers are built: -# - build (for traditional build and test or first stage build) -# - test (for test stages, using build artefacts from a build stage) -stages: - - containers - - containers-layer2 - - build - - test - include: + - local: '/.gitlab-ci.d/stages.yml' - local: '/.gitlab-ci.d/edk2.yml' - local: '/.gitlab-ci.d/opensbi.yml' - local: '/.gitlab-ci.d/containers.yml' --=20 2.26.3 From nobody Fri May 17 08:39:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) client-ip=209.85.221.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1622063961; cv=none; d=zohomail.com; s=zohoarc; b=SuZ51d30JMMKya69ilrLDVMZZbkrTWsn55r8ltJu4ChyXtTD6cUaSiJlKaZXGbiHufNqLry4ZXp9973kKhpar2CDsrXfO7sdiWtJOqOfxGB1NDF0Fn6tT0fosroGaxSiUrTTUZvNpVb2Q96P3UHDtfDUVcE6mBLzST+p6kchmOw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622063961; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qtpQnhGZkfCRsXEa9SZ4yCe8E1ZJmuR7BJFCDJ8Dfpg=; b=DcXsmaoSOA5O/fr91/BIl7ZtDXafOIeU6XLW9gQRljfhYn6WlRN90zHePnCDgTszvhneVwGOfX4aQnig41kai9uBb1aRpsDgDjM/OYFsNYLkPavqcP/SqZjQnhSC1ZOToRs9KUZkBLPEPRkPRo0yG3PB8Ti31M2zkFDpVtcOSKE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mx.zohomail.com with SMTPS id 1622063961757865.5620034290694; Wed, 26 May 2021 14:19:21 -0700 (PDT) Received: by mail-wr1-f41.google.com with SMTP id g17so2315158wrs.13 for ; Wed, 26 May 2021 14:19:21 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (235.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.235]) by smtp.gmail.com with ESMTPSA id p6sm318808wma.4.2021.05.26.14.19.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 14:19:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qtpQnhGZkfCRsXEa9SZ4yCe8E1ZJmuR7BJFCDJ8Dfpg=; b=sM+KBOMo8i8AaFapkk3uPcTcEQ5+Q+y5y3FOwrF21PX5OjHN6IvUiZGIRQ0o1KqANR xQO55637lghJ+YUqsN+ToFI9O/B1wF6fqS0/ghDh1aSHLf9NF+UWfShCqgy02VRisr5m gPVHANBM3oIbObDwLexiKw+vHh4rmvVIkQfPVYxHJZhq262u8flZVIU5ZJKGB/lU+mP2 tKqOeQBJrdsAtBjXX3A8bN5gglXZUFiaq8kZdiqPiGZTT1ccWUkMX4dQLY1PRVi+WGyT oaz1P6XXYrmUE5pvMlmKnVhUYbeWywhunLLHXUD3oCpdd9oDgH1NMz65S6SNIERY3E/O q2HA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=qtpQnhGZkfCRsXEa9SZ4yCe8E1ZJmuR7BJFCDJ8Dfpg=; b=SzjBSshYIjMU2oqAQ91vqMKQN4vHOiXEq/P4FvSxyFpRrOHH4BaHbVbWZquXZUyTaj Dv77LnGr//Vt2PCg/6O/aLrRGigmVlPv52yaV0gLQkMEOzRQOnkU/8evFnx+Snhdjuzt f9/j9lHeGXFBWseXVVxbwqinU2/DJ+sIS870o5INGWrU9wSXORHshxZPUTLJUb20hp1Z RH1B4fO66MK9inB+vX7zpupCMh3ufQWs0OzJ6Fgn1yHkdvxjH0D+zRCpKS7pOIrU6OQi uiC/g5yS27lfNrjNERzwxewGtRdwJI6t5Urm+5noteozewwDKlbNxkXVyCKvCl9sUDqD 8mIg== X-Gm-Message-State: AOAM5323eUvkt4MUYsTkcTp7a7SOlSyUFpxHm2hvbHpGYdTws3k8kplw snGRgzFTqZUUmtVI1yii9kQ= X-Google-Smtp-Source: ABdhPJwZ6SeNMe0on1Dv0GfJWh7hmfnXkI77XXiytIFPeUkPLaB71x9cDNbDnWgFZ9HxRxGBDLMzXA== X-Received: by 2002:a5d:4246:: with SMTP id s6mr3842wrr.9.1622063960017; Wed, 26 May 2021 14:19:20 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta Subject: [PULL 08/19] gitlab: Extract default build/test jobs templates Date: Wed, 26 May 2021 23:18:27 +0200 Message-Id: <20210526211838.421716-9-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210526211838.421716-1-f4bug@amsat.org> References: <20210526211838.421716-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) To be able to reuse the mainstream build/test jobs templates, extract them into a new file (buildtest-template.yml). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Willian Rampazzo Message-Id: <20210519185504.2198573-8-f4bug@amsat.org> [thuth: Keep the "acceptance_test_job_template" name for now] Signed-off-by: Thomas Huth --- .gitlab-ci.d/buildtest-template.yml | 69 ++++++++++++++++++++++++++++ .gitlab-ci.yml | 71 +---------------------------- 2 files changed, 70 insertions(+), 70 deletions(-) create mode 100644 .gitlab-ci.d/buildtest-template.yml diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-t= emplate.yml new file mode 100644 index 00000000000..167ee88c410 --- /dev/null +++ b/.gitlab-ci.d/buildtest-template.yml @@ -0,0 +1,69 @@ +.native_build_job_template: + stage: build + image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + before_script: + - JOBS=3D$(expr $(nproc) + 1) + script: + - if test -n "$LD_JOBS"; + then + scripts/git-submodule.sh update meson ; + fi + - mkdir build + - cd build + - if test -n "$TARGETS"; + then + ../configure --enable-werror --disable-docs ${LD_JOBS:+--meson=3Di= nternal} $CONFIGURE_ARGS --target-list=3D"$TARGETS" ; + else + ../configure --enable-werror --disable-docs ${LD_JOBS:+--meson=3Di= nternal} $CONFIGURE_ARGS ; + fi || { cat config.log meson-logs/meson-log.txt && exit 1; } + - if test -n "$LD_JOBS"; + then + ../meson/meson.py configure . -Dbackend_max_links=3D"$LD_JOBS" ; + fi || exit 1; + - make -j"$JOBS" + - if test -n "$MAKE_CHECK_ARGS"; + then + make -j"$JOBS" $MAKE_CHECK_ARGS ; + fi + +.native_test_job_template: + stage: test + image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + script: + - scripts/git-submodule.sh update + $(sed -n '/GIT_SUBMODULES=3D/ s/.*=3D// p' build/config-host.mak) + - cd build + - find . -type f -exec touch {} + + # Avoid recompiling by hiding ninja with NINJA=3D":" + - make NINJA=3D":" $MAKE_CHECK_ARGS + +.acceptance_test_job_template: + extends: .native_test_job_template + cache: + key: "${CI_JOB_NAME}-cache" + paths: + - ${CI_PROJECT_DIR}/avocado-cache + policy: pull-push + artifacts: + name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" + when: always + expire_in: 2 days + paths: + - build/tests/results/latest/results.xml + - build/tests/results/latest/test-results + reports: + junit: build/tests/results/latest/results.xml + before_script: + - mkdir -p ~/.config/avocado + - echo "[datadir.paths]" > ~/.config/avocado/avocado.conf + - echo "cache_dirs =3D ['${CI_PROJECT_DIR}/avocado-cache']" + >> ~/.config/avocado/avocado.conf + - echo -e '[job.output.testlogs]\nstatuses =3D ["FAIL", "INTERRUPT"]' + >> ~/.config/avocado/avocado.conf + - if [ -d ${CI_PROJECT_DIR}/avocado-cache ]; then + du -chs ${CI_PROJECT_DIR}/avocado-cache ; + fi + - export AVOCADO_ALLOW_UNTRUSTED_CODE=3D1 + after_script: + - cd build + - du -chs ${CI_PROJECT_DIR}/avocado-cache diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f170065ac63..ccd11e1625a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,78 +4,9 @@ include: - local: '/.gitlab-ci.d/opensbi.yml' - local: '/.gitlab-ci.d/containers.yml' - local: '/.gitlab-ci.d/crossbuilds.yml' + - local: '/.gitlab-ci.d/buildtest-template.yml' - local: '/.gitlab-ci.d/static_checks.yml' =20 -.native_build_job_template: - stage: build - image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest - before_script: - - JOBS=3D$(expr $(nproc) + 1) - script: - - if test -n "$LD_JOBS"; - then - scripts/git-submodule.sh update meson ; - fi - - mkdir build - - cd build - - if test -n "$TARGETS"; - then - ../configure --enable-werror --disable-docs ${LD_JOBS:+--meson=3Di= nternal} $CONFIGURE_ARGS --target-list=3D"$TARGETS" ; - else - ../configure --enable-werror --disable-docs ${LD_JOBS:+--meson=3Di= nternal} $CONFIGURE_ARGS ; - fi || { cat config.log meson-logs/meson-log.txt && exit 1; } - - if test -n "$LD_JOBS"; - then - ../meson/meson.py configure . -Dbackend_max_links=3D"$LD_JOBS" ; - fi || exit 1; - - make -j"$JOBS" - - if test -n "$MAKE_CHECK_ARGS"; - then - make -j"$JOBS" $MAKE_CHECK_ARGS ; - fi - -.native_test_job_template: - stage: test - image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest - script: - - scripts/git-submodule.sh update - $(sed -n '/GIT_SUBMODULES=3D/ s/.*=3D// p' build/config-host.mak) - - cd build - - find . -type f -exec touch {} + - # Avoid recompiling by hiding ninja with NINJA=3D":" - - make NINJA=3D":" $MAKE_CHECK_ARGS - -.acceptance_test_job_template: - extends: .native_test_job_template - cache: - key: "${CI_JOB_NAME}-cache" - paths: - - ${CI_PROJECT_DIR}/avocado-cache - policy: pull-push - artifacts: - name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" - when: always - expire_in: 2 days - paths: - - build/tests/results/latest/results.xml - - build/tests/results/latest/test-results - reports: - junit: build/tests/results/latest/results.xml - before_script: - - mkdir -p ~/.config/avocado - - echo "[datadir.paths]" > ~/.config/avocado/avocado.conf - - echo "cache_dirs =3D ['${CI_PROJECT_DIR}/avocado-cache']" - >> ~/.config/avocado/avocado.conf - - echo -e '[job.output.testlogs]\nstatuses =3D ["FAIL", "INTERRUPT"]' - >> ~/.config/avocado/avocado.conf - - if [ -d ${CI_PROJECT_DIR}/avocado-cache ]; then - du -chs ${CI_PROJECT_DIR}/avocado-cache ; - fi - - export AVOCADO_ALLOW_UNTRUSTED_CODE=3D1 - after_script: - - cd build - - du -chs ${CI_PROJECT_DIR}/avocado-cache - build-system-alpine: extends: .native_build_job_template needs: --=20 2.26.3 From nobody Fri May 17 08:39:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) client-ip=209.85.128.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1622063966; cv=none; d=zohomail.com; s=zohoarc; b=kbzRict2JspATKYg74sPtoa3xFQk2GJgo512wUHE1Q31E3wUoWUfL2f/Nic9N5y9LjL3T0TSODd4n+DaDBwjfFD/gv9VAxNCy3H59gwHBHQUG4tFRj2gDSCLd3xa51pjYZtjnifgUpZH6reQM3mtaB/1J5XfuxWFeUW9M/OwJg4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622063966; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TAWBCS/jkXxoAg50yEeoy5C+3FJkTgMoTfO907Q+3r4=; b=NaIzNjiKCvK2pADpV9CTgdeeHJ1ONV2Rj7mJ/swqcBC2F/5RxgpBmxyfdIA9Au0b0b5xg4/yX+lVrCROU9UG7vpqDk897trp+Dd2U/v7foWYmjWXxVLn29E7AIwgKi+UGJx5tgCaFKJmHudr+Yayc3VEeYvcf/9Uo9B2hqfRl1Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.zohomail.com with SMTPS id 1622063966466359.6951716014927; Wed, 26 May 2021 14:19:26 -0700 (PDT) Received: by mail-wm1-f43.google.com with SMTP id s5-20020a7bc0c50000b0290147d0c21c51so1292992wmh.4 for ; Wed, 26 May 2021 14:19:25 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (235.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.235]) by smtp.gmail.com with ESMTPSA id b10sm223996wrr.27.2021.05.26.14.19.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 14:19:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TAWBCS/jkXxoAg50yEeoy5C+3FJkTgMoTfO907Q+3r4=; b=Q5umiYmJ2P/wCv3jb03ITY2RHucDhmpy4iaMWkzQJvhlsXFcWr9i/1Oa9cXtNzpZ9b /1E8rV2DVZ4rKW84VNLzbrEL/HxwAsscWo5lyga7JmeHJBh7Hdz9FG6WzfZh95xJxv4p 79SBWLVsrW/QlTX9zbS118Adz+YI4LUPMbeUVcQKxDcnvl1hRyokcyiRmIlsODAkEVgc iY9psvRQgpbwC1TOZCvGyij5fXN6OcMQJ0V2tTQpoI1uhPjXGMIgiTMYFk6Rf5765XeB iCyzRx8ecs3UfqyCOlstf08qw0Ns91SuK3qZYoNNq5kG24UZqRjcGI22YyeIiFCPki5/ 002Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=TAWBCS/jkXxoAg50yEeoy5C+3FJkTgMoTfO907Q+3r4=; b=Dl3fp9hnMhxP2gMgEjAe+ImQgpxjGofIxArW80V6dgP4Xzeh41/WuTyPBVhZAi340m 3LrboGbISzmk/4pA73KToGXtApJ6nHkuXS3i58wOv06jAVDfCF951xpsFtVW+DKiyMG+ 48BUvYHYvE3+0EzBoAjlBQPz8HgknG9ytWtnY1HJDjCum+dN8uaEs/Dc+2WDwEO+iUiU c8iz7nITBtxM0Xsf0qZsCMkZzlqZ3VhiNVUOlEPwFi2RQBGNr6tWabuEtt5GiT9YFzno 9I4dBJRq5d3jbQM6b5NdRWs+Mk7TtcX+9z7OGTmDFovTkDmyR+GusT5+frcDJHoJLEkN 930A== X-Gm-Message-State: AOAM530K4RBP9VOo9wk+PqdQJkx10nCl7+27hexASj9rnBAyRE/fKvmL 7WcQuXBoXbLnN9hPZIez4PA= X-Google-Smtp-Source: ABdhPJytiYB6nmIqjxob5ku3XqTdM1sdM4jsqnigSishO04XmchVinKPZYybgWMCDy/NsS6unhVWfg== X-Received: by 2002:a1c:3183:: with SMTP id x125mr5281926wmx.80.1622063964663; Wed, 26 May 2021 14:19:24 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta Subject: [PULL 09/19] gitlab: Extract core container jobs to container-core.yml Date: Wed, 26 May 2021 23:18:28 +0200 Message-Id: <20210526211838.421716-10-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210526211838.421716-1-f4bug@amsat.org> References: <20210526211838.421716-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) It is not possible to use the previously extracted templates without this set of core containers. Extract them into a new file (container-core.yml) to be able to build them without having to build all the other containers by default. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Reviewed-by: Willian Rampazzo Message-Id: <20210519185504.2198573-10-f4bug@amsat.org> Signed-off-by: Thomas Huth --- .gitlab-ci.d/container-core.yml | 17 +++++++++++++++++ .gitlab-ci.d/containers.yml | 17 +---------------- 2 files changed, 18 insertions(+), 16 deletions(-) create mode 100644 .gitlab-ci.d/container-core.yml diff --git a/.gitlab-ci.d/container-core.yml b/.gitlab-ci.d/container-core.= yml new file mode 100644 index 00000000000..e8dd1f476a2 --- /dev/null +++ b/.gitlab-ci.d/container-core.yml @@ -0,0 +1,17 @@ +include: + - local: '/.gitlab-ci.d/container-template.yml' + +amd64-centos8-container: + extends: .container_job_template + variables: + NAME: centos8 + +amd64-fedora-container: + extends: .container_job_template + variables: + NAME: fedora + +amd64-debian10-container: + extends: .container_job_template + variables: + NAME: debian10 diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 2b06763d73b..0acc8381ac1 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -1,5 +1,5 @@ include: - - local: '/.gitlab-ci.d/container-template.yml' + - local: '/.gitlab-ci.d/container-core.yml' =20 amd64-alpine-container: extends: .container_job_template @@ -11,16 +11,6 @@ amd64-centos7-container: variables: NAME: centos7 =20 -amd64-centos8-container: - extends: .container_job_template - variables: - NAME: centos8 - -amd64-debian10-container: - extends: .container_job_template - variables: - NAME: debian10 - amd64-debian11-container: extends: .container_job_template variables: @@ -211,11 +201,6 @@ cris-fedora-cross-container: variables: NAME: fedora-cris-cross =20 -amd64-fedora-container: - extends: .container_job_template - variables: - NAME: fedora - i386-fedora-cross-container: extends: .container_job_template variables: --=20 2.26.3 From nobody Fri May 17 08:39:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) client-ip=209.85.221.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1622063972; cv=none; d=zohomail.com; s=zohoarc; b=maCbkI1fPcUpjMlnlY5cYpS7drebZTjrUXRhSVWGxKYy0gUxRDnpPhM8Xf5pyjjnUfxDOrhnyOD/bYu0How0D9xb4BIKG3padfq8Hsghp/vFBJQFai31FkrV72fzQXqALQ4FlRDErmgNxz+pEDyHG9U+Y6KLP+DmJ245UcOtGCQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622063972; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UywJEjii0MbrynfKRWwBYy206Jhb7s4MybZ2FyOynsk=; b=nV3zCsUaiVCMdyL+A0C04N7TViM7Moykb6zf2HMn2Wa2ISuPg098xY75vL1WL91evzRYBkX1mSmSb4rpuZbzu10m6lsEFejDEPOpZECQ6M6SshymX99CeJmSprMhP29vptRPOLjLtRYdS89/smG8IHYPkAWoUNx1hZozqTyTz7U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.zohomail.com with SMTPS id 1622063972106267.9468790315242; Wed, 26 May 2021 14:19:32 -0700 (PDT) Received: by mail-wr1-f54.google.com with SMTP id x7so2506187wrt.12 for ; Wed, 26 May 2021 14:19:30 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (235.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.235]) by smtp.gmail.com with ESMTPSA id s5sm155266wrw.95.2021.05.26.14.19.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 14:19:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UywJEjii0MbrynfKRWwBYy206Jhb7s4MybZ2FyOynsk=; b=G7krePIkBAG7tpaPkqNsY7UIj9cXUjtiS40s3Lf9EiAj4p0DhZRt+wHKkaUpi8BLQQ 9vtYcLuAe/qpvoe1SaD29trfamEW5UgaRCT1uVCT4JlT+nH1Wb5c1xprQ1B9/oR3UlvU UUQqnlgr4jFs9tuokwabqKLr+NRS3WqPh6Ze0o7y/FoJbMIApWRzxrQW4IyPJmlyRknp /XD9Qf1x+DzzTUCx9P5s4z4bw4skxm+9eWF6qNL40BlfVrjU21kukNK9qO6qlfCqIIQF g5lPeWHnc+mKX1FNL1WnUASdDg61gd8okfGcjGM2RoOlMH5GxCB9UlovvwMlnR8EYC0S yCDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=UywJEjii0MbrynfKRWwBYy206Jhb7s4MybZ2FyOynsk=; b=J2N2VL81Ur3LVQvSnE3RpIaQZhoJv2N3+ec6j+kKUYcq4ui0Ol1mcyUW0ZC2H9s0f7 0a6+5tvwvDLs9DzvAV3IPaGfuuD95wBPTiJEBwzPFedblYWjqJoQSqkr9uzjOuNDtgTo YATXYIfjZ5GWRFI6vUk1maxGL/M4XGQcYj36TIJv2DUdmW6CymOA0+6hZH4WHz5OgyWd k7KopeQHQNVApobFVDm6xCDHFj/YxTZSXDSWE3xPqEzx/TjIENox75jGg9n3GJTAplYJ 7Bf/nLJh2yJ09b+a72ESl6S5sib+TwOpcU1HzKWNKpwW45COt7ORLFEdx1fNwQuLLXAa bdRQ== X-Gm-Message-State: AOAM533PhiO7v+V6kP1ypFdQzqjBwjbXX29oc0HihdOFU1BBCQEJWpgh xYxmX55OVGo7io/vAd2Pejk= X-Google-Smtp-Source: ABdhPJzh9MV0Lq9l221f6aRGptfd+2gnRUN3ioV4k6T20r2Nd+cG7Ip8CQ/f0GRwmFNC0/Wk6atnkg== X-Received: by 2002:a05:6000:1001:: with SMTP id a1mr2765wrx.59.1622063969336; Wed, 26 May 2021 14:19:29 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Willian Rampazzo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta Subject: [PULL 10/19] gitlab: Drop linux user build job for CentOS 7 Date: Wed, 26 May 2021 23:18:29 +0200 Message-Id: <20210526211838.421716-11-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210526211838.421716-1-f4bug@amsat.org> References: <20210526211838.421716-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) From: Daniel P. Berrang=C3=A9 It has been over two years since RHEL-8 was released, and thus per the platform build policy, we no longer need to support RHEL-7 as a build target. The build-user-centos7 job was to detect a failure specific to CentOS 7 and there are already other linux user jobs for other platforms. Thus we can drop this job rather than move it to CentOS 8. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Willian Rampazzo Reviewed-by: Thomas Huth Message-Id: <20210514120415.1368922-2-berrange@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ccd11e1625a..09ac74fc509 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -373,15 +373,6 @@ build-user-plugins: MAKE_CHECK_ARGS: check-tcg timeout: 1h 30m =20 -build-user-centos7: - extends: .native_build_job_template - needs: - job: amd64-centos7-container - variables: - IMAGE: centos7 - CONFIGURE_ARGS: --disable-system --disable-tools --disable-docs - MAKE_CHECK_ARGS: check-tcg - build-some-softmmu-plugins: extends: .native_build_job_template needs: --=20 2.26.3 From nobody Fri May 17 08:39:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) client-ip=209.85.221.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1622063978; cv=none; d=zohomail.com; s=zohoarc; b=Q4Rwo2+Sv2GmOZgRa4Q92KO9tqylnhZM1TmInKLL3fkJAV0hZkpe5GiYlZAx74ltgZR6vl1EEVIFHaG0Vx9TwUrMcHLAPhhnr7e+lvNDualJCkr4Md5pXonKlyJ79wPtiuL/R/C/EngpG4yLARmyqwT5pW1aGePmHbDQua67I9U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622063978; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=91ROUPIF87/L78mCbvzy0lPFZp2SeZs8Cc18nZzS9r8=; b=be2eTZli69qxQwqQ76Gof1i6v/B5c08FQZ6Qpodmwm/rcG9zlB1xv/+xIan6lCF+9mtgCZWdhfPZ38CY/ias7KV6a1JvygMZwA16WnlAvz2L/jvspmsNNROy55KHzmVAsVy2Hl8O9igLiNONp9l3pyG21nxz11Jz1eZwZeHqFFM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.zohomail.com with SMTPS id 1622063978508568.591632027259; Wed, 26 May 2021 14:19:38 -0700 (PDT) Received: by mail-wr1-f46.google.com with SMTP id v12so2558358wrq.6 for ; Wed, 26 May 2021 14:19:35 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (235.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.235]) by smtp.gmail.com with ESMTPSA id s7sm7729020wmh.35.2021.05.26.14.19.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 14:19:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=91ROUPIF87/L78mCbvzy0lPFZp2SeZs8Cc18nZzS9r8=; b=p9prnGG7hAKTGVJ+Lbs3KyKAfUSjnIb2vXUHVrpfBdd98uFi7exJI5SVeDtCmuIUtW jZ3eaFFaQqiEfGvnMfzaX7YJ0abXK836un+3ljU9pLfHVJiB+oODNRhQ00AAuUG55gut LA0sg9kkOAmv/573IN5pIC0JUiHmbsbl+P//6S6jNANRTcUuLuxdY25kG211G6gn6w6Y tWvDT+aAS/txkoAGNsOIwLjy6sL6I/sBkLd/J5llJaVElkGR1PRrryoZMmUuKyY4ByIJ 6847HBZCjYSHsEYYqOe4V4MUHlqgCGtQQd1MwmUIAu80Smdte4muLvh59+mdSvQz8RGU I27g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=91ROUPIF87/L78mCbvzy0lPFZp2SeZs8Cc18nZzS9r8=; b=QuRB0mA07TlXAK9JaXr/6gmwyW2nuJCF2TFDN9McJoOVz7uqDEBVI53oC7G13tGlB4 kCCl0rq79G81nwKNGWfyzJdNyjx+gE0hyu1PjK0mYJC2DPWsA7vGgja9p0/GwT2RbtoV leYArmm8UPZVgh8gB/itZgbGgzG9tS4bL08XNgZN0FBilQHXYsUZhDnOQUvNYiGd3PvC y2U83lsvjnw6ivfcvz6u19zNcOZUU0VMgCE8JwlTcpjCk4eGFlK4pcR4RkJ88z9TIH2d fRkR+PSqzwmK6Ov0ItkCv0lYb1D1+Hr0h6LYuSHFHpuek0B+pgv7h8Q+NsnjWPNVed4s pBfw== X-Gm-Message-State: AOAM531eZA28jVJRMMEcLncgwnFHwVCdvos8xRXLPfCfn2ZjrRYaH0oa POU3HMJTWcpUTSOONZEoie8= X-Google-Smtp-Source: ABdhPJzOW//ffUX16YQx+lKPgq7NBPqE/96saf52D6Z42Whj6UC/0mLkNhxBsfCUoPH78QheKHgN9g== X-Received: by 2002:a5d:5306:: with SMTP id e6mr10457wrv.324.1622063974308; Wed, 26 May 2021 14:19:34 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta Subject: [PULL 11/19] gitlab: Extract all default build/test jobs to buildtest.yml Date: Wed, 26 May 2021 23:18:30 +0200 Message-Id: <20210526211838.421716-12-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210526211838.421716-1-f4bug@amsat.org> References: <20210526211838.421716-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Extract the build/test jobs run by default on the mainstream CI into a new file (buildtest.yml). Reviewed-by: Willian Rampazzo Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Message-Id: <20210511072952.2813358-9-f4bug@amsat.org> --- .gitlab-ci.d/buildtest.yml | 730 +++++++++++++++++++++++++++++++++++++ .gitlab-ci.yml | 730 +------------------------------------ 2 files changed, 731 insertions(+), 729 deletions(-) create mode 100644 .gitlab-ci.d/buildtest.yml diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml new file mode 100644 index 00000000000..807040c1c71 --- /dev/null +++ b/.gitlab-ci.d/buildtest.yml @@ -0,0 +1,730 @@ +include: + - local: '/.gitlab-ci.d/buildtest-template.yml' + +build-system-alpine: + extends: .native_build_job_template + needs: + - job: amd64-alpine-container + variables: + IMAGE: alpine + TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu + microblazeel-softmmu mips64el-softmmu + MAKE_CHECK_ARGS: check-build + CONFIGURE_ARGS: --enable-docs --enable-trace-backends=3Dlog,simple,sys= log + artifacts: + expire_in: 2 days + paths: + - .git-submodule-status + - build + +check-system-alpine: + extends: .native_test_job_template + needs: + - job: build-system-alpine + artifacts: true + variables: + IMAGE: alpine + MAKE_CHECK_ARGS: check + +acceptance-system-alpine: + extends: .acceptance_test_job_template + needs: + - job: build-system-alpine + artifacts: true + variables: + IMAGE: alpine + MAKE_CHECK_ARGS: check-acceptance + +build-system-ubuntu: + extends: .native_build_job_template + needs: + job: amd64-ubuntu2004-container + variables: + IMAGE: ubuntu2004 + CONFIGURE_ARGS: --enable-docs --enable-fdt=3Dsystem --enable-slirp=3Ds= ystem + TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu + microblazeel-softmmu mips64el-softmmu + MAKE_CHECK_ARGS: check-build + artifacts: + expire_in: 2 days + paths: + - build + +check-system-ubuntu: + extends: .native_test_job_template + needs: + - job: build-system-ubuntu + artifacts: true + variables: + IMAGE: ubuntu2004 + MAKE_CHECK_ARGS: check + +acceptance-system-ubuntu: + extends: .acceptance_test_job_template + needs: + - job: build-system-ubuntu + artifacts: true + variables: + IMAGE: ubuntu2004 + MAKE_CHECK_ARGS: check-acceptance + +build-system-debian: + extends: .native_build_job_template + needs: + job: amd64-debian-container + variables: + IMAGE: debian-amd64 + CONFIGURE_ARGS: --enable-fdt=3Dsystem + TARGETS: arm-softmmu avr-softmmu i386-softmmu mipsel-softmmu + riscv64-softmmu sh4eb-softmmu sparc-softmmu xtensaeb-softmmu + MAKE_CHECK_ARGS: check-build + artifacts: + expire_in: 2 days + paths: + - build + +check-system-debian: + extends: .native_test_job_template + needs: + - job: build-system-debian + artifacts: true + variables: + IMAGE: debian-amd64 + MAKE_CHECK_ARGS: check + +acceptance-system-debian: + extends: .acceptance_test_job_template + needs: + - job: build-system-debian + artifacts: true + variables: + IMAGE: debian-amd64 + MAKE_CHECK_ARGS: check-acceptance + +build-system-fedora: + extends: .native_build_job_template + needs: + job: amd64-fedora-container + variables: + IMAGE: fedora + CONFIGURE_ARGS: --disable-gcrypt --enable-nettle --enable-docs + --enable-fdt=3Dsystem --enable-slirp=3Dsystem --enable-capsto= ne=3Dsystem + TARGETS: tricore-softmmu microblaze-softmmu mips-softmmu + xtensa-softmmu m68k-softmmu riscv32-softmmu ppc-softmmu sparc64-soft= mmu + MAKE_CHECK_ARGS: check-build + artifacts: + expire_in: 2 days + paths: + - build + +check-system-fedora: + extends: .native_test_job_template + needs: + - job: build-system-fedora + artifacts: true + variables: + IMAGE: fedora + MAKE_CHECK_ARGS: check + +acceptance-system-fedora: + extends: .acceptance_test_job_template + needs: + - job: build-system-fedora + artifacts: true + variables: + IMAGE: fedora + MAKE_CHECK_ARGS: check-acceptance + +build-system-centos: + extends: .native_build_job_template + needs: + job: amd64-centos8-container + variables: + IMAGE: centos8 + CONFIGURE_ARGS: --disable-nettle --enable-gcrypt --enable-fdt=3Dsystem + --enable-modules --enable-trace-backends=3Ddtrace + TARGETS: ppc64-softmmu or1k-softmmu s390x-softmmu + x86_64-softmmu rx-softmmu sh4-softmmu nios2-softmmu + MAKE_CHECK_ARGS: check-build + artifacts: + expire_in: 2 days + paths: + - build + +check-system-centos: + extends: .native_test_job_template + needs: + - job: build-system-centos + artifacts: true + variables: + IMAGE: centos8 + MAKE_CHECK_ARGS: check + +acceptance-system-centos: + extends: .acceptance_test_job_template + needs: + - job: build-system-centos + artifacts: true + variables: + IMAGE: centos8 + MAKE_CHECK_ARGS: check-acceptance + +build-system-opensuse: + extends: .native_build_job_template + needs: + job: amd64-opensuse-leap-container + variables: + IMAGE: opensuse-leap + CONFIGURE_ARGS: --enable-fdt=3Dsystem + TARGETS: s390x-softmmu x86_64-softmmu aarch64-softmmu + MAKE_CHECK_ARGS: check-build + artifacts: + expire_in: 2 days + paths: + - build + +check-system-opensuse: + extends: .native_test_job_template + needs: + - job: build-system-opensuse + artifacts: true + variables: + IMAGE: opensuse-leap + MAKE_CHECK_ARGS: check + +acceptance-system-opensuse: + extends: .acceptance_test_job_template + needs: + - job: build-system-opensuse + artifacts: true + variables: + IMAGE: opensuse-leap + MAKE_CHECK_ARGS: check-acceptance + + +build-disabled: + extends: .native_build_job_template + needs: + job: amd64-fedora-container + variables: + IMAGE: fedora + CONFIGURE_ARGS: + --disable-attr + --disable-auth-pam + --disable-avx2 + --disable-bochs + --disable-brlapi + --disable-bzip2 + --disable-cap-ng + --disable-capstone + --disable-cloop + --disable-coroutine-pool + --disable-curl + --disable-curses + --disable-dmg + --disable-docs + --disable-gcrypt + --disable-glusterfs + --disable-gnutls + --disable-gtk + --disable-guest-agent + --disable-iconv + --disable-keyring + --disable-kvm + --disable-libiscsi + --disable-libpmem + --disable-libssh + --disable-libudev + --disable-libusb + --disable-libxml2 + --disable-linux-aio + --disable-live-block-migration + --disable-lzo + --disable-malloc-trim + --disable-mpath + --disable-nettle + --disable-numa + --disable-opengl + --disable-parallels + --disable-pie + --disable-qcow1 + --disable-qed + --disable-qom-cast-debug + --disable-rbd + --disable-rdma + --disable-replication + --disable-sdl + --disable-seccomp + --disable-slirp + --disable-smartcard + --disable-snappy + --disable-sparse + --disable-spice + --disable-strip + --disable-tpm + --disable-usb-redir + --disable-vdi + --disable-vhost-crypto + --disable-vhost-net + --disable-vhost-scsi + --disable-vhost-kernel + --disable-vhost-user + --disable-vhost-vdpa + --disable-vhost-vsock + --disable-virglrenderer + --disable-vnc + --disable-vte + --disable-vvfat + --disable-xen + --disable-zstd + TARGETS: arm-softmmu i386-softmmu ppc64-softmmu mips64-softmmu + s390x-softmmu i386-linux-user + MAKE_CHECK_ARGS: check-qtest SPEED=3Dslow + +# This jobs explicitly disable TCG (--disable-tcg), KVM is detected by +# the configure script. The container doesn't contain Xen headers so +# Xen accelerator is not detected / selected. As result it build the +# i386-softmmu and x86_64-softmmu with KVM being the single accelerator +# available. +# Also use a different coroutine implementation (which is only really of +# interest to KVM users, i.e. with TCG disabled) +build-tcg-disabled: + extends: .native_build_job_template + needs: + job: amd64-centos8-container + variables: + IMAGE: centos8 + script: + - mkdir build + - cd build + - ../configure --disable-tcg --audio-drv-list=3D"" --with-coroutine=3D= ucontext + || { cat config.log meson-logs/meson-log.txt && exit 1; } + - make -j"$JOBS" + - make check-unit + - make check-qapi-schema + - cd tests/qemu-iotests/ + - ./check -raw 001 002 003 004 005 008 009 010 011 012 021 025 032 033= 048 + 052 063 077 086 101 104 106 113 148 150 151 152 157 159 160 163 + 170 171 183 184 192 194 197 208 215 221 222 226 227 236 253 277 + - ./check -qcow2 028 051 056 057 058 065 068 082 085 091 095 096 102 1= 22 + 124 132 139 142 144 145 151 152 155 157 165 194 196 197 200 202 + 208 209 215 216 218 222 227 234 246 247 248 250 254 255 257 258 + 260 261 262 263 264 270 272 273 277 279 + +build-user: + extends: .native_build_job_template + needs: + job: amd64-debian-user-cross-container + variables: + IMAGE: debian-all-test-cross + CONFIGURE_ARGS: --disable-tools --disable-system + MAKE_CHECK_ARGS: check-tcg + +build-user-static: + extends: .native_build_job_template + needs: + job: amd64-debian-user-cross-container + variables: + IMAGE: debian-all-test-cross + CONFIGURE_ARGS: --disable-tools --disable-system --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 an optional dependen= cy +# declared. The image is manually uploaded. +build-user-hexagon: + extends: .native_build_job_template + needs: + job: hexagon-cross-container + optional: true + variables: + IMAGE: debian-hexagon-cross + TARGETS: hexagon-linux-user + CONFIGURE_ARGS: --disable-tools --disable-docs --enable-debug-tcg + MAKE_CHECK_ARGS: check-tcg + +# Only build the softmmu targets we have check-tcg tests for +build-some-softmmu: + extends: .native_build_job_template + needs: + job: amd64-debian-user-cross-container + variables: + IMAGE: debian-all-test-cross + CONFIGURE_ARGS: --disable-tools --enable-debug + TARGETS: xtensa-softmmu arm-softmmu aarch64-softmmu alpha-softmmu + MAKE_CHECK_ARGS: check-tcg + +# Run check-tcg against linux-user (with plugins) +# we skip sparc64-linux-user until it has been fixed somewhat +# we skip cris-linux-user as it doesn't use the common run loop +build-user-plugins: + extends: .native_build_job_template + needs: + job: amd64-debian-user-cross-container + variables: + IMAGE: debian-all-test-cross + CONFIGURE_ARGS: --disable-tools --disable-system --enable-plugins --en= able-debug-tcg --target-list-exclude=3Dsparc64-linux-user,cris-linux-user + MAKE_CHECK_ARGS: check-tcg + timeout: 1h 30m + +build-some-softmmu-plugins: + extends: .native_build_job_template + needs: + job: amd64-debian-user-cross-container + variables: + IMAGE: debian-all-test-cross + CONFIGURE_ARGS: --disable-tools --disable-user --enable-plugins --enab= le-debug-tcg + TARGETS: xtensa-softmmu arm-softmmu aarch64-softmmu alpha-softmmu + MAKE_CHECK_ARGS: check-tcg + +clang-system: + extends: .native_build_job_template + needs: + job: amd64-fedora-container + variables: + IMAGE: fedora + CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ + --extra-cflags=3D-fsanitize=3Dundefined --extra-cflags=3D-fno-saniti= ze-recover=3Dundefined + TARGETS: alpha-softmmu arm-softmmu m68k-softmmu mips64-softmmu + ppc-softmmu s390x-softmmu + MAKE_CHECK_ARGS: check-qtest check-tcg + +clang-user: + extends: .native_build_job_template + needs: + job: amd64-debian-user-cross-container + variables: + IMAGE: debian-all-test-cross + CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ --disable-system + --target-list-exclude=3Dmicroblazeel-linux-user,aarch64_be-linux-use= r,i386-linux-user,m68k-linux-user,mipsn32el-linux-user,xtensaeb-linux-user + --extra-cflags=3D-fsanitize=3Dundefined --extra-cflags=3D-fno-saniti= ze-recover=3Dundefined + MAKE_CHECK_ARGS: check-unit check-tcg + +# Set LD_JOBS=3D1 because this requires LTO and ld consumes a large amount= of memory. +# On gitlab runners, default value sometimes end up calling 2 lds concurre= ntly and +# triggers an Out-Of-Memory error +# +# Since slirp callbacks are used in QEMU Timers, slirp needs to be compile= d together +# with QEMU and linked as a static library to avoid false positives in CFI= checks. +# This can be accomplished by using -enable-slirp=3Dgit, which avoids the = use of +# a system-wide version of the library +# +# Split in three sets of build/check/acceptance to limit the execution tim= e of each +# job +build-cfi-aarch64: + extends: .native_build_job_template + needs: + - job: amd64-fedora-container + variables: + LD_JOBS: 1 + AR: llvm-ar + IMAGE: fedora + CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ --enable-cfi --enable-cfi= -debug + --enable-safe-stack --enable-slirp=3Dgit + TARGETS: aarch64-softmmu + MAKE_CHECK_ARGS: check-build + timeout: 70m + artifacts: + expire_in: 2 days + paths: + - build + +check-cfi-aarch64: + extends: .native_test_job_template + needs: + - job: build-cfi-aarch64 + artifacts: true + variables: + IMAGE: fedora + MAKE_CHECK_ARGS: check + +acceptance-cfi-aarch64: + extends: .acceptance_test_job_template + needs: + - job: build-cfi-aarch64 + artifacts: true + variables: + IMAGE: fedora + MAKE_CHECK_ARGS: check-acceptance + +build-cfi-ppc64-s390x: + extends: .native_build_job_template + needs: + - job: amd64-fedora-container + variables: + LD_JOBS: 1 + AR: llvm-ar + IMAGE: fedora + CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ --enable-cfi --enable-cfi= -debug + --enable-safe-stack --enable-slirp=3Dgit + TARGETS: ppc64-softmmu s390x-softmmu + MAKE_CHECK_ARGS: check-build + timeout: 70m + artifacts: + expire_in: 2 days + paths: + - build + +check-cfi-ppc64-s390x: + extends: .native_test_job_template + needs: + - job: build-cfi-ppc64-s390x + artifacts: true + variables: + IMAGE: fedora + MAKE_CHECK_ARGS: check + +acceptance-cfi-ppc64-s390x: + extends: .acceptance_test_job_template + needs: + - job: build-cfi-ppc64-s390x + artifacts: true + variables: + IMAGE: fedora + MAKE_CHECK_ARGS: check-acceptance + +build-cfi-x86_64: + extends: .native_build_job_template + needs: + - job: amd64-fedora-container + variables: + LD_JOBS: 1 + AR: llvm-ar + IMAGE: fedora + CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ --enable-cfi --enable-cfi= -debug + --enable-safe-stack --enable-slirp=3Dgit + TARGETS: x86_64-softmmu + MAKE_CHECK_ARGS: check-build + timeout: 70m + artifacts: + expire_in: 2 days + paths: + - build + +check-cfi-x86_64: + extends: .native_test_job_template + needs: + - job: build-cfi-x86_64 + artifacts: true + variables: + IMAGE: fedora + MAKE_CHECK_ARGS: check + +acceptance-cfi-x86_64: + extends: .acceptance_test_job_template + needs: + - job: build-cfi-x86_64 + artifacts: true + variables: + IMAGE: fedora + MAKE_CHECK_ARGS: check-acceptance + +tsan-build: + extends: .native_build_job_template + needs: + job: amd64-ubuntu2004-container + variables: + IMAGE: ubuntu2004 + CONFIGURE_ARGS: --enable-tsan --cc=3Dclang-10 --cxx=3Dclang++-10 + --enable-trace-backends=3Dust --enable-fdt=3Dsystem --enable-sli= rp=3Dsystem + TARGETS: x86_64-softmmu ppc64-softmmu riscv64-softmmu x86_64-linux-user + MAKE_CHECK_ARGS: bench V=3D1 + +# These targets are on the way out +build-deprecated: + extends: .native_build_job_template + needs: + job: amd64-debian-user-cross-container + variables: + IMAGE: debian-all-test-cross + CONFIGURE_ARGS: --disable-tools + MAKE_CHECK_ARGS: build-tcg + TARGETS: ppc64abi32-linux-user + artifacts: + expire_in: 2 days + paths: + - build + +# We split the check-tcg step as test failures are expected but we still +# want to catch the build breaking. +check-deprecated: + extends: .native_test_job_template + needs: + - job: build-deprecated + artifacts: true + variables: + IMAGE: debian-all-test-cross + MAKE_CHECK_ARGS: check-tcg + allow_failure: true + +# gprof/gcov are GCC features +gprof-gcov: + extends: .native_build_job_template + needs: + job: amd64-ubuntu2004-container + variables: + IMAGE: ubuntu2004 + CONFIGURE_ARGS: --enable-gprof --enable-gcov + MAKE_CHECK_ARGS: check + TARGETS: aarch64-softmmu ppc64-softmmu s390x-softmmu x86_64-softmmu + timeout: 70m + after_script: + - ${CI_PROJECT_DIR}/scripts/ci/coverage-summary.sh + +build-oss-fuzz: + extends: .native_build_job_template + needs: + job: amd64-fedora-container + variables: + IMAGE: fedora + script: + - mkdir build-oss-fuzz + - CC=3D"clang" CXX=3D"clang++" CFLAGS=3D"-fsanitize=3Daddress" + ./scripts/oss-fuzz/build.sh + - export ASAN_OPTIONS=3D"fast_unwind_on_malloc=3D0" + - for fuzzer in $(find ./build-oss-fuzz/DEST_DIR/ -executable -type f + | grep -v slirp); do + grep "LLVMFuzzerTestOneInput" ${fuzzer} > /dev/null 2>&1 || contin= ue ; + echo Testing ${fuzzer} ... ; + "${fuzzer}" -runs=3D1 -seed=3D1 || exit 1 ; + done + # Unrelated to fuzzer: run some tests with -fsanitize=3Daddress + - cd build-oss-fuzz && make check-qtest-i386 check-unit + +build-tci: + extends: .native_build_job_template + needs: + job: amd64-debian-user-cross-container + variables: + IMAGE: debian-all-test-cross + script: + - TARGETS=3D"aarch64 alpha arm hppa m68k microblaze ppc64 s390x x86_64" + - mkdir build + - cd build + - ../configure --enable-tcg-interpreter + --target-list=3D"$(for tg in $TARGETS; do echo -n ${tg}'-softmmu '= ; done)" || { cat config.log meson-logs/meson-log.txt && exit 1; } + - make -j"$JOBS" + - make tests/qtest/boot-serial-test tests/qtest/cdrom-test tests/qtest= /pxe-test + - for tg in $TARGETS ; do + export QTEST_QEMU_BINARY=3D"./qemu-system-${tg}" ; + ./tests/qtest/boot-serial-test || exit 1 ; + ./tests/qtest/cdrom-test || exit 1 ; + done + - QTEST_QEMU_BINARY=3D"./qemu-system-x86_64" ./tests/qtest/pxe-test + - QTEST_QEMU_BINARY=3D"./qemu-system-s390x" ./tests/qtest/pxe-test -m = slow + - make check-tcg + +# Alternate coroutines implementations are only really of interest to KVM = users +# However we can't test against KVM on Gitlab-CI so we can only run unit t= ests +build-coroutine-sigaltstack: + extends: .native_build_job_template + needs: + job: amd64-ubuntu2004-container + variables: + IMAGE: ubuntu2004 + CONFIGURE_ARGS: --with-coroutine=3Dsigaltstack --disable-tcg + --enable-trace-backends=3Dftrace + MAKE_CHECK_ARGS: check-unit + +# Most jobs test latest gcrypt or nettle builds +# +# These jobs test old gcrypt and nettle from RHEL7 +# which had some API differences. +crypto-old-nettle: + extends: .native_build_job_template + needs: + job: amd64-centos7-container + variables: + IMAGE: centos7 + TARGETS: x86_64-softmmu x86_64-linux-user + CONFIGURE_ARGS: --disable-gcrypt --enable-nettle + MAKE_CHECK_ARGS: check + +crypto-old-gcrypt: + extends: .native_build_job_template + needs: + job: amd64-centos7-container + variables: + IMAGE: centos7 + TARGETS: x86_64-softmmu x86_64-linux-user + CONFIGURE_ARGS: --disable-nettle --enable-gcrypt + MAKE_CHECK_ARGS: check + +crypto-only-gnutls: + extends: .native_build_job_template + needs: + job: amd64-centos7-container + variables: + IMAGE: centos7 + TARGETS: x86_64-softmmu x86_64-linux-user + CONFIGURE_ARGS: --disable-nettle --disable-gcrypt --enable-gnutls + MAKE_CHECK_ARGS: check + + +# Check our reduced build configurations +build-without-default-devices: + extends: .native_build_job_template + needs: + job: amd64-centos8-container + variables: + IMAGE: centos8 + CONFIGURE_ARGS: --without-default-devices --disable-user + +build-without-default-features: + extends: .native_build_job_template + needs: + job: amd64-debian-container + variables: + IMAGE: debian-amd64 + CONFIGURE_ARGS: --without-default-features --disable-user + --target-list-exclude=3Darm-softmmu,i386-softmmu,mipsel-softmmu,mi= ps64-softmmu,ppc-softmmu + MAKE_CHECK_ARGS: check-unit + +build-libvhost-user: + stage: build + image: $CI_REGISTRY_IMAGE/qemu/fedora:latest + needs: + job: amd64-fedora-container + before_script: + - dnf install -y meson ninja-build + script: + - mkdir subprojects/libvhost-user/build + - cd subprojects/libvhost-user/build + - meson + - ninja + +# No targets are built here, just tools, docs, and unit tests. This +# also feeds into the eventual documentation deployment steps later +build-tools-and-docs-debian: + extends: .native_build_job_template + needs: + job: amd64-debian-container + variables: + IMAGE: debian-amd64 + MAKE_CHECK_ARGS: check-unit check-softfloat ctags TAGS cscope + CONFIGURE_ARGS: --disable-system --disable-user --enable-docs --enable= -tools + artifacts: + expire_in: 2 days + paths: + - build + +# Prepare for GitLab pages deployment. Anything copied into the +# "public" directory will be deployed to $USER.gitlab.io/$PROJECT +pages: + image: $CI_REGISTRY_IMAGE/qemu/debian-amd64:latest + stage: test + needs: + - job: build-tools-and-docs-debian + script: + - mkdir -p public + # HTML-ised source tree + - make gtags + - htags -anT --tree-view=3Dfiletree -m qemu_init + -t "Welcome to the QEMU sourcecode" + - mv HTML public/src + # Project documentation + - make -C build install DESTDIR=3D$(pwd)/temp-install + - mv temp-install/usr/local/share/doc/qemu/* public/ + artifacts: + paths: + - public diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 09ac74fc509..aea58813a25 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,733 +4,5 @@ include: - local: '/.gitlab-ci.d/opensbi.yml' - local: '/.gitlab-ci.d/containers.yml' - local: '/.gitlab-ci.d/crossbuilds.yml' - - local: '/.gitlab-ci.d/buildtest-template.yml' + - local: '/.gitlab-ci.d/buildtest.yml' - local: '/.gitlab-ci.d/static_checks.yml' - -build-system-alpine: - extends: .native_build_job_template - needs: - - job: amd64-alpine-container - variables: - IMAGE: alpine - TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu - microblazeel-softmmu mips64el-softmmu - MAKE_CHECK_ARGS: check-build - CONFIGURE_ARGS: --enable-docs --enable-trace-backends=3Dlog,simple,sys= log - artifacts: - expire_in: 2 days - paths: - - .git-submodule-status - - build - -check-system-alpine: - extends: .native_test_job_template - needs: - - job: build-system-alpine - artifacts: true - variables: - IMAGE: alpine - MAKE_CHECK_ARGS: check - -acceptance-system-alpine: - extends: .acceptance_test_job_template - needs: - - job: build-system-alpine - artifacts: true - variables: - IMAGE: alpine - MAKE_CHECK_ARGS: check-acceptance - -build-system-ubuntu: - extends: .native_build_job_template - needs: - job: amd64-ubuntu2004-container - variables: - IMAGE: ubuntu2004 - CONFIGURE_ARGS: --enable-docs --enable-fdt=3Dsystem --enable-slirp=3Ds= ystem - TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu - microblazeel-softmmu mips64el-softmmu - MAKE_CHECK_ARGS: check-build - artifacts: - expire_in: 2 days - paths: - - build - -check-system-ubuntu: - extends: .native_test_job_template - needs: - - job: build-system-ubuntu - artifacts: true - variables: - IMAGE: ubuntu2004 - MAKE_CHECK_ARGS: check - -acceptance-system-ubuntu: - extends: .acceptance_test_job_template - needs: - - job: build-system-ubuntu - artifacts: true - variables: - IMAGE: ubuntu2004 - MAKE_CHECK_ARGS: check-acceptance - -build-system-debian: - extends: .native_build_job_template - needs: - job: amd64-debian-container - variables: - IMAGE: debian-amd64 - CONFIGURE_ARGS: --enable-fdt=3Dsystem - TARGETS: arm-softmmu avr-softmmu i386-softmmu mipsel-softmmu - riscv64-softmmu sh4eb-softmmu sparc-softmmu xtensaeb-softmmu - MAKE_CHECK_ARGS: check-build - artifacts: - expire_in: 2 days - paths: - - build - -check-system-debian: - extends: .native_test_job_template - needs: - - job: build-system-debian - artifacts: true - variables: - IMAGE: debian-amd64 - MAKE_CHECK_ARGS: check - -acceptance-system-debian: - extends: .acceptance_test_job_template - needs: - - job: build-system-debian - artifacts: true - variables: - IMAGE: debian-amd64 - MAKE_CHECK_ARGS: check-acceptance - -build-system-fedora: - extends: .native_build_job_template - needs: - job: amd64-fedora-container - variables: - IMAGE: fedora - CONFIGURE_ARGS: --disable-gcrypt --enable-nettle --enable-docs - --enable-fdt=3Dsystem --enable-slirp=3Dsystem --enable-capsto= ne=3Dsystem - TARGETS: tricore-softmmu microblaze-softmmu mips-softmmu - xtensa-softmmu m68k-softmmu riscv32-softmmu ppc-softmmu sparc64-soft= mmu - MAKE_CHECK_ARGS: check-build - artifacts: - expire_in: 2 days - paths: - - build - -check-system-fedora: - extends: .native_test_job_template - needs: - - job: build-system-fedora - artifacts: true - variables: - IMAGE: fedora - MAKE_CHECK_ARGS: check - -acceptance-system-fedora: - extends: .acceptance_test_job_template - needs: - - job: build-system-fedora - artifacts: true - variables: - IMAGE: fedora - MAKE_CHECK_ARGS: check-acceptance - -build-system-centos: - extends: .native_build_job_template - needs: - job: amd64-centos8-container - variables: - IMAGE: centos8 - CONFIGURE_ARGS: --disable-nettle --enable-gcrypt --enable-fdt=3Dsystem - --enable-modules --enable-trace-backends=3Ddtrace - TARGETS: ppc64-softmmu or1k-softmmu s390x-softmmu - x86_64-softmmu rx-softmmu sh4-softmmu nios2-softmmu - MAKE_CHECK_ARGS: check-build - artifacts: - expire_in: 2 days - paths: - - build - -check-system-centos: - extends: .native_test_job_template - needs: - - job: build-system-centos - artifacts: true - variables: - IMAGE: centos8 - MAKE_CHECK_ARGS: check - -acceptance-system-centos: - extends: .acceptance_test_job_template - needs: - - job: build-system-centos - artifacts: true - variables: - IMAGE: centos8 - MAKE_CHECK_ARGS: check-acceptance - -build-system-opensuse: - extends: .native_build_job_template - needs: - job: amd64-opensuse-leap-container - variables: - IMAGE: opensuse-leap - CONFIGURE_ARGS: --enable-fdt=3Dsystem - TARGETS: s390x-softmmu x86_64-softmmu aarch64-softmmu - MAKE_CHECK_ARGS: check-build - artifacts: - expire_in: 2 days - paths: - - build - -check-system-opensuse: - extends: .native_test_job_template - needs: - - job: build-system-opensuse - artifacts: true - variables: - IMAGE: opensuse-leap - MAKE_CHECK_ARGS: check - -acceptance-system-opensuse: - extends: .acceptance_test_job_template - needs: - - job: build-system-opensuse - artifacts: true - variables: - IMAGE: opensuse-leap - MAKE_CHECK_ARGS: check-acceptance - - -build-disabled: - extends: .native_build_job_template - needs: - job: amd64-fedora-container - variables: - IMAGE: fedora - CONFIGURE_ARGS: - --disable-attr - --disable-auth-pam - --disable-avx2 - --disable-bochs - --disable-brlapi - --disable-bzip2 - --disable-cap-ng - --disable-capstone - --disable-cloop - --disable-coroutine-pool - --disable-curl - --disable-curses - --disable-dmg - --disable-docs - --disable-gcrypt - --disable-glusterfs - --disable-gnutls - --disable-gtk - --disable-guest-agent - --disable-iconv - --disable-keyring - --disable-kvm - --disable-libiscsi - --disable-libpmem - --disable-libssh - --disable-libudev - --disable-libusb - --disable-libxml2 - --disable-linux-aio - --disable-live-block-migration - --disable-lzo - --disable-malloc-trim - --disable-mpath - --disable-nettle - --disable-numa - --disable-opengl - --disable-parallels - --disable-pie - --disable-qcow1 - --disable-qed - --disable-qom-cast-debug - --disable-rbd - --disable-rdma - --disable-replication - --disable-sdl - --disable-seccomp - --disable-slirp - --disable-smartcard - --disable-snappy - --disable-sparse - --disable-spice - --disable-strip - --disable-tpm - --disable-usb-redir - --disable-vdi - --disable-vhost-crypto - --disable-vhost-net - --disable-vhost-scsi - --disable-vhost-kernel - --disable-vhost-user - --disable-vhost-vdpa - --disable-vhost-vsock - --disable-virglrenderer - --disable-vnc - --disable-vte - --disable-vvfat - --disable-xen - --disable-zstd - TARGETS: arm-softmmu i386-softmmu ppc64-softmmu mips64-softmmu - s390x-softmmu i386-linux-user - MAKE_CHECK_ARGS: check-qtest SPEED=3Dslow - -# This jobs explicitly disable TCG (--disable-tcg), KVM is detected by -# the configure script. The container doesn't contain Xen headers so -# Xen accelerator is not detected / selected. As result it build the -# i386-softmmu and x86_64-softmmu with KVM being the single accelerator -# available. -# Also use a different coroutine implementation (which is only really of -# interest to KVM users, i.e. with TCG disabled) -build-tcg-disabled: - extends: .native_build_job_template - needs: - job: amd64-centos8-container - variables: - IMAGE: centos8 - script: - - mkdir build - - cd build - - ../configure --disable-tcg --audio-drv-list=3D"" --with-coroutine=3D= ucontext - || { cat config.log meson-logs/meson-log.txt && exit 1; } - - make -j"$JOBS" - - make check-unit - - make check-qapi-schema - - cd tests/qemu-iotests/ - - ./check -raw 001 002 003 004 005 008 009 010 011 012 021 025 032 033= 048 - 052 063 077 086 101 104 106 113 148 150 151 152 157 159 160 163 - 170 171 183 184 192 194 197 208 215 221 222 226 227 236 253 277 - - ./check -qcow2 028 051 056 057 058 065 068 082 085 091 095 096 102 1= 22 - 124 132 139 142 144 145 151 152 155 157 165 194 196 197 200 202 - 208 209 215 216 218 222 227 234 246 247 248 250 254 255 257 258 - 260 261 262 263 264 270 272 273 277 279 - -build-user: - extends: .native_build_job_template - needs: - job: amd64-debian-user-cross-container - variables: - IMAGE: debian-all-test-cross - CONFIGURE_ARGS: --disable-tools --disable-system - MAKE_CHECK_ARGS: check-tcg - -build-user-static: - extends: .native_build_job_template - needs: - job: amd64-debian-user-cross-container - variables: - IMAGE: debian-all-test-cross - CONFIGURE_ARGS: --disable-tools --disable-system --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 an optional dependen= cy -# declared. The image is manually uploaded. -build-user-hexagon: - extends: .native_build_job_template - needs: - job: hexagon-cross-container - optional: true - variables: - IMAGE: debian-hexagon-cross - TARGETS: hexagon-linux-user - CONFIGURE_ARGS: --disable-tools --disable-docs --enable-debug-tcg - MAKE_CHECK_ARGS: check-tcg - -# Only build the softmmu targets we have check-tcg tests for -build-some-softmmu: - extends: .native_build_job_template - needs: - job: amd64-debian-user-cross-container - variables: - IMAGE: debian-all-test-cross - CONFIGURE_ARGS: --disable-tools --enable-debug - TARGETS: xtensa-softmmu arm-softmmu aarch64-softmmu alpha-softmmu - MAKE_CHECK_ARGS: check-tcg - -# Run check-tcg against linux-user (with plugins) -# we skip sparc64-linux-user until it has been fixed somewhat -# we skip cris-linux-user as it doesn't use the common run loop -build-user-plugins: - extends: .native_build_job_template - needs: - job: amd64-debian-user-cross-container - variables: - IMAGE: debian-all-test-cross - CONFIGURE_ARGS: --disable-tools --disable-system --enable-plugins --en= able-debug-tcg --target-list-exclude=3Dsparc64-linux-user,cris-linux-user - MAKE_CHECK_ARGS: check-tcg - timeout: 1h 30m - -build-some-softmmu-plugins: - extends: .native_build_job_template - needs: - job: amd64-debian-user-cross-container - variables: - IMAGE: debian-all-test-cross - CONFIGURE_ARGS: --disable-tools --disable-user --enable-plugins --enab= le-debug-tcg - TARGETS: xtensa-softmmu arm-softmmu aarch64-softmmu alpha-softmmu - MAKE_CHECK_ARGS: check-tcg - -clang-system: - extends: .native_build_job_template - needs: - job: amd64-fedora-container - variables: - IMAGE: fedora - CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ - --extra-cflags=3D-fsanitize=3Dundefined --extra-cflags=3D-fno-saniti= ze-recover=3Dundefined - TARGETS: alpha-softmmu arm-softmmu m68k-softmmu mips64-softmmu - ppc-softmmu s390x-softmmu - MAKE_CHECK_ARGS: check-qtest check-tcg - -clang-user: - extends: .native_build_job_template - needs: - job: amd64-debian-user-cross-container - variables: - IMAGE: debian-all-test-cross - CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ --disable-system - --target-list-exclude=3Dmicroblazeel-linux-user,aarch64_be-linux-use= r,i386-linux-user,m68k-linux-user,mipsn32el-linux-user,xtensaeb-linux-user - --extra-cflags=3D-fsanitize=3Dundefined --extra-cflags=3D-fno-saniti= ze-recover=3Dundefined - MAKE_CHECK_ARGS: check-unit check-tcg - -# Set LD_JOBS=3D1 because this requires LTO and ld consumes a large amount= of memory. -# On gitlab runners, default value sometimes end up calling 2 lds concurre= ntly and -# triggers an Out-Of-Memory error -# -# Since slirp callbacks are used in QEMU Timers, slirp needs to be compile= d together -# with QEMU and linked as a static library to avoid false positives in CFI= checks. -# This can be accomplished by using -enable-slirp=3Dgit, which avoids the = use of -# a system-wide version of the library -# -# Split in three sets of build/check/acceptance to limit the execution tim= e of each -# job -build-cfi-aarch64: - extends: .native_build_job_template - needs: - - job: amd64-fedora-container - variables: - LD_JOBS: 1 - AR: llvm-ar - IMAGE: fedora - CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ --enable-cfi --enable-cfi= -debug - --enable-safe-stack --enable-slirp=3Dgit - TARGETS: aarch64-softmmu - MAKE_CHECK_ARGS: check-build - timeout: 70m - artifacts: - expire_in: 2 days - paths: - - build - -check-cfi-aarch64: - extends: .native_test_job_template - needs: - - job: build-cfi-aarch64 - artifacts: true - variables: - IMAGE: fedora - MAKE_CHECK_ARGS: check - -acceptance-cfi-aarch64: - extends: .acceptance_test_job_template - needs: - - job: build-cfi-aarch64 - artifacts: true - variables: - IMAGE: fedora - MAKE_CHECK_ARGS: check-acceptance - -build-cfi-ppc64-s390x: - extends: .native_build_job_template - needs: - - job: amd64-fedora-container - variables: - LD_JOBS: 1 - AR: llvm-ar - IMAGE: fedora - CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ --enable-cfi --enable-cfi= -debug - --enable-safe-stack --enable-slirp=3Dgit - TARGETS: ppc64-softmmu s390x-softmmu - MAKE_CHECK_ARGS: check-build - timeout: 70m - artifacts: - expire_in: 2 days - paths: - - build - -check-cfi-ppc64-s390x: - extends: .native_test_job_template - needs: - - job: build-cfi-ppc64-s390x - artifacts: true - variables: - IMAGE: fedora - MAKE_CHECK_ARGS: check - -acceptance-cfi-ppc64-s390x: - extends: .acceptance_test_job_template - needs: - - job: build-cfi-ppc64-s390x - artifacts: true - variables: - IMAGE: fedora - MAKE_CHECK_ARGS: check-acceptance - -build-cfi-x86_64: - extends: .native_build_job_template - needs: - - job: amd64-fedora-container - variables: - LD_JOBS: 1 - AR: llvm-ar - IMAGE: fedora - CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ --enable-cfi --enable-cfi= -debug - --enable-safe-stack --enable-slirp=3Dgit - TARGETS: x86_64-softmmu - MAKE_CHECK_ARGS: check-build - timeout: 70m - artifacts: - expire_in: 2 days - paths: - - build - -check-cfi-x86_64: - extends: .native_test_job_template - needs: - - job: build-cfi-x86_64 - artifacts: true - variables: - IMAGE: fedora - MAKE_CHECK_ARGS: check - -acceptance-cfi-x86_64: - extends: .acceptance_test_job_template - needs: - - job: build-cfi-x86_64 - artifacts: true - variables: - IMAGE: fedora - MAKE_CHECK_ARGS: check-acceptance - -tsan-build: - extends: .native_build_job_template - needs: - job: amd64-ubuntu2004-container - variables: - IMAGE: ubuntu2004 - CONFIGURE_ARGS: --enable-tsan --cc=3Dclang-10 --cxx=3Dclang++-10 - --enable-trace-backends=3Dust --enable-fdt=3Dsystem --enable-sli= rp=3Dsystem - TARGETS: x86_64-softmmu ppc64-softmmu riscv64-softmmu x86_64-linux-user - MAKE_CHECK_ARGS: bench V=3D1 - -# These targets are on the way out -build-deprecated: - extends: .native_build_job_template - needs: - job: amd64-debian-user-cross-container - variables: - IMAGE: debian-all-test-cross - CONFIGURE_ARGS: --disable-tools - MAKE_CHECK_ARGS: build-tcg - TARGETS: ppc64abi32-linux-user - artifacts: - expire_in: 2 days - paths: - - build - -# We split the check-tcg step as test failures are expected but we still -# want to catch the build breaking. -check-deprecated: - extends: .native_test_job_template - needs: - - job: build-deprecated - artifacts: true - variables: - IMAGE: debian-all-test-cross - MAKE_CHECK_ARGS: check-tcg - allow_failure: true - -# gprof/gcov are GCC features -gprof-gcov: - extends: .native_build_job_template - needs: - job: amd64-ubuntu2004-container - variables: - IMAGE: ubuntu2004 - CONFIGURE_ARGS: --enable-gprof --enable-gcov - MAKE_CHECK_ARGS: check - TARGETS: aarch64-softmmu ppc64-softmmu s390x-softmmu x86_64-softmmu - timeout: 70m - after_script: - - ${CI_PROJECT_DIR}/scripts/ci/coverage-summary.sh - -build-oss-fuzz: - extends: .native_build_job_template - needs: - job: amd64-fedora-container - variables: - IMAGE: fedora - script: - - mkdir build-oss-fuzz - - CC=3D"clang" CXX=3D"clang++" CFLAGS=3D"-fsanitize=3Daddress" - ./scripts/oss-fuzz/build.sh - - export ASAN_OPTIONS=3D"fast_unwind_on_malloc=3D0" - - for fuzzer in $(find ./build-oss-fuzz/DEST_DIR/ -executable -type f - | grep -v slirp); do - grep "LLVMFuzzerTestOneInput" ${fuzzer} > /dev/null 2>&1 || contin= ue ; - echo Testing ${fuzzer} ... ; - "${fuzzer}" -runs=3D1 -seed=3D1 || exit 1 ; - done - # Unrelated to fuzzer: run some tests with -fsanitize=3Daddress - - cd build-oss-fuzz && make check-qtest-i386 check-unit - -build-tci: - extends: .native_build_job_template - needs: - job: amd64-debian-user-cross-container - variables: - IMAGE: debian-all-test-cross - script: - - TARGETS=3D"aarch64 alpha arm hppa m68k microblaze ppc64 s390x x86_64" - - mkdir build - - cd build - - ../configure --enable-tcg-interpreter - --target-list=3D"$(for tg in $TARGETS; do echo -n ${tg}'-softmmu '= ; done)" || { cat config.log meson-logs/meson-log.txt && exit 1; } - - make -j"$JOBS" - - make tests/qtest/boot-serial-test tests/qtest/cdrom-test tests/qtest= /pxe-test - - for tg in $TARGETS ; do - export QTEST_QEMU_BINARY=3D"./qemu-system-${tg}" ; - ./tests/qtest/boot-serial-test || exit 1 ; - ./tests/qtest/cdrom-test || exit 1 ; - done - - QTEST_QEMU_BINARY=3D"./qemu-system-x86_64" ./tests/qtest/pxe-test - - QTEST_QEMU_BINARY=3D"./qemu-system-s390x" ./tests/qtest/pxe-test -m = slow - - make check-tcg - -# Alternate coroutines implementations are only really of interest to KVM = users -# However we can't test against KVM on Gitlab-CI so we can only run unit t= ests -build-coroutine-sigaltstack: - extends: .native_build_job_template - needs: - job: amd64-ubuntu2004-container - variables: - IMAGE: ubuntu2004 - CONFIGURE_ARGS: --with-coroutine=3Dsigaltstack --disable-tcg - --enable-trace-backends=3Dftrace - MAKE_CHECK_ARGS: check-unit - -# Most jobs test latest gcrypt or nettle builds -# -# These jobs test old gcrypt and nettle from RHEL7 -# which had some API differences. -crypto-old-nettle: - extends: .native_build_job_template - needs: - job: amd64-centos7-container - variables: - IMAGE: centos7 - TARGETS: x86_64-softmmu x86_64-linux-user - CONFIGURE_ARGS: --disable-gcrypt --enable-nettle - MAKE_CHECK_ARGS: check - -crypto-old-gcrypt: - extends: .native_build_job_template - needs: - job: amd64-centos7-container - variables: - IMAGE: centos7 - TARGETS: x86_64-softmmu x86_64-linux-user - CONFIGURE_ARGS: --disable-nettle --enable-gcrypt - MAKE_CHECK_ARGS: check - -crypto-only-gnutls: - extends: .native_build_job_template - needs: - job: amd64-centos7-container - variables: - IMAGE: centos7 - TARGETS: x86_64-softmmu x86_64-linux-user - CONFIGURE_ARGS: --disable-nettle --disable-gcrypt --enable-gnutls - MAKE_CHECK_ARGS: check - - -# Check our reduced build configurations -build-without-default-devices: - extends: .native_build_job_template - needs: - job: amd64-centos8-container - variables: - IMAGE: centos8 - CONFIGURE_ARGS: --without-default-devices --disable-user - -build-without-default-features: - extends: .native_build_job_template - needs: - job: amd64-debian-container - variables: - IMAGE: debian-amd64 - CONFIGURE_ARGS: --without-default-features --disable-user - --target-list-exclude=3Darm-softmmu,i386-softmmu,mipsel-softmmu,mi= ps64-softmmu,ppc-softmmu - MAKE_CHECK_ARGS: check-unit - -build-libvhost-user: - stage: build - image: $CI_REGISTRY_IMAGE/qemu/fedora:latest - needs: - job: amd64-fedora-container - before_script: - - dnf install -y meson ninja-build - script: - - mkdir subprojects/libvhost-user/build - - cd subprojects/libvhost-user/build - - meson - - ninja - -# No targets are built here, just tools, docs, and unit tests. This -# also feeds into the eventual documentation deployment steps later -build-tools-and-docs-debian: - extends: .native_build_job_template - needs: - job: amd64-debian-container - variables: - IMAGE: debian-amd64 - MAKE_CHECK_ARGS: check-unit check-softfloat ctags TAGS cscope - CONFIGURE_ARGS: --disable-system --disable-user --enable-docs --enable= -tools - artifacts: - expire_in: 2 days - paths: - - build - -# Prepare for GitLab pages deployment. Anything copied into the -# "public" directory will be deployed to $USER.gitlab.io/$PROJECT -pages: - image: $CI_REGISTRY_IMAGE/qemu/debian-amd64:latest - stage: test - needs: - - job: build-tools-and-docs-debian - script: - - mkdir -p public - # HTML-ised source tree - - make gtags - - htags -anT --tree-view=3Dfiletree -m qemu_init - -t "Welcome to the QEMU sourcecode" - - mv HTML public/src - # Project documentation - - make -C build install DESTDIR=3D$(pwd)/temp-install - - mv temp-install/usr/local/share/doc/qemu/* public/ - artifacts: - paths: - - public --=20 2.26.3 From nobody Fri May 17 08:39:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) client-ip=209.85.221.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1622063980; cv=none; d=zohomail.com; s=zohoarc; b=S4R5V94GOFhOnNTuXY5+V/g7r7hVbFkJtbFbsmr3NVwZQE9IbstP4KviIugn5xMNy08y4kitWeT24Xt6KSQqATkTkTtG3zXSqUvwsXiIDlrQGAGZAivzo5uX0CdlrRXFxKOOIaEYac/c/v7+0qjllUJXaq22d9YwAA1KiVlX2WI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622063980; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=j6j9YrZTaq5jWzBey0qvSrBDDImcEHz2FSmzTTCG5t4=; b=IsI2Dp0K25AecEx4IU4csby1yYyck9fRDYoNoxUxpzwKfAaqkKhfPWRP1e5SgYC6Bndj+1w3haj4R2ark9KdSGEuQASpU2moqsETf57YWYgGn3In5IBIfZBtDYbsfOAXx9UVtFf0nzPy3tSPWdzucgbC7MHcDByJ806dprtR14U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.zohomail.com with SMTPS id 1622063980908150.86022502095648; Wed, 26 May 2021 14:19:40 -0700 (PDT) Received: by mail-wr1-f46.google.com with SMTP id r12so2567554wrp.1 for ; Wed, 26 May 2021 14:19:40 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (235.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.235]) by smtp.gmail.com with ESMTPSA id u26sm290708wmn.19.2021.05.26.14.19.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 14:19:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=j6j9YrZTaq5jWzBey0qvSrBDDImcEHz2FSmzTTCG5t4=; b=BlneFHuPdp2PjI52d9eCDei3jOcpkfuYiZOXXzjOt5iSiFnCs9pu9GRcX05xK3NDvv cmSArrFAKthCThofLO3UiH3GVwjlOubPlcW0NijsjSleqHt5iCuskwjDjJRxyU8A9dA1 jPY9ccFQMPfqlc0i8K8os5e4PqhQeomittNF6IU09ybcLzIUrQsksxKhl1lfO5rQjQ4m +rVOTgfayM+1porLscmbZ1aFZoVgReveoeKyJMz/p3c5wJzAwasqtXjjXBqGXWV0K0Bi cqzkqbfPzyIuQJM9vueJ1W/wCOaRE9TfV4XeAAFwtZx6u5+u+SbRQUbj/JHRGBQrDzsE YExw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=j6j9YrZTaq5jWzBey0qvSrBDDImcEHz2FSmzTTCG5t4=; b=qsybljMAW9STPnJxC6UTYNfy4VCsfZsv7WyPnI9iwBrjhwdLelnxWZwCie1dat7yuQ H+ixmvjwzTO5HoMrnebNNbUyCvvmXDFKcTcR42msE7/tYLK9b+JrgBnWQsNQDs7XaFrW Wb2eumsGr/zxM2wjTX5sAXw31VMBJN8S5yD3isVc+yfRL4Wv4TeXReXi8wk++gkMWBTH 5a3fkpU5SdNMixPGHhLvyPU/qqTHd7Sq6WPRMdjpLlGMlV/XAamY+29ideKQDo0e4/8s s/MwcRvvu8izfjk6b3I2Y28vPhcSapTTikPGpMadi/fw1ma8dfidRN5m6KKUcq5IrWKT b8Mg== X-Gm-Message-State: AOAM5332i9OvIGM09tBNqEUvzAlWh35n8gTZndMPvv5pC/vKYRdHGM+N V3i79puxUTFt89+96LfUJVw= X-Google-Smtp-Source: ABdhPJycEG85ixpawyLp8uhoQ3DfaaLjdGIUt2RVcPOqMNv/iGSFoviTk+l2McePtTv+3awXTse/Nw== X-Received: by 2002:adf:cc81:: with SMTP id p1mr33933522wrj.175.1622063979117; Wed, 26 May 2021 14:19:39 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta Subject: [PULL 12/19] gitlab: Move current job set to qemu-project.yml Date: Wed, 26 May 2021 23:18:31 +0200 Message-Id: <20210526211838.421716-13-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210526211838.421716-1-f4bug@amsat.org> References: <20210526211838.421716-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) To allow forks to easily decide which jobs they want to run, but without disrupting the current default, move the current set of jobs to a new file corresponding to the jobs run by the mainstream project CI: https://gitlab.com/qemu-project/qemu/-/pipelines Reviewed-by: Willian Rampazzo Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Message-Id: <20210511072952.2813358-11-f4bug@amsat.org> --- .gitlab-ci.d/qemu-project.yml | 11 +++++++++++ .gitlab-ci.yml | 8 +------- 2 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 .gitlab-ci.d/qemu-project.yml diff --git a/.gitlab-ci.d/qemu-project.yml b/.gitlab-ci.d/qemu-project.yml new file mode 100644 index 00000000000..64cb2ba1da5 --- /dev/null +++ b/.gitlab-ci.d/qemu-project.yml @@ -0,0 +1,11 @@ +# This file contains the set of jobs run by the QEMU project: +# https://gitlab.com/qemu-project/qemu/-/pipelines + +include: + - local: '/.gitlab-ci.d/stages.yml' + - local: '/.gitlab-ci.d/edk2.yml' + - local: '/.gitlab-ci.d/opensbi.yml' + - local: '/.gitlab-ci.d/containers.yml' + - local: '/.gitlab-ci.d/crossbuilds.yml' + - local: '/.gitlab-ci.d/buildtest.yml' + - local: '/.gitlab-ci.d/static_checks.yml' diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aea58813a25..533a7e61339 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,2 @@ include: - - local: '/.gitlab-ci.d/stages.yml' - - local: '/.gitlab-ci.d/edk2.yml' - - local: '/.gitlab-ci.d/opensbi.yml' - - local: '/.gitlab-ci.d/containers.yml' - - local: '/.gitlab-ci.d/crossbuilds.yml' - - local: '/.gitlab-ci.d/buildtest.yml' - - local: '/.gitlab-ci.d/static_checks.yml' + - local: '/.gitlab-ci.d/qemu-project.yml' --=20 2.26.3 From nobody Fri May 17 08:39:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) client-ip=209.85.128.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1622063985; cv=none; d=zohomail.com; s=zohoarc; b=Zpt+vQBUiowUv7evy4YEDhJp9+0CPnnqhQI7EqUOWN0UgL9TzIKmwZP0kJCR8ni+5MRd/w8JEy5T7dZPJuce6yspWuEq3Fcw4R6LqJW8NrRwlmpESMCZOtx+MAX5zajYt1Dd5SNvcDzCpuzEtlKiH75TdzkDnel5lGkFimfpKYU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622063985; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=c/9em1Rc0w7uvJ9uL6InauPjExLfDiqhVvlPxi7IGY4=; b=DEpQxwkC1ihqDY+5zFo15BMEFwUKEzuCxIs8Nclouh87GMOPNbOfs68pv2nD34Uyzc6JX0VTSbcDgXvkAktPyg/qy1ESwGwe6FjZZawQR7/GPdbL6bFbRCUX6SzrA4zYAHCVF+XGDkBXbwXxFaAwt9V7VBnx3eFbiSpnSwMo0KE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mx.zohomail.com with SMTPS id 1622063985664304.852962731184; Wed, 26 May 2021 14:19:45 -0700 (PDT) Received: by mail-wm1-f44.google.com with SMTP id n17-20020a7bc5d10000b0290169edfadac9so1368864wmk.1 for ; Wed, 26 May 2021 14:19:45 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (235.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.235]) by smtp.gmail.com with ESMTPSA id f6sm211840wru.72.2021.05.26.14.19.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 14:19:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=c/9em1Rc0w7uvJ9uL6InauPjExLfDiqhVvlPxi7IGY4=; b=kc7z+v2luTx1XPNejLrkbj5gV24xfeee+dCBr0GRz2BdwfEkhGsGuFydBquDPYwKGp Nku8NQpDfdfb5HDRORRCoLC4/n123Xpi1Q7raCyeptzM6EfwfaMyOXcW2u6a67tXkXuE LqJHpsI32Agq5fqjgh7cI4qRGwOZ9QWujbUSYLkilkO0LooH1HVR1NFnYq9Sy3j/4bRZ PgKiWNKvvFR/gFphDFbofCG3wWrIMUaQdmL2YXbqPEW3+AsWfzRNYhJzyvUUzw/IkLw9 QYvDgtRf4ZRwSGGMRCkHNXjpWzFMeGu83tgcTAd5hv6nbc6cCXoP0Z2utibaLHsdW1rN EstA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=c/9em1Rc0w7uvJ9uL6InauPjExLfDiqhVvlPxi7IGY4=; b=hYs7gRrQWJrjMhTKmBPRMRGvdQTD9V2bkN/rQjFL9iMYJsxQfYHn0DOmErcYoavRtw OwKTM+Pi2ePFN8WfIGpfVZBhZzCHJpSDYBV0NuCFJSGS1psZ+/hClZmRL3WbHilpfT9m 2P1w+J1DyD5h1Tg+njGZfBy44tqlPMDp+lk98eNK6Q9N1MkEZ69qCRMpBjO9HEDB8IpV SZBsKJc1/HZZjM8GQ8IzGAjn/PF32vNu2t7kqOs6/z4tuTKWwDT3Ay8PhPk6+qFZrFLz G98OTk/wC44AoLOPhS8S0gas5qhh7ucNmso4AR/Ie+0+jc/CynW8cTfHAIAq22ezpiWX 3MCg== X-Gm-Message-State: AOAM532FY+v4WdEmyIwFcxKuxPAH/i//nJPZ4sf7fj6cwSv4dyUefpmV l1LGo4wff7f7vcaBBwxhFm0= X-Google-Smtp-Source: ABdhPJy/rg0JdE1n5TtKXxoY/+ruJN9SQ4iobXwODNZiiyANNQSIrNYePCw1ElNFdC8DpysFh4QGkw== X-Received: by 2002:a1c:a7c2:: with SMTP id q185mr327296wme.112.1622063983990; Wed, 26 May 2021 14:19:43 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20Berrang=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta , Willian Rampazzo Subject: [PULL 13/19] gitlab: Document how forks can use different set of jobs Date: Wed, 26 May 2021 23:18:32 +0200 Message-Id: <20210526211838.421716-14-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210526211838.421716-1-f4bug@amsat.org> References: <20210526211838.421716-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Document how forks can use different set of jobs and add a big warning so no new configuration is added to this file. Suggested-by: Daniel Berrang=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Message-Id: <20210525082556.4011380-4-f4bug@amsat.org> --- .gitlab-ci.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 533a7e61339..7e4ffab4d11 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,2 +1,15 @@ +# +# This is the GitLab CI configuration file for the mainstream QEMU +# project: https://gitlab.com/qemu-project/qemu/-/pipelines +# +# !!! DO NOT ADD ANY NEW CONFIGURATION TO THIS FILE !!! +# +# Only documentation or comments is accepted. +# +# To use a different set of jobs than the mainstream QEMU project, +# you need to set the location of your custom yml file at "custom CI/CD +# configuration path", on your GitLab CI namespace: +# https://docs.gitlab.com/ee/ci/pipelines/settings.html#custom-cicd-config= uration-path +# include: - local: '/.gitlab-ci.d/qemu-project.yml' --=20 2.26.3 From nobody Fri May 17 08:39:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1622063990; cv=none; d=zohomail.com; s=zohoarc; b=UXuEB+UtxonzCiNnMTZW1+Cz+AHNUdN/nziqgGxkQ39bGjhZVnBOXnOIVCi6Mi9+JkjW4YgsFSHPp5HDoqMv54OJFKgobv3Zms6naclVBcrHMK6RbhAet5IL1ZeFTMA5TOssuPQs24P+OA4hjbzDmm0/aBmKsoQP3lOiJy9ispQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622063990; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1KWkuZlvY+TLAeYBW8QJth9AmRm0grBKq41zaEW21NE=; b=iF8hzvvLGNAzjLCLMb1TM9aIpC3RgdETgiPfNwJomKImBIXrWSsO8y1ejVrWC9DV7ra1V0sOqADC3A/uKR7liRTujRKcvUMcZCYzjtjFh6Ak7VoehuDpb0AS1tqB6K3+5MOFRIxvahiebEA4pwP9YZTfK1qsptynN892zsECQqk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 1622063990590746.7129820134921; Wed, 26 May 2021 14:19:50 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id m18so2575231wrv.2 for ; Wed, 26 May 2021 14:19:50 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (235.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.235]) by smtp.gmail.com with ESMTPSA id s5sm280793wmh.37.2021.05.26.14.19.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 14:19:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1KWkuZlvY+TLAeYBW8QJth9AmRm0grBKq41zaEW21NE=; b=anS8Ci3PrDQicJR/mex9OVubxcO4hi3CDMHTLRgGJbJRK69yWQF8LVuLGiYCCHqRzh fUYVTeOog/AAEomQN3b749hEohjHkxs9g2hsHQKmOjGS5GrakFsYIcCX4cSBK3oorMmC rVF/rDsh/KhE7bzqFKcBAIlQTzLPcnh/B3RjSt7bSVHsAehRb9hKUuL8gEQwHDmU25Wk lwvRaH4Qho/2t/+IRCXR0Vp9+oGWBv+TYoO9BupWGyxJxlwOd2IhClfM4TLHBkcAyXU8 bFBz4rPewXzDTC0pBEY108OUErOpOw26x59alRRcqKDHeuUZsxWiblOb70Az7c+vzMRz cb8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=1KWkuZlvY+TLAeYBW8QJth9AmRm0grBKq41zaEW21NE=; b=mzjSBSEMgJl8wNbOaZcf51ilAC3ZC1FR1VUKNC7aYType2OGl19QxvTviTpVvTn6is U8p1Sjk20HmAgGnqFMqlSoOLllZMRQ7g+cWRAk3ILk6PLlW7h1PtppzQxe72fOo8uMca rUH7L158Ijj/ASI8xA9wXrvVAdCmdTAIUoHWk9NO5/5uEf5y/UKvPYhgULsFLD3/urDT AhEAUQNj5CwiESdP5YGpqAzz+XSHwa/mLufshUJmCFHNlM2g1in7XQzZznNPNoB81h1V B0+HiBVSOvAkOE8T16RhpuAgusqq3meC0IPji1j66nmlPbFQqPq3CchXDGG7fPUobR16 VNBQ== X-Gm-Message-State: AOAM530Monb3EnvxuLmvTTXq7eaOwoxOJ6W+VcyTkfinpuVXLIC8SVd+ Sl0J/TXbBZpAHXz9JGIhfb4= X-Google-Smtp-Source: ABdhPJxEMAl4/qoN4Rok/ayA4vsV3GgKwov5Oat0gvir1asl7wZoDiWnLsO+eylUbKnz2Nb0yNQ4vA== X-Received: by 2002:a05:6000:511:: with SMTP id a17mr34783723wrf.351.1622063988803; Wed, 26 May 2021 14:19:48 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Willian Rampazzo , Wainer dos Santos Moschetta Subject: [PULL 14/19] gitlab: Extract cross-container jobs to container-cross.yml Date: Wed, 26 May 2021 23:18:33 +0200 Message-Id: <20210526211838.421716-15-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210526211838.421716-1-f4bug@amsat.org> References: <20210526211838.421716-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Extract the jobs preparing the cross containers into a new file (container-cross.yml). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Willian Rampazzo Message-Id: <20210525082556.4011380-5-f4bug@amsat.org> --- .gitlab-ci.d/container-cross.yml | 192 ++++++++++++++++++++++++++++++ .gitlab-ci.d/containers.yml | 194 +------------------------------ 2 files changed, 193 insertions(+), 193 deletions(-) create mode 100644 .gitlab-ci.d/container-cross.yml diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cros= s.yml new file mode 100644 index 00000000000..0fcebe363a4 --- /dev/null +++ b/.gitlab-ci.d/container-cross.yml @@ -0,0 +1,192 @@ +alpha-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-alpha-cross + +amd64-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-amd64-cross + +amd64-debian-user-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-all-test-cross + +arm64-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-arm64-cross + +arm64-test-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian11-container'] + variables: + NAME: debian-arm64-test-cross + +armel-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-armel-cross + +armhf-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-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: + image: docker:stable + stage: containers + rules: + - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project"' + when: never + - when: always + variables: + NAME: debian-hexagon-cross + GIT_DEPTH: 1 + services: + - docker:dind + before_script: + - export TAG=3D"$CI_REGISTRY_IMAGE/qemu/$NAME:latest" + - export COMMON_TAG=3D"$CI_REGISTRY/qemu-project/qemu/qemu/$NAME:lates= t" + - docker info + - docker login $CI_REGISTRY -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PA= SSWORD" + script: + - echo "TAG:$TAG" + - echo "COMMON_TAG:$COMMON_TAG" + - docker pull $COMMON_TAG + - docker tag $COMMON_TAG $TAG + - docker push "$TAG" + after_script: + - docker logout + +hppa-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-hppa-cross + +m68k-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-m68k-cross + +mips64-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-mips64-cross + +mips64el-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-mips64el-cross + +mips-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-mips-cross + +mipsel-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-mipsel-cross + +powerpc-test-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian11-container'] + variables: + NAME: debian-powerpc-test-cross + +ppc64el-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-ppc64el-cross + +riscv64-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-riscv64-cross + +s390x-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-s390x-cross + +sh4-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-sh4-cross + +sparc64-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-sparc64-cross + +tricore-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-tricore-cross + +xtensa-debian-cross-container: + extends: .container_job_template + variables: + NAME: debian-xtensa-cross + +cris-fedora-cross-container: + extends: .container_job_template + variables: + NAME: fedora-cris-cross + +i386-fedora-cross-container: + extends: .container_job_template + variables: + NAME: fedora-i386-cross + +win32-fedora-cross-container: + extends: .container_job_template + variables: + NAME: fedora-win32-cross + +win64-fedora-cross-container: + extends: .container_job_template + variables: + NAME: fedora-win64-cross diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 0acc8381ac1..bd01ae8f802 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -1,5 +1,6 @@ include: - local: '/.gitlab-ci.d/container-core.yml' + - local: '/.gitlab-ci.d/container-cross.yml' =20 amd64-alpine-container: extends: .container_job_template @@ -16,27 +17,6 @@ amd64-debian11-container: variables: NAME: debian11 =20 -alpha-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-alpha-cross - -amd64-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-amd64-cross - -amd64-debian-user-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-all-test-cross - amd64-debian-container: extends: .container_job_template stage: containers-layer2 @@ -44,178 +24,6 @@ amd64-debian-container: variables: NAME: debian-amd64 =20 -arm64-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-arm64-cross - -arm64-test-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian11-container'] - variables: - NAME: debian-arm64-test-cross - -armel-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-armel-cross - -armhf-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-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: - image: docker:stable - stage: containers - rules: - - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project"' - when: never - - when: always - variables: - NAME: debian-hexagon-cross - GIT_DEPTH: 1 - services: - - docker:dind - before_script: - - export TAG=3D"$CI_REGISTRY_IMAGE/qemu/$NAME:latest" - - export COMMON_TAG=3D"$CI_REGISTRY/qemu-project/qemu/qemu/$NAME:lates= t" - - docker info - - docker login $CI_REGISTRY -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PA= SSWORD" - script: - - echo "TAG:$TAG" - - echo "COMMON_TAG:$COMMON_TAG" - - docker pull $COMMON_TAG - - docker tag $COMMON_TAG $TAG - - docker push "$TAG" - after_script: - - docker logout - -hppa-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-hppa-cross - -m68k-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-m68k-cross - -mips64-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-mips64-cross - -mips64el-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-mips64el-cross - -mips-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-mips-cross - -mipsel-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-mipsel-cross - -powerpc-test-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian11-container'] - variables: - NAME: debian-powerpc-test-cross - -ppc64el-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-ppc64el-cross - -riscv64-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-riscv64-cross - -s390x-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-s390x-cross - -sh4-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-sh4-cross - -sparc64-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-sparc64-cross - -tricore-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-tricore-cross - -xtensa-debian-cross-container: - extends: .container_job_template - variables: - NAME: debian-xtensa-cross - -cris-fedora-cross-container: - extends: .container_job_template - variables: - NAME: fedora-cris-cross - -i386-fedora-cross-container: - extends: .container_job_template - variables: - NAME: fedora-i386-cross - -win32-fedora-cross-container: - extends: .container_job_template - variables: - NAME: fedora-win32-cross - -win64-fedora-cross-container: - extends: .container_job_template - variables: - NAME: fedora-win64-cross - amd64-ubuntu1804-container: extends: .container_job_template variables: --=20 2.26.3 From nobody Fri May 17 08:39:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) client-ip=209.85.221.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1622063996; cv=none; d=zohomail.com; s=zohoarc; b=aNmQpFe3LXbAwx22bl1K4gKwoCBGVozaR7NG6sxRZzeCLCRHOTAOs1cLUxZvt5b8FmFxH3g1qttqC0wWf3zlDER/MARr5e0e9vyMk5rrnWSr03jFQs7rPaHO2Or+gzD0UDfn+8xEDkdzu6B9mdi00d01cOkur2lN1k8v77zX8jI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622063996; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=AyPLI6JLUcbjYeHJDUpwGJGLFNpEvS/d73n7elFgK6w=; b=b9+0cNPte7VmTAqx+xYfqxscvBg3gkcDuIM29YI0CWrxNjfgRA3l/WdmA/PBLeLxLZO3dol3PiQvqtQfGhHAayJsFaJaTmNE5yzqD14LmXOlOelgAGn6XT/x0CQiakpKQ6ZL6ZDSSjlkEkOuyG1laTexUa6oWGXIfV8WikWSwvg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mx.zohomail.com with SMTPS id 1622063996723976.6032591710554; Wed, 26 May 2021 14:19:56 -0700 (PDT) Received: by mail-wr1-f41.google.com with SMTP id r12so2568018wrp.1 for ; Wed, 26 May 2021 14:19:55 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (235.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.235]) by smtp.gmail.com with ESMTPSA id z9sm305498wmi.17.2021.05.26.14.19.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 14:19:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AyPLI6JLUcbjYeHJDUpwGJGLFNpEvS/d73n7elFgK6w=; b=A0E0xhwrkSGZVTLwsUNmEWuHl8kbj7JtQ39tyikvFDlgTFOcCwSSHqc8eLNXquPebf bczlQIE4zKDAIGqpElBQZg0UGS7BqeWKpPLy5IHRDGgxtl74c20d/RNiyksN36a9oLOt 3qyVh4vZKt5e1h4qrOunB3QnKa4UztpqoyOf2ZQjEHk3jyrcHPrWJINham08eodhZ5Y4 wAFOwm0h5rydZ/a4B3bzuXTJGHzKDVNWdxAHPE1U1PnX/j/1hsoAXs9ER+ZE6BsrEWT+ 6kC1LIy2uyv1HeDDD626XJjA/x4mpb1nbeFpd4vO6grGmFOc2f6ucKOPuyqTnuT/dU9r lNlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=AyPLI6JLUcbjYeHJDUpwGJGLFNpEvS/d73n7elFgK6w=; b=jcBO6U7ruGnTDYKti6lYox1PKi4uDMMgPAb1puuIPav5zTjFNpWli1f8UyiNEdtWHG 1oNWQdGdgDCXER0d/kvsO/odh6ikNBY6fdrlXk9Qag0BEHntw8jgkbwmLnFeaRXTnbny BBNhS++CvnZA4TToggsctw3+u+7/OgML8NrED0jsbBetE4tq4AWGd+bBorQV3B9gFu4A kh25I++dbfWgoDi4vJVsxrUEjZkh593XyFEWlJZdHGMBy5+qkz1PP8/cdU0Bn+Meonej eSeCRqjgdaEPY6B1DG0FDunCsHTqWi1MGFAGWZRotITyN8qTfUt4VoJ3eGz3F7ep2aMG KsYg== X-Gm-Message-State: AOAM530pnsEKWIiY0b5Eh6eUjD0gJ9HrHBqQgQYq6MO9ZqNm6tsqrJOc QZQBkCL68iSRY7Fua3Da36M= X-Google-Smtp-Source: ABdhPJyiVxeW8b0wtFhacGima1ynEST+bfmxzXdLXb+YWNyh+gH9zJUKq8RovlTU5cpcp044q9xUUQ== X-Received: by 2002:adf:f386:: with SMTP id m6mr111wro.111.1622063993995; Wed, 26 May 2021 14:19:53 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Willian Rampazzo , Wainer dos Santos Moschetta Subject: [PULL 15/19] gitlab: Keep Avocado reports during 1 week Date: Wed, 26 May 2021 23:18:34 +0200 Message-Id: <20210526211838.421716-16-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210526211838.421716-1-f4bug@amsat.org> References: <20210526211838.421716-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Sometimes pull requests are merged during the week-end, triggering a CI pipeline. Currently if such pipeline fails, the Avocado reports are available for 2 days. For the reviewers working on the project during office hours, the reports are already discarded when they want to look at them. Increase this time to 1 week, which should give reviewers enough time. Only keep the reports on failure, which is the only case we'll look at them. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Willian Rampazzo Message-Id: <20210525082556.4011380-8-f4bug@amsat.org> --- .gitlab-ci.d/buildtest-template.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-t= emplate.yml index 167ee88c410..180bf1aee7e 100644 --- a/.gitlab-ci.d/buildtest-template.yml +++ b/.gitlab-ci.d/buildtest-template.yml @@ -46,8 +46,8 @@ policy: pull-push artifacts: name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" - when: always - expire_in: 2 days + when: on_failure + expire_in: 7 days paths: - build/tests/results/latest/results.xml - build/tests/results/latest/test-results --=20 2.26.3 From nobody Fri May 17 08:39:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) client-ip=209.85.221.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1622064000; cv=none; d=zohomail.com; s=zohoarc; b=eYu6mWWbHUIv7cBv2UfiCd7rszXyp+iv2S7VoJ+hl+0mDwKKvEFG68myBPoenl2puEQXEjYGT5IkTGQEA0JvwDJ1AHco+wpuul9FyJ1mNkMlCypIgckTT8mNTuDKVURdT+SRNHYgiMu+XTWEqtJdb8IPpNy/L3pAtG1tOqXW8sU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622064000; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lIEqgB+giR/wnzQzzV/rr/ZCGepg7sgkPVrarMz2gUg=; b=AX8yqvlH47gHAk8p84ppPzSaFkV1SA5N3BxK7RxmRHBDvhkyHJsu11Ysk7SFZAjT2h5Z7jVWG4kvSvgN1ijoLzBEUyzM1Q8slbbZUQeFlIrH1FriZLr5meLT2UB6HqnWw4CtTBDbUjsGkJ36V7V6/MfEMS05JHJAeNxd5Y4Cc4c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.zohomail.com with SMTPS id 1622064000597818.3802582517718; Wed, 26 May 2021 14:20:00 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id x7so2507062wrt.12 for ; Wed, 26 May 2021 14:20:00 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (235.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.235]) by smtp.gmail.com with ESMTPSA id t5sm8190099wmi.32.2021.05.26.14.19.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 14:19:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lIEqgB+giR/wnzQzzV/rr/ZCGepg7sgkPVrarMz2gUg=; b=EXzMd1pq1WIAyvn0ZmVv3B4AxMN6JuXJ8yYFOM4OI9tuI8ka2XmF1hWWqlm+XET4O8 nj19KmNtG7fKNuBy4wUUVJjfBJRpYvulX9KKbgMdpn4DOMnN6X6B8JZHh4zxZ5jiELcb lvaUe0oCnAoQ1ENRVTGZCSbRjajo+TtKC6WXM3DzVf8fsEFHSzcV/EMKNvbz5M+D/SYc Zz/a2s5gfselVltBbPeuFhX943cvc/V0p5pbKdiYX+IAevuv/VQKvErHcZcOMe6ooJwl n1JVeXjVvH2rNN95WrAP41hS8a5Kalb9UQv2DgadCfioAiiE94EVOsWCmtparfz73gZm OaNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=lIEqgB+giR/wnzQzzV/rr/ZCGepg7sgkPVrarMz2gUg=; b=tlfwAfSXxWXJsx4IWQPJq63WMU+HcqhjyI07KuZJ9shTZSXHDWLmFlVs9PcYf9WD40 odhZeCsP6qFkwfDyUo1pA/mJHvGLQGNxGDobeC81f4SUEkCVt/MbpKWixOdztqvuU32z B+AanS5ASUvafnIMQvFajFTShMcRHHSpVLY/Kvt2pFsFn2N78gS8VvK0hFrvxoqd648a 7PpEpnikzO/GczqLGPH4O/y9O3Wwd/oDebKBwaAhtXNblByu2KFIruM2q2/AHfyxVy3d vSitvh0+ecAUJdpelOUPTR4eja4tBJhCPeaa4Yng525wNhBJOZ36CXSRJg5naLvct1B1 fujA== X-Gm-Message-State: AOAM532xMq3sPtnrYpGvPjfL5I/tT9QGlFCUQCJFfDjs/P1p8z60BGzz 2jXZUzygVBY7NK6fnPL3DuA= X-Google-Smtp-Source: ABdhPJwiulO7kTeSeiAURaIgMIQdYDfyXLDkWfRtuBXKUnachGCEfx9OmfzKf8X/v8d1u/njU3Zklw== X-Received: by 2002:a05:6000:108f:: with SMTP id y15mr403wrw.115.1622063998863; Wed, 26 May 2021 14:19:58 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta , Willian Rampazzo Subject: [PULL 16/19] gitlab: Run Avocado tests manually (except mainstream CI) Date: Wed, 26 May 2021 23:18:35 +0200 Message-Id: <20210526211838.421716-17-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210526211838.421716-1-f4bug@amsat.org> References: <20210526211838.421716-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Due to a design problem and misunderstanding between the Avocado framework and QEMU, Avocado is fetching many asset artifacts it shouldn't be fetching, exhausting the jobs CI timeout. Since Avocado artifacts are cached, this is not an issue with old forks, which already have populated the cache and do not need to download new artifacts to run the tests. However this is very confusing to new contributors who start to fork the project and keep having failing CI pipelines. As a temporary kludge, add the QEMU_CI_AVOCADO_TESTING variable to allow old forks to keep running the Avocado tests, while still allowing new forks to use the mainstream set of CI tests. Keep the tests enabled by default on the mainstream namespace which is old enough to have a populated cache, hoping we will keep this cache long enough until the Avocado/QEMU design issue is fixed. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Message-Id: <20210525082556.4011380-9-f4bug@amsat.org> --- .gitlab-ci.d/buildtest-template.yml | 12 ++++++++++++ .gitlab-ci.yml | 24 ++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-t= emplate.yml index 180bf1aee7e..8e6321c2a38 100644 --- a/.gitlab-ci.d/buildtest-template.yml +++ b/.gitlab-ci.d/buildtest-template.yml @@ -67,3 +67,15 @@ after_script: - cd build - du -chs ${CI_PROJECT_DIR}/avocado-cache + rules: + # Only run these jobs if running on the mainstream namespace, + # or if the user set the QEMU_CI_AVOCADO_TESTING variable (either + # in its namespace setting or via git-push option, see documentation + # in /.gitlab-ci.yml of this repository). + - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project"' + when: always + - if: '$QEMU_CI_AVOCADO_TESTING' + when: always + # Otherwise, set to manual (the jobs are created but not run). + - when: manual + allow_failure: true diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7e4ffab4d11..6dc5385e697 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,5 +11,29 @@ # configuration path", on your GitLab CI namespace: # https://docs.gitlab.com/ee/ci/pipelines/settings.html#custom-cicd-config= uration-path # +# ---------------------------------------------------------------------- +# +# QEMU CI jobs are based on templates. Some templates provide +# user-configurable options, modifiable via configuration variables. +# +# These variables can be set globally in the user's CI namespace +# setting: +# https://docs.gitlab.com/ee/ci/variables/#create-a-custom-variable-in-the= -ui +# or set manually each time a branch/tag is pushed, as a git-push +# command line argument: +# https://docs.gitlab.com/ee/user/project/push_options.html#push-options-f= or-gitlab-cicd +# +# Example setting the QEMU_CI_EXAMPLE_VAR variable: +# +# git push -o ci.variable=3D"QEMU_CI_EXAMPLE_VAR=3Dvalue" myrepo mybranch +# +# ---------------------------------------------------------------------- +# +# List of environment variables that can be use to modify the set +# of jobs selected: +# +# - QEMU_CI_AVOCADO_TESTING +# If set, tests using the Avocado framework will be run + include: - local: '/.gitlab-ci.d/qemu-project.yml' --=20 2.26.3 From nobody Fri May 17 08:39:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) client-ip=209.85.221.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1622064007; cv=none; d=zohomail.com; s=zohoarc; b=MxVeEhapiQDkxU/4t07+hsVAbORRy6TLS8Iu+Et+qwVaObFMCPkx3pEeECoCcezN69GEko4AAlaNRuZjmhdZUaUszCVCm+sXsWMVk764ETh0QWO4rkGdSph6+eUIqOW6GevnH2BFbxUY1nRqMSpdYACNy63JUFdAzlHIxByOF38= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622064007; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7R688np30I5+o18WAIciru1O5zsACw6s83EuiMLwj4I=; b=a9i58lJmNR4+1PnohlE6STQipZVOhISsumWnOydRoDWsSzr8x8MKzEs/INCZMWm474v2amyn2sLPLUjGl/5NzIy0TmwkmHO0CujpdhRaJObSNU7Aq58S4R2tbK0c9R+LHVy0GjYyByRXnChy2Ls+JoeXt2HTLEYl3m+g36LKkXI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.zohomail.com with SMTPS id 1622064007927555.1466445758654; Wed, 26 May 2021 14:20:07 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id j14so2547894wrq.5 for ; Wed, 26 May 2021 14:20:07 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (235.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.235]) by smtp.gmail.com with ESMTPSA id r17sm8420936wmh.25.2021.05.26.14.20.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 14:20:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7R688np30I5+o18WAIciru1O5zsACw6s83EuiMLwj4I=; b=aiAd76s2gfv/wJQWAKsZcrcVEXAs6BEsxSpw7Dx7kVsOvfcd6cF5Pg91IrPd4o7g/9 3D7o2XT0TexDlAeVulcIHZKuDjJfj4nqDM3fk12Ik+E2Yd0Slrjj7PNUioZWNYCDsYG5 i9zmRE8j2ISuTzVCgyfBEuxo/8CCosQnh8F6ehcV1Z1mO5SShfC+9agzn8Goq9INIVzW C6c20iHnnJFASN9euBPwPQj1wwEPZSA8wjukjhjk63ztUr1ZCk4+gDlbjSrtuu3O5Auv 0rD6c6bxyg/ufXusS500by5ioBe2knqRGvZ506XPaKKCN/+IzMIzuTyBRWkM6pl6utHT pWcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=7R688np30I5+o18WAIciru1O5zsACw6s83EuiMLwj4I=; b=pQXnNF0fA8sMWJpyRdzOZCoFlGjasczjMd4oCUsS2qtDvvsd6SvtRBHgI6JsE5fi5S nR1SlbynlN1ah2fbz1h1uiOjiWl6sCvGgZpd2NVcC7e7IJ6QWlBHqITGE/sU1klfEdm2 qoqzLdkGyqNTn/XG5+cWLzC+FtUa9OfXiiklRWzy8aOQ5GDiI3UvQk88JOUK+aHaQs/0 Q4eiHxWvNZ709p1Tif9Ff84q5P2jEdKyLY6eRH94GlAJ6u/dfFAB0sDK6VyCVE9NPIkq GYOf0kfDVUTd6dlKgVqpMQtkkeYP8GjPmumh8UORZb9sUQWKes5FIoI72gQZ90UzTi0Q qReQ== X-Gm-Message-State: AOAM533QEcLzqg8aLjBGjsRhxoqxVeOTcGpC7tN19KOj+si70l8zXvlA Z2Fio+FJEgx47hxj8nr8CNU= X-Google-Smtp-Source: ABdhPJyNogQlTo+siy8/6uGT2zaMm7D94ch07LCuPqIQGHc9urDRe87t0I1yAcPZQJt/ouFp6+ROCw== X-Received: by 2002:a5d:598d:: with SMTP id n13mr27802wri.38.1622064006249; Wed, 26 May 2021 14:20:06 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Savitoj Singh , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta Subject: [PULL 17/19] gitlab: Use $CI_DEFAULT_BRANCH instead of hardcoded 'master' Date: Wed, 26 May 2021 23:18:36 +0200 Message-Id: <20210526211838.421716-18-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210526211838.421716-1-f4bug@amsat.org> References: <20210526211838.421716-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) From: Philippe Mathieu-Daud=C3=A9 We want to skip the checkpatch and DCO signoff jobs when pushing to the default branch. Currently this branch is called 'master', but we don't need to hardcode this in the CI configuration, because the $CI_DEFAULT_BRANCH env variable exposes it. References: - https://sfconservancy.org/news/2020/jun/23/gitbranchname/ - https://about.gitlab.com/blog/2021/03/10/new-git-default-branch-name/ Suggested-by: Savitoj Singh Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210525153826.4174157-1-philmd@redhat.com> Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Willian Rampazzo --- .gitlab-ci.d/static_checks.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.d/static_checks.yml b/.gitlab-ci.d/static_checks.yml index f695627b7cd..9c9a771b744 100644 --- a/.gitlab-ci.d/static_checks.yml +++ b/.gitlab-ci.d/static_checks.yml @@ -6,7 +6,7 @@ check-patch: script: .gitlab-ci.d/check-patch.py except: variables: - - $CI_PROJECT_NAMESPACE =3D=3D 'qemu-project' && $CI_COMMIT_BRANCH = =3D=3D 'master' + - $CI_PROJECT_NAMESPACE =3D=3D 'qemu-project' && $CI_COMMIT_BRANCH = =3D=3D $CI_DEFAULT_BRANCH variables: GIT_DEPTH: 1000 allow_failure: true @@ -19,6 +19,6 @@ check-dco: script: .gitlab-ci.d/check-dco.py except: variables: - - $CI_PROJECT_NAMESPACE =3D=3D 'qemu-project' && $CI_COMMIT_BRANCH = =3D=3D 'master' + - $CI_PROJECT_NAMESPACE =3D=3D 'qemu-project' && $CI_COMMIT_BRANCH = =3D=3D $CI_DEFAULT_BRANCH variables: GIT_DEPTH: 1000 --=20 2.26.3 From nobody Fri May 17 08:39:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) client-ip=209.85.128.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1622064012; cv=none; d=zohomail.com; s=zohoarc; b=iEI3JBfXaglVZJoE3blndbVAaG4ddHMMjQXTyt55Z7GZGA1SFv+C/eMMOApcQ9Ayj3TjYR9JmR74gtbVB7UaTxJhYhRWcURjl48VijyjsSSw02Mjp9vFJdFVeJPHRGAK3/FpSQuhOEWb1WAMBBzXTO+3qIvlUfAS31Yfh64tyh8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622064012; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TY3ef7OherZxOloGST3Aka9cKHY1uYUJOsmuFrhKM3Y=; b=Svu3ICFNFmr2kFGpHi8IVoAC9k/8U5ty/GIFQ+NiaPkYnR25PS3B53jOZnSoH19mbUD79LkJHS/ccJJcv0Z4HUsFwNpqXPojssVOlbeOlpTMuNNDxMODPhtwGFZXmIzogDhpUirQ0hh3+/zvQGsCsEy1vQfsMsYElIqbzKEiO94= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.zohomail.com with SMTPS id 1622064012743441.0860663065962; Wed, 26 May 2021 14:20:12 -0700 (PDT) Received: by mail-wm1-f43.google.com with SMTP id l18-20020a1c79120000b0290181c444b2d0so1291469wme.5 for ; Wed, 26 May 2021 14:20:12 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (235.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.235]) by smtp.gmail.com with ESMTPSA id j10sm187378wrt.32.2021.05.26.14.20.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 14:20:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TY3ef7OherZxOloGST3Aka9cKHY1uYUJOsmuFrhKM3Y=; b=bfjDMKl14OGXzzWkJk+3wdXnxbtImRShNmPgu43FTWW2+fKlWp0ZBUyvbUFrtF9xZG 1wDnwzJxBk03VuNCsBlykxDCdISDFNp6AvqulboyyMnyEV6cMQVRq9RpaRaxwZt0Ffxo wnNKicmbFN5fio9qDpvOLGh8aGrn2DcFpAkiTvztKKwDEdDidD4EAhjXVHF5nomxBMxU a6DdesyYG+61yVhoxLGSNp32rC+p5onpkcd+o0rwMsxNT5iWQbKpHMUwDmw5XPnHCR7P jYfsGJ9Hta3wvruhSH/sE/PqdRiWbq5Q8UoAOKuGsv6806G5KVQTNjE33J3+OWnh6hba Avww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=TY3ef7OherZxOloGST3Aka9cKHY1uYUJOsmuFrhKM3Y=; b=CbsfQHqMLGDFtaoP7JKEeNiUQifyrAUcQM+CKxz1YoDp7OjaLfp/cH8QH2YrlpRtuO b3Xil0rAhSGlgMhgGwNAQRjyLiaDIAOqZ24EI1fgg8LFoVhm2Wo3TRwJkkPl1dKluK+l F34+kxeL8NanuKzbHbyS4Hmk0d4sbsNgalxvIx6+jskz7yDCff5y8UkiIUTkgDvL8jXY hefNyuAMpPrbZDd1ivcNBV8kK/UIyZVevEIIjmuiESi+S8fDV4q4FozkaAF5fpDGAXuY Clo4GiWb95/oSmlJXIANUqmr6w0TzHbF/uG3hOdsoiMWJVzSigRqOXXcJ4rtdomnGjX+ Pk+A== X-Gm-Message-State: AOAM530PPRZKoL5+7siDWgZVgzg6pfPmX2Fod7kXiPz2mmEX+QtOY19K eU+aCL0W4YjihDkS5YK2BlA= X-Google-Smtp-Source: ABdhPJz+dAkHXGt+MoyRUwR26qWm3TITJbwf1VahM8RimAZAPVu+prIIoMJhCV4QKF2+JWpSgShwEQ== X-Received: by 2002:a7b:cb96:: with SMTP id m22mr311301wmi.59.1622064011016; Wed, 26 May 2021 14:20:11 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta Subject: [PULL 18/19] gitlab: Convert check-dco/check-patch jobs to the 'rules' syntax Date: Wed, 26 May 2021 23:18:37 +0200 Message-Id: <20210526211838.421716-19-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210526211838.421716-1-f4bug@amsat.org> References: <20210526211838.421716-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Per GitLab documentation [*]: "rules replaces only/except and they can=E2=80=99t 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=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Willian Rampazzo Message-Id: <20210525132418.4133235-3-f4bug@amsat.org> --- .gitlab-ci.d/static_checks.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.d/static_checks.yml b/.gitlab-ci.d/static_checks.yml index 9c9a771b744..91247a6f670 100644 --- a/.gitlab-ci.d/static_checks.yml +++ b/.gitlab-ci.d/static_checks.yml @@ -4,12 +4,13 @@ check-patch: needs: job: amd64-centos8-container script: .gitlab-ci.d/check-patch.py - except: - variables: - - $CI_PROJECT_NAMESPACE =3D=3D 'qemu-project' && $CI_COMMIT_BRANCH = =3D=3D $CI_DEFAULT_BRANCH variables: GIT_DEPTH: 1000 - allow_failure: true + rules: + - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANC= H =3D=3D $CI_DEFAULT_BRANCH' + when: never + - when: on_success + allow_failure: true =20 check-dco: stage: build @@ -17,8 +18,9 @@ check-dco: needs: job: amd64-centos8-container script: .gitlab-ci.d/check-dco.py - except: - variables: - - $CI_PROJECT_NAMESPACE =3D=3D 'qemu-project' && $CI_COMMIT_BRANCH = =3D=3D $CI_DEFAULT_BRANCH variables: GIT_DEPTH: 1000 + rules: + - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANC= H =3D=3D $CI_DEFAULT_BRANCH' + when: never + - when: on_success --=20 2.26.3 From nobody Fri May 17 08:39:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) client-ip=209.85.221.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1622064017; cv=none; d=zohomail.com; s=zohoarc; b=aLsVD+v0WhhzZxqiZ0T0/Xx1x6yBEDTHuzOEbCM9QE+c+TpzoT1od5YiwZma87chwg1Vvdkz3XeAIQaJ6PbCsrh2bYmAq1oe/wpVJGy8uA4PUzeoYkMBaRBedjLKA5AyBCuAzoQRoUOyGDSzOteIBa0H+/jYIOMxq4KOQlr6LBI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622064017; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VbyBXzHeoNkDJMekkl7ISJa2BGBdQOhtzOvcT0Bp44k=; b=BbEUEEI1GwNP/Hbz9Bv3uAoO8C47SzUihgnv+NWmfcomGy7LcO8ouV1NexSOKpKuu9fadeuRsOKpT8dFUFm5qiIpwtu1aJTKyyfW3CIs3/cuOecpj7JFUsXHeIAf+RPY7den3lX51RKKPveBbTq3nzQMZaabngL0wCKGelJ1ENo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mx.zohomail.com with SMTPS id 1622064017809703.77740485258; Wed, 26 May 2021 14:20:17 -0700 (PDT) Received: by mail-wr1-f53.google.com with SMTP id r12so2568747wrp.1 for ; Wed, 26 May 2021 14:20:17 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (235.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.235]) by smtp.gmail.com with ESMTPSA id x65sm2650367wmg.20.2021.05.26.14.20.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 14:20:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VbyBXzHeoNkDJMekkl7ISJa2BGBdQOhtzOvcT0Bp44k=; b=uJEPxNL7zRgbJ97im0GikcElOlCNgBDj5DsKKGE7GRZL6fmK3WQj5lbysLNDPb4YZU Cu0OvaFMkf8q82ZfsRk342S/KZ3hqqbjNHYT9wcX3BsMi5TVlxxelai/KjufU/9paCmi UjbyuaNiWppOAXFEUYq0A9/OT7Yd0nDw6Jw5a59OHhqdj/oj1/rQVyPGHxobAr7ryKMy hRSQw+ry1GKHYXqagLi1eDI51fwaQ5xQoz/f6rqG+JUDEc0ztnRzTyBuh2zBAXC6Hl4s bxwp/yV6yAQ6zg7rFa1VeqIVWGcEkmryOPxnxZgAdN0b84A77gtkG5J+uA/ldDi4ljcP 8k8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=VbyBXzHeoNkDJMekkl7ISJa2BGBdQOhtzOvcT0Bp44k=; b=n/+XBy3J0L5lGd/5NO0zBroky7Dg6K9m1gOQsjb8mBDUijSE/t2J3+EO1Fx854ibw4 n03nLaS6iI53fx/OuW7wb+UxYddsX6rcNx9kRKzO90q1G0bH5fN0U+DKI8eYj7GLZ1Od h5391mh9xKhzYtpCEDXXwTMMpo9NyR+YA8eYqHoXWhEvlai/BmHVuCDUb1lRsK4NhqSF lMpej5UmKMxgJ/zfN6FSDtmKqurJ1MDczkETV6lfHChuo6qg7HaGuqMCu2ZPH7MSfN+O 25/V8wtoErReFE8RCqXoZ/GeflMerkR3ytV+mZ2uHPVEGQLO1OWkWCZuyVVxnLZLWGib Y/Jw== X-Gm-Message-State: AOAM533PTh//Br8R/gYxylVZWsrSxfzB98XNbMn5yBQ7ZJRUT0t1ZWff ZcuBPBVAlcNNgnANywmpW1I= X-Google-Smtp-Source: ABdhPJyv2WOy+2FFdCsPevzIPPSnotKd4gtaFhWnzLgI91f/xw4PjpR36XDY5tKqjQuVIt85OSv9fg== X-Received: by 2002:a5d:410e:: with SMTP id l14mr17126wrp.230.1622064016068; Wed, 26 May 2021 14:20:16 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta Subject: [PULL 19/19] gitlab: Split gprof-gcov job Date: Wed, 26 May 2021 23:18:38 +0200 Message-Id: <20210526211838.421716-20-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210526211838.421716-1-f4bug@amsat.org> References: <20210526211838.421716-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) This job is hitting the 70min limit, so split it in 2 tasks. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Willian Rampazzo Message-Id: <20210525082556.4011380-7-f4bug@amsat.org> --- .gitlab-ci.d/buildtest.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 807040c1c71..7bfbfab8f20 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -558,16 +558,27 @@ check-deprecated: allow_failure: true =20 # gprof/gcov are GCC features -gprof-gcov: +build-gprof-gcov: extends: .native_build_job_template needs: job: amd64-ubuntu2004-container variables: IMAGE: ubuntu2004 CONFIGURE_ARGS: --enable-gprof --enable-gcov - MAKE_CHECK_ARGS: check TARGETS: aarch64-softmmu ppc64-softmmu s390x-softmmu x86_64-softmmu - timeout: 70m + artifacts: + expire_in: 1 days + paths: + - build + +check-gprof-gcov: + extends: .native_test_job_template + needs: + - job: build-gprof-gcov + artifacts: true + variables: + IMAGE: ubuntu2004 + MAKE_CHECK_ARGS: check after_script: - ${CI_PROJECT_DIR}/scripts/ci/coverage-summary.sh =20 --=20 2.26.3