From nobody Tue Feb 10 06:26:48 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) client-ip=209.85.128.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1621450528; cv=none; d=zohomail.com; s=zohoarc; b=K8M359cXJpvx5sfOVwpo/NUZKTvRtaBx0B2/FJohneXxwtYfglAHT0A1ZusgMDPTzYr+/knc8f5tBjlGt9WSHkatnIJf6NpAcwRzx1YcF72RjLcsR2Erxxc4/mMem78XW9ZYNGlkPK40KnuHUCDs+iiqayJWSyj8sLaMhEK9o+c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621450528; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=otmO7cV5sbn1QwMinKoN9JECUO1gQ96dd58xZqbWwRU=; b=l//deSsJQgTc+HlP4nnK+t3tTYtTaidnnypQwJKs5WJ2og0kYEFZr43mHDaFlYmmatLsM7lYMBu2rzpQL/aOg/42coJHyLI/mC3bVJru971b78n7YOXPW9Rjbj0/siZbHbshPz6NfNNw5G42KwOJYOAFQcow5iI8ETjHWm+QdKs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.zohomail.com with SMTPS id 16214505287177.98913857405239; Wed, 19 May 2021 11:55:28 -0700 (PDT) Received: by mail-wm1-f53.google.com with SMTP id u5-20020a7bc0450000b02901480e40338bso3794403wmc.1 for ; Wed, 19 May 2021 11:55:28 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id e8sm257331wrt.30.2021.05.19.11.55.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 May 2021 11:55:26 -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=otmO7cV5sbn1QwMinKoN9JECUO1gQ96dd58xZqbWwRU=; b=cKKawsq3OtIYz6hz9/RH64I/6z3nDrBz9JV+plTmMxeqNL5gXC35lbFcXTyj+ZniWV nYJvCxnC0t5n7SepxWLObAZlPZUN1YCyExV+rGq/EaYJOU1v8RXAPNUhAMdyWsDVIfqe 1MMpC/Ekv2ertkxSJI7iZOmqsqI6v79MBP8vyFvM9Up5G2F1BdS7hduBRWLXQ5ZAxxOk FnlG0xhz4hFl7WdNo1W5coscU74gFbTJtaSLbRHBqDtENYVF33U4GGzXuFKaSPDn4nx2 nAhrrMrc46QH4j3WdaPb3jJYZtYZZANAgBgPwlLqVQRnPWlHnvq2/S8GGnje7RmbNSDL 6BHA== 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=otmO7cV5sbn1QwMinKoN9JECUO1gQ96dd58xZqbWwRU=; b=rIiJ/TRk3bSXSGeBc/unTMwtCGWyqYa8QkCXe91xEK0K3pqACQcfquOwBEES+RKyni ZU3Zfqajn3bTYQvtUEcnVsiexuKCl2blFro+j8bX9tIy+xMVFTNHXFCWuTrKo5rWfh1G CUyzateU9iGcGodvWQYYswtO+21VzmrSaT+Y11a0FYe3x9zwHKUPiMFB6Z/AV64EBvjA 8UUJnY3/ofxmfQyx1UYYUO/bl3osuFK7PVK70rVPWV2uj3SoOErQGxAOmr1YuHSEs8hi rl/DWFmasyC26uZo2E1XbWoCkREtpsGm0U19YLwN/ngptWe8H4bCLc0l0oypgjVMygj+ LSlw== X-Gm-Message-State: AOAM533xp3lxYVhMYkXpb0r+JlDaTcO+bq8ETZ1A+JOL/OVViN7tGByc TGEEg2dc4eCX2CbLu2q1gcs= X-Google-Smtp-Source: ABdhPJwdOizko43XbVMXBXqOxuF557jJVGHgrL1NOendcYNLd096rTi2rLCZRyV5+Kc5pb5BzeeLNg== X-Received: by 2002:a1c:7315:: with SMTP id d21mr212167wmb.155.1621450526984; Wed, 19 May 2021 11:55:26 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , Wainer dos Santos Moschetta , Willian Rampazzo Subject: [PATCH v3 04/10] gitlab-ci: Extract crossbuild job templates to crossbuild-template.yml Date: Wed, 19 May 2021 20:54:58 +0200 Message-Id: <20210519185504.2198573-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210519185504.2198573-1-f4bug@amsat.org> References: <20210519185504.2198573-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. Reviewed-by: Willian Rampazzo Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .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