From nobody Wed Nov 19 21:05:24 2025 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=1618788897; cv=none; d=zohomail.com; s=zohoarc; b=Hvotxv9vVEjG3e/l9+NzYfMbtYZOzUhEWYGNxrwCVIE6j+LeEgYa5Cy1MMNXvp9uXYwsc3g/8LuxBZk4nMtZ5TtP7k0s4vL2fsWVVnW/RGcV4tdghG/rUzmuggJJXtaBycj4NFNBIaKDpgLo02OAkpSip3s2feTaVPz6hb7yOKs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618788897; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1hXnyveSLJsQ7n0YcKe7UrZPwhbG4ssbFPID1DDVw8E=; b=Tq5vaa1P7evg+0stkWqbRAFq7MUu6Pi0Xr+TdxJpLLSRHri4webu8P9VT5K/0MzWIAAuINMUlX7UbD7hiwEXkUchqhhNatI9TO55/8Zbx5EyRFwNtqMxDc83KHvw+ZncdlxgtguwSDWRShn2Rcm7EDi95NlNqm2WsSsBOKINr48= 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 1618788897910623.5509826548459; Sun, 18 Apr 2021 16:34:57 -0700 (PDT) Received: by mail-wr1-f43.google.com with SMTP id x7so32063503wrw.10 for ; Sun, 18 Apr 2021 16:34:57 -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 h2sm17787030wmc.24.2021.04.18.16.34.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Apr 2021 16:34:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1hXnyveSLJsQ7n0YcKe7UrZPwhbG4ssbFPID1DDVw8E=; b=unIf2a+vtqiwBehGW7gFu33pJN01KVamOGzD/Zk2ELU61IAsAXDQTHDhOxEkLLEWzh A2HbKeTMGxFveXxoc2suCfdDp5IDOBG7kvHFVvBtaHKHPZKsh0SyBZ5uo997zSod7Ybj q51hrCbA66RJIQmBxoJ7znCIC1QgB871aTvlAhFkP6ITAJ5WjayxhuNyzn203MLNLOIa GfJPYytx/HybudctqYyLnh+7lDpzp2R+xqDboCj2PMiXbcUz5hVh0agTEmutc3cXfzol rhiTrMLWVu+6pDXt/JOneN6hkvsTUMVyC1OsVJT5jXKUHy0H5qBxqDdZTlf5jv9OfyAp T66w== 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=1hXnyveSLJsQ7n0YcKe7UrZPwhbG4ssbFPID1DDVw8E=; b=PhTV1+iQhEZm8ekqF/DR/H3rdv3P+u9lo2cOD8g4XVtEllHWHPtGvSasALOXFLNf1P bYgQmB02LgYn6LFElE5JxkbqxEA76l0dnGTTBVkvGfvLZlXiZNsD6AAd4/RbC7QC5xy/ rwEl5hEQHMest0mWamh9z2Rwcl8vSeYhX9g8OA2nHSOj6JYbbjdpds20VZMheRMDGOo4 KHs0A4A8plPh/Rt0ImalO5FEztDqJk4jUr4Bb2F0k3aX+Tk267C1vOsqP+jFeEPqnW66 3nlFejRus0QIQueF7hnKEAUS/UlIE+a3S+kDWkQkum51jargMMcElvatUs8pTlUps9lE AQkw== X-Gm-Message-State: AOAM533RMWiKk82ofKWYARvq4gDWyynQCKf/scr6KwUowaF6XxGVF4ou i0FZWwJCB8rU+C3OueSw57g= X-Google-Smtp-Source: ABdhPJzi7UocJcqejlapWYin8XqCLgJWtA/fTETFHHQeq1hi+asbhGFnm4OoLNWUTKg+d9QkL9zR2A== X-Received: by 2002:a5d:524e:: with SMTP id k14mr10909969wrc.282.1618788896216; Sun, 18 Apr 2021 16:34:56 -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: Erik Skultety , Thomas Huth , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Miroslav Rezanina , Wainer dos Santos Moschetta , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 01/15] gitlab-ci: Replace YAML anchors by extends (container_job) Date: Mon, 19 Apr 2021 01:34:34 +0200 Message-Id: <20210418233448.1267991-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210418233448.1267991-1-f4bug@amsat.org> References: <20210418233448.1267991-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 Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.d/containers.yml | 76 ++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 33e4046e233..4ef76d1f54d 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -1,4 +1,4 @@ -.container_job_template: &container_job_definition +.container_job_template: image: docker:stable stage: containers services: @@ -22,230 +22,230 @@ - docker logout =20 amd64-alpine-container: - <<: *container_job_definition + extends: .container_job_template variables: NAME: alpine =20 amd64-centos7-container: - <<: *container_job_definition + extends: .container_job_template variables: NAME: centos7 =20 amd64-centos8-container: - <<: *container_job_definition + extends: .container_job_template variables: NAME: centos8 =20 amd64-debian10-container: - <<: *container_job_definition + extends: .container_job_template variables: NAME: debian10 =20 amd64-debian11-container: - <<: *container_job_definition + extends: .container_job_template variables: NAME: debian11 =20 alpha-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-alpha-cross =20 amd64-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-amd64-cross =20 amd64-debian-user-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-all-test-cross =20 amd64-debian-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-amd64 =20 arm64-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-arm64-cross =20 arm64-test-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian11-container'] variables: NAME: debian-arm64-test-cross =20 armel-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-armel-cross =20 armhf-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-armhf-cross =20 hppa-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-hppa-cross =20 m68k-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-m68k-cross =20 mips64-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-mips64-cross =20 mips64el-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-mips64el-cross =20 mips-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-mips-cross =20 mipsel-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-mipsel-cross =20 powerpc-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-powerpc-cross =20 ppc64-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-ppc64-cross =20 ppc64el-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-ppc64el-cross =20 riscv64-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-riscv64-cross =20 s390x-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-s390x-cross =20 sh4-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-sh4-cross =20 sparc64-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-sparc64-cross =20 tricore-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-tricore-cross =20 xtensa-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template variables: NAME: debian-xtensa-cross =20 cris-fedora-cross-container: - <<: *container_job_definition + extends: .container_job_template variables: NAME: fedora-cris-cross =20 amd64-fedora-container: - <<: *container_job_definition + extends: .container_job_template variables: NAME: fedora =20 i386-fedora-cross-container: - <<: *container_job_definition + extends: .container_job_template variables: NAME: fedora-i386-cross =20 win32-fedora-cross-container: - <<: *container_job_definition + extends: .container_job_template variables: NAME: fedora-win32-cross =20 win64-fedora-cross-container: - <<: *container_job_definition + extends: .container_job_template variables: NAME: fedora-win64-cross =20 amd64-ubuntu1804-container: - <<: *container_job_definition + extends: .container_job_template variables: NAME: ubuntu1804 =20 amd64-ubuntu2004-container: - <<: *container_job_definition + extends: .container_job_template variables: NAME: ubuntu2004 =20 amd64-ubuntu-container: - <<: *container_job_definition + extends: .container_job_template variables: NAME: ubuntu =20 amd64-opensuse-leap-container: - <<: *container_job_definition + extends: .container_job_template variables: NAME: opensuse-leap --=20 2.26.3 From nobody Wed Nov 19 21:05:24 2025 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=1618788902; cv=none; d=zohomail.com; s=zohoarc; b=c/OkTLW92UCbYcuhuXiTo/+qLhp0hablsBPCVa696ow5TLE5L2hnS3VqN/aeVuhsbDf7wpk5cMck9SJAu/jaOqduwruf/POvKCqNJ4EGgJFouy3Ca5odAbVcX6LtacoWK/p8rxSR7txAxtCZIyU0Ic6/1IsouG+6/uYWwGXUvbo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618788902; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4k10ItHi8X/62o5b3Q+1SRRAEz1STuAQuVd1i9kEo+M=; b=VzHjpWJaX7E+ZK3Lyjf4smMNWnPLKC1AXpueuBhxA0JR7cRlglcI/X2EiqDKJ0jobI53+4Cb+jgIA6TNUlFFTHEsy5sCFzcWq74KQEj/xum0VjfpbkRRjHWohH712vlXCZe4nUDEQX17T4fzDuEUBSwC+doiL7hfS0XqbdQRbSA= 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 1618788902858641.1905547339688; Sun, 18 Apr 2021 16:35:02 -0700 (PDT) Received: by mail-wr1-f46.google.com with SMTP id s7so31991585wru.6 for ; Sun, 18 Apr 2021 16:35:02 -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 y125sm6617012wmc.40.2021.04.18.16.34.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Apr 2021 16:35:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4k10ItHi8X/62o5b3Q+1SRRAEz1STuAQuVd1i9kEo+M=; b=sIe8NlKffV/yS7UIl7qhtIr0unhUbD9pVeyD9Du+99anG26q2HlqwBfI9WQ2c4ZRJr inJlkXuV2aW29L1dIxqsuTajDaVpkuTjdW/Kq71FOgHSkSfuUEV4f+RkbcWhgSJx3tZ5 6vct+sNPAiV74kzsgu1H9FCYRbO1ts6EOaOSlr3Aqx4UxBdoUych57ngIrT6xL7lhkAy U4Th4D3TerPCN8Jl7RVwE0rbwzlEFxZ5uU708AkNGheS4jbUUx63HKq3vIjxWeU0rj9Z HFs9xfZ70GFtKs5yPxkgxPncGazdH/1uFc4H+u28rB3m0ux1iqjfws/eRCKHNcBU3PxL kiRg== 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=4k10ItHi8X/62o5b3Q+1SRRAEz1STuAQuVd1i9kEo+M=; b=k4JjrSgECDjLoEv6mAfNGSQhbI/1g+twc97BbOSjSDqSqDmp18WO1l81qi9Izz4gz0 5joc8121bHTRNsUQNkvpmIKb4m46KfsVXXh/gSOwzlVLBjSi/Y0O1BwruVPfSFdrnchO it+bg184n6dLHlRC4kv9OEb5hnGkzeb7YRgKz+6aPIzgNEG/kZUn9dlrmLIJSUOGFoPI KFwGrAfBTIEXmjoOhC5lRlxl3pmSVr9a18iuYwX65ODs+0YYusQ/vR+tvjafc7E6OPDV zMy+6AWpMQhMxucDlGJefiO1BU/vYLtIL74nSYdBsyCVDxBBwsMX8GzU1iBd9NG8tzPn w1kw== X-Gm-Message-State: AOAM530DtZ/0thVltjuL9HJ4K6KvzhVR9y+XMVBMXKXoOnlhaY8nNqc0 kw5cEK9/n4ypCZTs6EHqZCBdSxEDTtTveA== X-Google-Smtp-Source: ABdhPJzArSrs6GV9nzAHxEM3zD/ZJ7moRILb/IiTTHiWbno7UN+4EnT5nM1BmKDF+myqzUofxghg5A== X-Received: by 2002:adf:e6cd:: with SMTP id y13mr11150050wrm.87.1618788901111; Sun, 18 Apr 2021 16:35:01 -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: Erik Skultety , Thomas Huth , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Miroslav Rezanina , Wainer dos Santos Moschetta , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 02/15] gitlab-ci: Replace YAML anchors by extends (native_build_job) Date: Mon, 19 Apr 2021 01:34:35 +0200 Message-Id: <20210418233448.1267991-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210418233448.1267991-1-f4bug@amsat.org> References: <20210418233448.1267991-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 --- .gitlab-ci.yml | 64 +++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 52d65d6c04f..98d73429405 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,7 @@ include: - local: '/.gitlab-ci.d/containers.yml' - local: '/.gitlab-ci.d/crossbuilds.yml' =20 -.native_build_job_template: &native_build_job_definition +.native_build_job_template: stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest before_script: @@ -79,7 +79,7 @@ include: - du -chs ${CI_PROJECT_DIR}/avocado-cache =20 build-system-alpine: - <<: *native_build_job_definition + extends: .native_build_job_template needs: - job: amd64-alpine-container variables: @@ -114,7 +114,7 @@ acceptance-system-alpine: <<: *acceptance_definition =20 build-system-ubuntu: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-ubuntu2004-container variables: @@ -148,7 +148,7 @@ acceptance-system-ubuntu: <<: *acceptance_definition =20 build-system-debian: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-debian-container variables: @@ -182,7 +182,7 @@ acceptance-system-debian: <<: *acceptance_definition =20 build-system-fedora: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-fedora-container variables: @@ -217,7 +217,7 @@ acceptance-system-fedora: <<: *acceptance_definition =20 build-system-centos: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-centos8-container variables: @@ -252,7 +252,7 @@ acceptance-system-centos: <<: *acceptance_definition =20 build-system-opensuse: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-opensuse-leap-container variables: @@ -286,7 +286,7 @@ acceptance-system-opensuse: =20 =20 build-disabled: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-fedora-container variables: @@ -373,7 +373,7 @@ build-disabled: # Also use a different coroutine implementation (which is only really of # interest to KVM users, i.e. with TCG disabled) build-tcg-disabled: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-centos8-container variables: @@ -396,7 +396,7 @@ build-tcg-disabled: 260 261 262 263 264 270 272 273 277 279 =20 build-user: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-debian-user-cross-container variables: @@ -405,7 +405,7 @@ build-user: MAKE_CHECK_ARGS: check-tcg =20 build-user-static: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-debian-user-cross-container variables: @@ -415,7 +415,7 @@ build-user-static: =20 # Only build the softmmu targets we have check-tcg tests for build-some-softmmu: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-debian-user-cross-container variables: @@ -428,7 +428,7 @@ build-some-softmmu: # 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: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-debian-user-cross-container variables: @@ -438,7 +438,7 @@ build-user-plugins: timeout: 1h 30m =20 build-user-centos7: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-centos7-container variables: @@ -447,7 +447,7 @@ build-user-centos7: MAKE_CHECK_ARGS: check-tcg =20 build-some-softmmu-plugins: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-debian-user-cross-container variables: @@ -457,7 +457,7 @@ build-some-softmmu-plugins: MAKE_CHECK_ARGS: check-tcg =20 clang-system: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-fedora-container variables: @@ -469,7 +469,7 @@ clang-system: MAKE_CHECK_ARGS: check-qtest check-tcg =20 clang-user: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-debian-user-cross-container variables: @@ -491,7 +491,7 @@ clang-user: # Split in three sets of build/check/acceptance to limit the execution tim= e of each # job build-cfi-aarch64: - <<: *native_build_job_definition + extends: .native_build_job_template needs: - job: amd64-fedora-container variables: @@ -528,7 +528,7 @@ acceptance-cfi-aarch64: <<: *acceptance_definition =20 build-cfi-ppc64-s390x: - <<: *native_build_job_definition + extends: .native_build_job_template needs: - job: amd64-fedora-container variables: @@ -565,7 +565,7 @@ acceptance-cfi-ppc64-s390x: <<: *acceptance_definition =20 build-cfi-x86_64: - <<: *native_build_job_definition + extends: .native_build_job_template needs: - job: amd64-fedora-container variables: @@ -602,7 +602,7 @@ acceptance-cfi-x86_64: <<: *acceptance_definition =20 tsan-build: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-ubuntu2004-container variables: @@ -614,7 +614,7 @@ tsan-build: =20 # These targets are on the way out build-deprecated: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-debian-user-cross-container variables: @@ -641,7 +641,7 @@ check-deprecated: =20 # gprof/gcov are GCC features gprof-gcov: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-ubuntu2004-container variables: @@ -654,7 +654,7 @@ gprof-gcov: - ${CI_PROJECT_DIR}/scripts/ci/coverage-summary.sh =20 build-oss-fuzz: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-fedora-container variables: @@ -674,7 +674,7 @@ build-oss-fuzz: - cd build-oss-fuzz && make check-qtest-i386 check-unit =20 build-tci: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-debian-user-cross-container variables: @@ -699,7 +699,7 @@ build-tci: # 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: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-ubuntu2004-container variables: @@ -713,7 +713,7 @@ build-coroutine-sigaltstack: # These jobs test old gcrypt and nettle from RHEL7 # which had some API differences. crypto-old-nettle: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-centos7-container variables: @@ -723,7 +723,7 @@ crypto-old-nettle: MAKE_CHECK_ARGS: check =20 crypto-old-gcrypt: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-centos7-container variables: @@ -733,7 +733,7 @@ crypto-old-gcrypt: MAKE_CHECK_ARGS: check =20 crypto-only-gnutls: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-centos7-container variables: @@ -745,7 +745,7 @@ crypto-only-gnutls: =20 # Check our reduced build configurations build-without-default-devices: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-centos8-container variables: @@ -753,7 +753,7 @@ build-without-default-devices: CONFIGURE_ARGS: --without-default-devices --disable-user =20 build-without-default-features: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-debian-container variables: @@ -803,7 +803,7 @@ build-libvhost-user: # 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: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-debian-container variables: --=20 2.26.3 From nobody Wed Nov 19 21:05:24 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) client-ip=209.85.128.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1618788907; cv=none; d=zohomail.com; s=zohoarc; b=EVUJClQWRDYJ63UIB+dk/H6Btsj9X4UxDYEA1u51i3j3Blb0jxTr0oe7Mq5HS7IpvwVlcrfW0AQ6CvWacbD5UszX0UYD2P2rPv0vHEHU79Y2p8SHIX1haJMedj9eM0a+2z1ivlSq38p4BqA95yUZxW/w3S/rd1rBPeX1DkFuWAU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618788907; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dN+1Fz7A3P3flnj/XHZg7NUSu3iHLZrIm3Xc3Jtho64=; b=TuIKrQfnM6YfTC7YuBt98FrGu6Xp/g8SuXBjx2KD1Rzekf6xfMVc1F0Eu5+LX/Hjp0NEWUk2UIACpO+rxn9gORHwMa8wApPp2C3GA7tnLMlEJD3lTghAB/MISY/sBwfEzVXp2v6oBhCwkYCKR5aZmhUcJyOOEoSsamfUGG2WODM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mx.zohomail.com with SMTPS id 1618788907893980.1664978858242; Sun, 18 Apr 2021 16:35:07 -0700 (PDT) Received: by mail-wm1-f44.google.com with SMTP id u5-20020a7bcb050000b029010e9316b9d5so17071003wmj.2 for ; Sun, 18 Apr 2021 16:35:07 -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 l14sm8984920wrv.94.2021.04.18.16.35.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Apr 2021 16:35: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=dN+1Fz7A3P3flnj/XHZg7NUSu3iHLZrIm3Xc3Jtho64=; b=NHjdVQQPbg0h2BoT3TB/xsQpVYFyaP2c30iAnxuY3b0I+c/8YQAEjnJnjJ3szFA4UK L22H/SOea1hQ+dgyzkoy8q91F44OGKH30K6UF4iJP8NYs5tRm6Z6sVUL/k1Zx8PAYYXn rxOJLIzS9hBfy5v7NWaJIFBDh6eWg3ELAl5/E/zABqHxt7jdTKNaG9yWgn8/RGg2iPD8 Ke/TsojbNrLq5QC7gmfyqmNW3pzlSLAtoGbVXTbaapmVJyURHwsusac69yYYlxR6iu/t 16GFENjQXAAESjTpdWqST00AZppq8x3t7XCtkPCV82XYGpuIQSSthEIP7hr/8xcLTFlm gvZw== 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=dN+1Fz7A3P3flnj/XHZg7NUSu3iHLZrIm3Xc3Jtho64=; b=mhxLz7rUsmFFRLbAAirpYi+ZHtsm6dw897pdGP2ORDkAw2rcvg7XDBdIricGjQ/4t4 63JiAQxnTd7LZH6w/NLCfUEDQQbL7kUsRPMf6InFKnVfr4yNYJ7TBT9PEIUhkDvl74xq RmB9GYNsBuEASIgG+rnd//ui9Q//7HH2HuDW+Hd6vhJdznZm2C3zM2h8f5XHdEZxUgwh kyn3aRyJmkh/cD2X5LgdTNl8AHVJL55gifkIzw0u0nnduU6FvbcfyQg9w4HhBmKcalJi g02BDBhwM8/i4Xk1RabQBrQGpL8jYgPT4iaJN747MQE5nHBUow6zuXVNSLjqDOHADHbQ ve6A== X-Gm-Message-State: AOAM5339OVnpeszN/uFe8kbLbRxzjFlHdGrHOZYfPwrMLSupd6/gpgvB gXPwSjOfXnDmkpYYd0gPzHk= X-Google-Smtp-Source: ABdhPJyc3HbGD5jyUNW/cCdefGgzzTpmXBmMWbJt6OrmXNymv3BhY9KYWk26+bTjA6tAxxiJirQoig== X-Received: by 2002:a05:600c:3594:: with SMTP id p20mr17992590wmq.173.1618788906135; Sun, 18 Apr 2021 16:35:06 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Erik Skultety , Thomas Huth , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Miroslav Rezanina , Wainer dos Santos Moschetta , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 03/15] gitlab-ci: Replace YAML anchors by extends (native_test_job) Date: Mon, 19 Apr 2021 01:34:36 +0200 Message-Id: <20210418233448.1267991-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210418233448.1267991-1-f4bug@amsat.org> References: <20210418233448.1267991-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 --- .gitlab-ci.yml | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 98d73429405..11bda3abf33 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,7 +37,7 @@ include: make -j"$JOBS" $MAKE_CHECK_ARGS ; fi =20 -.native_test_job_template: &native_test_job_definition +.native_test_job_template: stage: test image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest script: @@ -95,7 +95,7 @@ build-system-alpine: - build =20 check-system-alpine: - <<: *native_test_job_definition + extends: .native_test_job_template needs: - job: build-system-alpine artifacts: true @@ -104,7 +104,7 @@ check-system-alpine: MAKE_CHECK_ARGS: check =20 acceptance-system-alpine: - <<: *native_test_job_definition + extends: .native_test_job_template needs: - job: build-system-alpine artifacts: true @@ -129,7 +129,7 @@ build-system-ubuntu: - build =20 check-system-ubuntu: - <<: *native_test_job_definition + extends: .native_test_job_template needs: - job: build-system-ubuntu artifacts: true @@ -138,7 +138,7 @@ check-system-ubuntu: MAKE_CHECK_ARGS: check =20 acceptance-system-ubuntu: - <<: *native_test_job_definition + extends: .native_test_job_template needs: - job: build-system-ubuntu artifacts: true @@ -163,7 +163,7 @@ build-system-debian: - build =20 check-system-debian: - <<: *native_test_job_definition + extends: .native_test_job_template needs: - job: build-system-debian artifacts: true @@ -172,7 +172,7 @@ check-system-debian: MAKE_CHECK_ARGS: check =20 acceptance-system-debian: - <<: *native_test_job_definition + extends: .native_test_job_template needs: - job: build-system-debian artifacts: true @@ -198,7 +198,7 @@ build-system-fedora: - build =20 check-system-fedora: - <<: *native_test_job_definition + extends: .native_test_job_template needs: - job: build-system-fedora artifacts: true @@ -207,7 +207,7 @@ check-system-fedora: MAKE_CHECK_ARGS: check =20 acceptance-system-fedora: - <<: *native_test_job_definition + extends: .native_test_job_template needs: - job: build-system-fedora artifacts: true @@ -233,7 +233,7 @@ build-system-centos: - build =20 check-system-centos: - <<: *native_test_job_definition + extends: .native_test_job_template needs: - job: build-system-centos artifacts: true @@ -242,7 +242,7 @@ check-system-centos: MAKE_CHECK_ARGS: check =20 acceptance-system-centos: - <<: *native_test_job_definition + extends: .native_test_job_template needs: - job: build-system-centos artifacts: true @@ -266,7 +266,7 @@ build-system-opensuse: - build =20 check-system-opensuse: - <<: *native_test_job_definition + extends: .native_test_job_template needs: - job: build-system-opensuse artifacts: true @@ -275,7 +275,7 @@ check-system-opensuse: MAKE_CHECK_ARGS: check =20 acceptance-system-opensuse: - <<: *native_test_job_definition + extends: .native_test_job_template needs: - job: build-system-opensuse artifacts: true @@ -509,7 +509,7 @@ build-cfi-aarch64: - build =20 check-cfi-aarch64: - <<: *native_test_job_definition + extends: .native_test_job_template needs: - job: build-cfi-aarch64 artifacts: true @@ -518,7 +518,7 @@ check-cfi-aarch64: MAKE_CHECK_ARGS: check =20 acceptance-cfi-aarch64: - <<: *native_test_job_definition + extends: .native_test_job_template needs: - job: build-cfi-aarch64 artifacts: true @@ -546,7 +546,7 @@ build-cfi-ppc64-s390x: - build =20 check-cfi-ppc64-s390x: - <<: *native_test_job_definition + extends: .native_test_job_template needs: - job: build-cfi-ppc64-s390x artifacts: true @@ -555,7 +555,7 @@ check-cfi-ppc64-s390x: MAKE_CHECK_ARGS: check =20 acceptance-cfi-ppc64-s390x: - <<: *native_test_job_definition + extends: .native_test_job_template needs: - job: build-cfi-ppc64-s390x artifacts: true @@ -583,7 +583,7 @@ build-cfi-x86_64: - build =20 check-cfi-x86_64: - <<: *native_test_job_definition + extends: .native_test_job_template needs: - job: build-cfi-x86_64 artifacts: true @@ -592,7 +592,7 @@ check-cfi-x86_64: MAKE_CHECK_ARGS: check =20 acceptance-cfi-x86_64: - <<: *native_test_job_definition + extends: .native_test_job_template needs: - job: build-cfi-x86_64 artifacts: true @@ -630,7 +630,7 @@ build-deprecated: # We split the check-tcg step as test failures are expected but we still # want to catch the build breaking. check-deprecated: - <<: *native_test_job_definition + extends: .native_test_job_template needs: - job: build-deprecated artifacts: true --=20 2.26.3 From nobody Wed Nov 19 21:05:24 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) client-ip=209.85.221.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1618788913; cv=none; d=zohomail.com; s=zohoarc; b=L/69rrksN8cdGk7/eqSrdGHz5d1mx/XVruP9cAD2mYeSvcsbNnqvXEu0PCYgiEpSS32qY+SiH+AEZ0R1ev5e7JK38cYpidropS/zg0JT0VkWho8pBIRhcV8iYVqKMPwO8FF8LYr2y9zS1imH8s3PNtEOCjr1KB+nEHopU0xMOzw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618788913; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qcLXkvBe6T3rF4X/u6wiQxn9g8xfcysDobF2aflqITA=; b=fGJHlMcnk3LlGAsyVC/6S19z7xHZyWO6l62Y4b21Xzz/I772Rv0E0EDqB0FsOn/po9vjd9WPgeHU++FH9pzaM8yRVGV3JNkjGenaxpFt+wAJkOePoOF7iApLVO0PnjhD25Rf0h5BLh8UWbGiQbKDylSMr3zucejqwwyR5k36a3M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.zohomail.com with SMTPS id 1618788913029662.9194293026633; Sun, 18 Apr 2021 16:35:13 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id e5so3431349wrg.7 for ; Sun, 18 Apr 2021 16:35:12 -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 z14sm19241855wrs.96.2021.04.18.16.35.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Apr 2021 16:35:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qcLXkvBe6T3rF4X/u6wiQxn9g8xfcysDobF2aflqITA=; b=vhVJEZpW8e4Q4YlToLcil9FxE+S+TezqS1J5M73hb80olvfUZVsJYWAlI9eLBB1AqK B9RDJ0DWaC4+9CZcHEDudS73LpxGdxX6PPibtSzu9JRkGmj5fwtykwWevreKtxPeBdF+ vZkFzTNcSxcRzlf60R8mE25i1zanZkBBtO8Uz93Ad4L/HmLorTXHsWTJY97GSaTUt4sS N4ZX0xZVT7ZOw9NK95G9WVLrLYOiGQYmB7VK7cfFuD99eS5RfEZcUj6EfdZ4e8p7Il1T KLzrESQnlCs+ePoc7lRdKpjfwnxAz6SxWzsoic+nor664CFt1cpae8UUuCHnot8mYJ7l CUkw== 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=qcLXkvBe6T3rF4X/u6wiQxn9g8xfcysDobF2aflqITA=; b=cmET3xmkWNB9zQ9cup1oAynTgeHsgnFBj5gs6UIkA5N8R3OzrP1NsI0oK5z5oojj0W grwjQS/Vbwz+GgZI/3bjDj1zxJbW87b4NqITGKU/V894DDWtw5pNmMQquNvMZhwCBfQE NGgvcP8UaNBgXCkevjGN8VyTxSAB6Xs4WZwdzqTQ9ln3EguxEqkGMAFnkPcrPM6wX3qX Djx3iRxZUzbyOz3FZI3hV4yoOti9g//qKQqcVe4hHpHDRh06KPazALKaJptx+3LDyXyH txCvY+uUidmxQbEhum6rKbydHEk9NAzOb+xBZLqSlBf9p5E5hETzKIcF1iuqI3NZvXdz l3Rg== X-Gm-Message-State: AOAM532gLmGkIJreoQs7fk3OPoKfxmxT24RLSJbmII4y/tIqglVp07nv G1Hfua8KcDZiPmF78E2Kutk= X-Google-Smtp-Source: ABdhPJwGCetydwS+NvNWnoBhJZSpAVb7qR0cUvZgx2E/LRnGyU+/hjp49JXQUusHKmun4I8Gf7AWJA== X-Received: by 2002:a5d:67c8:: with SMTP id n8mr4256565wrw.200.1618788911223; Sun, 18 Apr 2021 16:35:11 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Erik Skultety , Thomas Huth , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Miroslav Rezanina , Wainer dos Santos Moschetta , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 04/15] gitlab-ci: Replace YAML anchors by extends (acceptance_test_job) Date: Mon, 19 Apr 2021 01:34:37 +0200 Message-Id: <20210418233448.1267991-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210418233448.1267991-1-f4bug@amsat.org> References: <20210418233448.1267991-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 --- .gitlab-ci.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 11bda3abf33..07e5e737685 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,7 @@ include: # Avoid recompiling by hiding ninja with NINJA=3D":" - make NINJA=3D":" $MAKE_CHECK_ARGS =20 -.acceptance_template: &acceptance_definition +.acceptance_test_job_template: cache: key: "${CI_JOB_NAME}-cache" paths: @@ -111,7 +111,7 @@ acceptance-system-alpine: variables: IMAGE: alpine MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition + extends: .acceptance_test_job_template =20 build-system-ubuntu: extends: .native_build_job_template @@ -145,7 +145,7 @@ acceptance-system-ubuntu: variables: IMAGE: ubuntu2004 MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition + extends: .acceptance_test_job_template =20 build-system-debian: extends: .native_build_job_template @@ -179,7 +179,7 @@ acceptance-system-debian: variables: IMAGE: debian-amd64 MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition + extends: .acceptance_test_job_template =20 build-system-fedora: extends: .native_build_job_template @@ -214,7 +214,7 @@ acceptance-system-fedora: variables: IMAGE: fedora MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition + extends: .acceptance_test_job_template =20 build-system-centos: extends: .native_build_job_template @@ -249,7 +249,7 @@ acceptance-system-centos: variables: IMAGE: centos8 MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition + extends: .acceptance_test_job_template =20 build-system-opensuse: extends: .native_build_job_template @@ -282,7 +282,7 @@ acceptance-system-opensuse: variables: IMAGE: opensuse-leap MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition + extends: .acceptance_test_job_template =20 =20 build-disabled: @@ -525,7 +525,7 @@ acceptance-cfi-aarch64: variables: IMAGE: fedora MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition + extends: .acceptance_test_job_template =20 build-cfi-ppc64-s390x: extends: .native_build_job_template @@ -562,7 +562,7 @@ acceptance-cfi-ppc64-s390x: variables: IMAGE: fedora MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition + extends: .acceptance_test_job_template =20 build-cfi-x86_64: extends: .native_build_job_template @@ -599,7 +599,7 @@ acceptance-cfi-x86_64: variables: IMAGE: fedora MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition + extends: .acceptance_test_job_template =20 tsan-build: extends: .native_build_job_template --=20 2.26.3 From nobody Wed Nov 19 21:05:24 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) client-ip=209.85.128.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 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=1618788917; cv=none; d=zohomail.com; s=zohoarc; b=elu1KpnmtrypbFRTb4a6YjEeBjX4tBUmXer3OAz6BX/eB5HBDQgQca8UmSFx1ks+leFEgP13+VcSfw8tEeWQz5d0h7GNOimq163rRtGxXDlhwv6GHQoSxZUJQQPkgK4PodAcqufrzqor4hjcP9BA6A6xybU6b+r3t5U+6u0TvVs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618788917; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rZ5w+1CeqdCiiYndsmhgl1cCVc6vRLgkh6Xz/B0ueLg=; b=OSeCV5VRT9WD3uVZCphHH7G11cgKfgGtLxpu3xjwmKeUkQem+GmwvifjbNA4UnbJWsLmQlnUPM03pVOxioN/TAM/ZI1vcMSUrULtjKCI69kOZalQNRLhKoHaoTDOIBxTPjWFcurgnYsFC0ZXp4PtaYNBXtVjxy0Kj3LFyX6NSb8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.zohomail.com with SMTPS id 1618788917987195.80833830937445; Sun, 18 Apr 2021 16:35:17 -0700 (PDT) Received: by mail-wm1-f49.google.com with SMTP id t14-20020a05600c198eb029012eeb3edfaeso7175491wmq.2 for ; Sun, 18 Apr 2021 16:35:17 -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 l8sm17282484wme.18.2021.04.18.16.35.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Apr 2021 16:35:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rZ5w+1CeqdCiiYndsmhgl1cCVc6vRLgkh6Xz/B0ueLg=; b=hwOiMNn8zxPJk/P6jRrumol00B7lGsreH2Pr7KuMYp2AylsekPWMvcBm2/tiCrPCFC bVkfNApW388T/scgxThJBoqUZ29oF4r2NzgE4IrYhJKg/awtRDWGVjHLPSzFdZLFUGqB d5unXdCRw3Vt7EnAEqc4KGI3s7SyVDKxsLKmh0whYbYSywpPmZhRlu8+1jDwLo9Y6X50 qqAh0GNkRShmsHW7AqQQilNp7tUucE9vLfK8SEZtiwZIZGudKA03YlID8rLSMjBlQ8bv tc/DZMBD9mQ6MrZLuQ+nhSFSeinoT+4Mle74WyADjyrGFZW1w+3CAAvENi2kktf6OhZS /P8Q== 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=rZ5w+1CeqdCiiYndsmhgl1cCVc6vRLgkh6Xz/B0ueLg=; b=DX42u5M9dJuzdCZklUy8EBvxRkxmU5TGtX4D2wOev+9qA9XH4aux8ViVYymlv5TkeX braDgMnp6wVoAn22ViwwUL6CWzY46BzAZhPMJ+20P7y4zRrEGm/RPl7oC5n2/UDhy79Y pBF4HEHxqkKH+E6BFDniOh+veCSHfMLZpgoQ57SWwqg6dWE9yqrbaoHeyljLC7q5TFMp lQEJmvSbAOR4BT5008mNj7xzTxaA0jz4+Wm4VqvaSiEwofgvbewAYFyoogSydQ9AU3Jk ThbH4U0kTYG1g1up47GD96L6gzRmnC8HWlgV8CwDKgo3KbyPUWwRBRhJL3GP2xuLg1l0 7quA== X-Gm-Message-State: AOAM53294X/mUmQa3V1dxGU8rSIcx/Ly4aTDhrfyihS+KRj7dqVk7pA1 bkTph9rxL0UJpgCYDH/gKVkvCL4dc09NlQ== X-Google-Smtp-Source: ABdhPJwI2OXs9tPqGBJDyFVIHwZlgKwVG/2GKF8U4z61N4MHQfJH0k5l2fcz7osOsiwMjvtTvaOI3g== X-Received: by 2002:a1c:196:: with SMTP id 144mr18503911wmb.72.1618788916255; Sun, 18 Apr 2021 16:35:16 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Erik Skultety , Thomas Huth , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Miroslav Rezanina , Wainer dos Santos Moschetta , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 05/15] gitlab-ci: Rename acceptance_test_job -> integration_test_job Date: Mon, 19 Apr 2021 01:34:38 +0200 Message-Id: <20210418233448.1267991-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210418233448.1267991-1-f4bug@amsat.org> References: <20210418233448.1267991-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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Thomas Huth --- .gitlab-ci.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 07e5e737685..bf4862a78de 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,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: cache: key: "${CI_JOB_NAME}-cache" paths: @@ -111,7 +111,7 @@ acceptance-system-alpine: variables: IMAGE: alpine MAKE_CHECK_ARGS: check-acceptance - extends: .acceptance_test_job_template + extends: .integration_test_job_template =20 build-system-ubuntu: extends: .native_build_job_template @@ -145,7 +145,7 @@ acceptance-system-ubuntu: variables: IMAGE: ubuntu2004 MAKE_CHECK_ARGS: check-acceptance - extends: .acceptance_test_job_template + extends: .integration_test_job_template =20 build-system-debian: extends: .native_build_job_template @@ -179,7 +179,7 @@ acceptance-system-debian: variables: IMAGE: debian-amd64 MAKE_CHECK_ARGS: check-acceptance - extends: .acceptance_test_job_template + extends: .integration_test_job_template =20 build-system-fedora: extends: .native_build_job_template @@ -214,7 +214,7 @@ acceptance-system-fedora: variables: IMAGE: fedora MAKE_CHECK_ARGS: check-acceptance - extends: .acceptance_test_job_template + extends: .integration_test_job_template =20 build-system-centos: extends: .native_build_job_template @@ -249,7 +249,7 @@ acceptance-system-centos: variables: IMAGE: centos8 MAKE_CHECK_ARGS: check-acceptance - extends: .acceptance_test_job_template + extends: .integration_test_job_template =20 build-system-opensuse: extends: .native_build_job_template @@ -282,7 +282,7 @@ acceptance-system-opensuse: variables: IMAGE: opensuse-leap MAKE_CHECK_ARGS: check-acceptance - extends: .acceptance_test_job_template + extends: .integration_test_job_template =20 =20 build-disabled: @@ -525,7 +525,7 @@ acceptance-cfi-aarch64: variables: IMAGE: fedora MAKE_CHECK_ARGS: check-acceptance - extends: .acceptance_test_job_template + extends: .integration_test_job_template =20 build-cfi-ppc64-s390x: extends: .native_build_job_template @@ -562,7 +562,7 @@ acceptance-cfi-ppc64-s390x: variables: IMAGE: fedora MAKE_CHECK_ARGS: check-acceptance - extends: .acceptance_test_job_template + extends: .integration_test_job_template =20 build-cfi-x86_64: extends: .native_build_job_template @@ -599,7 +599,7 @@ acceptance-cfi-x86_64: variables: IMAGE: fedora MAKE_CHECK_ARGS: check-acceptance - extends: .acceptance_test_job_template + extends: .integration_test_job_template =20 tsan-build: extends: .native_build_job_template --=20 2.26.3 From nobody Wed Nov 19 21:05:24 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) client-ip=209.85.128.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 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=1618788922; cv=none; d=zohomail.com; s=zohoarc; b=KFK4FF9bgJcRK3jv7V1S7/tfBjPYISrFIKu4j11svKTW8f+UletTChueeckuYhaPiJnTQnl+cmUcgRfkNRi4q5d43+Dh5GQaXEP1G2/nnjridgO00QvBG2t1LoAx63nGsg6RpEB9FOSHxIGyCi4fdO1VmPDWA9mMKUQuFvIhVWA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618788922; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=IZMKyCqMyO5bHC9zaYKJDMgMEQPBUUEp167PbRshw9g=; b=NcDB3Gv1bPhs9n4ijVdH7QRE6y4bvJDJo9cuPgxDFklEc1AtyCvLlAN/SC8fW1muvMJFc88q+muoHKAqrK12GNY02t1u5xJcrws5y5DU7zX31vxSJPNdRlu1y1hZ/XdslW8ypAtbbAsCL0tibuG0r6RGGd+c7XSE3dQ7YSIDwzQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.zohomail.com with SMTPS id 1618788922795268.43976034582465; Sun, 18 Apr 2021 16:35:22 -0700 (PDT) Received: by mail-wm1-f52.google.com with SMTP id t14-20020a05600c198eb029012eeb3edfaeso7175544wmq.2 for ; Sun, 18 Apr 2021 16:35:22 -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 o12sm11079262wmq.21.2021.04.18.16.35.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Apr 2021 16:35:20 -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=JRzyvRaIgVduiKXSWdzn/SYoIhyNKinnWaHrByMEw1yGdhdon3Sz6EMBkxllp5RC6p urjTb7gd7qO2vExG0RMdExbwLeY2LrlPuehSgtzQzDKs9arsQQz8I8V8fFsco2wvua6d CpZpcdVLLsOb9JqJiwBDT6eZXlZo+Ad+GF1FvfsVbe7RVxfKQ3S1vvZ8MDkxK1TaQlz1 pYY74icrWnhYfbImuXA3q2Rg67oZsf8v1r0SuvVUOQ++77FUV+XsFsT0BFq8Qd5E+6eZ ZkmKRoxWSJy8YfR1awSi1mp/LsVDNDtuPaGUW7ROGotnmwTWm4wopaqcgm34SmSGj97J 3bqg== 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=p1nYkYKjX+KCqXGmQJeOxm+SF64eOgyeNEcJ6hNTLvZoVHTTAps6POqcibuhHElyPc hl5vpCrdr2FlVTumpZ5dqoyG8DeA4F2fq0JeDDTOpzaCUuMXoBUaVto1XcfTxIv7lLR1 lIpL3TdqCHqmgB5tLGXhNp43Msa5t2O0fW0IpTJN71dgwE6I4e/mdKIRJvh9KL93sSK0 ObxWvyYGi2kzpoObPi2cCJU1zPFnn+IcdQhywvuYVamHdFUI0nXi9VXw7gwGTZ7VkbHh HkXeM2/me9VULTD+/WnkzuT5CP4PJeF2bn8tNWka8EZ1ym295JGa+EEt1ufyzQ5YZswP 0W7Q== X-Gm-Message-State: AOAM533Xmb1Ls6ByKyhWVYbOdWfeAIFQUkIGkXzJoi+LFJQeDU7+uWas M6NzVlU/nBc7W1DWGQYNeuU= X-Google-Smtp-Source: ABdhPJx2ngVZ6mivhw8Xtv4B2x49q2Ox3RqRCjLHcXxRaMPX8eOcYlz1dqyFr3co8R56R0LXUWN5EA== X-Received: by 2002:a1c:7f16:: with SMTP id a22mr17791114wmd.17.1618788921072; Sun, 18 Apr 2021 16:35:21 -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: Erik Skultety , Thomas Huth , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Miroslav Rezanina , Wainer dos Santos Moschetta , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cleber Rosa Subject: [PATCH 06/15] gitlab-ci: Extract container job template to container-template.yml Date: Mon, 19 Apr 2021 01:34:39 +0200 Message-Id: <20210418233448.1267991-7-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210418233448.1267991-1-f4bug@amsat.org> References: <20210418233448.1267991-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 --- .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 Wed Nov 19 21:05:24 2025 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=1618788928; cv=none; d=zohomail.com; s=zohoarc; b=j2r3pcPC/YgdEwc2PEaDLKyetn96+/kROHuwEV/z6BtCyDY+vPECNwZM7g4kQ+5ekQItEWKsfsi/Ns5/b2g6ZEjIQigqsQ2g/T9J3uYb8I48TxszInlP1u473kvC5JID5R9nPmXZT3886EovdqybG0uOcQ4DCrUlqjz4xZFZ9Nk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618788928; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GiGPjIPUchqYBK2KNH58Rypm9hg2GtmV2AFVIAdCZkA=; b=UstHy1SRFUW8qZP53081Doy7726jfP46U1bcS8fY6Px7YdkElNTAdPPNPyilIp7SiYbkoWZrYFn8PPH3jGx7t9IZRd8YOcI7Gfb2kOTkwa/jAca0dh22sHujHaOTR8eiNzvAw3M9b36PHSC26OAIBqiu1REzAjjPeqy2EUV4v2U= 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 1618788928744354.0007230885759; Sun, 18 Apr 2021 16:35:28 -0700 (PDT) Received: by mail-wm1-f47.google.com with SMTP id u5-20020a7bcb050000b029010e9316b9d5so17071208wmj.2 for ; Sun, 18 Apr 2021 16:35:27 -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 3sm20534240wma.45.2021.04.18.16.35.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Apr 2021 16:35:25 -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=GiGPjIPUchqYBK2KNH58Rypm9hg2GtmV2AFVIAdCZkA=; b=AFvudnFRtRLINKpFrciZxdXQOQOkjdy3yEP4JZZAtlAL4N+0CIcRy58ISKrW5YTibn xcFTKbh+xdvLzwfKwlkjG2R1zd1zFVnsNJAidFbM0AQmZ/PJd99An7q1Sx26jP3ue9Dm W9beiBPSKVh5LBZkAeQtbEAiVNpYmjsIGSmHfbfvH6lRc5NtIk4Fp7e12cYV8a1mMqU0 mjbewNzfjBlxxTEMgIqA7cwyWraXGWl7yzqjC5RpK3eJy6iXDzd5elL6+XZv6tnDRqWb /QyUEg9tkDAJ6NxiD28WQXBLODHlndpNugpHD+CNVVSdhIOtxhHFfZNHqGxVmCxPkfSB vwBA== 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=GiGPjIPUchqYBK2KNH58Rypm9hg2GtmV2AFVIAdCZkA=; b=RQjTNvauuAzG0CDUEkscF6GOZRnpNSrHG7bVT+cqeVd891NMYWmiHwT/8gIon8JNDd kAh4+xoGaIGdqlJkWtYeYxeDM3xDDZnToCRnx7f4NdBBuCahxhGmiI8pUhb9Egn1RaKK 8Ktwb9FEGwgk1hMC7YXfaL9/pkMONiKYyMK6d3s58TjPDCljikozJ/KpIJil1xCgS8Ij jn+q0lqMm+t9SAdgtPFj0SYFRuaGVx384bMW6G7pijoKFvLmwGAqCJuUcUz4Nms8NiAe k7W5vBRuvRKzJONAshSuPl+tiNQbIIw792hz7yr8kGU8PvpgMjI4+y5o220BAKFceFpl a3wg== X-Gm-Message-State: AOAM5339+oQPV5m4Ik+gqdRc4dw/w41ENN/2f0O81YWczx28QIdTEAFx 6N32kl+QljSsbuSC0erw65I= X-Google-Smtp-Source: ABdhPJyVSwxXALi3+UZDcTYHXHwJdqvDPn5iOm+ngO1Jc+Ipws4FnNglgW0NrtXa45M06t1VGP9xoA== X-Received: by 2002:a05:600c:4fd0:: with SMTP id o16mr13767522wmq.140.1618788925976; Sun, 18 Apr 2021 16:35:25 -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: Erik Skultety , Thomas Huth , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Miroslav Rezanina , Wainer dos Santos Moschetta , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cleber Rosa Subject: [PATCH 07/15] gitlab-ci: Extract crossbuild job templates to crossbuild-template.yml Date: Mon, 19 Apr 2021 01:34:40 +0200 Message-Id: <20210418233448.1267991-8-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210418233448.1267991-1-f4bug@amsat.org> References: <20210418233448.1267991-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 --- .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 2d95784ed51..7a0d2069c14 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 Wed Nov 19 21:05:24 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) client-ip=209.85.221.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1618788932; cv=none; d=zohomail.com; s=zohoarc; b=YkAqP0xWmGT6zPMrLlbAhWSb/DsBEgzP9H6YLfI3KPqUJeabS18/6YwzZITuKLjUB/R4YtBB7Eie/KHdwb5NZy9XXhtmChFo2JvR67Az91My8JRivopcJ6BUTvWealWI6dKEFmW5yx/bTR/woG+kiLxWSh1DIV75ql5TtApRwnk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618788932; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+NQxwbCz8CKvqbwDBKHnsWT3vklC845mX0CEiVetIvQ=; b=hH3QRHcnl78h+LWWQylD34M56AQOw+J/m9LR5Lf/enSppz/5VUfEZwzTghlgttJnkLbIN/kqPTW3UPvbe34o8ylAbJaytdIgcle82u1zkW838O0Xxa87grI0CzCt3hLR2uDEPmTRyVhc9EbSmbSvFFx5KRb6lEeY3oy/Cqlf3qE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.zohomail.com with SMTPS id 1618788932622959.0395518771443; Sun, 18 Apr 2021 16:35:32 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id m9so19334636wrx.3 for ; Sun, 18 Apr 2021 16:35:32 -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 k22sm19762514wrh.5.2021.04.18.16.35.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Apr 2021 16:35:30 -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=+NQxwbCz8CKvqbwDBKHnsWT3vklC845mX0CEiVetIvQ=; b=f2K4ccK610ZFmrSt7dO9/ivOhKFjrx0C6J1Yvu/GwTAcZ/aOwPbVaw/u+eNWcmrpmr GUUZCjBSKCMjTTmZOocJKltFO7eoNwgoTOdY1yy92cOtHrZu6+CKaP4eVnNq9vGd2jrq do9njY+OkG/2etpPbFiY9mh13PZkGWBdNzjjPsk1ppyedywzDVnIL+LgtDyUPAxXbKGq Aesw0MfFagcruilfuyC+bep4eIbJECg4ed5pkRWKlxxwmKP/aDMm/dQdwVJr6X/ojLQN HpeNzHDzjsvvPcZ1stgR4AH4FazkLp2RGlfDcgjnwaKIt4auos5rT9fN2+ywF/iICzH/ qRng== 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=+NQxwbCz8CKvqbwDBKHnsWT3vklC845mX0CEiVetIvQ=; b=NOnKCjimUmxwyW5KKugGCVP3FvYpa47wz4qABUvTKSc/KUIBn7ERj4j+yVxGtS15l9 zf43MF13hOTRMNajnbgEcTdkiI/u6rz3bbLC9gygpCH04gSjhfVwvv7B0pGmTAci765M vibGeVOer0yFgNWwyXB0kV087m/SeYdOHi+5RMJR0PpPX0mwelfcQ5ecaixnMnTVAsYz FoG9wSfCno7tl5dUaFHWeSe6bjr+qv5fYIiOIXwUFtq8cxrT/HkgfdG/RYHOwUqBo2kx MQI3jKgv3XI/REeDcjKHO9fQv0Oyon01gxu6l2lCzNfd9OTjnxJTUdP8vOqwCVlzf5lq +zcg== X-Gm-Message-State: AOAM531qmNBbMBmPyj4+iwwS+9kgc8B/D93yo2SQMu6BpE5BK6r0RUet RvbXxBXrc+f3y6kHmXCBaVc= X-Google-Smtp-Source: ABdhPJxAx6PdGko7beXAGNOUr45+OaxjYJPme6eWkszJuOXBB91xo3Z0BqaBkYPbWjwusaGsjYjtqA== X-Received: by 2002:a5d:424a:: with SMTP id s10mr11553130wrr.70.1618788930926; Sun, 18 Apr 2021 16:35:30 -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: Erik Skultety , Thomas Huth , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Miroslav Rezanina , Wainer dos Santos Moschetta , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cleber Rosa Subject: [PATCH 08/15] gitlab-ci: Extract DCO/style check jobs to checks.yml Date: Mon, 19 Apr 2021 01:34:41 +0200 Message-Id: <20210418233448.1267991-9-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210418233448.1267991-1-f4bug@amsat.org> References: <20210418233448.1267991-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 (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 mainstream CI. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.d/checks.yml | 24 ++++++++++++++++++++++++ .gitlab-ci.yml | 1 + 2 files changed, 25 insertions(+) create mode 100644 .gitlab-ci.d/checks.yml diff --git a/.gitlab-ci.d/checks.yml b/.gitlab-ci.d/checks.yml new file mode 100644 index 00000000000..f695627b7cd --- /dev/null +++ b/.gitlab-ci.d/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 bf4862a78de..ba35b3917e7 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/checks.yml' =20 .native_build_job_template: stage: build --=20 2.26.3 From nobody Wed Nov 19 21:05:24 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) client-ip=209.85.221.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1618788937; cv=none; d=zohomail.com; s=zohoarc; b=cq84e4HZciNwE41YbTSDIshDVC4CStTGDrG8xp1X4hfst/mx3n8Zpkfb12O8PS4sSaFZ0MKFn5lVDF2qspVsbVeHn2kq57bEE8b1zcMYxB0IJogn0mS0RMkkUDlLHt01MY5p1lwWRXJ75dQF4+FGtTCgPdOscXgrR1dHvP6zGIc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618788937; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ub4Z4KuEsuOp57bzjB7PNdaoI3pNBoAGYQv//w2NMwY=; b=ThdwBYNNibuXAqnw2b8jYfEv9S7roxmM53qTEvCK9AGIWmB/LOP39rKtJK6FhQm4MkUMqukomsi+1fGz93ypNpFMSC1z8kUIyAm2OtgTUzRxhY2AMm81xH/jHN9hQB9dcDE2W45Gwhv9tNXHkGQmSyp7ZDbrkYAszm+jaWgU0Fc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.zohomail.com with SMTPS id 1618788937523586.1189517472337; Sun, 18 Apr 2021 16:35:37 -0700 (PDT) Received: by mail-wr1-f47.google.com with SMTP id r7so20078257wrm.1 for ; Sun, 18 Apr 2021 16:35:36 -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 p17sm16851681wmq.47.2021.04.18.16.35.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Apr 2021 16:35:35 -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=ub4Z4KuEsuOp57bzjB7PNdaoI3pNBoAGYQv//w2NMwY=; b=iNeXxebXFZDbNhLOAbwVbyVoIeT1MWUuN2X3mQqvoxbgjf9CSrUJZl/isPdjAwD6Nb ehKxmKPZ4TEZGDhkNWG6KuTY+k0YOOVYOsmFmWfwIiYkQ/ETK5XSz/a1/gVKbXbn0TQw JtUBJEFMDOc7j9qpA+CY7tNSCLuF38r4KIa+4qx0Iq/DzbaNiVOY3TAHfvrUQ7S291ZY NfwBoHR6iA1D4Irmq7OjCvVr4yM+yp1u0CdSKoamYH1sQrutjEow2fAo6ACGZoCW8IUY lTEmBQ08rb+lsxMGGyxIAHOQ8FhOsPhS5qanSsBRs3AbkiMNGvXcKQM7XGaq527vWUki j1TQ== 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=ub4Z4KuEsuOp57bzjB7PNdaoI3pNBoAGYQv//w2NMwY=; b=ubLG6e5rA6T5ZBqcU6www3i59xX+k/Vip9EjGFpffV+aBHHz9BrJedQXJwL+6Mz+Lp zxO9jQ78sQZPlabhly6gavd6NsiUFxDi38tIrwutouqDTIPOxwjuIyTR+fubn3Gjkf+O HNte5K/ULwdUsgX6JDV56TVw/OifrU/omXAnXQCUojl8STtcgbDG+nwT8XjjpjP2otii 5IqsVjwmzf1uHgUTLDbbLeRUSUE93cma7te6kGQ3EclGrj2AYUVVRfRIsz5Duv34iuXx hGGxHkiiMtYn6kRktDv3Or7NoGVApztk3crIKSKr8pF5LEZzEVpGbieV4Hi1t55nThUW nqkA== X-Gm-Message-State: AOAM531jLSoa4EY1RKdHU+zpjOf5opakWGPXx23YxjxVnG1ifbAIW/AB IhzS7uixXWJS2B8mxyT0qnM= X-Google-Smtp-Source: ABdhPJyt8tZ7RzLX1OglFDMKOCkUTlmK22B45ni7TAKx7cc5JA8/Ajv9f9BkINuqBZGHHGoMVj0cVA== X-Received: by 2002:adf:e901:: with SMTP id f1mr10686915wrm.44.1618788935828; Sun, 18 Apr 2021 16:35:35 -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: Erik Skultety , Thomas Huth , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Miroslav Rezanina , Wainer dos Santos Moschetta , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cleber Rosa Subject: [PATCH 09/15] gitlab-ci: Extract build stages to stages.yml Date: Mon, 19 Apr 2021 01:34:42 +0200 Message-Id: <20210418233448.1267991-10-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210418233448.1267991-1-f4bug@amsat.org> References: <20210418233448.1267991-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 --- .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 ba35b3917e7..c367d42977c 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 Wed Nov 19 21:05:24 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) client-ip=209.85.128.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1618788943; cv=none; d=zohomail.com; s=zohoarc; b=l3LCyBwmdh21Ua1jDPN5gial1VypkREcl9ZWaHHDiNAynsaCXcDZbWeIl5CCPlINI6ZFOUEbtUWizmCb1LeH0fdfYvkJx9ke2OGfz48O/Kyfhu8DPTELFkkbUUCJztWSPsimIQUTLT0sEewYbCjOWkW/90Fy9YxweZu554m/wj8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618788943; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bR+US8EtIGOaPN7Cu4S5D8+ZPqozvGpU/wsfyKwzMIM=; b=b0NunFnOMuM5seEee4mjDBtew1BP5UeJ8Yn8hTSYlzULi73KcqxbgAaFgtAtq1mvvIrJBdqek9arMBw7WjOIqO/aN4boU+c1gzLPGRobvIUTKgn28KCZnzcfiZSIhPSzTMltw2wODz0HL42kubANYOtA/SWoTfd7DatXcd8pZNM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.zohomail.com with SMTPS id 161878894321895.05668133562335; Sun, 18 Apr 2021 16:35:43 -0700 (PDT) Received: by mail-wm1-f46.google.com with SMTP id w186so12651335wmg.3 for ; Sun, 18 Apr 2021 16:35:42 -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 c18sm19965806wrn.92.2021.04.18.16.35.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Apr 2021 16:35:40 -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=bR+US8EtIGOaPN7Cu4S5D8+ZPqozvGpU/wsfyKwzMIM=; b=K0iryv/i4T7+29bWKXSNzL+Qxtx/Ek++ofitBHF9RJFy4uAVdJ76Wyyowb3ep+bxDN 1ictidzUVjrB7CDjpL964d5KYEVZKF++kCG+gzr1fkpwh6vuRkk1bDlgv6pwL4paxKaf JYbciloSETL4jtiPOzLhFeI4J36oDEquVlZog/rRM2Sda5X5eAHpzrvZ/79VUSJ0wKPx lhnPCasXPHDhDHS9I876K4UcZE0tXfTElecEWegC06ZSKT/pB6/rB57FRMun6ZYGH21s VMGrW/tyq8wBEZCP0xXnaMfDGwnNEjg7K1Ww2KGoK3IjEz053+ym5tnRml/U/+5Th5JF RMoA== 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=bR+US8EtIGOaPN7Cu4S5D8+ZPqozvGpU/wsfyKwzMIM=; b=CgPn0d0JdrlVFD4bMwVxZavSSrSHRZbEmNAl6qaT4pVtU84o+3c+B7zM6rMB6u3VHG fpDxkO3L8zTh99cR6dDNzJ1I+j2XaML8SobTuDzb6iKPxkGS9U1+3f3qnMqedi2HoExw 46ASVr7ztdMJE5h3f4jPTl1wIb6kxlnGS0pm/b5keDsT1mX2z1riNR99nVl8/85wbZyN ObyYkjB/JDDvKxgW08uc7KqTS+7veoMqrwRF0qiXtet6oYff2alUmamu2uwMAq80SoE+ FCkmSx2DmSZfMV4530LLqNxBaq/NTp6Tyzj8PSrUdzePhax1aoqx6WGPdyzGDT5qOl5q CX8g== X-Gm-Message-State: AOAM531cHAzUn+LLVRw0zyd6y7GTfCiqlUk8jVoE4s8D/7DEeYxR0iEz dmJ3wQfffy7t/LHEkmtD7Ow= X-Google-Smtp-Source: ABdhPJyf6shy29oZasGRHvv81c94SDMjteUeAVjleKeSr+83nSxGjIh0TR5enwSCfxbwl2CCBYWdJA== X-Received: by 2002:a1c:f705:: with SMTP id v5mr17978959wmh.105.1618788941071; Sun, 18 Apr 2021 16:35:41 -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: Erik Skultety , Thomas Huth , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Miroslav Rezanina , Wainer dos Santos Moschetta , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cleber Rosa Subject: [PATCH 10/15] gitlab-ci: Extract all default build/test jobs to buildtest.yml Date: Mon, 19 Apr 2021 01:34:43 +0200 Message-Id: <20210418233448.1267991-11-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210418233448.1267991-1-f4bug@amsat.org> References: <20210418233448.1267991-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) and their templates into (buildtest-template.yml), to be able to reuse the templates without having to run all these mainstream jobs by default. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.d/buildtest-template.yml | 80 +++ .gitlab-ci.d/buildtest.yml | 744 +++++++++++++++++++++++++ .gitlab-ci.yml | 824 +--------------------------- 3 files changed, 825 insertions(+), 823 deletions(-) create mode 100644 .gitlab-ci.d/buildtest-template.yml create mode 100644 .gitlab-ci.d/buildtest.yml diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-t= emplate.yml new file mode 100644 index 00000000000..b24a153d904 --- /dev/null +++ b/.gitlab-ci.d/buildtest-template.yml @@ -0,0 +1,80 @@ +.native_build_job_template: + stage: build + image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + before_script: + - JOBS=3D$(expr $(nproc) + 1) + script: + - mkdir build + - cd build + - if test -n "$TARGETS"; + then + ../configure --enable-werror --disable-docs $CONFIGURE_ARGS --targ= et-list=3D"$TARGETS" ; + else + ../configure --enable-werror --disable-docs $CONFIGURE_ARGS ; + fi || { cat config.log meson-logs/meson-log.txt && exit 1; } + - if test -n "$LD_JOBS"; + then + meson 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: + 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: + - 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 diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml new file mode 100644 index 00000000000..c24553eab05 --- /dev/null +++ b/.gitlab-ci.d/buildtest.yml @@ -0,0 +1,744 @@ +include: + - local: '/.gitlab-ci.d/buildtest-template.yml' + +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: .native_test_job_template + needs: + - job: build-system-alpine + artifacts: true + variables: + IMAGE: alpine + MAKE_CHECK_ARGS: check-acceptance + extends: .integration_test_job_template + +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: .native_test_job_template + needs: + - job: build-system-ubuntu + artifacts: true + variables: + IMAGE: ubuntu2004 + MAKE_CHECK_ARGS: check-acceptance + extends: .integration_test_job_template + +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: .native_test_job_template + needs: + - job: build-system-debian + artifacts: true + variables: + IMAGE: debian-amd64 + MAKE_CHECK_ARGS: check-acceptance + extends: .integration_test_job_template + +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: .native_test_job_template + needs: + - job: build-system-fedora + artifacts: true + variables: + IMAGE: fedora + MAKE_CHECK_ARGS: check-acceptance + extends: .integration_test_job_template + +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: .native_test_job_template + needs: + - job: build-system-centos + artifacts: true + variables: + IMAGE: centos8 + MAKE_CHECK_ARGS: check-acceptance + extends: .integration_test_job_template + +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: .native_test_job_template + needs: + - job: build-system-opensuse + artifacts: true + variables: + IMAGE: opensuse-leap + MAKE_CHECK_ARGS: check-acceptance + extends: .integration_test_job_template + + +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: .native_test_job_template + needs: + - job: build-cfi-aarch64 + artifacts: true + variables: + IMAGE: fedora + MAKE_CHECK_ARGS: check-acceptance + extends: .integration_test_job_template + +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: .native_test_job_template + needs: + - job: build-cfi-ppc64-s390x + artifacts: true + variables: + IMAGE: fedora + MAKE_CHECK_ARGS: check-acceptance + extends: .integration_test_job_template + +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: .native_test_job_template + needs: + - job: build-cfi-x86_64 + artifacts: true + variables: + IMAGE: fedora + MAKE_CHECK_ARGS: check-acceptance + extends: .integration_test_job_template + +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 + +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 + 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 c367d42977c..8f13a584a29 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,827 +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.yml' - local: '/.gitlab-ci.d/checks.yml' - -.native_build_job_template: - stage: build - image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest - before_script: - - JOBS=3D$(expr $(nproc) + 1) - script: - - mkdir build - - cd build - - if test -n "$TARGETS"; - then - ../configure --enable-werror --disable-docs $CONFIGURE_ARGS --targ= et-list=3D"$TARGETS" ; - else - ../configure --enable-werror --disable-docs $CONFIGURE_ARGS ; - fi || { cat config.log meson-logs/meson-log.txt && exit 1; } - - if test -n "$LD_JOBS"; - then - meson 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: - 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: - - 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: .native_test_job_template - needs: - - job: build-system-alpine - artifacts: true - variables: - IMAGE: alpine - MAKE_CHECK_ARGS: check-acceptance - extends: .integration_test_job_template - -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: .native_test_job_template - needs: - - job: build-system-ubuntu - artifacts: true - variables: - IMAGE: ubuntu2004 - MAKE_CHECK_ARGS: check-acceptance - extends: .integration_test_job_template - -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: .native_test_job_template - needs: - - job: build-system-debian - artifacts: true - variables: - IMAGE: debian-amd64 - MAKE_CHECK_ARGS: check-acceptance - extends: .integration_test_job_template - -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: .native_test_job_template - needs: - - job: build-system-fedora - artifacts: true - variables: - IMAGE: fedora - MAKE_CHECK_ARGS: check-acceptance - extends: .integration_test_job_template - -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: .native_test_job_template - needs: - - job: build-system-centos - artifacts: true - variables: - IMAGE: centos8 - MAKE_CHECK_ARGS: check-acceptance - extends: .integration_test_job_template - -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: .native_test_job_template - needs: - - job: build-system-opensuse - artifacts: true - variables: - IMAGE: opensuse-leap - MAKE_CHECK_ARGS: check-acceptance - extends: .integration_test_job_template - - -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: .native_test_job_template - needs: - - job: build-cfi-aarch64 - artifacts: true - variables: - IMAGE: fedora - MAKE_CHECK_ARGS: check-acceptance - extends: .integration_test_job_template - -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: .native_test_job_template - needs: - - job: build-cfi-ppc64-s390x - artifacts: true - variables: - IMAGE: fedora - MAKE_CHECK_ARGS: check-acceptance - extends: .integration_test_job_template - -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: .native_test_job_template - needs: - - job: build-cfi-x86_64 - artifacts: true - variables: - IMAGE: fedora - MAKE_CHECK_ARGS: check-acceptance - extends: .integration_test_job_template - -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 - -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 - 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 Wed Nov 19 21:05:24 2025 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 ARC-Seal: i=1; a=rsa-sha256; t=1618788947; cv=none; d=zohomail.com; s=zohoarc; b=fMLHB+nbAHURhbwjzsPEr+2Llyf5ausNongDa0WO/Cx6xV8+Z5I6ECnW9HR44kJk6vAPOqH0A/ukHmmmLGLxprf59ReX3Oall5VYba6JJIs6WmsLina2+K4cNZ0a3iFcqa2vqjBb7PC5LgYF9ZOd2RUC+1Qbbni0ApmcodLThcc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618788947; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yp2oeeOnRwUm8R3KG/hR76rs8Lvxb/h3WI1buy5HvJU=; b=g7KzMFiN1K36HjKcX/lBLl9ns6klnpO8FB3nrRQgJzpmFspMdh+etJTj1Q4uMmMBE6DscGTL1aLGs+P+IvttPtDxc0Zpy5Cuf3l4V2GhbuUstn4v1Hnd2+QIdBaLl4UFGKvZSHhUmQM72obxOr6V14EC7mNzigtDZTjCHLVquQw= 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 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.zohomail.com with SMTPS id 161878894754844.73421598229095; Sun, 18 Apr 2021 16:35:47 -0700 (PDT) Received: by mail-wm1-f45.google.com with SMTP id i21-20020a05600c3555b029012eae2af5d4so7565721wmq.4 for ; Sun, 18 Apr 2021 16:35:46 -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 u2sm17125918wmc.22.2021.04.18.16.35.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Apr 2021 16:35:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yp2oeeOnRwUm8R3KG/hR76rs8Lvxb/h3WI1buy5HvJU=; b=U+78c2EYUsMzGjb3E+3MhaMa3yt4ILdRRaQ0dVya5mDvPl3Zy3QY+YOW8XeCn0wdTR O2yp2HwAMlSi/tVlGGIUAI/fEfi0Ozfrzz0MkY3A4pKp8JH0fYnYh8NBcmD4QotFg2Mr qc7nDEq70oqpGXkvX842UtUTGlVxbq2RaGRNcJ3eZYyYbJ22Y+lcWVQIfRWpN44/h11z 5k9QuaMlpzSb7E8jqtJkjwgckQ3i6XqQK1tlDb2lJ0wyXNUGIfeBPLXjxOEzGEHBfJJl 1cWR5f6FjgfL8s0K/J58CihX66MH7ZJj6P9yJmNNRhbEYwo5iz2/zsI+StLWb0jRlk5G UPSg== 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=yp2oeeOnRwUm8R3KG/hR76rs8Lvxb/h3WI1buy5HvJU=; b=sg35e3Zc5kaCr62TmLh2PINPTMKNz9rROBwhr2+DRM2aqNtlhGAC2L1r5QTwZpZzhl Y4vsj8/vH8yuQZL/xjaXxP9VYaNjx+Wqe1CnuLVqYPO10MyAOdz0yQZJ9Xu/zqbaJ2y2 XOumR3aK0A/LVPbEWDfrc8xA2xjjrF7xhh3emh7lRKvsgRvTqYS9i5eC/DbUvWTnMvfr N5YZU+xnL21kC83ye5Bam/auIMk9Av6bLGj96zBCCM4OD1kSsa8G2dQeQC8ph9i4Yx+H dzxNi8xrrMhu0PO55i/dTX9vN8OGq5sEMH2eMD46sxxWkgD2YKSs9/UuXHOPvY9pjX5b n4dA== X-Gm-Message-State: AOAM532qsrB0LQegutl6hKikdkrxuffxHT0HtPDvcd4aPWld4bd9FW0/ rpmcGIDNaLhl+mvEkhG5Bo0= X-Google-Smtp-Source: ABdhPJy3RVVB/1dxfxTvvMSEejZQOujG0cGs+nu60tchcc6Zdvz3Zy5vbAA9S2z/SskKy88LvJNM9A== X-Received: by 2002:a7b:c1c5:: with SMTP id a5mr18461855wmj.54.1618788945878; Sun, 18 Apr 2021 16:35:45 -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: Erik Skultety , Thomas Huth , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Miroslav Rezanina , Wainer dos Santos Moschetta , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cleber Rosa Subject: [PATCH 11/15] gitlab-ci: Extract core container jobs to container-core.yml Date: Mon, 19 Apr 2021 01:34:44 +0200 Message-Id: <20210418233448.1267991-12-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210418233448.1267991-1-f4bug@amsat.org> References: <20210418233448.1267991-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) It is not possible to use the previously extracted templates without this set of core containers. Extract them into a new file (container-core.yml) to be able to build them without having to build all the other containers by default. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- .gitlab-ci.d/container-core.yml | 17 +++++++++++++++++ .gitlab-ci.d/containers.yml | 16 +--------------- 2 files changed, 18 insertions(+), 15 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..c371f8587e1 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -1,5 +1,6 @@ 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 +12,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 +181,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 Wed Nov 19 21:05:24 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) client-ip=209.85.128.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1618788952; cv=none; d=zohomail.com; s=zohoarc; b=O5Md2w/h0cx5hHUZ7m6ohouLoNlH8Dcqdh7wgrjoSZOdcMHk5Rdecwyvfy3PnLTFayMBpCXS7VOVw7stGdTLjzQ4yWj+HjKf+lKJsKXV2SMdEB2jY9nzsQvFHs5kHxezis9r8EX/Od2hvSonWhpBOdyLao/3OxM9IgoJblFt9Wc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618788952; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=luRvL4igtqHocK7BdoHgxFjXZoT3hewA/GRk+uJX/ss=; b=TXTkbHzk0zSq8z8InXEIyaJr5pyH09K1yffNUX3bky0ibo07fS62UeD9v81OJ6MhEfehqrwfDjI0WAE1W5IWiqMoxhRJi1YjCXYTZ3B+e03RcMjpZhb7eTOoccGQeYxf6ftFLdQ6micxa6kWl75nmTzGlzY1/UiMFbBGxxocVoc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mx.zohomail.com with SMTPS id 1618788952451197.1360137839324; Sun, 18 Apr 2021 16:35:52 -0700 (PDT) Received: by mail-wm1-f42.google.com with SMTP id y204so15787305wmg.2 for ; Sun, 18 Apr 2021 16:35:51 -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 p3sm4621011wmq.31.2021.04.18.16.35.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Apr 2021 16:35:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=luRvL4igtqHocK7BdoHgxFjXZoT3hewA/GRk+uJX/ss=; b=jKddbjnv8OIKs/jfXACt4C6Sx0y3wznhvs1+aKB3OmJrcIb3Tgn7gEvKbVOKly+uba 1OHNOcS8FI/0A6oHgVxyZWbDLx0U1tyYxJbZ9PZECvPdkCNYN62pIywLN7NttOAjcqJI e3df/3CFpFM2ggqenMDS2c08bGm8pBTW4I11b92+5LrVrbpbk+zhf0hOf0TZw0M9STQQ 5Mjwi8bLwLIThYlxyGAEErrS+SnHgOe+veaD+KYub3DdH8nJm6pAYJWEUpZpxmjPdaJF LF3LvH1G55Cwocj/7qzl/2lvulrM7edIKmbRwwYufS01KIMV4DAByCYXfHUXdr2cFcdM +aGA== 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=luRvL4igtqHocK7BdoHgxFjXZoT3hewA/GRk+uJX/ss=; b=isLbO1qKigd+BOs+/JYGEkSw12k/WBfXPdOCtcOeHyNyvoB957Arc8J92F5FlozK3r 0jjB0HcwNPxUtgwtZovt3w5nmGlpA0c3KtpCSegnlJLrW7hQthrYI6UQV/7H1hgthOP2 gFOdb0KoiRFgj1Z+/UXn85FyzYg/OIeg+PzrTmBc2eXuo+5/lhy/i68vTCKstlsc14gN JjB4kA7K40jZXLeIZ+uO8f/0MXFsci2/MCZFDl/l5n8eahC3MdM5q0iKjF6ZgGs6AmRE LPde//0FDpk0dFAe947aeEWVnDay1DkRdWGFrNagN8QhWfY6mxT+EU3Xn7rk6lKdNaLE wTDQ== X-Gm-Message-State: AOAM5332lb3cWXhGTz9P2KpFs3rZPJTVAlBW8xwnYGeCKTcvmYnMZHnt a3M8oNhTvcOIaV0QGd1Ks8I= X-Google-Smtp-Source: ABdhPJy7vtnvn00eCQMpl9J9/aJCewjn3E7E07DSQEUFV5oXTFrirh20AgOX1R6Iig7N/NXY4oVcFg== X-Received: by 2002:a7b:c30e:: with SMTP id k14mr18809350wmj.128.1618788950776; Sun, 18 Apr 2021 16:35:50 -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: Erik Skultety , Thomas Huth , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Miroslav Rezanina , Wainer dos Santos Moschetta , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cleber Rosa Subject: [PATCH 12/15] gitlab-ci: Move current job set to qemu-project.yml Date: Mon, 19 Apr 2021 01:34:45 +0200 Message-Id: <20210418233448.1267991-13-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210418233448.1267991-1-f4bug@amsat.org> References: <20210418233448.1267991-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 --- .gitlab-ci.d/qemu-project.yml | 8 ++++++++ .gitlab-ci.yml | 8 +------- 2 files changed, 9 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..8f13a584a29 --- /dev/null +++ b/.gitlab-ci.d/qemu-project.yml @@ -0,0 +1,8 @@ +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/checks.yml' diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8f13a584a29..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/checks.yml' + - local: '/.gitlab-ci.d/qemu-project.yml' --=20 2.26.3 From nobody Wed Nov 19 21:05:24 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) client-ip=209.85.128.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1618788957; cv=none; d=zohomail.com; s=zohoarc; b=JAHROWDgX5t75edM5e6pfpn62YOWan+Mtw6N1qWbBBsD3c8oYf19fot5mAay+BCcgCfUHWDTs80ozULtqre66RJsQ+QlGq1IMYCzL5Irl/gPE874nX1N6f19mCOihIrQmqH6yXk0n4dPaNicbXPDFnvcGDNtMN6eoi5jNMc5OQ4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618788957; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rPpdvyQdnjV1hyP8p6HQlY/fim5Hnf4QrSAGX3smJ5Y=; b=g1r8CCzqIzULRGwDB2EluXC1SQr6c/Jqod6I839TLYipyH+yBhVsjejra2uWzJ0IXwxD3jj7tG5akYHnCzwKafdNPzLhdb+PtLkrvLHDshrwlnNJR5ZoQR5TkduPHB384PBHWdJwRcEPsOb6FzFD8njytcYr9s/K0OOAON0R2t8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.zohomail.com with SMTPS id 1618788957459945.5248552582591; Sun, 18 Apr 2021 16:35:57 -0700 (PDT) Received: by mail-wm1-f51.google.com with SMTP id w7-20020a1cdf070000b0290125f388fb34so17023147wmg.0 for ; Sun, 18 Apr 2021 16:35:56 -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 a72sm17050210wme.29.2021.04.18.16.35.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Apr 2021 16:35:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rPpdvyQdnjV1hyP8p6HQlY/fim5Hnf4QrSAGX3smJ5Y=; b=bV/GjduJ/QxCmctnK6WULgr46i8cn0yymikRkP1QL/nXLrj3mJc13NzPi8bqLltY8C 5C4uqeKVx3Jn6lEB8RfeLTY2O1EgghoFSqdPkkCjJCno0ghmYXjNOmZya1040djrIkWK 5Xd4z8SZPD1KEPrrA9TcjFIMU3HZRVd8W1IbP/7wP1a8livd/1c6Dfv6WhLIlGxc8RgE aSYh/6UIE7Etk6/ZO2mHyzsBHtugyjCyfIOiRODRMJ8B1om/NTTnyN9aOBBwod7VTetN hpOZFsv2CAA1S43wkS1InJaTOieHgVq+frgbPQivhTUievLumMltzfBWLeUN/0Li0n1Y RonA== 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=rPpdvyQdnjV1hyP8p6HQlY/fim5Hnf4QrSAGX3smJ5Y=; b=Oj1A6ciDoE0xblTXqEvS1JRON9b7gxlmohhCLNAActzLPl+0kBIwyzvbSv47ZYFb7Z b+18JUMyl3k3BgKaNVlt8LZvaJFYlXbFlxeiEbyPNyjTgmfC30Sk8KPctHjxG+P7JkX3 F46iu/bFTA5C7fTA7/c2be/HmJViGfhDrxsQjOCEJDxZOpQueucyUaSMoZSJvskr+J41 ECWnbOUqE+hggY0QYLfvrct74zP4n/1Nq+rhBTg9FiUOSpUisF7ac71pXggUkVse/JCW WUpHaEXNhs4/6Oxknb6T08abgCfOE6sdlO2BFT7TjhZnmxCjtbwBryDGsQk2e8NkDuPa W9zA== X-Gm-Message-State: AOAM533eq7dLeArvPWsR/VE4e2dLEpkySb6jivP69MTPC51TJ/ppbHOf +u9pI/wAELGQx4Tk9liYv4k= X-Google-Smtp-Source: ABdhPJzkdZU6p+WmffXJEnhHazwwC2JQnWLxBOkYMurbmu/Sh4eUKMY4v/UghzUMMH7M0+gEr9ePbg== X-Received: by 2002:a1c:9dd1:: with SMTP id g200mr18981645wme.60.1618788955710; Sun, 18 Apr 2021 16:35:55 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Erik Skultety , Thomas Huth , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Miroslav Rezanina , Wainer dos Santos Moschetta , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cleber Rosa Subject: [RFC PATCH 13/15] gitlab-ci: Switch to dynamically generated pipelines Date: Mon, 19 Apr 2021 01:34:46 +0200 Message-Id: <20210418233448.1267991-14-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210418233448.1267991-1-f4bug@amsat.org> References: <20210418233448.1267991-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) Switch to the dynamically generated pipeline scheme described in: https://docs.gitlab.com/ee/ci/parent_child_pipelines.html#dynamic-child-pip= elines Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.yml | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 533a7e61339..718c8e004be 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,2 +1,21 @@ -include: - - local: '/.gitlab-ci.d/qemu-project.yml' +# Dynamic child pipelines +# https://docs.gitlab.com/ee/ci/parent_child_pipelines.html#dynamic-child-= pipelines + +generate-config: + stage: build + variables: + GIT_SUBMODULE_STRATEGY: none + artifacts: + paths: + - generated-config.yml + script: + - cp .gitlab-ci.d/qemu-project.yml generated-config.yml + +generate-pipeline: + stage: test + variables: + GIT_SUBMODULE_STRATEGY: none + trigger: + include: + - artifact: generated-config.yml + job: generate-config --=20 2.26.3 From nobody Wed Nov 19 21:05:24 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) client-ip=209.85.221.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1618788962; cv=none; d=zohomail.com; s=zohoarc; b=O/7pKZe9dDXNJ1W+ZmH+lGPGpY/3XoRcF/c3eTy9XJcd/TSUDHQ8lRTDetCb/aNikiDePzNTScE7KukKwtwdnkLPB7FVD/XyKERXsn31Ep7XIhKRjZ4ljil+KVaWA4iVb1SXKpehrg0D59OIcFCElQe4NJETLu0/mEjKkkYJMSM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618788962; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=T8BFfTvY4m5j6dkvWFL9bHoXXUlACw5KgYibCTJPKfE=; b=E5tuf1lK2qIwj6eMhMZjbe9hPWR+QnsRxj7F05JI///d1CodvTktmkpRvNJDCbRXGvXsIyPZuB/Pvo7e7Ke3wAao6hfIHlf8rdIqcVfUEY6XaZtCWjT0hGi+wOreeXmMXYSQV/VVOpGZYt3ma3oNwc5xl/tlrsblWoHBsPY2zLo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.zohomail.com with SMTPS id 1618788962473747.8762518610569; Sun, 18 Apr 2021 16:36:02 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id j5so31137304wrn.4 for ; Sun, 18 Apr 2021 16:36:01 -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 l20sm17925605wmg.33.2021.04.18.16.35.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Apr 2021 16:36:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=T8BFfTvY4m5j6dkvWFL9bHoXXUlACw5KgYibCTJPKfE=; b=KECAzo4PStC4QmVUws8joqGntRt0CzRGmyeriXfUGsW2Rp4FDvTMeb3qblEy2dpGWc sVe8C+48r4JwYAbFR8EQoV0zh71DT60QP0alHk1gQ4sJijO1ZN//w3aQah8xgtcJlLkX 8sF0RczNoYtUICMcSMeQBQlsIPIcd/ekHKb4a+q/tAYxql4fxkipJpjh+Xkr1QMI7HQ0 dHqNGGFSLEko2IATvJsuudkDpaoo+VyebFArly5nT+PDbnqqUcDXCO2qoEhT5rddogKO aDJG1BbUE2OC/440imrcxlCj8FoM+C/XHnA57oKnG6g47JvmkfxLq5ixKzBmCuJsUmeY X3NQ== 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=T8BFfTvY4m5j6dkvWFL9bHoXXUlACw5KgYibCTJPKfE=; b=U/pYt8rQnxoX1uKII/oRU628y4X0gnRSopk2HN8ouw67Kxkv6zH1HVGGrN1E5BD2OV xG0LDVrN6WOce85QV7PoCfPxYpxh1LIQhzKUglzc3Oy8M5Y9FrqsNE5F/GW8wTy2uRXl Fw3nf2dSvmJJ5rlCx3KG5gKQzSqp6OKhwHP9h/vq4yW+pWyfPrP9PpKX7zv4Fn6mlwsK b8lEBHDpWC25d44AZMTBvqZOGKVxlmR7QKVI1nZHW9cfRRSVLrmU2Gf1ra+QnV9G6oH9 bT0MOd6HZjhG3AIN2VN3IifTJFMdaSqzw8PVMIY/vDbK6v6qiTF67aquiuIH9k+Pb9Ps oXYQ== X-Gm-Message-State: AOAM532I7Jz3r4S7z+VtuKy8i4SR6jwnG2bwpSkSHlyTLYwgcBc2BO8E Js7uSpjwURwjISyFWELg5CU= X-Google-Smtp-Source: ABdhPJxKiKasbtPDMgubFBvX3xBtC524VvxPj7cx33k438Exr0ZqGJT0Q/Zrs9eU5/6h7vFJoml8xQ== X-Received: by 2002:a05:6000:154e:: with SMTP id 14mr11332072wry.24.1618788960772; Sun, 18 Apr 2021 16:36:00 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Erik Skultety , Thomas Huth , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Miroslav Rezanina , Wainer dos Santos Moschetta , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cleber Rosa Subject: [RFC PATCH 14/15] gitlab-ci: Allow forks to use different set of jobs Date: Mon, 19 Apr 2021 01:34:47 +0200 Message-Id: <20210418233448.1267991-15-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210418233448.1267991-1-f4bug@amsat.org> References: <20210418233448.1267991-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) Forks run the same jobs than mainstream, which might be overkill. Allow them to easily rebase their custom set, while keeping using the mainstream templates, and ability to pick specific jobs from the mainstream set. To switch to your set, simply add your .gitlab-ci.yml as .gitlab-ci.d/${CI_PROJECT_NAMESPACE}.yml (where CI_PROJECT_NAMESPACE is your gitlab 'namespace', usually username). This file will be used instead of the default mainstream set. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 718c8e004be..35fd35075db 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,12 @@ generate-config: paths: - generated-config.yml script: - - cp .gitlab-ci.d/qemu-project.yml generated-config.yml + - if test -e .gitlab-ci.d/${CI_PROJECT_NAMESPACE}.yml ; + then + cp .gitlab-ci.d/${CI_PROJECT_NAMESPACE}.yml generated-config.yml ; + else + cp .gitlab-ci.d/qemu-project.yml generated-config.yml ; + fi =20 generate-pipeline: stage: test --=20 2.26.3 From nobody Wed Nov 19 21:05:24 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) client-ip=209.85.128.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1618788967; cv=none; d=zohomail.com; s=zohoarc; b=ZSgtDSJLFHOumsdaYAX2TCoZFJQNAuSPHPPbxlx0f9emVA9PMI+Ji9/6u26RZuY4S1sQfhMIWUKm/jL3Ebwve5y6CYnpWPMrY/o8mgVZ7s4AKNA7XThpwXPLSI8D8dHpkId7C5cW3ybgjfPvsZYpzQArpVnu3HqTRzNNi2zxhrw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618788967; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=z7Ep6fYXtdJtKlmnq+PKoKN/lqrVctpakcoxcBuJMWs=; b=gghI60mXMA8THcoPmCFC2nGEpm0MGQjOO9ocq99lsfjdc2O/DWln4v+6QzktWEFexuDpRq0ZDOHWL0mryMS4feRuu6bcpf2KmH3lG7w7XPYTq5oQ5VtlFWawUaJ/kxP3s5WRjFXOCi6gmDBcAj/8M1l3n1znACmiR/A7tjyCMG8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mx.zohomail.com with SMTPS id 1618788967234362.1358223456614; Sun, 18 Apr 2021 16:36:07 -0700 (PDT) Received: by mail-wm1-f42.google.com with SMTP id u5-20020a7bcb050000b029010e9316b9d5so17071566wmj.2 for ; Sun, 18 Apr 2021 16:36:06 -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 i15sm20769193wru.12.2021.04.18.16.36.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Apr 2021 16:36: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=z7Ep6fYXtdJtKlmnq+PKoKN/lqrVctpakcoxcBuJMWs=; b=tAaGxuDvaMkXYKiAF1lIcYGoLfsAl3r1RHTXvQIBCD1cj+RebsQ6tFyWS2mdOSzEZ1 0jjzBb3zq9VRxiegdMnjgMnKyuP6KM/SEuhKh7tACJgMgXljC+J3tX0B+Yr+OkKIjSGK n86ue1Cupn6j2P1UYYMcyQDcSgbpqivILdva3tHsN2H5EX3WGmoru+ei8Agra8q3juDa baVldvL3JRpng/nYhtpDKLv8KJEHV4w+CxQ9vKPsycKXOdH/oJzC7lfDbXpIYmxo4OQ7 aPVbnTg4cpV7Q0J1QUPsPuMHwfS7Y2GxbRvKRVihmqj+B23AGRrHfxLvFADSJWAKGFi6 X8dg== 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=z7Ep6fYXtdJtKlmnq+PKoKN/lqrVctpakcoxcBuJMWs=; b=bXvOmpnRU9rpsvO2LQKfWUKTurqtLyLEMlLuX8EDbMCcwMnJqgDrXuvenSXVMAoKem rC1EVj0jQnIOM6D+BAtFuajVFfNQhks26+pFKdxN+7j+1qAQEDAOEcgbYE5tqisq2L8h BXKCldOAgkIrTkrFtsErTW5v3ht7880UtPrjHK4TeHw/NRMsbA5BTsE3k3UmXqj18pKZ 4O+Qh/gCKSz5zeNqZwnDNp1HJn57lpJteo+IvP+V85ReLUg3lS28wyLT01el85cpY/Ie FZz4R1k/ZHoIYBP2OlM7cFYJV2ssMmlGpFK4fIvxz3U/j0r5Es77EaBx9VxfPBfAV6sk c3Pw== X-Gm-Message-State: AOAM531zIH8G0qQDjWBChZPh5G00pnKFtadJ/F0OLZ3v47gRgzzPFbNU FfYAsJGq6HWZ4Svfa0DA8qJxQNyQijz7jg== X-Google-Smtp-Source: ABdhPJwwo4nLm1MfU9dIqUdAyzUW2Du5yHaE/mDik8s2+L8BAchP7/6xMlQgOM+nDHLtQhpEJzVd3w== X-Received: by 2002:a05:600c:19d1:: with SMTP id u17mr4432435wmq.111.1618788965550; Sun, 18 Apr 2021 16:36: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: Erik Skultety , Thomas Huth , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Miroslav Rezanina , Wainer dos Santos Moschetta , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cleber Rosa Subject: [NOTFORMERGE PATCH 15/15] gitlab-ci: Use my own set of jobs for CI pipeline Date: Mon, 19 Apr 2021 01:34:48 +0200 Message-Id: <20210418233448.1267991-16-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210418233448.1267991-1-f4bug@amsat.org> References: <20210418233448.1267991-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) This is an example to use a different set of jobs than the mainstream one (currently 116 jobs). Here I only select 2 jobs: - cross-s390x-kvm-only - build-libvhost-user Including their dependencies, I have to run 8 jobs. Result (build time 15 minutes and 25 seconds): https://gitlab.com/philmd/qemu/-/pipelines/284362446 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.d/philmd.yml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .gitlab-ci.d/philmd.yml diff --git a/.gitlab-ci.d/philmd.yml b/.gitlab-ci.d/philmd.yml new file mode 100644 index 00000000000..402228e6ed1 --- /dev/null +++ b/.gitlab-ci.d/philmd.yml @@ -0,0 +1,33 @@ +include: + - local: '/.gitlab-ci.d/stages.yml' + - local: '/.gitlab-ci.d/container-core.yml' + - local: '/.gitlab-ci.d/crossbuild-template.yml' + - local: '/.gitlab-ci.d/checks.yml' + +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 + +s390x-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-s390x-cross + +cross-s390x-kvm-only: + extends: .cross_accel_build_job + needs: + job: s390x-debian-cross-container + variables: + IMAGE: debian-s390x-cross + ACCEL_CONFIGURE_OPTS: --disable-tcg --=20 2.26.3