From nobody Sun Apr 28 15:04:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604596539; cv=none; d=zohomail.com; s=zohoarc; b=MiN6T3RPsIUuGsaFMqIwmagDlZVI5AYg8zXvO9UiPfs5duWQ00Ne7+bp3QxSNXSU/OHGsqKPQU0Wg5q/rpadkjB+M+yn3HrGhpp2Rf+MAq5H8PvsMMokzf1b69tUNVr12zhD+lFDB/gT2KfeLFhjloCmFgfHKNBSvWfXSrE4YuU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604596539; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=jje+QkM8EIIDX196QXsItz5lUhUXvc2nsiwvd/KOGGQ=; b=nbaJJ4iZyMMy5WaoJgutdscf7ANb4FBdWZJqX4qAFPI+FhfJlXA8/qe18kiaoil6lrp/YVp70lZl7X6saAyraF7nF9kQyFjVrcdU2dFYO9FEJLMgYGbOWOjSSbAwelzzPoua/+9jKDuzX+hxiFj3nwbUtkaqCzTFWbVbYOJqiG8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1604596539213865.1875766511081; Thu, 5 Nov 2020 09:15:39 -0800 (PST) Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-547-hfAKUXcIMYal-enNmrYsHA-1; Thu, 05 Nov 2020 12:15:36 -0500 Received: by mail-wr1-f70.google.com with SMTP id e11so976693wrw.14 for ; Thu, 05 Nov 2020 09:15:36 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id d3sm3805176wrg.16.2020.11.05.09.15.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Nov 2020 09:15:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604596538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jje+QkM8EIIDX196QXsItz5lUhUXvc2nsiwvd/KOGGQ=; b=ONILDOW52Q31rpXtQHbEY2uPglPJV39I0dwXp8cIFi0WJwkCRksZW386FHgyRjKt9nmfp7 K4l5r6Dt2Ck1AUSRMO5GZkbWI8IzADStzIr8Eu7xSO6+KFeOqkzQhapBjG5hSypQrVDkdT HGXkowNUxClZyMdYFy42iaAUE8i0VyI= X-MC-Unique: hfAKUXcIMYal-enNmrYsHA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jje+QkM8EIIDX196QXsItz5lUhUXvc2nsiwvd/KOGGQ=; b=TiAPECsxano+RQN1bP+dzM3t0/eoqjE9esZNaDrsDpVFjsjdzsnkGkVh8JLW671AnR fBZND9tARD+45n4PESqzApjbd2OofAP5e5BxHyKBZMVmImNVbUAMILiPdHSmsWGB8Dw8 nXwZi8B6tqo9Wzsq7fltmxHuvEJUZ95pLRkHC+PliU4hrdxWWIlTNDpabD44ibHSzSDx hgzW6aFxWKqvVrMMCbLWXuFEN0PxACGqwAUneeShO9y6YXRjmJ3Jnqq8BGuCp22zsV64 wnmM0DyOtliGjjPXek6WlJqySdJ1XXz64VS94S98/fwJzI1J+rfyLVPPOAUBv65DBQIL q1ow== X-Gm-Message-State: AOAM532FKUFAVgobbhMQ17PQxFNqPgVxt0+3nBoQxfgRFII6njz7DPYR +vlXIwNWfvD3wPGvQXEXcCqJKgssKaHB3/K1gaee8LfshTdhw9pmoe5vHakv34dasmOeVnnGaN6 8P9hU5U7i5Rxjyw== X-Received: by 2002:a1c:a7ce:: with SMTP id q197mr3857497wme.138.1604596534994; Thu, 05 Nov 2020 09:15:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJyV0gc18Czo6wJ4bTL+BrnMjdbeemztbyN2h8rtztYYsoCnuilNKTAOa2FoTH0A7nieM9C6ew== X-Received: by 2002:a1c:a7ce:: with SMTP id q197mr3857486wme.138.1604596534859; Thu, 05 Nov 2020 09:15:34 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Wainer dos Santos Moschetta , "Daniel P . Berrange" , John Snow , Cornelia Huck , Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH v2 01/11] gitlab-ci: Drop generic cache rule Date: Thu, 5 Nov 2020 18:15:16 +0100 Message-Id: <20201105171526.3763499-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201105171526.3763499-1-philmd@redhat.com> References: <20201105171526.3763499-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) This cache rule is meant for Avocado artifacts, but affects all jobs. Moreover the 'acceptance_template' template already include a more detailled rule to cache artifacts. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3b15ae5c302..5763318d375 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,12 +7,6 @@ stages: - build - test =20 -# We assume GitLab has it's own caching set up for RPM/APT repositories so= we -# just take care of avocado assets here. -cache: - paths: - - $HOME/avocado/data/cache - include: - local: '/.gitlab-ci.d/edk2.yml' - local: '/.gitlab-ci.d/opensbi.yml' --=20 2.26.2 From nobody Sun Apr 28 15:04:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604596543; cv=none; d=zohomail.com; s=zohoarc; b=kS3IHYciH1CqFQ5p7UDDmnQCHjQOCLneLDfTunrmA3mcxKSyC3k8sUrxQypFeABucqA3jeYHlo+TL077sG0lf1dX4neP5+aruIfJ0EXhq3ca2LzbNFIhL/Zr3RRvJmb7rXcOR038hKdS091hTIo2UWwfCSx+E28ODp7Q4O+hjJ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604596543; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=HkmWM8pdBxBAkh2ux+VVNAnnOD7tHToqsp9wNXfrvV8=; b=HnQr8lC9du+iUhsQ7rnnsJ2AAfYnmwURxBA1fwlrFD3QXaWy8C7ocVfMUuIu8jyukvl18iG6/r/QiY1ZseSJqpdZ4h4sbn7Ce1yvfadCMT7r7s7oGcSoj6Q3IJR1qM4GJfAjhdGI7nM5WLo2p+cZAUm9Vs2i96F35OpC6nJLcLg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1604596543872737.149498338228; Thu, 5 Nov 2020 09:15:43 -0800 (PST) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-572-v2zV2e6RPqO1maudtPhkAw-1; Thu, 05 Nov 2020 12:15:41 -0500 Received: by mail-wr1-f69.google.com with SMTP id r16so958354wrw.22 for ; Thu, 05 Nov 2020 09:15:41 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id f1sm3214130wmj.3.2020.11.05.09.15.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Nov 2020 09:15:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604596542; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HkmWM8pdBxBAkh2ux+VVNAnnOD7tHToqsp9wNXfrvV8=; b=PCFvVogpwc1invP7wVbp+xcuzjzkYSJE7Bw9DbJ4VH1tBApKcYSE5hjWzP1XiHIJCWuR+b evKP52pzex6YEDaPRsgMs3HCNjOxZH90GtUKypFuLzdm3JeS80Uwu4j/0fPnZ3e487gz01 wvkCHyUfJJ0BhE52wSG2frzYFXTAli0= X-MC-Unique: v2zV2e6RPqO1maudtPhkAw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HkmWM8pdBxBAkh2ux+VVNAnnOD7tHToqsp9wNXfrvV8=; b=jDOml+GK/Cm+4yCxPZgrLZe1Qz7yfEKTKOw7cvLZyipJrlt9WzmZeJvfK1EHU8c5LY O6ftOGEbmFABCWdcup/UBRh0S7mUeuHvvAKKmd4C2Kc5RdZhtjF4b8rV8YzlC4Wtt3/N IW13aUkPiJlh4gczp4Z3w+oeHn/fdQHNpl4w9hf+2Iv1eI+SA40d4pqOjiEx+8gWEBYu WgouW15irwJ2U4HrsADceQMCLicGe0Xu5+ABaeE2TY4KdLHYj4JlwStEuA2rJwFlaPOf DlXp8qlrXM0Vx5P4k2k7tZGPNeCZtPd+5L9dgO2vY7q6lJFcdc8OKMGd65aYdGwLURw5 Aj7w== X-Gm-Message-State: AOAM533s5wyJIXa7daAINp3qayosUhPjXWDaKnTsJZFhKqli5bjZdkn5 Ls+3uMusSOfns+ZreYCpoACmO1DTHQFyep+yPrZBDduhJ0ODohQ0o9RgFtec7NPVCxJ36vKub7U oAe8zex1r+BqR0g== X-Received: by 2002:adf:c58f:: with SMTP id m15mr4366654wrg.144.1604596540221; Thu, 05 Nov 2020 09:15:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJx7Wkakn0kEZHVOb36r9JJwbMYzTAz6foUZ8ekjAHYbsROwI1dm8PcA4iYB/tYiTiEAgXaTww== X-Received: by 2002:adf:c58f:: with SMTP id m15mr4366631wrg.144.1604596540034; Thu, 05 Nov 2020 09:15:40 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Wainer dos Santos Moschetta , "Daniel P . Berrange" , John Snow , Cornelia Huck , Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH v2 02/11] gitlab-ci: Replace YAML anchors by extends (cross_system_build_job) Date: Thu, 5 Nov 2020 18:15:17 +0100 Message-Id: <20201105171526.3763499-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201105171526.3763499-1-philmd@redhat.com> References: <20201105171526.3763499-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) 'extends' is an alternative to using YAML anchors and is a little more flexible and readable. See: https://docs.gitlab.com/ee/ci/yaml/#extends Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.d/crossbuilds.yml | 40 ++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index 03ebfabb3fa..099949aaef3 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -1,5 +1,5 @@ =20 -.cross_system_build_job_template: &cross_system_build_job_definition +.cross_system_build_job: stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest timeout: 80m @@ -13,7 +13,7 @@ xtensa-softmmu" - make -j$(expr $(nproc) + 1) all check-build =20 -.cross_user_build_job_template: &cross_user_build_job_definition +.cross_user_build_job: stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest script: @@ -24,91 +24,91 @@ - make -j$(expr $(nproc) + 1) all check-build =20 cross-armel-system: - <<: *cross_system_build_job_definition + extends: .cross_system_build_job variables: IMAGE: debian-armel-cross =20 cross-armel-user: - <<: *cross_user_build_job_definition + extends: .cross_user_build_job variables: IMAGE: debian-armel-cross =20 cross-armhf-system: - <<: *cross_system_build_job_definition + extends: .cross_system_build_job variables: IMAGE: debian-armhf-cross =20 cross-armhf-user: - <<: *cross_user_build_job_definition + extends: .cross_user_build_job variables: IMAGE: debian-armhf-cross =20 cross-arm64-system: - <<: *cross_system_build_job_definition + extends: .cross_system_build_job variables: IMAGE: debian-arm64-cross =20 cross-arm64-user: - <<: *cross_user_build_job_definition + extends: .cross_user_build_job variables: IMAGE: debian-arm64-cross =20 cross-mips-system: - <<: *cross_system_build_job_definition + extends: .cross_system_build_job variables: IMAGE: debian-mips-cross =20 cross-mips-user: - <<: *cross_user_build_job_definition + extends: .cross_user_build_job variables: IMAGE: debian-mips-cross =20 cross-mipsel-system: - <<: *cross_system_build_job_definition + extends: .cross_system_build_job variables: IMAGE: debian-mipsel-cross =20 cross-mipsel-user: - <<: *cross_user_build_job_definition + extends: .cross_user_build_job variables: IMAGE: debian-mipsel-cross =20 cross-mips64el-system: - <<: *cross_system_build_job_definition + extends: .cross_system_build_job variables: IMAGE: debian-mips64el-cross =20 cross-mips64el-user: - <<: *cross_user_build_job_definition + extends: .cross_user_build_job variables: IMAGE: debian-mips64el-cross =20 cross-ppc64el-system: - <<: *cross_system_build_job_definition + extends: .cross_system_build_job variables: IMAGE: debian-ppc64el-cross =20 cross-ppc64el-user: - <<: *cross_user_build_job_definition + extends: .cross_user_build_job variables: IMAGE: debian-ppc64el-cross =20 cross-s390x-system: - <<: *cross_system_build_job_definition + extends: .cross_system_build_job variables: IMAGE: debian-s390x-cross =20 cross-s390x-user: - <<: *cross_user_build_job_definition + extends: .cross_user_build_job variables: IMAGE: debian-s390x-cross =20 cross-win32-system: - <<: *cross_system_build_job_definition + extends: .cross_system_build_job variables: IMAGE: fedora-win32-cross =20 cross-win64-system: - <<: *cross_system_build_job_definition + extends: .cross_system_build_job variables: IMAGE: fedora-win64-cross --=20 2.26.2 From nobody Sun Apr 28 15:04:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604596549; cv=none; d=zohomail.com; s=zohoarc; b=j3ZeuFmL1OihzKEtNWqwRGzcMQm0w1YXOEXEv/PjGglTXO2bvQnqfk4AQF8D7Fjdoi6n++9TgtsUk5XZHCxinsqcR6Jp2f8md+xQA0yqwONNRKMg80NewqKChtaSSdbpzwro4hxnTUU1SRii+wXNd/d5o9RNpXSLyy5RxGo07IA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604596549; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=CmyNUmooLdVHry+yJmzGfzNT00h5DfYz55kuF8g/yME=; b=KXjuLHoTeHLyBDFPOgBUbPIjWEXOxga2kj+xyBl+MApnxKoPWqk1GhNzqBqequYG/bEbh17vTUOsL+4UArnI+ZXowNnIVSkHBnYhEgodyrjtUWqUkeUOT9vEhyO2VmfT5zwqePxIzJ130lB2v94by2Pj9TqsVz9K+pCUPtuGZjU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1604596549138638.6455825309912; Thu, 5 Nov 2020 09:15:49 -0800 (PST) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-342-ZcnxpJCEN-C_jGoj3DG4bw-1; Thu, 05 Nov 2020 12:15:46 -0500 Received: by mail-wr1-f72.google.com with SMTP id j13so1000988wrn.4 for ; Thu, 05 Nov 2020 09:15:46 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id p4sm3789551wmc.46.2020.11.05.09.15.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Nov 2020 09:15:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604596548; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CmyNUmooLdVHry+yJmzGfzNT00h5DfYz55kuF8g/yME=; b=PoBgeNUreV6K3lG4n4rlCEj9wtCZZ0DOwqKTvaL6y1msHkmDL/ZncK9FrCRtrmt8u1pO0L Mr/ljNkAykSO0yvVizV43mv+sgkEnWcZiytXa2txWi+/2sdHiH/uwyFFWPkVcorHG0G4DF AwHFNq5rAEAV9g5a1DJD0bJDCblNOQw= X-MC-Unique: ZcnxpJCEN-C_jGoj3DG4bw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CmyNUmooLdVHry+yJmzGfzNT00h5DfYz55kuF8g/yME=; b=e4s92U6+cxJAHaNK9iyrr+myrm8jSWL7qVf32VyFPmoUXRwCchnSA1hD6B+h31M4Gb lIb9oYMZtv9Uk1cfoEcc+OueS0azzG1OCB68ETEsm8TBBtfrcmLSsjQRTeT1MKD3eaKa yMqTE4gBkgSyi0NT+zxVOOtIXVmx5ajfzOCA7Iow6PrAmciT+nlZmpfNPEIV84fOkC5J FVqT0XKoWqVMwxbFVgHLodMO0tnC+4xwrJ7t381PYAO69I6cboGEesZE5Q6PtchmTXXj WD94+g1RrwXOw1+U02Se2uJxq17ozuPQz8LflTOSMPUe6/1ak6e2uZ+NKq5UggbKUU1G fnLg== X-Gm-Message-State: AOAM533pc/zdTt9i+nzrx3K5fKu4eUPrDMUBB/ZqrgghqEmpesxh9JfT XyEqBDyXPtOp6sUAW48Z9M6TrTSxhACImOBMwNEjDhOJkS7XMjLkwJe5mAUY/aSd2uapOidhwtm Iad+AbYhF3zXbLw== X-Received: by 2002:a5d:6092:: with SMTP id w18mr4256491wrt.350.1604596545271; Thu, 05 Nov 2020 09:15:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJz/uq6MnfTfrzacvgPK9uYpil3EQvf5F2HcB1I0xiqt/pDgA1u9QWZNcDVLWPn9iFqaIHmzqQ== X-Received: by 2002:a5d:6092:: with SMTP id w18mr4256473wrt.350.1604596545112; Thu, 05 Nov 2020 09:15:45 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Wainer dos Santos Moschetta , "Daniel P . Berrange" , John Snow , Cornelia Huck , Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH v2 03/11] gitlab-ci: Replace YAML anchors by extends (native_build_job) Date: Thu, 5 Nov 2020 18:15:18 +0100 Message-Id: <20201105171526.3763499-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201105171526.3763499-1-philmd@redhat.com> References: <20201105171526.3763499-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) 'extends' is an alternative to using YAML anchors and is a little more flexible and readable. See: https://docs.gitlab.com/ee/ci/yaml/#extends Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5763318d375..a96e7dd23e5 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: stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest before_script: @@ -68,7 +68,7 @@ include: - du -chs ${CI_PROJECT_DIR}/avocado-cache =20 build-system-ubuntu: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: ubuntu2004 TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu @@ -99,7 +99,7 @@ acceptance-system-ubuntu: <<: *acceptance_definition =20 build-system-debian: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: debian-amd64 TARGETS: arm-softmmu avr-softmmu i386-softmmu mipsel-softmmu @@ -130,7 +130,7 @@ acceptance-system-debian: <<: *acceptance_definition =20 build-system-fedora: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: fedora CONFIGURE_ARGS: --disable-gcrypt --enable-nettle @@ -162,7 +162,7 @@ acceptance-system-fedora: <<: *acceptance_definition =20 build-system-centos: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: centos8 CONFIGURE_ARGS: --disable-nettle --enable-gcrypt @@ -194,7 +194,7 @@ acceptance-system-centos: <<: *acceptance_definition =20 build-disabled: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: fedora CONFIGURE_ARGS: --disable-attr --disable-avx2 --disable-bochs @@ -219,7 +219,7 @@ build-disabled: MAKE_CHECK_ARGS: check-qtest SPEED=3Dslow =20 build-tcg-disabled: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: centos8 script: @@ -239,7 +239,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 variables: IMAGE: debian-all-test-cross CONFIGURE_ARGS: --disable-tools --disable-system @@ -249,7 +249,7 @@ build-user: # 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 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 @@ -257,7 +257,7 @@ build-user-plugins: timeout: 1h 30m =20 build-clang: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: fedora CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ @@ -267,7 +267,7 @@ build-clang: =20 # These targets are on the way out build-deprecated: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: debian-all-test-cross CONFIGURE_ARGS: --disable-docs --disable-tools @@ -292,7 +292,7 @@ check-deprecated: allow_failure: true =20 build-oss-fuzz: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: fedora script: @@ -310,7 +310,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 variables: IMAGE: fedora script: @@ -335,7 +335,7 @@ build-tci: # These jobs test old gcrypt and nettle from RHEL7 # which had some API differences. build-crypto-old-nettle: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: centos7 TARGETS: x86_64-softmmu x86_64-linux-user @@ -356,7 +356,7 @@ check-crypto-old-nettle: =20 =20 build-crypto-old-gcrypt: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: centos7 TARGETS: x86_64-softmmu x86_64-linux-user @@ -377,7 +377,7 @@ check-crypto-old-gcrypt: =20 =20 build-crypto-only-gnutls: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: centos7 TARGETS: x86_64-softmmu x86_64-linux-user --=20 2.26.2 From nobody Sun Apr 28 15:04:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604596557; cv=none; d=zohomail.com; s=zohoarc; b=QvwHY3wghiG+mKWVkoS5qEEU2bnM3wxLLFtqVkXT7ys6ud3AiGpskxj0Ve/jsw4lD2Cny2PU57LNfpYOOmSMhJEEFuZe1ejrPLZHub4UGssq3D7BX+f6HjvANuuSy/h+o7EZ0r2wTR+rKI7sFl/mOcafAI6t0B1nlZdRkUhx0Tg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604596557; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=EMPOslgUIn2gPkqETCgv4eVsfUBUm27ATWoJ+FEEAoc=; b=cn88jqmOlSYORZcJi09mZBxe/Eo772EvZgIzkMsgQoY5Sq5TgTDeCm1MzS/OdzMZdd6z/kYSlpB8HjIih6gRTTsnx07pvSnvYwdQ6aHldHfBAkr4hbEsh5zNlAtmIewfjXkkYTEJwzLb7BAJIIr3vnguZ95LkWSXQdvDu6L46jU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1604596557940933.6238794009795; Thu, 5 Nov 2020 09:15:57 -0800 (PST) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-316-1LiMSQUcO7KLswwREUThZw-1; Thu, 05 Nov 2020 12:15:51 -0500 Received: by mail-wm1-f72.google.com with SMTP id y187so876267wmy.3 for ; Thu, 05 Nov 2020 09:15:51 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id 30sm3758376wrs.84.2020.11.05.09.15.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Nov 2020 09:15:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604596556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EMPOslgUIn2gPkqETCgv4eVsfUBUm27ATWoJ+FEEAoc=; b=ZaRr9vT1f6oVMyeCdl2Wn9Ds9kNXLm4DiykBnfb+sKjzVcUttt4szgJ8G7OPb57KkqtySf vLxZBCvBoNDX38+84aDAH8tQ++mmND/qtN80YIJNcE6VSruHbgTU7/pjrGSlS7DCwkUj/d 1Ap0D+OAszrupIblTuHoh4TLM4nAJuk= X-MC-Unique: 1LiMSQUcO7KLswwREUThZw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EMPOslgUIn2gPkqETCgv4eVsfUBUm27ATWoJ+FEEAoc=; b=iL04RkyI7MrFLRC+XKiGKcDZ2zDri3i/cKmq9s7MLkviRiRb7i0cq5tK+gwdEWlP3n 0Bh0apZa4ee0vzUH+d7mNEgx7VoAhU+oyUWOHZ1vBJpxSAck/2oKNea5QfV6rWVoIkZw vUBYyeJsy7ZUwjofibkFtWEPEwjV8rLU/GBX0w0eokvlhgIzNT/nObYN+GOH5GEhAwpT hVfEmKnJy1NvjHp/KTay/4AA/5BRZ8MsuEXdDd/Vygw4AD9ptPBJOMc4GR+8gspZ1PL2 S1RpW8OGD+3IzGVUchvmTtYiFXLzyeU25sfZb/qQ/oiijJN+B3Ynbj5qjjq5r9WP7I5J 1j0w== X-Gm-Message-State: AOAM531XKElMXPTdE1tZfULU1kIKRaonCBDgsEK6hqNVwVO8/Fyjl1g5 JgQWWsd4dJtyFhNyYgCX/PTP9qTzrSXvbLIJ9cV7KCL9VEi5cLrthG2SEz29lAW8QszWiaXoJSw vOpgtvZcWBfWK8g== X-Received: by 2002:a1c:b041:: with SMTP id z62mr3962851wme.183.1604596550346; Thu, 05 Nov 2020 09:15:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJx2cAFHaSKEG6BMInTVNSAhFW7XLEfZjGDO2qjo0Df9CCYgZxIFxwbK7U7zGI4jUZW2+SgfDw== X-Received: by 2002:a1c:b041:: with SMTP id z62mr3962837wme.183.1604596550192; Thu, 05 Nov 2020 09:15:50 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Wainer dos Santos Moschetta , "Daniel P . Berrange" , John Snow , Cornelia Huck , Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH v2 04/11] gitlab-ci: Replace YAML anchors by extends (native_test_job) Date: Thu, 5 Nov 2020 18:15:19 +0100 Message-Id: <20201105171526.3763499-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201105171526.3763499-1-philmd@redhat.com> References: <20201105171526.3763499-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) 'extends' is an alternative to using YAML anchors and is a little more flexible and readable. See: https://docs.gitlab.com/ee/ci/yaml/#extends Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a96e7dd23e5..e11f80f6d65 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,7 +34,7 @@ include: make -j"$JOBS" $MAKE_CHECK_ARGS ; fi =20 -.native_test_job_template: &native_test_job_definition +.native_test_job: stage: test image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest script: @@ -80,7 +80,7 @@ build-system-ubuntu: - build =20 check-system-ubuntu: - <<: *native_test_job_definition + extends: .native_test_job needs: - job: build-system-ubuntu artifacts: true @@ -89,7 +89,7 @@ check-system-ubuntu: MAKE_CHECK_ARGS: check =20 acceptance-system-ubuntu: - <<: *native_test_job_definition + extends: .native_test_job needs: - job: build-system-ubuntu artifacts: true @@ -111,7 +111,7 @@ build-system-debian: - build =20 check-system-debian: - <<: *native_test_job_definition + extends: .native_test_job needs: - job: build-system-debian artifacts: true @@ -120,7 +120,7 @@ check-system-debian: MAKE_CHECK_ARGS: check =20 acceptance-system-debian: - <<: *native_test_job_definition + extends: .native_test_job needs: - job: build-system-debian artifacts: true @@ -143,7 +143,7 @@ build-system-fedora: - build =20 check-system-fedora: - <<: *native_test_job_definition + extends: .native_test_job needs: - job: build-system-fedora artifacts: true @@ -152,7 +152,7 @@ check-system-fedora: MAKE_CHECK_ARGS: check =20 acceptance-system-fedora: - <<: *native_test_job_definition + extends: .native_test_job needs: - job: build-system-fedora artifacts: true @@ -175,7 +175,7 @@ build-system-centos: - build =20 check-system-centos: - <<: *native_test_job_definition + extends: .native_test_job needs: - job: build-system-centos artifacts: true @@ -184,7 +184,7 @@ check-system-centos: MAKE_CHECK_ARGS: check =20 acceptance-system-centos: - <<: *native_test_job_definition + extends: .native_test_job needs: - job: build-system-centos artifacts: true @@ -282,7 +282,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 needs: - job: build-deprecated artifacts: true @@ -346,7 +346,7 @@ build-crypto-old-nettle: - build =20 check-crypto-old-nettle: - <<: *native_test_job_definition + extends: .native_test_job needs: - job: build-crypto-old-nettle artifacts: true @@ -367,7 +367,7 @@ build-crypto-old-gcrypt: - build =20 check-crypto-old-gcrypt: - <<: *native_test_job_definition + extends: .native_test_job needs: - job: build-crypto-old-gcrypt artifacts: true @@ -388,7 +388,7 @@ build-crypto-only-gnutls: - build =20 check-crypto-only-gnutls: - <<: *native_test_job_definition + extends: .native_test_job needs: - job: build-crypto-only-gnutls artifacts: true --=20 2.26.2 From nobody Sun Apr 28 15:04:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604596559; cv=none; d=zohomail.com; s=zohoarc; b=a+V5q/G/RIzu2OWVkMNcM8wH+YCWZpW93yADk/5mi/UaopUlMFC12m3x9MIGyarGrFB5+r6jo+IAlE3zrtdF9pXdNFeIE71618V55rh/Fcl3idY9dc2nb72kelIirsPezklOsHZe18TyEe1FUddHUhd3L3B6qFoOs2DQm8HR/Hg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604596559; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=Vjq32+DhREyifig8wIg6zg2KFvI7/fWuGdDzcT/0/h8=; b=emWqhitBzZsNdjOx/OC+E6opp+6NNU0yeicDbglNWsGwXqFIEQiInqPgEVgnPXA+TsdCv6inlUk6CXoZciu9t0LsM9frrMXF5rTH2ZESb7Auaxe16MKbMXe/vLCQMnFbghA7+c1zOQI+iBMpcSpKmhty3aXXAkfc2YvcRmARasA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1604596559519258.94903129152124; Thu, 5 Nov 2020 09:15:59 -0800 (PST) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-149-CTEtk_CvNiaPK0oKgb4eIw-1; Thu, 05 Nov 2020 12:15:56 -0500 Received: by mail-wm1-f71.google.com with SMTP id t201so878881wmt.1 for ; Thu, 05 Nov 2020 09:15:56 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id 15sm3200673wmg.1.2020.11.05.09.15.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Nov 2020 09:15:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604596558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Vjq32+DhREyifig8wIg6zg2KFvI7/fWuGdDzcT/0/h8=; b=A6HZWDZ0tHMiy3g9m7RRyWJYV6399zspwsm7M6oJFzbEi6i94KmlzeOp5ZA6vFT7NV/vZo EGtrw+yp7MrOmSYHkPHHIzsdbmVPhpnvzn2D1KOZtb0+/FH2vZ3TdUTWw3jNbiOKmXUmKi MNoiROKBng4IagegP3Bfhnh5JIZIrK0= X-MC-Unique: CTEtk_CvNiaPK0oKgb4eIw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Vjq32+DhREyifig8wIg6zg2KFvI7/fWuGdDzcT/0/h8=; b=crZx8TUWi6eh81OoFgIo/5SlaZCdUO+q3zxYKVX0Lvii696Vov/XB6+S6SV3qefW9r k3WWeyGuIP8yle5t/mtlS8YJGp3xG9lRJXMQhArlow/zHR/Yxka6LqGcE81qZrJlfU2I rx0YrtwQAQXZ+G/aQHongY8+NT6GUj0eX74VwreU9o/A+0ODzetBPWbd3kqCAfT71Vw1 4mgXgnEQofhZlzqbY9zlthQqSFtHgSmNOuy0gNoxjsPmxYGgpiL5AvsKp3goj8TIudfX f1PUS2pS6MK5a1e7xcmKqKMM8ZpCI8bEu6C+nE/vNCEipbLXBbuwNCaON1I7WuDVqLcv /T/g== X-Gm-Message-State: AOAM533pBMNRTFixNujmkYEdUinGiSWqgDZ/lwk2usQLUh1MsRlxXj1K +KT8SBnGe6i1qcVpPodphq4sT5DZk5F6+U/Gvy4YTIArqFyBSDF5P1vMJnwSr4IFWXoRZiU55e9 AwUPIPsWCulJiPA== X-Received: by 2002:a7b:c3d2:: with SMTP id t18mr4007551wmj.112.1604596555392; Thu, 05 Nov 2020 09:15:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJyP4pZaMiNrIIxOHC4mvDi3jKuihB07EfBqkIGA4EuEG+9PkW707A3MAFAHfVcosW/SpibQFg== X-Received: by 2002:a7b:c3d2:: with SMTP id t18mr4007527wmj.112.1604596555195; Thu, 05 Nov 2020 09:15:55 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Wainer dos Santos Moschetta , "Daniel P . Berrange" , John Snow , Cornelia Huck , Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH v2 05/11] gitlab-ci: Replace YAML anchors by extends (acceptance_test_job) Date: Thu, 5 Nov 2020 18:15:20 +0100 Message-Id: <20201105171526.3763499-6-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201105171526.3763499-1-philmd@redhat.com> References: <20201105171526.3763499-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) 'extends' is an alternative to using YAML anchors and is a little more flexible and readable. See: https://docs.gitlab.com/ee/ci/yaml/#extends Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e11f80f6d65..0ef814764a0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,7 +42,8 @@ include: - find . -type f -exec touch {} + - make $MAKE_CHECK_ARGS =20 -.acceptance_template: &acceptance_definition +.acceptance_test_job: + extends: .native_test_job cache: key: "${CI_JOB_NAME}-cache" paths: @@ -89,14 +90,13 @@ check-system-ubuntu: MAKE_CHECK_ARGS: check =20 acceptance-system-ubuntu: - extends: .native_test_job + extends: .acceptance_test_job needs: - job: build-system-ubuntu artifacts: true variables: IMAGE: ubuntu2004 MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition =20 build-system-debian: extends: .native_build_job @@ -120,14 +120,13 @@ check-system-debian: MAKE_CHECK_ARGS: check =20 acceptance-system-debian: - extends: .native_test_job + extends: .acceptance_test_job needs: - job: build-system-debian artifacts: true variables: IMAGE: debian-amd64 MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition =20 build-system-fedora: extends: .native_build_job @@ -152,14 +151,13 @@ check-system-fedora: MAKE_CHECK_ARGS: check =20 acceptance-system-fedora: - extends: .native_test_job + extends: .acceptance_test_job needs: - job: build-system-fedora artifacts: true variables: IMAGE: fedora MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition =20 build-system-centos: extends: .native_build_job @@ -184,14 +182,13 @@ check-system-centos: MAKE_CHECK_ARGS: check =20 acceptance-system-centos: - extends: .native_test_job + extends: .acceptance_test_job needs: - job: build-system-centos artifacts: true variables: IMAGE: centos8 MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition =20 build-disabled: extends: .native_build_job --=20 2.26.2 From nobody Sun Apr 28 15:04:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604596564; cv=none; d=zohomail.com; s=zohoarc; b=WpzSV/SGAofE4hg63H0tGhro1nN/JyKGoy2744p3f5uU38/fRtnG+wn7YZz0lEKoFqDMh8Ik3b0n73IUD3R4/cWeyzxtAguzG4skFmYD2rF67JwmmPr6O7cn6W/VFp4IXkyRIQ0RGHZLHkmCmBzTetuhDWSQvxsZDqp+gLydEb8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604596564; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=9mtvwmDQbHZS+o/2u9r9g/ECxc+lEAZnhg4b7CvVWbM=; b=fSWt7C5ULoUmcNXTzPBpYrGug91Zhkx2/EjZqhyXTwmTh3P38jAjZcHdUPXMeglRMGQCQIJlgyuiyp6Gch5+/nHJvj3vCZuoZaAQL7ilTVHJlDNULJ5OHYGJSX51FgQRTddciF5bpXoua0p/UbDDaCb0lS+q3KL2rdqkEbVgy/Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 160459656463232.16260273478042; Thu, 5 Nov 2020 09:16:04 -0800 (PST) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-69-ATLkodeGNjeDvhW6V3p7Rg-1; Thu, 05 Nov 2020 12:16:01 -0500 Received: by mail-wm1-f69.google.com with SMTP id y26so612274wmj.7 for ; Thu, 05 Nov 2020 09:16:01 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id j127sm3449898wma.31.2020.11.05.09.15.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Nov 2020 09:15:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604596563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9mtvwmDQbHZS+o/2u9r9g/ECxc+lEAZnhg4b7CvVWbM=; b=EaMnIKp7y/sYRWiVENxZf+e5IwFiwACtMwSFzK958k7BrVLMwqXxYvOPsITwrYjdjr6gR8 WRkjDpgIckctbqYEvjpKDC6TAx+zgjfAUwhUHwhuxKl8SyYaYuE0jejTS6Hu6Vl7S8CB4F 5UBvDPBofwTIu6BJk6t2Kqr2L0C7YwM= X-MC-Unique: ATLkodeGNjeDvhW6V3p7Rg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9mtvwmDQbHZS+o/2u9r9g/ECxc+lEAZnhg4b7CvVWbM=; b=Z4LcPYGRHKbUSvH2YDqGFKfYdXWDG395olPKMUIFINJmmqQw3Tj4buQMR96YwPaydp vo1eUpI4Nziw8ftF3WSumPWprAfR2OXbSfy0Yn9/viINH/JTsGacZUir6cGrV6Jz8M1P FUqQqOd6FSTCNnjwx3SIM3uZMCat+g0GGQNoFVZugPUwRfbZQF+52As9puCLcPvMA+RJ +Rg/XGaVQtl6fYjLkhtX4wBmF7S3rMsza6N0m/v77dUseQ6awqYZpiPmVEyaE3afXuQw 9deXdUZYUgw9tk5ax9FryV7e++ZbK8Jf170tmDg/lxvc/KGmEVIJCW7XO449OJSkV+8/ J2EA== X-Gm-Message-State: AOAM530pFBRFGtHU928fMjZsy6Z1CJwSS99HuDSR88ceybsVlo3Vu0k2 vqLMPSB2SqY7qBvKYUe/XgeulgxN+hOF8LrHuKGnqrmsaHHMigSUzCPNEbl0sn9/E9mT8+XEXfz GvQf1TZoBJp/+BA== X-Received: by 2002:a5d:5106:: with SMTP id s6mr4074332wrt.51.1604596560343; Thu, 05 Nov 2020 09:16:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJwkj4o2RlCPfQ5kGW0tOz5vV026RPPnMop4BY65acEM1tm/pEbwE3duVGM1gny7KHrh7HvnMw== X-Received: by 2002:a5d:5106:: with SMTP id s6mr4074301wrt.51.1604596560134; Thu, 05 Nov 2020 09:16:00 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Wainer dos Santos Moschetta , "Daniel P . Berrange" , John Snow , Cornelia Huck , Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH v2 06/11] gitlab-ci: Rename acceptance_test_job -> integration_test_job Date: Thu, 5 Nov 2020 18:15:21 +0100 Message-Id: <20201105171526.3763499-7-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201105171526.3763499-1-philmd@redhat.com> References: <20201105171526.3763499-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0ef814764a0..d4526323169 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,7 +42,7 @@ include: - find . -type f -exec touch {} + - make $MAKE_CHECK_ARGS =20 -.acceptance_test_job: +.integration_test_job: extends: .native_test_job cache: key: "${CI_JOB_NAME}-cache" @@ -89,8 +89,8 @@ check-system-ubuntu: IMAGE: ubuntu2004 MAKE_CHECK_ARGS: check =20 -acceptance-system-ubuntu: - extends: .acceptance_test_job +integration-system-ubuntu: + extends: .integration_test_job needs: - job: build-system-ubuntu artifacts: true @@ -119,8 +119,8 @@ check-system-debian: IMAGE: debian-amd64 MAKE_CHECK_ARGS: check =20 -acceptance-system-debian: - extends: .acceptance_test_job +integration-system-debian: + extends: .integration_test_job needs: - job: build-system-debian artifacts: true @@ -150,8 +150,8 @@ check-system-fedora: IMAGE: fedora MAKE_CHECK_ARGS: check =20 -acceptance-system-fedora: - extends: .acceptance_test_job +integration-system-fedora: + extends: .integration_test_job needs: - job: build-system-fedora artifacts: true @@ -181,8 +181,8 @@ check-system-centos: IMAGE: centos8 MAKE_CHECK_ARGS: check =20 -acceptance-system-centos: - extends: .acceptance_test_job +integration-system-centos: + extends: .integration_test_job needs: - job: build-system-centos artifacts: true --=20 2.26.2 From nobody Sun Apr 28 15:04:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604596568; cv=none; d=zohomail.com; s=zohoarc; b=PGmLie5piNMTpMIzAbV7+aw18eTf9dltEGvyp1b2zG8NxNLxyoqrxkoHRdYFCT8P90dNo+LybAzfTeFlIB0j3uYi7foao+GRr0Tz6fBkrh/1BzuKQXUBxl6KLGIsvpzDLPpO92odMOrEjHkWSxwlKUWB317WF4aVtS8MCfpPNas= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604596568; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=r+24Qtjsem3z7nn8q0n3COy79qpz54BrkmBsMuZl5LU=; b=nAiONKZVX/ID53yVd3BKFaa9sAmGN8hNmZQ1Bm3+y9ToqCfP+H+m9q65ISAOvLVGDNQA4D3+XsLqt3QOTk+kmu+d48vY5eeM/dtGat7FmHKbGXASg13zESBy5YXqX+4+KIW7ethob/0ft+81/gIKDmBU7FzfMkYIhZtZuty86rw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1604596568879315.56805689789826; Thu, 5 Nov 2020 09:16:08 -0800 (PST) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-124-9MxEVr4GNm-ulH6Lys7VNQ-1; Thu, 05 Nov 2020 12:16:06 -0500 Received: by mail-wr1-f71.google.com with SMTP id r16so958832wrw.22 for ; Thu, 05 Nov 2020 09:16:06 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id y200sm3841700wmc.23.2020.11.05.09.16.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Nov 2020 09:16:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604596567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=r+24Qtjsem3z7nn8q0n3COy79qpz54BrkmBsMuZl5LU=; b=f1saEyyw5Q62mzz3S5GqKLPglwhA2aSkX0uD9w5KJ9mKXfgyD+Q5aZ5S735XMIGTGG+PlR 7mo7oKCPAXFFfazdMzDgPpv24f8rtrmcE7Wyewt3Vh/yf6wVvu/TAocv5jYyVtGXjgBDdk JkdiUZAt4cNug076LMzdnvw0VUsK2Ws= X-MC-Unique: 9MxEVr4GNm-ulH6Lys7VNQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=r+24Qtjsem3z7nn8q0n3COy79qpz54BrkmBsMuZl5LU=; b=VJ7v4hf5RbxvU0ydAwV2MWSaqGp1kp1UZHYgPj2a63FBE7DxnwsNHYOd5+RSPKXPWX 5Fwp2Y6jT/0Z3Hn0s59ZiWWaDvRayvNnEgTqZ/POlsIVxG1BcnZrFReGJpCmAvKJyrNo FjYULtMpw2pfVh1s/KX8Cqwgd69YqXur2jU2qUFDrq9GFacdON5y7mMIQ7ASkj5iGtfJ 7EXO4vFWcxrGhxJP6u47pZQP4q/bYvyhAcOim7zhvliWd8G99EuCAKWRp6XlLVgTPr23 iQzN8Drib/BJs4yKwsSkREcWo13w4yUyEdbzSlGcgpzFhhNcz+LfNbExe+ehj+TI8SK2 wfnA== X-Gm-Message-State: AOAM5329nk5x7MH3kAQydM+I+ZGmUt6onc3LgZpv3iHqd8fmJIZIxyZT dgLBuM2cKbPVU4ObCS4/VUFd7C9qPSUv2xz0pOpWc4MyluGzzDoO0xTHg+y+6f0BPyuSKhfAbxo Yk18GmjaKxzLyLg== X-Received: by 2002:a1c:41c4:: with SMTP id o187mr3762463wma.158.1604596565266; Thu, 05 Nov 2020 09:16:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJwDbHlVX67fHTCNN0lVfK9Ga/07LUoaPVRCcZBAJhtrvvGg57+HA2b5J4CvIN80p1tOKC6rvg== X-Received: by 2002:a1c:41c4:: with SMTP id o187mr3762444wma.158.1604596565144; Thu, 05 Nov 2020 09:16:05 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Wainer dos Santos Moschetta , "Daniel P . Berrange" , John Snow , Cornelia Huck , Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH v2 07/11] gitlab-ci: Extract common job definition as 'cross_common_job' Date: Thu, 5 Nov 2020 18:15:22 +0100 Message-Id: <20201105171526.3763499-8-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201105171526.3763499-1-philmd@redhat.com> References: <20201105171526.3763499-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Extract the common definitions shared by '.cross_system_build_job' and '.cross_user_build_job' to '.cross_common_job'. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.d/crossbuilds.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index 099949aaef3..701550f028c 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -1,7 +1,9 @@ - -.cross_system_build_job: +.cross_common_job: stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + +.cross_system_build_job: + extends: .cross_common_job timeout: 80m script: - mkdir build @@ -14,8 +16,7 @@ - make -j$(expr $(nproc) + 1) all check-build =20 .cross_user_build_job: - stage: build - image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + extends: .cross_common_job script: - mkdir build - cd build --=20 2.26.2 From nobody Sun Apr 28 15:04:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604596575; cv=none; d=zohomail.com; s=zohoarc; b=H8fqhXSDy3rCZm5Jw/rQYgaroqES28H+d7jA7I0EPXpeRrnlOY9sUDmIxYVECqb8dHz1yMLdlVOnqAaQxDJ9pETljI9g1/BSdmLlk32Y/kwaTgfkBVH9RJYhGCBo30lXxHbSw5xUd9+xOnuY+fVkKepadE27R1hxMhzpfwtdERc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604596575; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=tOlQmfFaNvcfnBXreBEQVhcMzqQm6Lj5i87BO0gaUIY=; b=Ate/ms+PxKgMn5RDS4oEQll//MB9nBpE7/CPi0nfIvMsvLn0QZHT1utZjlKTS5psoFDsyLOkR5whmbceNGdErZqyD1melg6JAzD+77UFoSX8Q1kjFYKSDwE8wrcEW6mkMGj/CRxX30SuEvcTStxuYzyaSUTeZvKCNNKoIz8ty94= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1604596575278266.5175418058943; Thu, 5 Nov 2020 09:16:15 -0800 (PST) Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-486-IF5e6P1UPW-yuITOGDFrkQ-1; Thu, 05 Nov 2020 12:16:11 -0500 Received: by mail-wr1-f70.google.com with SMTP id t11so983606wrv.10 for ; Thu, 05 Nov 2020 09:16:11 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id y20sm3248715wma.15.2020.11.05.09.16.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Nov 2020 09:16:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604596574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tOlQmfFaNvcfnBXreBEQVhcMzqQm6Lj5i87BO0gaUIY=; b=JHIyaHkxrFtKHGTSdKjmnb2wy65X1GCJiTz2Wqg/k67ItknwtclQg/N5offhJMbCburFri k2aMb3Lf6NLrc7ae/ZDABNNGeRSddRWEi5K4FhUnu4rjAAgYqdKa6ZF8cn47xgjksp9M6I k0yvn1qPZCRxdCGfrIb22D8PXORIbik= X-MC-Unique: IF5e6P1UPW-yuITOGDFrkQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tOlQmfFaNvcfnBXreBEQVhcMzqQm6Lj5i87BO0gaUIY=; b=Yf8pEZh0Q/bgAEgnJRup29p6Tb3uBe4BXf8NORHg/pzuxpyad9VHFuwy1xAJtUharr NcOI9adO7ZXJez5LtWa5wfgLS06n09Ghyurb8UKCCLfe45qohAfbQpfaXUxksTj328tx JCWXCbXGd2skppdbQ2vCU9Lk4Oz0d/XMxvOEGMlqXhWySRmPPOyCtntU0X+kcdjYWR25 PDWEszmN1E02CpbZ1fkrPii0N7HQgB7RxHP+6UKCMYkIf+DhN2rnXXrK1+FIlE0Zjwap NHc3skpwlB61pU1pK3TOIzwzTG7ktf0rVhSASFKWm7PdKDNVOSx1BgqOoaqH7E7mh59b d10A== X-Gm-Message-State: AOAM5315XyMOyNCpATq/SztRPBhBUUFaavp80YSJwHQkqyI9ZxRv/6MA U9vB9n2B1/936UlPHqcn/8ltsJxYBO4V7W24yfZPmjFXW2vH236mEFm7VY1xSt+M0xe4Rg3PywN 9RTwIi6MctzuJfQ== X-Received: by 2002:a1c:b0ca:: with SMTP id z193mr3789367wme.82.1604596570221; Thu, 05 Nov 2020 09:16:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJwvfqvqlzKK5CFedjgTrZgyZyvsjS9hCmWkPCgSQBeqT4AGNpwc12lTUlxpOvo1Pafoedf8qg== X-Received: by 2002:a1c:b0ca:: with SMTP id z193mr3789345wme.82.1604596570057; Thu, 05 Nov 2020 09:16:10 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Wainer dos Santos Moschetta , "Daniel P . Berrange" , John Snow , Cornelia Huck , Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH v2 08/11] gitlab-ci: Extract common job definition as 'native_common_job' Date: Thu, 5 Nov 2020 18:15:23 +0100 Message-Id: <20201105171526.3763499-9-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201105171526.3763499-1-philmd@redhat.com> References: <20201105171526.3763499-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Extract the common definitions shared by '.native_build_job' and '.native_test_job' to '.native_common_job'. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d4526323169..f708573884e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,9 +13,12 @@ include: - local: '/.gitlab-ci.d/containers.yml' - local: '/.gitlab-ci.d/crossbuilds.yml' =20 -.native_build_job: - stage: build +.native_common_job: image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + +.native_build_job: + extends: .native_common_job + stage: build before_script: - JOBS=3D$(expr $(nproc) + 1) - sed -i s,git.qemu.org/git,gitlab.com/qemu-project, .gitmodules @@ -35,8 +38,8 @@ include: fi =20 .native_test_job: + extends: .native_common_job stage: test - image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest script: - cd build - find . -type f -exec touch {} + --=20 2.26.2 From nobody Sun Apr 28 15:04:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604596579; cv=none; d=zohomail.com; s=zohoarc; b=N5JiBcCxH01QEgvONwqVisOAr9dE/jvrxZ+fLWTUVRUBJ4U9vDVM5SpWae0Dkt76Q2GRvF8sOSrwGq6oFqA0L3FzVSIs8vW/kZWrmwOmfwYLhcOldBq4l9u/jcjBwJLzHSszSOhGkRrOgtfkvh4+3vM1jhgtG5pa0Iv0n9+stGY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604596579; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=SuM/NV4PbLQPpbKnL+diVRLlTqVchxOKQRecSqdKDQY=; b=G0v6WsWPeLqpiklH6m+vi5WPje7VRpW29dioPyb4JbVy5NGXkR6WHKklIh0iMIGWur5B95tQwz65q6lPfkfuSvFl0tiygfLZ32zRKHMcB5JeraJMWqOuWwwy+6+CzRkiqxsPV5k5WaZVdteJx8RqmAsBpja74GG3Lm2SEIT3ZFA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1604596579298404.0721184937529; Thu, 5 Nov 2020 09:16:19 -0800 (PST) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-205-q5blKwHsNKWTNS5jWO-AGA-1; Thu, 05 Nov 2020 12:16:16 -0500 Received: by mail-wr1-f71.google.com with SMTP id j15so971949wrd.16 for ; Thu, 05 Nov 2020 09:16:16 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id u202sm3663443wmu.23.2020.11.05.09.16.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Nov 2020 09:16:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604596578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SuM/NV4PbLQPpbKnL+diVRLlTqVchxOKQRecSqdKDQY=; b=JycKt7mQ/8Ja5qwisbK2EWRukXmOBoUwiN/94LnXeT+cAjOSGlmFvnvoEPh7VVSL3JTSpz M7ZZUKDXRCkh4Ss1jDAz1TVEAxUycw4mxJA2k0EeFDkgd+w6NlgAi86SUcZrLh7aex0gAT TqIKptNsAOqHDMetO+ADjQwBzS7tgT0= X-MC-Unique: q5blKwHsNKWTNS5jWO-AGA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SuM/NV4PbLQPpbKnL+diVRLlTqVchxOKQRecSqdKDQY=; b=Y0VehVwsyWvYGVb6xwmp3Dbi7txqd/W9MEvvUKfo+owqoXGR5DDwxDJG1/p94xgSH9 dmhSRuAiyPPYayOuOwysQT+rGgYHslfiDbvU6hf5ehszRSFlgvS3T+jxkDjpQ5ioM/1j cE98rNk00QpPJe/S28nhK3GbtNtb1Cw8Ksudjjvij3g3Q/p0+nmZQgkHYsVVojueVS0y idKHnZxqYJHnSAy12G47I9i3iO9fD/ivjWeeD72t+SH4C55CmMw1dLoEywV0kIrTiF6A mig2qfFoyIuS5eSup96RbWXEGB3wtEKcW4ayYf1yRPdodH9/EL6es7XLU3Noczi8/2gH UtLg== X-Gm-Message-State: AOAM531hx1WLAcnQAFEUH/MDJ7DvFwVwsjbDZ4GIAQKLcSLouhzwo0As gFlbagC0ckQ5HtVnqqAKLGHuuVzwqBGyVtbGPfvU0wZyfnysF7dUYucEDH/ICvMTMbdCOaOdrx9 huPvsgqeQJeYccQ== X-Received: by 2002:a7b:cb46:: with SMTP id v6mr3683601wmj.159.1604596575389; Thu, 05 Nov 2020 09:16:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJzacydmB61d0VpJd9NJ5llLAgk6WvBW7odPftBvtDa+a2Gi+gsoVQOr+26h4472RuZlajkglQ== X-Received: by 2002:a7b:cb46:: with SMTP id v6mr3683577wmj.159.1604596575203; Thu, 05 Nov 2020 09:16:15 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Wainer dos Santos Moschetta , "Daniel P . Berrange" , John Snow , Cornelia Huck , Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH v2 09/11] gitlab-ci: Add rules to select cross-jobs to build Date: Thu, 5 Nov 2020 18:15:24 +0100 Message-Id: <20201105171526.3763499-10-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201105171526.3763499-1-philmd@redhat.com> References: <20201105171526.3763499-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Add rules to select some crossbuild jobs. The following tags are available to restrict the CI jobs: - all (select all jobs, this is default) - cross (select all cross-jobs) - system (select all cross-system jobs) - user (select all cross-user jobs) - $ARCH (select an architecture: arm/mips/ppc/sparc/...) Developers can combine tags in the QEMU_BUILD variable when pushing a branch (or tag) to repositories. Examples: $ git push -o ci.variable=3D"QEMU_BUILD=3Duser" myrepo mybranch $ git push -o ci.variable=3D"QEMU_BUILD=3Duser,system" myrepo mybranch References: - https://docs.gitlab.com/ee/ci/yaml/#rulesif - https://docs.gitlab.com/ee/user/project/push_options.html#push-options-fo= r-gitlab-cicd Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.d/crossbuilds.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index 701550f028c..7503d24a57b 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -1,6 +1,36 @@ .cross_common_job: stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + rules: + # If the if statement is true, the job is added to the pipeline. + # We only filter for push events + - if: '$CI_PIPELINE_SOURCE !=3D "push"' + # Build all when no variable defined, or set to "all" + - if: $QEMU_BUILD =3D=3D null || $QEMU_BUILD =3D~ /^all$/ + # Build specific job name + - if: $QEMU_BUILD =3D~ /^$CI_JOB_NAME$/ + # Build set of jobs by feature + - if: $QEMU_BUILD =3D~ /cross/ + - if: $QEMU_BUILD =3D~ /system/ && $CI_JOB_NAME =3D~ /system/ + - if: $QEMU_BUILD =3D~ /user/ && $CI_JOB_NAME =3D~ /user/ + # Build set of jobs by arch + - if: $QEMU_BUILD =3D~ /aarch64/ && ($CI_JOB_NAME =3D~ /aarch64/ || $I= MAGE =3D~ /aarch64/) + - if: $QEMU_BUILD =3D~ /alpha/ && ($CI_JOB_NAME =3D~ /alpha/ || $IMAGE= =3D~ /alpha/) + - if: $QEMU_BUILD =3D~ /arm/ && ($CI_JOB_NAME =3D~ /arm/ || $IMAGE =3D= ~ /arm/) + - if: $QEMU_BUILD =3D~ /avr/ && ($CI_JOB_NAME =3D~ /avr/ || $IMAGE =3D= ~ /avr/) + - if: $QEMU_BUILD =3D~ /hppa/ && ($CI_JOB_NAME =3D~ /hppa/ || $IMAGE = =3D~ /hppa/) + - if: $QEMU_BUILD =3D~ /i386/ && ($CI_JOB_NAME =3D~ /i386/ || $IMAGE = =3D~ /i386/) + - if: $QEMU_BUILD =3D~ /lm32/ && ($CI_JOB_NAME =3D~ /lm32/ || $IMAGE = =3D~ /lm32/) + - if: $QEMU_BUILD =3D~ /m68k/ && ($CI_JOB_NAME =3D~ /m68k/ || $IMAGE = =3D~ /m68k/) + - if: $QEMU_BUILD =3D~ /ppc/ && ($CI_JOB_NAME =3D~ /ppc/ || $IMAGE =3D= ~ /ppc/) + - if: $QEMU_BUILD =3D~ /riscv/ && ($CI_JOB_NAME =3D~ /riscv/ || $IMAGE= =3D~ /riscv/) + - if: $QEMU_BUILD =3D~ /s390x/ && ($CI_JOB_NAME =3D~ /s390x/ || $IMAGE= =3D~ /s390x/) + - if: $QEMU_BUILD =3D~ /sparc/ && ($CI_JOB_NAME =3D~ /sparc/ || $IMAGE= =3D~ /sparc/) + - if: $QEMU_BUILD =3D~ /tricore/ && ($CI_JOB_NAME =3D~ /tricore/ || $I= MAGE =3D~ /tricore/) + - if: $QEMU_BUILD =3D~ /x86/ && ($CI_JOB_NAME =3D~ /x86/ || $IMAGE =3D= ~ /x86/) + - if: $QEMU_BUILD =3D~ /xtensa/ && ($CI_JOB_NAME =3D~ /xtensa/ || $IMA= GE =3D~ /xtensa/) + # In all other cases, the job is excluded from a pipeline. + - when: never =20 .cross_system_build_job: extends: .cross_common_job --=20 2.26.2 From nobody Sun Apr 28 15:04:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604596584; cv=none; d=zohomail.com; s=zohoarc; b=d3DSSV9qnvBmFyKws/xS9bWdsMzAvx/uL7xJ8FVDcL0+t69PQK3yycRYmuh35NhX8vxafqxbWNgUl3ovQenNuslia6FW/OtbyYUmMMVqDub6VFK227rPQ2buTVKI88sSqEB87YMJMM5svSdXUH6uzbY1nEEdYLDXpknv1HLSAOY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604596584; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=aTSVN3oUuqR2+G30Aw9N7n9SpQDpAdEdj3jqg7jW23U=; b=lKmcB1BEGqKSmKPCtdOKnQDgYBIZ3QZTzXAxexFAnsBH12XIzE2glXuIq3FXEkp6mCPtN3YAMh7ru+lDtflurhCxofOfYZppprZW+ro1CFjdr3ooGw4TlvrfHBEVhfG6gzSlAbWJ6MM/a1Ee/SO1PWfdJfEAntf0x4TAaFbArMo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1604596584360142.06850251008768; Thu, 5 Nov 2020 09:16:24 -0800 (PST) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-481-McxWCYarMlmzk0mqo7ql1Q-1; Thu, 05 Nov 2020 12:16:21 -0500 Received: by mail-wm1-f71.google.com with SMTP id 8so611743wmg.6 for ; Thu, 05 Nov 2020 09:16:21 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id t6sm3351615wrp.68.2020.11.05.09.16.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Nov 2020 09:16:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604596583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aTSVN3oUuqR2+G30Aw9N7n9SpQDpAdEdj3jqg7jW23U=; b=cDWfY64q+poP75p7ADyZl76bTyzauDQKR72KLTUgxhEOj5yBlprdNJmKTWFU+7qS9dzASk /xr7ZiQKT85vawFdPQycYM53oqJ0XtLVRhEfE7yFCX02gveC6SBw0M0TWLVuHW7Di5iujW 7eA8zNQNleSXBZYHZz8wOWqRufZpfN0= X-MC-Unique: McxWCYarMlmzk0mqo7ql1Q-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aTSVN3oUuqR2+G30Aw9N7n9SpQDpAdEdj3jqg7jW23U=; b=Sngq9uF7M8Lf9op6cnLwYESilhCd4ibWxuxPc6ewYRPrpCIUuN+F3kQMB2eMGwn1cZ YM1kPbr6QKdY+mFufXuZL9JDT/c/rEddye+aq0Jiw0dd3s18agJ55vUDqhDNbPJw0PiL 6LkFJpFnyap+EblJbWaGnL82WxyqR8Rm9fTzkLHRFBdNkfLoK75QtCucOpsGcRobrT86 Styj2oClizjoSWUt6jC1N23udp25H+RRKiNe81NaFdx9G1gF8Z7MURTRqZM8kIv+PbhO CrHALPupeqmLTgRWk6ctfMpYG5mtm2kQNI/yatq4COjEV+xthYu0axmtxitj2nK5fKpC Zhzw== X-Gm-Message-State: AOAM532pcKOqM13tiVMzFYio73lbXfwW50KOIRJ2UiVIHm4yvJ5ibgoQ rlyfY2O+7p/ygTGBqUvVGFSNTzCMLUyR0hMtZzYM1TEWuF57aEkvLN7ZPalddU05kkdqpwBj1cS P80h1L+UpE9s6OQ== X-Received: by 2002:a1c:3c84:: with SMTP id j126mr3899180wma.151.1604596580368; Thu, 05 Nov 2020 09:16:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJzwuR8+oLVW+15w+g5aC0JpLhZrw0paviDb6+TKlGgM/OvHyWCAcrah//qFPg5TiS6nT+M9mQ== X-Received: by 2002:a1c:3c84:: with SMTP id j126mr3899160wma.151.1604596580146; Thu, 05 Nov 2020 09:16:20 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Wainer dos Santos Moschetta , "Daniel P . Berrange" , John Snow , Cornelia Huck , Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH v2 10/11] gitlab-ci: Add rules to select building/testing native jobs Date: Thu, 5 Nov 2020 18:15:25 +0100 Message-Id: <20201105171526.3763499-11-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201105171526.3763499-1-philmd@redhat.com> References: <20201105171526.3763499-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Add rules to select various build/test jobs. The following tags are available to restrict CI jobs: - user (user-mode jobs) - system (system-mode jobs) - centos (jobs based on CentOS distribution image) - debian (... Debian) - fedora (... Fedora) - ubuntu (... Ubuntu) - crypto (jobs testing the crypto feature) - tci (jobs testing TCI feature) - fuzz (fuzzer job) - integration (integration tests) - $ARCH (select an architecture: arm/mips/ppc/sparc/...) Developers can combine tags in the QEMU_BUILD variable when pushing a branch (or tag) to repositories. Examples: $ git push -o ci.variable=3D"QEMU_BUILD=3Duser" myrepo= mybranch $ git push -o ci.variable=3D"QEMU_BUILD=3Duser,debian,crypto,fuzz" myrepo= mybranch References: - https://docs.gitlab.com/ee/ci/yaml/#rulesif - https://docs.gitlab.com/ee/user/project/push_options.html#push-options-fo= r-gitlab-cicd Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.yml | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f708573884e..debd4dea4fd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,6 +15,44 @@ include: =20 .native_common_job: image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + rules: + # If the if statement is true, the job is added to the pipeline. + # We only filter for push events + - if: '$CI_PIPELINE_SOURCE !=3D "push"' + # Build all when no variable defined, or set to "all" + - if: $QEMU_BUILD =3D=3D null || $QEMU_BUILD =3D~ /^all$/ + # Build specific job name + - if: $QEMU_BUILD =3D=3D $CI_JOB_NAME + # Build jobs using particular distribution image + - if: $QEMU_BUILD =3D~ /centos/ && $IMAGE =3D~ /^centos/ + - if: $QEMU_BUILD =3D~ /debian/ && $IMAGE =3D~ /^debian/ + - if: $QEMU_BUILD =3D~ /fedora/ && $IMAGE =3D~ /^fedora/ + - if: $QEMU_BUILD =3D~ /ubuntu/ && $IMAGE =3D~ /^ubuntu/ + # Build set of jobs by feature + - if: $QEMU_BUILD =3D~ /system/ && ($TARGETS =3D~ /softmmu/ || $CONFIG= URE_ARGS =3D~ /disable-user/) + - if: $QEMU_BUILD =3D~ /user/ && ($TARGETS =3D~ /user/ || $CONFIGURE_A= RGS =3D~ /disable-system/) + - if: $QEMU_BUILD =3D~ /integration/ && ($CI_JOB_NAME =3D~ /^integrati= on/ || $CI_JOB_NAME =3D~ /^build-system/ || $MAKE_CHECK_ARGS =3D~ /check-ac= ceptance/) # integration depends on build-system + - if: $QEMU_BUILD =3D~ /crypto/ && $CI_JOB_NAME =3D~ /crypto/ + - if: $QEMU_BUILD =3D~ /tci/ && $CI_JOB_NAME =3D~ /tci$/ + - if: $QEMU_BUILD =3D~ /fuzz/ && $CI_JOB_NAME =3D~ /fuzz$/ + # Build set of jobs by arch + - if: $QEMU_BUILD =3D~ /aarch64/ && ($CI_JOB_NAME =3D~ /aarch64/ || $T= ARGETS =3D~ /aarch64/) + - if: $QEMU_BUILD =3D~ /alpha/ && ($CI_JOB_NAME =3D~ /alpha/ || $TARGE= TS =3D~ /alpha/) + - if: $QEMU_BUILD =3D~ /arm/ && ($CI_JOB_NAME =3D~ /arm/ || $TARGETS = =3D~ /arm/) + - if: $QEMU_BUILD =3D~ /avr/ && ($CI_JOB_NAME =3D~ /avr/ || $TARGETS = =3D~ /avr/) + - if: $QEMU_BUILD =3D~ /hppa/ && ($CI_JOB_NAME =3D~ /hppa/ || $TARGETS= =3D~ /hppa/) + - if: $QEMU_BUILD =3D~ /i386/ && ($CI_JOB_NAME =3D~ /i386/ || $TARGETS= =3D~ /i386/) + - if: $QEMU_BUILD =3D~ /lm32/ && ($CI_JOB_NAME =3D~ /lm32/ || $TARGETS= =3D~ /lm32/) + - if: $QEMU_BUILD =3D~ /m68k/ && ($CI_JOB_NAME =3D~ /m68k/ || $TARGETS= =3D~ /m68k/) + - if: $QEMU_BUILD =3D~ /ppc/ && ($CI_JOB_NAME =3D~ /ppc/ || $TARGETS = =3D~ /ppc/) + - if: $QEMU_BUILD =3D~ /riscv/ && ($CI_JOB_NAME =3D~ /riscv/ || $TARGE= TS =3D~ /riscv/) + - if: $QEMU_BUILD =3D~ /s390x/ && ($CI_JOB_NAME =3D~ /s390x/ || $TARGE= TS =3D~ /s390x/) + - if: $QEMU_BUILD =3D~ /sparc/ && ($CI_JOB_NAME =3D~ /sparc/ || $TARGE= TS =3D~ /sparc/) + - if: $QEMU_BUILD =3D~ /tricore/ && ($CI_JOB_NAME =3D~ /tricore/ || $T= ARGETS =3D~ /tricore/) + - if: $QEMU_BUILD =3D~ /x86/ && ($CI_JOB_NAME =3D~ /x86/ || $TARGETS = =3D~ /x86/) + - if: $QEMU_BUILD =3D~ /xtensa/ && ($CI_JOB_NAME =3D~ /xtensa/ || $TAR= GETS =3D~ /xtensa/) + # In all other cases, the job is excluded from a pipeline. + - when: never =20 .native_build_job: extends: .native_common_job --=20 2.26.2 From nobody Sun Apr 28 15:04:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604596591; cv=none; d=zohomail.com; s=zohoarc; b=HW6VgrPVqkGU7NuE2ZrOUX6anzNJZE0fvxWF7TCVhjusFNkblrgQY0qV43tnSfJ9CMVps0tbCNCqSWNTU+Zx9/4kqxV0FpsGdAEi0qGyzW7nMbjw1eD8PuxEU0eeGz4AfbnTNo9hU7LUHSmlQ2Xv7xiTivqY7s15O0EjWvdGnqA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604596591; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=Dh8zYanri5cUjNjRO/cAMn2XcMmJnffL6Q+0hobMChg=; b=TEe98wyOTiwayhSXsbexil00gc8N78FJJc4Sx5d5G3y3nNAm8Osf+QPfYspHWReIq+R+iuiegF2URsksVXktU2QwtH4V5RDrI20/jMD4o0IT+UYeGwg8CE7d49Hm1YZ52WQ2YZsTP+9dPmUsNCoZLRA3t1gqCOxgvJmUia1KrIw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 160459659155785.32690118661992; Thu, 5 Nov 2020 09:16:31 -0800 (PST) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-437-a6wirVlxNj6LSuI3TXd9zA-1; Thu, 05 Nov 2020 12:16:27 -0500 Received: by mail-wr1-f72.google.com with SMTP id u1so994993wri.6 for ; Thu, 05 Nov 2020 09:16:26 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id f17sm3601261wme.22.2020.11.05.09.16.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Nov 2020 09:16:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604596590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Dh8zYanri5cUjNjRO/cAMn2XcMmJnffL6Q+0hobMChg=; b=gKvjDdGUl6G1cf9phxOpBM8Slt8Lp6NQCdb9IIjLa2HDHkaziG9EIlJeIoTnVyCeQ+Tjp9 V2x2uXjVqRuqRDl9gQIcDgz8u+tJheBThRoai+nD1Nuhky6oS+HssCpeSmHU7xFHuxqYpF AGPtb9B8PvPvN6gR/E5iJNFK6GPWWmM= X-MC-Unique: a6wirVlxNj6LSuI3TXd9zA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Dh8zYanri5cUjNjRO/cAMn2XcMmJnffL6Q+0hobMChg=; b=fg4OSyFSJaGI+2QMuNyy5RDdCC7n28asPrv415iH1AD8/O2YpOvSlkTF46US2mHKJG 2dyimlpP2jtgAvxwXf05oXTPaPNHn/HvRpp9qeaI0giXkR+YrvuTg1SFFGRMrUMf2UF5 U5wP2wT18pdCLGb0bzOyX0Px6sNiR5to4doFfXC5ifDvF5XQyRt4nmrhfASFYd+vz9/n QSoMbhDQ7qaUNpn3aKNigBaDJ4b01r5eKLycdSDgbaFtJcUiqlnYET4FvOFZGFdGIHaB 1LfPyNFRuTaAOHYwc68H6KUucSVKgDw77Ui/jG7XCuE35aSOOz+9WSIEv+jGheCKFtXw H6+w== X-Gm-Message-State: AOAM532OegTKUqrFzBw6UfNM1fea3Hmi6121gIrwG8P7UxmoSJPOT+jn zZ9CycFWXKit0plNX7RNwT0xelzbQGo8EvHSNSpMCkq2NHkPhUVetAcwmwNi/5oGOxAT6IfjVqy ET3xQmR8XVr6yuA== X-Received: by 2002:adf:ef02:: with SMTP id e2mr3959540wro.381.1604596585410; Thu, 05 Nov 2020 09:16:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJzytUtubNf9azxwy8izftM15Tlx9tFC/+UPKrgXy+qz4FcNWjoafVZs0jIWAzYx7bwxpEOVgQ== X-Received: by 2002:adf:ef02:: with SMTP id e2mr3959524wro.381.1604596585290; Thu, 05 Nov 2020 09:16:25 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Wainer dos Santos Moschetta , "Daniel P . Berrange" , John Snow , Cornelia Huck , Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH v2 11/11] gitlab-ci: Move artifacts expiry rule to common 'native_build_job' Date: Thu, 5 Nov 2020 18:15:26 +0100 Message-Id: <20201105171526.3763499-12-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201105171526.3763499-1-philmd@redhat.com> References: <20201105171526.3763499-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Build jobs include the 'native_build_job' template. Move the 'artifacts expiry' rule there. Now all build jobs benefit from it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.yml | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index debd4dea4fd..9c9a8584e4f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -74,6 +74,10 @@ include: then make -j"$JOBS" $MAKE_CHECK_ARGS ; fi + artifacts: + expire_in: 2 days + paths: + - build =20 .native_test_job: extends: .native_common_job @@ -116,10 +120,6 @@ build-system-ubuntu: 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 =20 check-system-ubuntu: extends: .native_test_job @@ -146,10 +146,6 @@ build-system-debian: 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 =20 check-system-debian: extends: .native_test_job @@ -177,10 +173,6 @@ build-system-fedora: 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 =20 check-system-fedora: extends: .native_test_job @@ -208,10 +200,6 @@ build-system-centos: 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 =20 check-system-centos: extends: .native_test_job @@ -312,10 +300,6 @@ build-deprecated: MAKE_CHECK_ARGS: build-tcg TARGETS: ppc64abi32-linux-user tilegx-linux-user lm32-softmmu unicore32-softmmu - artifacts: - expire_in: 2 days - paths: - - build =20 # We split the check-tcg step as test failures are expected but we still # want to catch the build breaking. --=20 2.26.2