From nobody Sat May 18 03:14:05 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=1620718201; cv=none; d=zohomail.com; s=zohoarc; b=Dxrz+hZptVdjBc59nLf8zxmDi//bJBkOlABoQKUku5PreXEs2HCSxY295m2vJnzPuoPHD9LDyA0MO1VLfxzbym86cIUqD3PwxnowRk8sRF24hN3D3majgOEAG+rjofkA9IwlhhqBUUt+4oImwaJFUFeLqMqTfJq661PC9xFMWNY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620718201; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=j5Sxu4ctDafvDSNcFbyYbFbbcAFEWQpn+j7ohAb2sA4=; b=BMRcsTAQE6IRY2SoueJB4CVwnY5Bw4m73Avx5z8I26CMw7pBtSmqPAx1dwk/xSGKTB3qjDEwa83cnf+jeMLye76HeWgM0IBCzUI88PkjKEU6nrd8d5w1njLATOLXgjVw4nwXDLwJK/9I9R083HEvFoaX5PLlhqAbkdPIPKn7Qds= 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 1620718201085158.66083426716784; Tue, 11 May 2021 00:30:01 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id d11so19018140wrw.8 for ; Tue, 11 May 2021 00:30:00 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id g129sm2807281wmg.27.2021.05.11.00.29.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 May 2021 00:29: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=j5Sxu4ctDafvDSNcFbyYbFbbcAFEWQpn+j7ohAb2sA4=; b=T5/gT1u1zbZYfqXgAxbthqe2XBSC9jqM9dyo6tulbTvdWSShXWdB/pSiMduNQDwnId 6CzQpoAfrZVSYx1hId4z8j3fMculbh00M6I6x1eQMDBAAhLJbSZ3tUB8GLWmYGg3F3WA ccl8FyO5i5nkNDXL0AQJ20sQEAaH5iSLL9fGDR8IGxBVDH6yMD3u+TGe2w3CqKbU9pk9 2FQXBNr03v2Wj0i5n4pRCv1qtmR3TJvpS1M10ETvPLFd1VlldDBGpzjjaS9BePm6J2oY 9aXdQQ14UDF8QGx9ywdgnzlEcgYkqY8GC8cNkzJx37BEvjZCVlBNLWtjDh4JQj84e7hI mV1g== 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=j5Sxu4ctDafvDSNcFbyYbFbbcAFEWQpn+j7ohAb2sA4=; b=SdUmWRkRxJEni9oCa6dQMcClUHwLP284KTeR6ixKtnRhmuynwKiWreoxMZH7ygfsbb QDxJY7xYCvzyjXFEdsn+Sb5LS6a4P6TC00quJeZAh6sLOQeh3IfZwbwPk9/wSwJSVl5/ vBHuqAk8WhlxW+PcXst6nuiNtRrvsJjmqSUo4b+MGLUVOYCFwenUc78CntXplyx0LJzC Ckk8n3i9rzGF1bNlo07N4SUBLO1Z1qwTWTB9KTPezIkqmEnkQQa7mKoCu6MjfR5g0BmE 3C2W5qbgPaOeelS0XO560WVqSo5KZOOdIIM9EJGdSkv7RSaHIC+YXUQVHO6oMwmlBPYN pDEA== X-Gm-Message-State: AOAM530R3VCKwX6AMSF18PNBkZwnAv5bMlLxyYaFN97U9itePIQ5tixR 0AS8BKnHQoM3NYBEyDb+sEA= X-Google-Smtp-Source: ABdhPJxnsig6bHEiUDTiKDQznPdOnRjToCkyylWOgMa+F6cMdH5eeOCTOeGhk5CE/6mXbImkcJ0VVQ== X-Received: by 2002:a5d:4a81:: with SMTP id o1mr1599563wrq.177.1620718199386; Tue, 11 May 2021 00:29:59 -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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Willian Rampazzo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Cleber Rosa , Wainer dos Santos Moschetta , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 01/10] gitlab-ci: Replace YAML anchors by extends (acceptance_test_job) Date: Tue, 11 May 2021 09:29:43 +0200 Message-Id: <20210511072952.2813358-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210511072952.2813358-1-f4bug@amsat.org> References: <20210511072952.2813358-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 Reviewed-by: Wainer dos Santos Moschetta Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Willian Rampazzo --- .gitlab-ci.yml | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 66b3d8602ca..1d8ecc281b4 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: @@ -522,14 +517,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 @@ -559,14 +553,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 @@ -596,14 +589,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 Sat May 18 03:14:05 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=1620718205; cv=none; d=zohomail.com; s=zohoarc; b=ZCQnUcKx/3OX0ej4eFZ7iUVkWje82cAp8nXNE8madtiOzU6LeIloDpXSIUlt/Ywqz3T6vq8xp6H0oqw0Z0COyr91Rw4EdHPfgxfL6sCQ3ny8nCYFqXpsAUP29scxkIp+LFYk5ob37XA8yfg+yUeWU/vQyq59kXuLrBy8kRC9Q2w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620718205; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HSxyb2XLxEd7xp/LblnlIgvehK/JlbNRJcr6qBoGWfk=; b=PnlUlV+HuGnWvk7oeOvltlcvqBhi47/iZCFHi1H514+H9O26jttn5I+xZ5ib8IkQXLi3Vjy5Xk/Rj9cW857y63vBjh5LmzJsF4qsctrofdec+Lt2XZR+7rj+GYB6WyP9LdZtAl3N3aMA/3SzSfIlH4zgOPmleKBON7Hj7MrId4Y= 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 16207182059846.501026161693176; Tue, 11 May 2021 00:30:05 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id v12so19020577wrq.6 for ; Tue, 11 May 2021 00:30:05 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id o13sm24078131wrf.91.2021.05.11.00.30.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 May 2021 00:30: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=HSxyb2XLxEd7xp/LblnlIgvehK/JlbNRJcr6qBoGWfk=; b=AmFCgAQjjCHN+mTMM5XI5bCzZQUBXTRQaDWfkJII50Ss+MmlInevvbFJ3iJKF4JaOp 09mA4tpI+xCKTwDPy+X+LMAr/ASmk0phTR4PG7KrXVeTW040MI25cG7HLE5BWDoqLsGw L4Me0Y/Q5ga3ULte9mINKCrJjTlOejRtV9fQr3vNXYR+L3evs4t1WfE2boUqoKWQ6CIq RtUxEt1Jn8GsQC/bqTDV1SlOYqb2QhA2B2NN0TmR/vv3S1aLfCqHRBiksnyF2pUksp4J 0B5tuIMtG30Hei7374mCvafH3qDRkEHc3BluHn5rMIWYkbxVB76Fj3CEBpCa5agrzGe/ lrkw== 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=HSxyb2XLxEd7xp/LblnlIgvehK/JlbNRJcr6qBoGWfk=; b=aq8/atuf8mJ9eGjUVRdvgQ3+3k9ljcSDwAJAwEvK1pRSjPu269brWc603rVg3Ga17W z6jnaYosBLaOAys+FPl2iwgtbwSAjuV6zVUIBSQNv0d8kRec7hVSQtO73qQBDDCbMQmL JT9XlZTfOegpZbBLSZJpBiq+KqEsHJWcagfUPHrALofLa/h1qZekv4jUE/dI3r+2/yvq BmWO66FYjl6X3KlW4gsHskCK/dUzIgzy1pgJ+mv0STIytWENZGei/UJ6PwGON/xBgl8+ EPVi8K6BbsPiryu5+R/yjGLBD6kWNjvdUr97x7gpcHNX8xWbQVlCXV/cwSUVJVRbzY2N H86g== X-Gm-Message-State: AOAM533qqa36eKkGZDUExub35Ewz+1ld9XvAWN8RfEqPBIqOz++Yw5rB e3+jev8SH7AMZiWk62xRUs8cTctiy0WziQ== X-Google-Smtp-Source: ABdhPJyHbSXBfcFIi/dQyXTw6qos9YOk0FF8wFs4Yt59HNPwOLHjYoj+2IlmD6aguKfwHmbSbHTB+g== X-Received: by 2002:adf:e9cf:: with SMTP id l15mr26623043wrn.209.1620718204256; Tue, 11 May 2021 00:30:04 -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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Willian Rampazzo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Cleber Rosa , Wainer dos Santos Moschetta , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 02/10] gitlab-ci: Rename acceptance_test_job -> integration_test_job Date: Tue, 11 May 2021 09:29:44 +0200 Message-Id: <20210511072952.2813358-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210511072952.2813358-1-f4bug@amsat.org> References: <20210511072952.2813358-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 The acceptance tests aren't accepting anything, rename them as integration tests. Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Willian Rampazzo Acked-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1d8ecc281b4..d474ffa030a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,7 +52,7 @@ include: # Avoid recompiling by hiding ninja with NINJA=3D":" - make NINJA=3D":" $MAKE_CHECK_ARGS =20 -.acceptance_test_job_template: +.integration_test_job_template: extends: .native_test_job_template cache: key: "${CI_JOB_NAME}-cache" @@ -109,7 +109,7 @@ check-system-alpine: MAKE_CHECK_ARGS: check =20 acceptance-system-alpine: - extends: .acceptance_test_job_template + extends: .integration_test_job_template needs: - job: build-system-alpine artifacts: true @@ -142,7 +142,7 @@ check-system-ubuntu: MAKE_CHECK_ARGS: check =20 acceptance-system-ubuntu: - extends: .acceptance_test_job_template + extends: .integration_test_job_template needs: - job: build-system-ubuntu artifacts: true @@ -175,7 +175,7 @@ check-system-debian: MAKE_CHECK_ARGS: check =20 acceptance-system-debian: - extends: .acceptance_test_job_template + extends: .integration_test_job_template needs: - job: build-system-debian artifacts: true @@ -209,7 +209,7 @@ check-system-fedora: MAKE_CHECK_ARGS: check =20 acceptance-system-fedora: - extends: .acceptance_test_job_template + extends: .integration_test_job_template needs: - job: build-system-fedora artifacts: true @@ -243,7 +243,7 @@ check-system-centos: MAKE_CHECK_ARGS: check =20 acceptance-system-centos: - extends: .acceptance_test_job_template + extends: .integration_test_job_template needs: - job: build-system-centos artifacts: true @@ -275,7 +275,7 @@ check-system-opensuse: MAKE_CHECK_ARGS: check =20 acceptance-system-opensuse: - extends: .acceptance_test_job_template + extends: .integration_test_job_template needs: - job: build-system-opensuse artifacts: true @@ -517,7 +517,7 @@ check-cfi-aarch64: MAKE_CHECK_ARGS: check =20 acceptance-cfi-aarch64: - extends: .acceptance_test_job_template + extends: .integration_test_job_template needs: - job: build-cfi-aarch64 artifacts: true @@ -553,7 +553,7 @@ check-cfi-ppc64-s390x: MAKE_CHECK_ARGS: check =20 acceptance-cfi-ppc64-s390x: - extends: .acceptance_test_job_template + extends: .integration_test_job_template needs: - job: build-cfi-ppc64-s390x artifacts: true @@ -589,7 +589,7 @@ check-cfi-x86_64: MAKE_CHECK_ARGS: check =20 acceptance-cfi-x86_64: - extends: .acceptance_test_job_template + extends: .integration_test_job_template needs: - job: build-cfi-x86_64 artifacts: true --=20 2.26.3 From nobody Sat May 18 03:14:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) client-ip=209.85.221.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1620718210; cv=none; d=zohomail.com; s=zohoarc; b=NmNnWtIDBXiwVjlisfAYhsiRraUARoyOiTNKc3fQVj94itGi6I5pFs49PQKNubzcwMPY8LN5lHv4/sZOCPjwxBdH/KKHjSunFEPP6cjN2VluiuCKmPQE3hpApFmdW9YOTGycj4MN2YVPiq27ZD6zA3c+/lYb94hSB+tWV2w/3qE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620718210; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=IZMKyCqMyO5bHC9zaYKJDMgMEQPBUUEp167PbRshw9g=; b=NT5QYYbIfjHUaQOLjHjQ45nTdgnf0/MCPJooKnB6tqreHqNDQtLrow/5S+r3BdhDbVFl8s6ICM6Jn8M3xdCXleqwX8OR7b9DMVIKwtW+4+XFaTKBXwZe1zq61kc0kgtx/9DI/f5oxUEQOUjPxq3UfFOh6XMEfCFrbf0JFUmWxPk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.zohomail.com with SMTPS id 1620718210919491.8620895434984; Tue, 11 May 2021 00:30:10 -0700 (PDT) Received: by mail-wr1-f45.google.com with SMTP id l2so19029902wrm.9 for ; Tue, 11 May 2021 00:30:10 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id s15sm25779125wrt.19.2021.05.11.00.30.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 May 2021 00:30:08 -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=IZMKyCqMyO5bHC9zaYKJDMgMEQPBUUEp167PbRshw9g=; b=jrhMpAWT7XBRSY4S1eJkgi6NUF+eIdmpAOlSayloWLYkN7Iwg/FSKukr3jSbxQpzMR 3l0wZ4A3yxub4T58Icr4rqMS9Ymh6r/ZvGB3U/PBeT/DkshHVTxWgQh8imiU6Qm5nAVj 4eQSabSrAHGdnknUNiJQsAdYrJR6Qtq9x0XRN0LV2IU0SmqQXiCuzfdXxGwUdjUaYEax Yn+OMKYT2kSipyq706hssHKTuR5tbK/9N4cHSwpE6gKXDS/HVe7fXoRY8EPcKwPNfIYY TnEYjVEtKWz4sY2nMe8jGiLNqGd8KUBDZhup4bTU0GqpYG3uVUHFDWRb7G20xCDN1D2q cnSA== 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=IZMKyCqMyO5bHC9zaYKJDMgMEQPBUUEp167PbRshw9g=; b=iSFebkw9MVu5A6QMELQuv3DAKE8dQXvpDBmY2D65KSeY1UbpWdD0GrQtPCmZF3LJN9 aNecNECBpa+yyXqEla1ln3JH1RcnXYQ2Rs9HMi4saHE83ZOC5LQbkYyUg1cmn2D8T3Yo Q/LIWElQMBs2DQmhZtbhvEK10Z3lV/QnPqXmpKBIq+dneJxbCMnfVWg6lcGGpxGB4tsw Vbm5GnOW3WS/wCjzak+s0n4fZkwc994gmzFkJR0DsTPNJdB9qG2JzKzl9P/62KjxVcYV l3w7q8tzJD5Rl7bWQoAVYoVzxXRV4MszZmcDaZU1TWMrCeC1vqJaL6vMtMmeoNaaIQPy x1Lg== X-Gm-Message-State: AOAM530WzLVzpNhBQDaU4EJkx1SvctoIeivy34KkT+ZAtf41Ccalu4wI 2tX8Opchg4DQUs2fMedwZg0= X-Google-Smtp-Source: ABdhPJyOnr7vureBpXbqKCpB/z8JCajKgoheRFHe7fakX93LvMzvFjdc6wyS2i1Unp/Kq19dOPPGbg== X-Received: by 2002:adf:e552:: with SMTP id z18mr34851602wrm.226.1620718209151; Tue, 11 May 2021 00:30:09 -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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Willian Rampazzo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Cleber Rosa , Wainer dos Santos Moschetta Subject: [PATCH v2 03/10] gitlab-ci: Extract container job template to container-template.yml Date: Tue, 11 May 2021 09:29:45 +0200 Message-Id: <20210511072952.2813358-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210511072952.2813358-1-f4bug@amsat.org> References: <20210511072952.2813358-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 --- .gitlab-ci.d/container-template.yml | 22 ++++++++++++++++++++++ .gitlab-ci.d/containers.yml | 24 ++---------------------- 2 files changed, 24 insertions(+), 22 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..9e3f3ae3c26 --- /dev/null +++ b/.gitlab-ci.d/container-template.yml @@ -0,0 +1,22 @@ +.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" + - docker pull "$TAG" || docker pull "$COMMON_TAG" || true + - ./tests/docker/docker.py --engine docker build + -t "qemu/$NAME" -f "tests/docker/dockerfiles/$NAME.docker" + -r $CI_REGISTRY_IMAGE + - 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 4ef76d1f54d..0bf4899df10 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -1,25 +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" - - docker pull "$TAG" || docker pull "$COMMON_TAG" || true - - ./tests/docker/docker.py --engine docker build - -t "qemu/$NAME" -f "tests/docker/dockerfiles/$NAME.docker" - -r $CI_REGISTRY_IMAGE - - 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 Sat May 18 03:14:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) client-ip=209.85.128.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1620718215; cv=none; d=zohomail.com; s=zohoarc; b=cYFSWXuhR+W7c7FMbFixaXAMJNSsW3FzXf5sgGW4ryKlJSekvfv4PqQjoHk0JvlPUavnR2dpIg+A57elZiZ3ZkjOt4msr+0mU3XdwYLU0eLDY0JrivEvOlLpjIKP3CNilFWMKjh5KoJbOHSoN1PwwlilL3FA+2chrvHsMYCny/k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620718215; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yPW/vWw/DYoYJxDKWIvJOoYPABx6estNS+RutNHnWXY=; b=gsgxCdYMzTMQuT9JPq113nG+uSlq/s/GvKf7glSoe+tfz10x43zS5YyQEJcj/CPAsViTr08Bt/Js7ak2Ek4KodgGVGgij4GdEmDPXnWeMNNmbzHv7rJZnvbzL+rMN23kxixDvOYSx4JVHDIJZB2sKLZR5qk3b8BuIBkgJLHlAUo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.zohomail.com with SMTPS id 162071821573128.137284910267795; Tue, 11 May 2021 00:30:15 -0700 (PDT) Received: by mail-wm1-f47.google.com with SMTP id u5-20020a7bc0450000b02901480e40338bso656005wmc.1 for ; Tue, 11 May 2021 00:30:15 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id 3sm22880446wms.30.2021.05.11.00.30.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 May 2021 00:30:13 -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=yPW/vWw/DYoYJxDKWIvJOoYPABx6estNS+RutNHnWXY=; b=o8VG16ZICoeldN9dqd2unuDJYF+4zflcS1lo45WRRCkBpoH75y2D9AmEzgAkckxWak yNOYhN5gbEtC1TH7MV7XZyWrfdxh1A/NATw/GUOx7Toizai8CcGV8dT7hjci2bdQk5mW F5mx9BwO+rWDszGyDCEYWGVHrPGEXNULdAGZyXrheipPDP/G7tdVLdDHPzMmW5fumtWh g0wRtI4GL73fLyia8v/uY19yb5SZVvZdGQfh5PLGEGM5J/I+xVeKfYp8oDq2dFsaVO34 Mz68Vu0vVUHyLIqSr5WM9ZQYPwIWvHYe4ID5BfAV6H2R9sQJTwsET5FrkSlLirTNSjDq p9HQ== 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=yPW/vWw/DYoYJxDKWIvJOoYPABx6estNS+RutNHnWXY=; b=FW/rQ4hXne9Fd8FcbMcIfhgfLI3DTjgibOYMiRw0MEATvab+HbC4E8bd2+3ZQlJSmw pwiCy9HpKYMxrV0lzh0PpxIGE9QapoCA8phrZ8k8MsbzFLwXqyoWCKv/Kp6YXPAnFb+k AKKid2h7xHPLu33bYy7vVMKnbcBvMTQyvo7aibQaBXaTLq8RBMFfnDPFjhMUzdRbvtNS 3ZbT7MEpcB26KJ/oFqMdwtvBy5cCxNwjYb88+F7i22vZdQV5TGSo3mBCsDit7q8m6+V6 pVBx+8N1XrConP5H489Ti6M5h4gorE1Ol3Pqe7SdeX5UQmkcd4deBFwn2+dRTEehnDqV 8uOQ== X-Gm-Message-State: AOAM530nXGanjRzInFTfMsFjbPVcEh+RXPCow4U2I0Bo1MATAeHYUK5K yhAlMInqLUzFBi4HGngtDWI= X-Google-Smtp-Source: ABdhPJzlmUsX+Yjo6KEmz/is/GZSeJyFUo8crOgHVDxq7oFA4+M2Si4SqQVnxjXD9gWKY7uqXR69Sw== X-Received: by 2002:a1c:cc12:: with SMTP id h18mr30164855wmb.141.1620718213896; Tue, 11 May 2021 00:30:13 -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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Willian Rampazzo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Cleber Rosa , Wainer dos Santos Moschetta Subject: [PATCH v2 04/10] gitlab-ci: Extract crossbuild job templates to crossbuild-template.yml Date: Tue, 11 May 2021 09:29:46 +0200 Message-Id: <20210511072952.2813358-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210511072952.2813358-1-f4bug@amsat.org> References: <20210511072952.2813358-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 --- .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..bc790a43486 --- /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 +# $ACCEL_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} $ACCEL_CONFIGURE_OPTS + - make -j$(expr $(nproc) + 1) all check-build + +.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 e44e4b49a25..bf626bed1cc 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 -# $ACCEL_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} $ACCEL_CONFIGURE_OPTS - - make -j$(expr $(nproc) + 1) all check-build - -.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 Sat May 18 03:14:05 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=1620718220; cv=none; d=zohomail.com; s=zohoarc; b=Cp6Z+BuACGGsA3/ukZBRAYGFOnJNsHLmDw03WgcHQAbURn8KsJhVI3PQVaUZQ5CWr2uYF3eqm5oFOivyR2H2tNO2rSoFLMN15neYH7jzHJUhA+3X6MDTI98tWOe8h81COBf5chVX5dze4YUMaHX2lCxTPjnEsti3Qv8x33pscko= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620718220; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cMLF+DiYB05VGczsv0EHFzokHqtb7UOcx/SnibJim1g=; b=QH+UX2rvVi+5J+mwmzSCaz2lKxNzLvhurIh+mStGq7kC3OYD6QrzAV2tdqlkHDodSif2VXJNGLJRQcb1VXikZNOEzswDDCA3AfmyTI4PSPgFm8kLcNZjEnMlYSSGpEVDFU9PYWcXlGMiJ/3uI3sGYoLk4C+VWzuwYZ2PyB8DuWM= 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 1620718220305304.7251530141615; Tue, 11 May 2021 00:30:20 -0700 (PDT) Received: by mail-wr1-f42.google.com with SMTP id z6so19040168wrm.4 for ; Tue, 11 May 2021 00:30:19 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id b10sm30859762wrr.27.2021.05.11.00.30.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 May 2021 00:30:18 -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=cMLF+DiYB05VGczsv0EHFzokHqtb7UOcx/SnibJim1g=; b=d6okAlqbrVmawA1Y1tE6/sHsdh8ch4YpcEafWeOXftdL70tbkzgRarGND23SiHXIej Aq9f97SFLPJWe6mBSH6FfSFydJpuXOcBleSjrqIGnSynNUdxElz5NE3KP/hh76oUQObC YfNJsmX02k1lCEJsEJqp78YPvoTUCLqFNHNRCjoSalF8XuKf/TgYKcp5WKydcK8oTJSP zbale9YCDM08dQMgpi6aQy8Nw3noh4J07XU5DUfkZUy1whW//tzzZ6j3p+KLE68LaJwg FukPZ1wtFPOSOhK2Q0UvE/3PNAt/uOnSNWgoecy2w9B5+S3u3pDyAAAVksqvzc9n1cWG Osdg== 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=cMLF+DiYB05VGczsv0EHFzokHqtb7UOcx/SnibJim1g=; b=m0awSgCKnsBTrF/piii88iWxVnJhkNEc6VnQngCvdGIoV3tD1p7OA9xB0LXwGogGjK mkPVhJnR6Te3PEIZIshspuyKw3eMDEtdGMld8blsSZZNv9urRJUWPpBws/+NrDyg9giy K9YeO87R+46Wp7L6YOv2QvrKEnc4yIl8y6CO0Be0KvCWWzq2KTRv0Yf0/OjKDjY76dY5 Wz8krfvVyH8OxXExTbJa7TYN3lXYxqS/uoGPgkiHU7/2fd5hUKxfp+QDDcLXcTXTU0F+ mfMHZKTnzQsYPQgAIoIA4AfSSQsImEvbVkXp92fn3ble2GJ6m8NN7aoUk3GV/4CTuEsC IDgg== X-Gm-Message-State: AOAM532IkoYL9OmSfQ+tIWgpWoVZR165OAW2wjxc2kVspYaAeQLq4CkW gGRmT44oZMSfG0HracbMtm/v3s1E1zwoeA== X-Google-Smtp-Source: ABdhPJzvtxYXjHxOcQ5ByOMI0THqw7/+CVyY6YcZcqjpuN06PPwyfOftvjPFK9zjCTdEeM+eA+FVSw== X-Received: by 2002:adf:cc85:: with SMTP id p5mr35828809wrj.75.1620718218539; Tue, 11 May 2021 00:30:18 -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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Willian Rampazzo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Cleber Rosa , Wainer dos Santos Moschetta Subject: [PATCH v2 05/10] gitlab-ci: Extract DCO/style check jobs to static_checks.yml Date: Tue, 11 May 2021 09:29:47 +0200 Message-Id: <20210511072952.2813358-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210511072952.2813358-1-f4bug@amsat.org> References: <20210511072952.2813358-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 --- v2: - renamed static_checks.yml (Wainer) - removed moved jobs (Thomas) --- .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 d474ffa030a..ab9edc78879 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 @@ -758,31 +759,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 Sat May 18 03:14:05 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=1620718224; cv=none; d=zohomail.com; s=zohoarc; b=QYSvtEkYNxLqwom4Fu7JgS1nCLh1DpahTDV7kLN4o+IuQf78Sf9/Kl8crq/5pem/inllf/0hIYzoOVP4+rsrU+0cTOUDoR4/R0oyjfTW40il/fJ1wSHKqKckBN+ulh1inFJ7ka/6x8r+pFtv5zmYY1b3z+262H03FrCEA7CMo8g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620718224; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Qj+Lzfuwxy78ivp7wbT+ICY6VHgDT26ec+hxPTVL25Q=; b=D+68A3QJWhHudPCkIf43MPIsRRKc78WHybn82XClP+yxHXaewuRDpmC1/2synwoxdsbxz8P/ugg52DL1PsWHwwMSzZUeKWTEqf1cy7WJgnjIQSmIPlrwD6NRbRkYWnqSfLLguYTelpgoTTXBYOm0vpw7nO+MsPzXQBdgX2njrlU= 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 1620718224970583.2713501358929; Tue, 11 May 2021 00:30:24 -0700 (PDT) Received: by mail-wr1-f43.google.com with SMTP id l2so19030569wrm.9 for ; Tue, 11 May 2021 00:30:24 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id y12sm22788431wma.47.2021.05.11.00.30.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 May 2021 00:30:22 -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=Qj+Lzfuwxy78ivp7wbT+ICY6VHgDT26ec+hxPTVL25Q=; b=LPBmz3bv+m0KKs1egWy/N0fQBMwA3yUgeHAWGnsghLx99+F/ElebC6nq5WJn64NUqT HAwAVRXnCds5U1GWLFEzOR2dcqR2W5qqEphBHfKHafuGmt1BMjsZjjG85nLlTnvD4nj+ uFRPRyTWyFrgsUlYmUkjrzwSr1sqtUBWo2/DUABVrUFeRI+Kf1q94anKDyGCisJ6FKRl PrSde5KIsoWtDXo58y82aPo8wHT25NaW0zRZ0i6ZRYZ8M3D37dJ5K0kL/kuzceJROqpc HV+cW8IgkFFMWP26it8iH3M/T5574btOPu7AX7to81KI444ZS7vf9nvqz+59BX92nxBu PtQQ== 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=Qj+Lzfuwxy78ivp7wbT+ICY6VHgDT26ec+hxPTVL25Q=; b=ZCjjWLhWOc/AUNdWkQoKqvPdgKGLlwlVodTk1ajEPcDZejJYtcZEO0nZdX+r0LDVtt pOVXF9CL5SHUPV+IkpUkvMpbyMs64tPopRpd2kqpVVO9hb+e+YQxIrypS/mRqMnpmOh2 lGMZaRRVBH81ALGIHyI4Mt2Aiz1DZr9q0vzH6f0b56XFGGQkeuuB4y1YuXdGmHes+CVd 63e8GoTwnsMuD+NklzdaD2Keb0MR93JjVyFyj3JG8fXlRsAg8n1hb5wBu5iV8YDCWFWo M1S6FdYMaCim3rzxx5uMflWL0XtkwlacU9C8Z4gzuuk38H/+kHoduzv2BUFAoNH1FeI8 9NZA== X-Gm-Message-State: AOAM533ZCk2qAlqAgKCizl6O0nyHVqIKPYN8/8/o0I01UP3B4ZNsYYoT kubhy6sfqiI94b/vZ0AR6qc= X-Google-Smtp-Source: ABdhPJwtS7hffTmDc8yjjSzGD1CRBFfI/qEsbCCjjf1WBhXM8ObNjq0e/fI8Y1GXvPGz0tk2f+wvIQ== X-Received: by 2002:a5d:6885:: with SMTP id h5mr36144550wru.229.1620718223251; Tue, 11 May 2021 00:30:23 -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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Willian Rampazzo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Cleber Rosa , Wainer dos Santos Moschetta Subject: [PATCH v2 06/10] gitlab-ci: Extract build stages to stages.yml Date: Tue, 11 May 2021 09:29:48 +0200 Message-Id: <20210511072952.2813358-7-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210511072952.2813358-1-f4bug@amsat.org> References: <20210511072952.2813358-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 --- .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 ab9edc78879..5bfcd8aaca4 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 Sat May 18 03:14:05 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=1620718229; cv=none; d=zohomail.com; s=zohoarc; b=G5RF3c4TBWJK4mBLwLL2nNb/Ko0viM29SZwxVK1c1Y7tTQqf6fIDRWb4/tmATy2xn7yKe3bAS9N+aXfiLfhi1C8xRq22K0ofuXeWH7otwc4vovXykFOvOsGdvfRbFrQITs7Z++WlbbI8apMQOk31EUpKuCOAB059izezbqXLg8s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620718229; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fRPFGdw6PWmrtWhxsB0bN4SSbxkOLvWecakHL8Bq24c=; b=QTOTkVxgd4DEJRwh/UG+6hsvl0YUHoLN9XWv128aohGeb1tLIywff5hakav7OSeQ0jUSN/M+xi0c/OAwR3wlftU1jINzpfOGD19vxu+nae5hrr632wVWLlS38bomuMq+F5wwH6wJCZo/BbxS7Bf5zWGq8A4VeJA3IaoPAjzGhDk= 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 1620718229652579.0148339604126; Tue, 11 May 2021 00:30:29 -0700 (PDT) Received: by mail-wr1-f46.google.com with SMTP id h4so19013632wrt.12 for ; Tue, 11 May 2021 00:30:28 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id f8sm20739045wmg.43.2021.05.11.00.30.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 May 2021 00:30:27 -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=fRPFGdw6PWmrtWhxsB0bN4SSbxkOLvWecakHL8Bq24c=; b=TMBh6qemUp/uAKA3q27y1qxklJTr0YkN5ldHCm8LUdFMNDTCnrTxvxoX+Ya5tkg8qJ h+lw+wWTYvmG0cGeoBKqnqkqspkS8EU3hjbhMDauT0vJ7COk7xvaJJNBvwhBcMnfuePq xgqW69EhK6lx2wVi+esff8MKFgUc2mJrTjdm1ENxr1cbko4As+o1s84Mj+6WQu3VSkDQ eA5mVA/tWUS0dyQLh6RngbGx18BrlF+1vkLU2FvuJMrsFDIYVoNUyF+7N5oH++Q4fXfi UnQ2xPhGNUB5hzYK9RkcJ+PhnwwTYhbZgY++vGiSInAeMqgUKD4mfUKGwZHG5OgcGE+o BopA== 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=fRPFGdw6PWmrtWhxsB0bN4SSbxkOLvWecakHL8Bq24c=; b=HGefgMdw3WkkOxRJw1T8MomPMFewPp3BgWj8KwAv0Qunm4fbHkMU7QO0uHL6QQBtjt UJl1CNKPoukuPoksOBhF6vj4eQL684ms9FXEr7VQZwsiUVPbjtQG85xEWZOqgQJXJudP eYL9VXdr5MuR9UqE06ySLr140tUE0N4Kii0ItWQbEDncuZB41/Ep5US065EK9zRr33MG AbInvv9Uv+3Uo1ixmHyaL0H4F9TBBwmdHxxLr8jRwhE7mWXA9RUyE6y6k/gbfDNxxpJt AoUwrwqqi75rflEKjBm+N4y1rtg8YvVWKSlrsPsFpTEm4KBpnYS+GShS3qb/7M232CnX VKbA== X-Gm-Message-State: AOAM5307YdZ/mRx7zEE/7yYQVh56XxAkkA6N4W4pV7MwujYsd73MbdJx pGWRH5mDoQde5RAceTzjW5o= X-Google-Smtp-Source: ABdhPJzQBiLx7tFmBv8a5wodrXQtj+R+vRs80b4l37pPGbtGbuHU0jLec1ymJrj+IkgOfBlg0Sq7rQ== X-Received: by 2002:adf:e552:: with SMTP id z18mr34853471wrm.226.1620718227860; Tue, 11 May 2021 00:30:27 -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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Willian Rampazzo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Cleber Rosa , Wainer dos Santos Moschetta Subject: [PATCH v2 07/10] gitlab-ci: Extract default build/test jobs templates Date: Tue, 11 May 2021 09:29:49 +0200 Message-Id: <20210511072952.2813358-8-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210511072952.2813358-1-f4bug@amsat.org> References: <20210511072952.2813358-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 --- .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..32aaef1a213 --- /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 + +.integration_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 5bfcd8aaca4..d1c8fcc3874 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 - -.integration_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 Sat May 18 03:14:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) client-ip=209.85.221.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1620718234; cv=none; d=zohomail.com; s=zohoarc; b=jha3/pqmTYleZMmujox5vgRuq2nX/lJJwhzaI7OeNF8396Vh7ADXj4RXW/qu9gQ8IT2Ddg47F8Q/8TPc/vo2KEkdxnuD46fSmPB0bWM1TlDA4ufHw0hAwRB9NwQlRS0XiLgNUhAunh7ovK5d4NUMGqwlwjzNWnX4lTkzG1JjOvI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620718234; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wHqXbmfdPqF+m665xLulV4uJW1BKrmZ0QzFHy8r/cXQ=; b=E+gPVxIXwYD9xErShWFyFzIRVI1d3xQ1pct8UMiSvz9yYkb6UOPuyRqU/de7OkW9TEfs83iRbQuFLevz0AUVA/QTCDQeY2dEAPiwa5H86y6393iw+ENEmTqTaqRRASajWIYJSSMI85skmkFPkGL4BtfYvvDXMG43YY7fhv5vKvg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.zohomail.com with SMTPS id 1620718234916409.6976270814773; Tue, 11 May 2021 00:30:34 -0700 (PDT) Received: by mail-wr1-f51.google.com with SMTP id x5so19018229wrv.13 for ; Tue, 11 May 2021 00:30:34 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id g129sm2809753wmg.27.2021.05.11.00.30.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 May 2021 00:30:32 -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=wHqXbmfdPqF+m665xLulV4uJW1BKrmZ0QzFHy8r/cXQ=; b=KMmb5qvfquYHhNne43MapBMCZSb8O5zjC58cVO3qR2D9rz90bryuUJ72MW7cKcZh9Y U9nZeDldpzwwKhNjdN6IiD75VUnNzPv2EJ9OgH+XDv9ib0oWG7vl0eNo/Qo6IVp4yZC9 F838RKt0F+6NVdBUw/PO+WOrwVbHLTVwiXzSfabRkMf27PEjNdO3UqnowdR4LuU3Kqvn usDdk7c8HnPt+rz90SOfdWSKawLoty9acEsBtE4XdovxvbDmX5DbBQXrudAWIo0w4sK2 DVKLxf8b5v3a9+s2BTk3MBLDwWEc/936MKA2o8hgl1YfuuW8usAf3se6P2rcHaRcgaOm Nk2A== 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=wHqXbmfdPqF+m665xLulV4uJW1BKrmZ0QzFHy8r/cXQ=; b=Cj+3JLAuY6u9EJoXLuKLkTrJFagX9VD5o5hGxYypS5pkDvBMI+MKxwCp1GicgaTxQK Sy1vdPkjDng6ag3da8BHbwxOcwvC4tmndYHZis51rlm4x8meQxvfSKSG45s20kJoLU4H pyXi0qo13ZtuC0r22JIkhDN+IRE+ilCyuqP670OtJBoUfqlARt0bGQg0HAEjiFcGrqlr yZn93O/lkbJicKy05kDkvoFuTWfzKJ92LX2cqWj4vOa7AkNvdVs4MDI02ZzWtMsE7Wnp 6Iz5drUjdN+19drMgt3qqt9+divJBu1g+nLt45bqJHY8weNHnkUK9eMAKVMEvdrJ6HXu CR9Q== X-Gm-Message-State: AOAM533Ukv+f7cfYyBwQVNz5SvlLnQ6ciQBhvqB5Hv8MA85YCE3KB2nS 7YXDnmXlRzA9+uDChEF5/4kWbIy0HUmdrw== X-Google-Smtp-Source: ABdhPJx8slKr9VtPMzuDem8utkFrwrn/RQQGozbTOpzROfbKP1I7aG1K8mDAjUFQcLB3P21VQjt3eg== X-Received: by 2002:a05:6000:1b06:: with SMTP id f6mr35583916wrz.339.1620718232790; Tue, 11 May 2021 00:30:32 -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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Willian Rampazzo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Cleber Rosa , Wainer dos Santos Moschetta Subject: [PATCH v2 08/10] gitlab-ci: Extract all default build/test jobs to buildtest.yml Date: Tue, 11 May 2021 09:29:50 +0200 Message-Id: <20210511072952.2813358-9-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210511072952.2813358-1-f4bug@amsat.org> References: <20210511072952.2813358-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). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Willian Rampazzo --- .gitlab-ci.d/buildtest.yml | 726 +++++++++++++++++++++++++++++++++++++ .gitlab-ci.yml | 726 +------------------------------------ 2 files changed, 727 insertions(+), 725 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..67114e8954a --- /dev/null +++ b/.gitlab-ci.d/buildtest.yml @@ -0,0 +1,726 @@ +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 + moxie-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: .integration_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 + moxie-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: .integration_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: .integration_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: .integration_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: .integration_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: .integration_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-sheepdog + --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 + +# 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-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: + 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: .integration_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: .integration_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: .integration_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 lm32-softmmu unicore32-softmmu + 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 moxie 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 d1c8fcc3874..aea58813a25 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,729 +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 - moxie-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: .integration_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 - moxie-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: .integration_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: .integration_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: .integration_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: .integration_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: .integration_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-sheepdog - --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 - -# 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-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: - 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: .integration_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: .integration_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: .integration_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 lm32-softmmu unicore32-softmmu - 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 moxie 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 Sat May 18 03:14:05 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=1620718239; cv=none; d=zohomail.com; s=zohoarc; b=OAFRP0Ykb8o5mG0jAO8WEEpb6AkxQmwF79e5StRS1DVfGTLJSWYTYmhgE7Cbwx091TM66CtJ7i3eI/K6w5qJPXRhOcM3DMOWfkeYB1340oALPZ/8ml0TgiBv71rSOy8I5R6zx4NtXsuo4qXKCFXSwhSnrv9Ucweb7omBgUKDDCA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620718239; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bhDHOqQ2nAkEgCh/bvWHJIp7Jturc4vuFN0lqBTsaWE=; b=CeCdGz8a4mfGPCbi3LNwboTRlGk8dI3bbGbXt6stEeUEnl1lC92Gb+dVWUEGEuxcPru9O5GqKBtMl0NxjhZrrXny35x9Cy7dXMXTBI1gc6c5btGTtIzccLh4/MrbPZwaUyjROLUVjri1ooJrvNVUr84UCjA3JKjUUQKiH4WP/8Q= 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 1620718239515967.6676482318359; Tue, 11 May 2021 00:30:39 -0700 (PDT) Received: by mail-wm1-f43.google.com with SMTP id j3-20020a05600c4843b02901484662c4ebso640005wmo.0 for ; Tue, 11 May 2021 00:30:38 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id u8sm2445910wmq.29.2021.05.11.00.30.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 May 2021 00:30:37 -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=bhDHOqQ2nAkEgCh/bvWHJIp7Jturc4vuFN0lqBTsaWE=; b=AZj4+0+PCrIjNIV993bU+m1XrAguCORiJNAo7b7Ur9Bt4hbkkZzHFedUuWfTmFG9Po vdsE5gWcG6FmNgGNjboRkT0HBkyvcXAtKLRHKCBgBWxYOfwCV6J0Irk8CaZhqmwU882j Rl9lhIYhwPG338lYw1u+ZGIFAKW4SUHZUDuyj9NBKYg9SpCSFOidzwp+qHheD+r+Kh21 BscvfE9127bemUN3BD0WZcAhHnT9CT9aZVi91+Pl43Em5TKmba8Qr/unF58Oc9brHLb2 roWTx6uzJu8766a/aQsZdXsx7AL1mzFV0xD8ASu5nqBEWKyGSXekDNZqPWXfxRs/GiQV DJsA== 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=bhDHOqQ2nAkEgCh/bvWHJIp7Jturc4vuFN0lqBTsaWE=; b=YyyzhMoI8e/Ff3naVHKU1PcVnQn9a5wN2nm2GnEqmn3lAJ9C75kWY1e9/0O1HakRZC QInZM40s9LNjP5ZHzSG7XEcbxHE34hX8Khodp4OQAklld84W4gLxciCCMj1YiN5wp57i /eNEVVEJsnCievTQW3wbuzhmVlPexeA08ZLY3GwM0DIw7tx5wLCmnUyFlNyeOkGOwwOQ lJc1co+roPfXhk/f2T8tUVf+YSvUfgm0EfvES3GBPNFtZ2NwLgVI4U6wx8vd8QRVlW/J RK1CVJB7wpKtBYNzp9fShTesQK2bKGT/G4CqfddahSUz/8Jt68Nn9bcoW+xagJIHe+SN SUGw== X-Gm-Message-State: AOAM530gvFhqV2nfXhHXcRMT23rzHJfIWANstu8g4H8SdsmVj4UZkfGB mc88koLkPU9+OordCMtUOI4= X-Google-Smtp-Source: ABdhPJyp4RV3t5w8LzzeNm+Fda1WFxDyhRz91XMo6ylSFlvoeLJBoiYGPnyGNNQW5UKNTTGEVnp1cA== X-Received: by 2002:a1c:c385:: with SMTP id t127mr31597119wmf.169.1620718237804; Tue, 11 May 2021 00:30:37 -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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Willian Rampazzo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Cleber Rosa , Wainer dos Santos Moschetta Subject: [PATCH v2 09/10] gitlab-ci: Extract core container jobs to container-core.yml Date: Tue, 11 May 2021 09:29:51 +0200 Message-Id: <20210511072952.2813358-10-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210511072952.2813358-1-f4bug@amsat.org> References: <20210511072952.2813358-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. Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Willian Rampazzo --- .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 0bf4899df10..2c1380158f8 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: @@ -190,11 +180,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 Sat May 18 03:14:05 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=1620718244; cv=none; d=zohomail.com; s=zohoarc; b=AgzubVkdC0vnj/Qk/98mw9NUwQlDT8IPAArHtfpfqZ3KqLVh7mTKg/ynScaxV2kXVzq1KBwzAcQzBS+M3d5exbSKLfhSDzzgxckg4jXJPpP93HTKgkigy7j6YG+aiTGh2m3jTLVbGyn2HXqWsGbmSO9cdGuaLWIPFGYstXK07M0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620718244; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=L3O7dX9rVS1hxltm38JzcGA9w2RaCAolW/vIAHETieA=; b=Cm8ouFmZHLEmBAauGW6qTZ+MEn1629kh/2xsBDF1JyL1hkFqEKxh6OyB/U/esuQG6Rfi4LYl/K703xosGAx+d9X5KgNGrtrbyYhdSXBsJVFHcVqowr4QUMU37w3zk1wlgQV/sB33oIFsK8LAZnWWDA2E6ehaYQCtbMfR77meqd8= 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 162071824424514.783457755550899; Tue, 11 May 2021 00:30:44 -0700 (PDT) Received: by mail-wr1-f54.google.com with SMTP id l14so19046891wrx.5 for ; Tue, 11 May 2021 00:30:43 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id w5sm21352949wrm.10.2021.05.11.00.30.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 May 2021 00:30:42 -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=L3O7dX9rVS1hxltm38JzcGA9w2RaCAolW/vIAHETieA=; b=A5si+FU3AqrrWqK3XxtiolRhsIOBvXgYhOceyYzZRt/syN2o97GbIJOdDfLyJ5mhm6 c8ogjR1dAMK7n9fYlzMT2hUytaIAVvB/ViWMHnEvrZ4yPvEgTalPdpqoXoiYQUWTdF2j xorpRE2Mq4JYPfp1LRs7llAKy3ILHycXe+UtzYJWlvwwoJVB0XsCH7plh/RsLvedOj3/ f/cQYllP5607+FCH0G1PDecarXjALdBupRxFQh+l3oIlSoc9VSh0vjMAk74WL2XPkbr0 FAEO4qslayn4i6ydFP1xjOt3TXgxgpVXbakm0xFJ82gLOizjVbCAy71ZjM+MCqR48EYP g9Yg== 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=L3O7dX9rVS1hxltm38JzcGA9w2RaCAolW/vIAHETieA=; b=Hu9xdF5CFyOtWi44xVQkPCRq3dSztmE1BaB0DkvTBVeJYxoM2OkeeVKr6bzFiQqZgO pxEeLg+Who73Jxi8AXNXfABQAX2AR2OLvvPhO5OBfslw4X/kjwwxMMUQYhtveR0/lHGq khvQFy1xrikhSJdMeSVAR9I61QGFLe+3hQL0DDSP6f1iDpTvMd7vsarYnXZ8BgXRw9x2 2LIMqlOkt/ZjXM5MkXakdLrvdIBtkL+0ngAYw/qU6x23Axigg625Fsu3c0WT7AtpCy4Q kCJ73tgDLN4rCnrJ2GwLL2kwXUBYWbzDTgTjcdCz9Lo6qAtnTBoAdi0xRnkX5YbSoIQO bEvQ== X-Gm-Message-State: AOAM530ncUmoRXrDJjLqI6Y/p60EyTHyetbLkbkSpJ4raThNEySKH1e8 RNm0UVzE5oWZ6RKOWhDB6u4= X-Google-Smtp-Source: ABdhPJwGcqV1gjiK8Os9q+BL4q6W9m+8XnBSdQvtd8X801/ZOb7pe7Ha21UilXfG0fSXZoa7MTBiVQ== X-Received: by 2002:a5d:4b4e:: with SMTP id w14mr36398925wrs.9.1620718242491; Tue, 11 May 2021 00:30:42 -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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Willian Rampazzo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Cleber Rosa , Wainer dos Santos Moschetta Subject: [PATCH v2 10/10] gitlab-ci: Move current job set to qemu-project.yml Date: Tue, 11 May 2021 09:29:52 +0200 Message-Id: <20210511072952.2813358-11-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210511072952.2813358-1-f4bug@amsat.org> References: <20210511072952.2813358-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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Willian Rampazzo --- .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