From nobody Tue Feb 10 07:57:38 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) client-ip=209.85.128.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1622063947; cv=none; d=zohomail.com; s=zohoarc; b=dcOuH3s1y/DfypECIzDinpj6kn+XWYBdxv/rm2PIhK0AZyU/FBy1HeNLI3UGzLLkdDnYNSKeHsPIhH6PBppPaN3TW2y/06lwubzTsxBancJk6PJzumC4cekAZAH14lj9ohVIEfj7JLErTt5g3x1iftGEsjKQBzqEgkFQT7nQo6M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622063947; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cBfMctSwzMD1BVBFymvsetW6bsopBRXF+wcu6ORjgWo=; b=QinhMOYdKO9p109wdMJ59MUw6Rmp9qGNnyYO7KHGmMAig/xGrsS4J/J8XRgAzGCyNTWK17386XJRkH+ko2W0jCR3p1WO0yGwbr8QTYf6ELEzUSm8nzAAmSRyZ/XWk8LVrKRjRcC6bA/sk+ipg2fISsRRM7kKK6ZuEkwX5v8Pjfw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.zohomail.com with SMTPS id 1622063947371460.1047424239854; Wed, 26 May 2021 14:19:07 -0700 (PDT) Received: by mail-wm1-f45.google.com with SMTP id t206so1535075wmf.0 for ; Wed, 26 May 2021 14:19:06 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (235.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.235]) by smtp.gmail.com with ESMTPSA id y3sm183878wrh.28.2021.05.26.14.19.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 14:19:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cBfMctSwzMD1BVBFymvsetW6bsopBRXF+wcu6ORjgWo=; b=l94Yda6s+AfIgpyEW33agTmjV30LcQ7AM8NNR59J1KSxkFs7nLCfVvDK3yE1fmJZy+ 8loXXkolm3l8o6UFZefVXzYVeNPSD0OUFVoxohf2AMG+Q8/Nvpd1o1JCawvJMGnsQPur 9Nne0LkfEV7GnAcooRM2PIXwKMJJUFkMt1LiQz9497kJtOJBr2OKRs10dPSaZwHnu1sp 3sOkX0aZ98QlbEPISI5hh1e/D4TTnX/f7+rMnfM10wGAUQ0j5f08hi113YFzz0mp5zd3 m9LJYcAG0yFxY38QBFDJIXsz79cWuOcYkvtOaqPGwyzjXGKgAHAKKKl0AGFjPoR+6pJu rYtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=cBfMctSwzMD1BVBFymvsetW6bsopBRXF+wcu6ORjgWo=; b=j74sUVJUeEbyDLpHiUwHDGI/iwYMlZxkkdnIVTYmjJN1tOleTpMf9wlfvXb9fAFF6E 1EPellKSyKaTW9P1+QuQgySJj4XQ5lqGgTubBZlqVSD2omcxyEUz9dMUOsvU8JMTiPpU jSO4p/ovdWCF9ccuEM+s60ioPJHRXq/MGn1XHd2AVl2QQ3PEc+CMa54TviTn8zMYj0U5 D7NDyyN9rXnEAi2FfDHVP7tpjvpXnLcYGTRj4MU7w9hj/57YFy91bQ/HcaouP1HIxIis hxOP/GFJvlBEO+vHuGNbv85Nz7sgTsebT9YQfYotkc/P8Cjoo76Q7t2wObaMpuJBnKq1 ncnQ== X-Gm-Message-State: AOAM5310aDL1aLsS2Z5UtXxnC7umNL30U7T5rrMYFrBWBwIxU/pMceFl kifRZS6vL6NNO5SViQexBRg= X-Google-Smtp-Source: ABdhPJwe2z/Nbc3GX6FM0RwZeW6RoKYp0PbCIXrEHijIZtVls0j8Sz3qKkfza7I/ERyZkUL50i8kwg== X-Received: by 2002:a1c:a58c:: with SMTP id o134mr354854wme.2.1622063945633; Wed, 26 May 2021 14:19:05 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta Subject: [PULL 05/19] gitlab: Extract crossbuild job templates to crossbuild-template.yml Date: Wed, 26 May 2021 23:18:24 +0200 Message-Id: <20210526211838.421716-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210526211838.421716-1-f4bug@amsat.org> References: <20210526211838.421716-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Extract the crossbuild job templates to a new file (crossbuild-template.yml) to be able to reuse them without having to run all the jobs included, which are mainly useful for mainstream CI. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Willian Rampazzo Message-Id: <20210519185504.2198573-5-f4bug@amsat.org> Signed-off-by: Thomas Huth --- .gitlab-ci.d/crossbuild-template.yml | 41 ++++++++++++++++++++++++++ .gitlab-ci.d/crossbuilds.yml | 43 ++-------------------------- 2 files changed, 43 insertions(+), 41 deletions(-) create mode 100644 .gitlab-ci.d/crossbuild-template.yml diff --git a/.gitlab-ci.d/crossbuild-template.yml b/.gitlab-ci.d/crossbuild= -template.yml new file mode 100644 index 00000000000..1be541174c9 --- /dev/null +++ b/.gitlab-ci.d/crossbuild-template.yml @@ -0,0 +1,41 @@ +.cross_system_build_job: + stage: build + image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + timeout: 80m + script: + - mkdir build + - cd build + - PKG_CONFIG_PATH=3D$PKG_CONFIG_PATH + ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS + --disable-user --target-list-exclude=3D"arm-softmmu cris-softmmu + i386-softmmu microblaze-softmmu mips-softmmu mipsel-softmmu + mips64-softmmu ppc-softmmu sh4-softmmu xtensa-softmmu" + - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS + +# Job to cross-build specific accelerators. +# +# Set the $ACCEL variable to select the specific accelerator (default to +# KVM), and set extra options (such disabling other accelerators) via the +# $EXTRA_CONFIGURE_OPTS variable. +.cross_accel_build_job: + stage: build + image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + timeout: 30m + script: + - mkdir build + - cd build + - PKG_CONFIG_PATH=3D$PKG_CONFIG_PATH + ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS + --disable-tools --enable-${ACCEL:-kvm} $EXTRA_CONFIGURE_OPTS + - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS + +.cross_user_build_job: + stage: build + image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + script: + - mkdir build + - cd build + - PKG_CONFIG_PATH=3D$PKG_CONFIG_PATH + ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS + --disable-system + - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index edf3a625633..6b3865c9e83 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -1,44 +1,5 @@ -.cross_system_build_job: - stage: build - image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest - timeout: 80m - script: - - mkdir build - - cd build - - PKG_CONFIG_PATH=3D$PKG_CONFIG_PATH - ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS - --disable-user --target-list-exclude=3D"arm-softmmu cris-softmmu - i386-softmmu microblaze-softmmu mips-softmmu mipsel-softmmu - mips64-softmmu ppc-softmmu sh4-softmmu xtensa-softmmu" - - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS - -# Job to cross-build specific accelerators. -# -# Set the $ACCEL variable to select the specific accelerator (default to -# KVM), and set extra options (such disabling other accelerators) via the -# $EXTRA_CONFIGURE_OPTS variable. -.cross_accel_build_job: - stage: build - image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest - timeout: 30m - script: - - mkdir build - - cd build - - PKG_CONFIG_PATH=3D$PKG_CONFIG_PATH - ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS - --disable-tools --enable-${ACCEL:-kvm} $EXTRA_CONFIGURE_OPTS - - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS - -.cross_user_build_job: - stage: build - image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest - script: - - mkdir build - - cd build - - PKG_CONFIG_PATH=3D$PKG_CONFIG_PATH - ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS - --disable-system - - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS +include: + - local: '/.gitlab-ci.d/crossbuild-template.yml' =20 cross-armel-system: extends: .cross_system_build_job --=20 2.26.3