From nobody Thu May 2 16:17:11 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=1604873976; cv=none; d=zohomail.com; s=zohoarc; b=fUmGJiI9r0aipV6LoKK5k9jKjEe9CWTgZyzWCOTZ2PPUVdgatuzl5X4VFA1mgoOE6q0m0ZKZe3hTJFvX02SN72SspjsAujkkOFJ8eqtYfxS5fYe4abkHsfzIjLq3zl1jU3p3NB2imEKZMKVCzDDZQgQMlRfZAi71IiE8SIYxxYk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604873976; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=jje+QkM8EIIDX196QXsItz5lUhUXvc2nsiwvd/KOGGQ=; b=nOANFMI7dzgIOMTdNqsuHJzZblg3lFi+WjwUandmp3qiNo2tpRWnvP3uB3B8ZyBG+CyxKdz0cokoR7OtABI5AGBkRbrexR0Ebn5wQzf17ef22V5KmKWXTeDcGN6HdmBWiavP7oHhR9rhovV+GD/Jk2HFnb1gSkaq8YK1j7zs2RE= 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 1604873976578880.2763107746574; Sun, 8 Nov 2020 14:19:36 -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-437-Q2EI2atRPz-AYR5l6MxLbQ-1; Sun, 08 Nov 2020 17:19:34 -0500 Received: by mail-wr1-f69.google.com with SMTP id 67so3488093wra.2 for ; Sun, 08 Nov 2020 14:19:34 -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 f8sm10735494wrt.88.2020.11.08.14.19.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Nov 2020 14:19:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604873975; 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=atxH/KN5IxjLyrP1OFD9ukba1DkFI3RUQn3man6qI3LSG929tIz+INqnzdUmREqvbxlPWt 4GHxfknL42RMnJOfgpIicw1KCVS9U3ZzrZcYPIKnQuoZz8sEWyfrXFA3l6xX7wTgnC13Jy sL2ssixel3Px66UeVneVM8PxPakZSSc= X-MC-Unique: Q2EI2atRPz-AYR5l6MxLbQ-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=OIeV9HKes/Hj7sL5qQmyZUjMspQJKMOoDTNWxvkC6YjX3o1M6zykhQ6oEj54N4isJE BcxONOjX7Pl+no2swFtmdKE+HvEv3Mfvnb0soBD6juK3Db4mBMhngdkddFhqGOu2oZTQ gB94uIXLNKeV6bqtzmI7/+B0astD7EqpiknecLeyap2OeyXF0O67942Sk3kUHUeRJX7+ C8VP5KC8y913kxnMkxKlW4dx0cU5DLaLPLJCl7obO8qhu6SWiT7oK3YDx3Yy6k1JwM2J xov7yv09CL8PUI4NMxElFI7X+KiTzI/B9sAzGISJrsHXFqbJ4FN6AcLxoBCYd5d359B6 gUVw== X-Gm-Message-State: AOAM533WeFflZgqc7j4/jjfSxQrDT6HG/113EIgc3jAPCj0Gvl1zUIwh QqAApkGGb+i9o9Zzwy7wbHVHOHj1J46X4BkblNEDdkhsZ1F1ULPyuHHScE1q6WGpyIfGjZ/kOCn OxBsh80K+t7lhBQ== X-Received: by 2002:a1c:97:: with SMTP id 145mr10961967wma.72.1604873972925; Sun, 08 Nov 2020 14:19:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJy3WPOTPx39UY6bBlDIjG81oA9Q+iyhbmk6P7uLuBowaVY/MFR426y1bws7wEEb+LYnBK6RSQ== X-Received: by 2002:a1c:97:: with SMTP id 145mr10961962wma.72.1604873972820; Sun, 08 Nov 2020 14:19:32 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , "Daniel P . Berrange" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta Subject: [PATCH v3 01/11] gitlab-ci: Drop generic cache rule Date: Sun, 8 Nov 2020 23:19:15 +0100 Message-Id: <20201108221925.2344515-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201108221925.2344515-1-philmd@redhat.com> References: <20201108221925.2344515-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 Reviewed-by: Thomas Huth --- .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 Thu May 2 16:17:11 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=1604873983; cv=none; d=zohomail.com; s=zohoarc; b=eSEH2z9pphpcGz9ZmfJqyqER5U3BUOYgKQ6xb0aDW3alcn/yeYdfPrW0oQiXhQ0j3Ccf9bfG70QL/spB22+jtvMg7q5bnRkYi3jiBNvUYF3nOEKIvuvZ6sNK+nxLEn47cfo1TP8LLVONw6MW7/7HS3F9qIYZ+2IKo4tP5NVnun0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604873983; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=HkmWM8pdBxBAkh2ux+VVNAnnOD7tHToqsp9wNXfrvV8=; b=VaWwsCLFU3UAS4v2D+sW3slAVEaQ4zxdJJ2pCptDwhvUgj7RQ2aA8LLMf4IjCRBMhv8WIZ89Uew5GkJf1iDg8pTxjQjR3w6xksoHPHzRIvp5OALhIJmjH075tqt3m9UgOFpVDmqsV2gP7jE+BtCdlhCVCfck73prRGCpVFzWob0= 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 1604873983685496.85580936422264; Sun, 8 Nov 2020 14:19:43 -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-546-oYEbf74xNfWxbZhcNfWR-A-1; Sun, 08 Nov 2020 17:19:38 -0500 Received: by mail-wr1-f72.google.com with SMTP id u1so3481889wri.6 for ; Sun, 08 Nov 2020 14:19:38 -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 u202sm10881001wmu.23.2020.11.08.14.19.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Nov 2020 14:19:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604873982; 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=R0+fVRnuSMebgmwLa4ygI2bIkMAC6k3/ZNlYkoEiSkBzOz+2Tv76zpbPTqqDXqMbYReERS QxN63Uq/7ZV+mtHZVw4iYAYOfgLEWnwPURzP67Gof5yAIGLQrh6aZmW1mgZPGbq1i39Bj5 Ns4RUw6mNUVtRAhbcYg1Rcv6KRghcMo= X-MC-Unique: oYEbf74xNfWxbZhcNfWR-A-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=fP7kq4V0In3CZCiUbMcVQuggdwIx6l5YWPC8htINoffexrLbEa6T/M7rrC2+0EHuwv RhL7hE+jOL8OXs6016YktrggOI+FENulJ1AX6gIaaJ0kg0txlJ6cbRx/nXmznY4WPyx8 FIIJryMva0WZOAdl6rW/7v1q4RR8NVqorr4T1Dasj4txy7lVlSuvS/94tVRvB330OX/j uc+cOrvZc6wbw9ntJHg32mxPzB6kIgByM3QxCl/elowd1pdWEnAqRpJiRzf7Fmt4NSvj mOoD/eg/PxRH9wOyksQ9P2m9OGReHVpFzHxbx2XuWiFYQ1RT81YQ8dtaad8HlLZpeR+P IXYg== X-Gm-Message-State: AOAM532h77z903/ALE32nm/uoPjZ/jk5Ad3JFWYe1N03F0IUnRjL7JYz aR8d9ze99eQ4HC2JgPU+mjUZTt1lgk+34xVkH3coX+COfk32nHdCrGclZLBFUhoKe7a6RNTKr8a misr/Bz/r8P7EPA== X-Received: by 2002:a1c:a185:: with SMTP id k127mr8244224wme.23.1604873977762; Sun, 08 Nov 2020 14:19:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJzeK5Iw3T3r0WchIm2XyJfBXdfpPPUWMmNwiialhbHsJs9HGg02JgTxPqhLVa3bKnrU0ubY1g== X-Received: by 2002:a1c:a185:: with SMTP id k127mr8244211wme.23.1604873977633; Sun, 08 Nov 2020 14:19:37 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , "Daniel P . Berrange" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta Subject: [PATCH v3 02/11] gitlab-ci: Replace YAML anchors by extends (cross_system_build_job) Date: Sun, 8 Nov 2020 23:19:16 +0100 Message-Id: <20201108221925.2344515-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201108221925.2344515-1-philmd@redhat.com> References: <20201108221925.2344515-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 Reviewed-by: Wainer dos Santos Moschetta --- .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 Thu May 2 16:17:11 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=1604873988; cv=none; d=zohomail.com; s=zohoarc; b=VQzHwlFtKuHNFLZ8F7BbrysmrsGhhQBwM2/3oyi4gXR87TujxhyKtcUpUjJLqLmT4RFF8/9PdisLNIgwsCBYtWd/xyMN48pOorTtfvelLv43b50XacLG7x4SYr9A3D0cPTtybZ0uf/J5JYFBU7cfNNejDQz4fIXVr5F+CKxBwKk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604873988; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=CmyNUmooLdVHry+yJmzGfzNT00h5DfYz55kuF8g/yME=; b=HvOydkDsIubQWpc2FU617AjAu8GiNeN/bFTvZPPM0ReVQv7Wd3THZoKAL4JKVRJw+nKrKMQBC2xZDf/zGOvyXk/V1zs0vbyC7eTFQKEIf902bmtNLyg9Bvm80RB88wUr1z30H6LC1UQqjoMc4cooQ7RvwyNXmKtZ3tHki+9xXKI= 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 1604873988398427.54385927990324; Sun, 8 Nov 2020 14:19:48 -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-259-htY_xHrxPJifGBL0B3VjmA-1; Sun, 08 Nov 2020 17:19:43 -0500 Received: by mail-wr1-f70.google.com with SMTP id x16so3451802wrg.7 for ; Sun, 08 Nov 2020 14:19:43 -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 l16sm10878402wrx.5.2020.11.08.14.19.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Nov 2020 14:19:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604873987; 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=BpBWwD3fgz6p2rH2h6L9AZ4IEKqVeTWLZtdYAoK3MIWrVIN8SzPHJxa13l3IfUfJ8Oyklw 2LqYyXcL1r6hVxdWIixj0m3rZsG0YNndbyO4bzeXcAt5+GqTUMbjeBhI73chF526jjZ1S5 8j0aT0K6hUK+iic8wNPd9QYr6IVORi0= X-MC-Unique: htY_xHrxPJifGBL0B3VjmA-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=M7w2r4Jwh79/4UZYI7K/4vkUn0KyRtTlhsELAUnUl8aOCTTm8pcNPjvhe3OFpqDHJp AXvfey+o3DM6Synf/WYHL9pZW3TM3FvNkEzYaLDV0TnNlvVlhwo+dQ15TtnOb039SMxa GQki3VqpJFDk1zN+CehfudnC046S7psZ/yCDvjHb8z7p/M+lSX9OvFHq5zB5S/vGjwO+ lecDK3zm6rGLTkA1SN995vZJ6YnqZi+brU2ZXk0mqqn5XvSA2p45qno0u6WLQBNp/qqG Xcz6ggje7p7RezNgjRZ5OrsWsrCnWoQmQtxdXm+tmoYYF1uz6QimPrHdJHOdAOma3VDD n/fA== X-Gm-Message-State: AOAM531g/TWdVY4W9ry/ohvfGRvGLWJX90WYqBbNigJssD0R2NVhE6nB vXGGBCR+zUs3+wMLNxBS4LPRxGi1sjLcA6rOtQKaUVpZLzkcwzOzxB/cz0IWpgT2BsGe4nwUtye bMKPs8SOvvRZQ+w== X-Received: by 2002:a1c:9dcc:: with SMTP id g195mr11040682wme.113.1604873982690; Sun, 08 Nov 2020 14:19:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJw8rbSR+GAEiCWBZ80Rwovk7pIKZSNYDTFyW3j6X3abJ5ASKZlFvvvDT2ACOZ/VU/1nDSh7qg== X-Received: by 2002:a1c:9dcc:: with SMTP id g195mr11040664wme.113.1604873982495; Sun, 08 Nov 2020 14:19:42 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , "Daniel P . Berrange" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta Subject: [PATCH v3 03/11] gitlab-ci: Replace YAML anchors by extends (native_build_job) Date: Sun, 8 Nov 2020 23:19:17 +0100 Message-Id: <20201108221925.2344515-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201108221925.2344515-1-philmd@redhat.com> References: <20201108221925.2344515-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 Reviewed-by: Wainer dos Santos Moschetta --- .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 Thu May 2 16:17:11 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=1604873990; cv=none; d=zohomail.com; s=zohoarc; b=kqvLykme4WdFLnmuR5/1+dWYgrdHhH2AgzqPQVgmhCMVTZUnZ4Rf26oUSDlP5TsMZA+OahIW837ydbqTT8UdYtUx9FMYUmB4By6jeeVjcYPfpmiqebQa6IzsiTH0BDoGDNRk7RbFNNiw5W2tuDFN16QJtQLr/R9EUEf8vzfi66w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604873990; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=EMPOslgUIn2gPkqETCgv4eVsfUBUm27ATWoJ+FEEAoc=; b=fEr4I6KL1tF9WCkEihf9rDf7PH1il0AY733E4pvNvRoNBzPLK/fJCTlMwYyT7JbRZjdVEAnbS4lW6a2qeXcF+PpRT8QQIDOdlOuO2Zhx0sZkLDQz8i3CY0lcaxo+CDVhjfMvO1cUEm1NaMpJOrcy8AodExx4daNjGrVfutBrZ3U= 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 1604873990892225.2851149572674; Sun, 8 Nov 2020 14:19:50 -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-197-umGr_z8NOUWPYr2gCr0t5A-1; Sun, 08 Nov 2020 17:19:48 -0500 Received: by mail-wr1-f70.google.com with SMTP id r16so3442386wrw.22 for ; Sun, 08 Nov 2020 14:19:48 -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 x10sm10538676wrp.62.2020.11.08.14.19.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Nov 2020 14:19:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604873989; 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=UDGgX5scR9fVrnXT6kCS3Hip30Cqcm5rLQzw6tq2BTmqHU0PAQc4QQhL7mSWZyzkcF7o4H 2E2o4wQPRAFsSUcp2A4a2DhCDTaeWRbHaj2FEKFoGty66XCmv0mPKvCVRLTZHI2g8RihYi 3wGslQfTDSt6qYZU8j0egBaOsnXBb5M= X-MC-Unique: umGr_z8NOUWPYr2gCr0t5A-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=cLWPCaCSelJCM4fKb2zY6lhn0OrW1K85byX6PgzrtcU4lz4OK1qCz3OivAmfhHHMJ5 k9TtXgCEetwbRzPNzFJe6rZxBaP0rLTX2Ycj7L/bt8cIMrNANGnUuz/OWIAjGPr2rF8g 35KXlLY11x6g34CWH7Pm7wvMmm3PeuCub+nN5JEtAF4gcBCH6niJ7mAdvXx6mqLLnieo KeNNkNmTSxPFshI4hxdMJJ1arDXod8dXoLXvM2Dkiq6HLFV9CyEO4FJ0X3tGdqlBcJe8 NNEKSobPFTuJLMC8Pv4bHpIVcGsTFoC9xpdso0NacUvT6A4J5S5qPlCuvN8eq68sGLh9 uTcg== X-Gm-Message-State: AOAM530Nz5P6QKErpP6RoSBuiYkIxBl61rPaIIlS69bq6un7iTwr/Sxj JegKdHb88SVsOodqMDGS1sAMybU+8UvZbPtWPDhKGnxt7razeTZxy/g2EN88C5CNXsLE2BMityJ mUUrm2AYbHsVKZw== X-Received: by 2002:a1c:1d51:: with SMTP id d78mr11136474wmd.60.1604873987326; Sun, 08 Nov 2020 14:19:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJx790b5XkPQ6PUx5vJM6dr0rGjJdTXYtHNpMdZF+xz0WZWWMx46WM0O0qNCw79SVOgroxt7Gw== X-Received: by 2002:a1c:1d51:: with SMTP id d78mr11136465wmd.60.1604873987193; Sun, 08 Nov 2020 14:19:47 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , "Daniel P . Berrange" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta Subject: [PATCH v3 04/11] gitlab-ci: Replace YAML anchors by extends (native_test_job) Date: Sun, 8 Nov 2020 23:19:18 +0100 Message-Id: <20201108221925.2344515-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201108221925.2344515-1-philmd@redhat.com> References: <20201108221925.2344515-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 Reviewed-by: Wainer dos Santos Moschetta --- .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 Thu May 2 16:17:11 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=1604873997; cv=none; d=zohomail.com; s=zohoarc; b=djywCdF0RK7ed/aIUc/fCeEb0dzCprV6lPYRBLO1O/gNlOv8c32h04RHDHMy4cCOh4IIqbj2E6hcAVoqMdWvdUkrqLFcrxV5jyLca2ZbCKIkkBSq6NqHVogpRCaH96pMqMBZaNsLQOgiQWJ/c6EBa9PueGE7wM2BKOU1cvsqxlU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604873997; 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=UrZhPSRV8nZmXhs6JNM+FCH7TShY1SZvY6J3Nl6eGFs5uKFSZjVfkelkfJUhpJSzHVthpCPvUZN5rOadPbo0I04QSe50yn2y/eFhs0Tn3UYayZ726+tcaOdcKN5bi2P+g+QXtlqnKv/gTI/8xGSP2nyuLQ3skJGxwYF0drTEBlQ= 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 1604873997209535.980694295984; Sun, 8 Nov 2020 14:19:57 -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-308-zWlMvoqnPlq89BJs46DjVA-1; Sun, 08 Nov 2020 17:19:53 -0500 Received: by mail-wr1-f71.google.com with SMTP id w17so2732587wrp.11 for ; Sun, 08 Nov 2020 14:19:53 -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 f2sm11554437wre.63.2020.11.08.14.19.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Nov 2020 14:19:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604873995; 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=OAphHeV1dRhXWzoObA2TDh5H2Vhywr0U64DpkPtUZlwE/2KxjJm3aj9g5OquCgDTSIjYC1 M90hfl4LM9HFy/c+cIxg5WeXcdpW7khHHCHEvG+Hk+nSD7jPuFSV8hfatF9jIxXlaU/t/6 qNmk3KlMtk/zl/VNuuLt8z2ng4MCK/M= X-MC-Unique: zWlMvoqnPlq89BJs46DjVA-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=qVanB2W/S+dNraR0bLNzZGpwnD8eveXON8lruBM34qCGWFufrnemx4Dauj0ln1gpm8 IPX+Vl1ob9mhjQiyr9CRyufJC4TmoOWbPKj3gLJhQNRsRDclLfMBIBUuKfRlnRAouZNE FfX33Nb6tZxz1Dmsjr+gGz4UERf0p7QHTM4/10Cvy8b1E5TMlCY2DlQBxbUDYv9Z/tiC sH1SGZRdcXcXsdme616dPdVldiJI6sm0+lRGVKdOP6IH1ukPyRrH507CzDed6DM3DlEm L752sYsZjgVo5kovQ0N9CHyuecC8lo4+l5rllzImY5IE5QfcR6v5w36XhGtPPf45BFGy uMiw== X-Gm-Message-State: AOAM532vl4iLRBT8RsRCDO73z/wqdhnkugO+R6UA+TmxmpKrvuC9w1L7 9MeV9mcJ9dUo2DBUR1hkumrvRRILtOqFDP3wmpSw914Pls2Izb2lZhoCX0anmTAk6w2mXIzRSv8 UJJYOVE6BufKKuw== X-Received: by 2002:a1c:a98c:: with SMTP id s134mr11676995wme.159.1604873992394; Sun, 08 Nov 2020 14:19:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJzjflHEZL+P6J8cz6tnr+unNNBzEkmK4pgGTTmcmAr1OtwdgIIqshzbnwlJwz6XuTvH0vhILQ== X-Received: by 2002:a1c:a98c:: with SMTP id s134mr11676981wme.159.1604873992263; Sun, 08 Nov 2020 14:19:52 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , "Daniel P . Berrange" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta Subject: [PATCH v3 05/11] gitlab-ci: Replace YAML anchors by extends (acceptance_test_job) Date: Sun, 8 Nov 2020 23:19:19 +0100 Message-Id: <20201108221925.2344515-6-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201108221925.2344515-1-philmd@redhat.com> References: <20201108221925.2344515-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 Reviewed-by: Wainer dos Santos Moschetta --- .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 Thu May 2 16:17:11 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=1604874001; cv=none; d=zohomail.com; s=zohoarc; b=n7gb1TqgDBfWi1wQ5CfX03II4FVtTPAtWpdoIe9CoU6dHhXVbi6UELL0/0EL9AHW09OCN3I3fP8wWvTFYUldq4WVG2pGs2cQrPoa77OJr0RtJB/xWCql/EpvpQn98cOiJFvPT94T8EWjR3z9v9UMREPBN9kelwrf2ZirSC21t24= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604874001; 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=DXMtffDC5dA0sFwKuIXa9chso4EsxsHTK6o8qIJQWFli0S7fKerSN+O9BtGMNky9nEiOIm8larNbYgjcBGmD8t6CMMku3y79mfVAkTOSSuKclUHv+BimrRMRMUCJBHVmesnt62cnrcwBH+rPIbC1pj5bBZvioSoc5uXRFm7gTMI= 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 1604874001359416.64750291297355; Sun, 8 Nov 2020 14:20:01 -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-64-zC9ADlC-OhKp24V1l8SgSg-1; Sun, 08 Nov 2020 17:19:58 -0500 Received: by mail-wr1-f71.google.com with SMTP id b6so3445261wrn.17 for ; Sun, 08 Nov 2020 14:19:58 -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 c2sm10502050wmf.47.2020.11.08.14.19.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Nov 2020 14:19:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604874000; 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=hWlBabvLGyX2IPp1Tvv1XbK2hr4kTNHK3ezmlYwLwFe5kGuXFcPsDRvLpu013fg9hwvSNE 7G2noUivADLVjZPyksAfGlhzuC3FdMbYtUaVsgHmLliDVrVert3AXVC8srSLDwJRL8FOuW J8c3OIuyr9jP3X0KQkFTohcfmgGFdw4= X-MC-Unique: zC9ADlC-OhKp24V1l8SgSg-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=ZafVAeFgMIgLYlIwytLINjAgdGNtlUDNyIgBPAVMZaVlpewW8QGnqcySOLd8NsaeGj vsZ9RGznHMLorP6pGOxQElhLkoa2m5hMZp6WMCPTWG2EXSeI1ByZNRGbzYzL7j8pasCY Xlng6mZiQ827UyM7E4p2qtBhDdyCoBUfq4jMjMtnx7K4wCbHpjmHq+EEXlgREjDAfZ3A KDSRyVQxXuVclomjwO4CJWUEC7wVR4Jdh2Xr1eMmOAuDrvIZQn4Ubg+5i0Te+LliYizv 9v9OJp71LcOvuEwjysW6AjEWPffuVRbmPzNyarNuJAfqtlr+m+qQ5qtqeddAHQxEfPKY dxag== X-Gm-Message-State: AOAM531hx6VEJ/tDrG8+Xm/RSTmXnkSGvQ8aKl5BDhnjsoSuY1fm5WHk Kr0R7VCQdz8Yk0kE6DhlEsXiDlrlv/jdYb26b7aEie/UqmzB58twqfJOfM5ttFDbNnewfsS3Y8H EJgIb0pY7MIaemg== X-Received: by 2002:a7b:c8c9:: with SMTP id f9mr10805560wml.3.1604873997268; Sun, 08 Nov 2020 14:19:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJzakcv/iBkUgS7j1oS0yoV1mLh7oyw+oZKMUHEamTSzjeOgdL/AX9oWy1/cGHnXv6O0INcazg== X-Received: by 2002:a7b:c8c9:: with SMTP id f9mr10805555wml.3.1604873997158; Sun, 08 Nov 2020 14:19:57 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , "Daniel P . Berrange" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta Subject: [PATCH v3 06/11] gitlab-ci: Rename acceptance_test_job -> integration_test_job Date: Sun, 8 Nov 2020 23:19:20 +0100 Message-Id: <20201108221925.2344515-7-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201108221925.2344515-1-philmd@redhat.com> References: <20201108221925.2344515-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 Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Willian Rampazzo --- .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 Thu May 2 16:17:11 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=1604874005; cv=none; d=zohomail.com; s=zohoarc; b=JYFbP/tP/FGQfnGG7xX/0UDPSpNgPgKOtTa/ghBvPy0ZUaqWJN8yCSmypCbe3Dr8hrpQ7UZuRQGWKz72FR5YFWynBzBlY7A2ogPuLIH4eCYZD638/UbYC8UvsADCQm7PdO6GfFopxKUFTXc9w0ypapwKcE/lvk5uejZAJQ9xQPI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604874005; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=r+24Qtjsem3z7nn8q0n3COy79qpz54BrkmBsMuZl5LU=; b=RWUTq/aSgfAlw+atZa2tHzI2YWS6CRKQbfF8/baESgyYBgoQ55X0MqKb4ckAn8Web1QAARz1MzbtlryXeWE72u8Qubxyy63bzqoOtAPL5w3YghQuoQSwwVuqdIg3Gu6rouyck87aP13Hu9HJR3zrTsldIH4pOqddJmZA0eBuy8A= 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 1604874005821466.78991392982994; Sun, 8 Nov 2020 14:20:05 -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-43-BLQ___peOQ6_UTG_nj3_pQ-1; Sun, 08 Nov 2020 17:20:03 -0500 Received: by mail-wr1-f72.google.com with SMTP id y2so832620wrl.3 for ; Sun, 08 Nov 2020 14:20:03 -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 i11sm4135012wrm.1.2020.11.08.14.20.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Nov 2020 14:20:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604874004; 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=SPoI0//LJwQeU+wJ6LkTDkbkLSGX4V5BjTwGxp5HAashoPKNhtocUj57+aBEc4ogg0vcvA m1ken1YFSiisAInsIpUo6ejrIAxMujj4i00q0IgK6vPyo7ObNaNHER2iSBPKz8vdOtkpTf J/TPxLyYiaQo+cZV6L8W7GdZrY4m/OI= X-MC-Unique: BLQ___peOQ6_UTG_nj3_pQ-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=IL+FKPUA8BLIqqWR1ikwKyODKa0D/uLLetHWZZ/6xIQf+KYGgaWzMn6lTxkpdFK0Tw jO1WyO4ps2+OWS9asN8rQ9t+oXN9/meSvuaiyE1yijmI3379YwbHta0SPCrBvFvb1OeV yczYBOJF53J0RAZQIAkwcmSSY3n8murrHEcP5gK7sHyx52R5BffD3U2UL6G/8NmsbF8n /+65ayihoriKHqEqV1hTGX9zte6sQawf8XinJP1KLRzuS1x39K+Gzc4DteazHYw+OHcF 70dU6t2eJpiUPfbURY1xOJBC0EbmFxUp4rzjacCEjLboGgtYo50AKWj+in1pcxtT8BJF gyrw== X-Gm-Message-State: AOAM531qMErNb2XXbDwIFjBMsog/yY1IsQNyb5I16sG+ksxWlybiayeY wZBNP7idwBnJN5otgZVLP2jDyY0WUL46QzkdoQJROeu14HCuORt5uYA4ORO6HIb2B1Cxfs6Oh7I MV312WV5tsQs+Sg== X-Received: by 2002:adf:f20f:: with SMTP id p15mr14742646wro.339.1604874002113; Sun, 08 Nov 2020 14:20:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJzIt3uSiJLzk1pUnLGjIVSg22h5INWArBzDzaXS7ePKJTEZIhAOiORr/mcvqbGu2nidIPCFww== X-Received: by 2002:adf:f20f:: with SMTP id p15mr14742638wro.339.1604874001996; Sun, 08 Nov 2020 14:20:01 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , "Daniel P . Berrange" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta Subject: [PATCH v3 07/11] gitlab-ci: Extract common job definition as 'cross_common_job' Date: Sun, 8 Nov 2020 23:19:21 +0100 Message-Id: <20201108221925.2344515-8-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201108221925.2344515-1-philmd@redhat.com> References: <20201108221925.2344515-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 Reviewed-by: Wainer dos Santos Moschetta --- .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 Thu May 2 16:17:11 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=1604874012; cv=none; d=zohomail.com; s=zohoarc; b=EndfjDgs5BhWNQZqpeJuFE2bdyC1ZOpFD07JaVZB2pscRZZP6ghfPAkBi8WCnbUBuFAOsifZc/LPmE1sB7vrUtNiVXM8gKde61KykLg+9D4zXv9cTq8nJMZWV9N1ogF6ITVTYMyPk8yoi2HgKM0HsSzoj4o8IR5p4TOhFM2qoxU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604874012; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=tOlQmfFaNvcfnBXreBEQVhcMzqQm6Lj5i87BO0gaUIY=; b=jQjKMpMPiwfvdyVOSUy811/OTuBrSuo2qNpNmY3zf9Kk6aG0eaqycN+gKGs/waC9kQfkx4dC++/eNnSQ2TbUZC42P5gQtESpLJvngAsRfLO4wdBM5mDx02O0NFSl6hjc4JNxay/VeEmNQvmb/TMZKMV8h+d2dd0J5EsdNEfkwDM= 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 1604874012070792.9986189321963; Sun, 8 Nov 2020 14:20:12 -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-265-0eAUtcWSMjqF00wJ-bAteA-1; Sun, 08 Nov 2020 17:20:08 -0500 Received: by mail-wr1-f71.google.com with SMTP id t17so3474180wrm.13 for ; Sun, 08 Nov 2020 14:20:08 -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 x6sm4107170wmc.48.2020.11.08.14.20.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Nov 2020 14:20:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604874011; 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=JuvnG18TYMUxYqpAgCi6zOU5ZaNVUQMPQKFpKL10Mvpf2pwJOr6QCIw8lOMqhO2JH5vTOH rHQE9oFhOeO6F5wtsw990Bi30bhTHgYroL5lmi5eJe1ppAXgTQC2vMhK3AmfyKuopAU2P0 ukYtZ3uonOOTXn8ho5K0J2E+jKI8/v8= X-MC-Unique: 0eAUtcWSMjqF00wJ-bAteA-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=XjeLBBN5fMZ2rfKx5EfTrkJWtTCeXcTMhdO1y1llVTdDu9odVcKCtN1+l8bD/IM9x5 4LoPTYHncTE9X0NlWCcOeJeLIxADx1PgX62Q/cgkIMBNLRuTE5N293iJlF0ZxuDlbtgc gM/5ONHc86kRn+DB9zso0lrVUnBC7U9QX8BDxQ1q0t/Nb/pEex3ZMHpeZo+GKEc3zMzT WxCyzfcrGQPqGlTYLbJQ8C4ZyayMViSVHdaHr7PsCwxY5UJrn9vse0SbvVwAiDbbywTc Bgd7dLrv+WWO3swLRjwPLOb0TakKvoIT/DFcDqi6MthmDIV/5a6/AypKUdzQnnNXn5lR xpSg== X-Gm-Message-State: AOAM533P/vRoGMlaRBR873aMjQHHjK71txV5KRC2CcBEniFnI1q3ZXqP PmsZSKTCTqE+NNn/I35poaiTuh+MNRiaudw+giqyzlxGJsL/EFesFnem3kRUPD3HW9pxKz3Mwi6 4R4m0MkYlacOLNw== X-Received: by 2002:a7b:c2f7:: with SMTP id e23mr11324770wmk.100.1604874006945; Sun, 08 Nov 2020 14:20:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJyZQUm+sFj9DoS7Tr778LdHf49FKFtfJ6i5n/KzjhiMfTDBccPg8W21lzQWuTjJS+pMpvvqdw== X-Received: by 2002:a7b:c2f7:: with SMTP id e23mr11324756wmk.100.1604874006800; Sun, 08 Nov 2020 14:20:06 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , "Daniel P . Berrange" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta Subject: [PATCH v3 08/11] gitlab-ci: Extract common job definition as 'native_common_job' Date: Sun, 8 Nov 2020 23:19:22 +0100 Message-Id: <20201108221925.2344515-9-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201108221925.2344515-1-philmd@redhat.com> References: <20201108221925.2344515-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 Reviewed-by: Wainer dos Santos Moschetta --- .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 Thu May 2 16:17:11 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=1604874015; cv=none; d=zohomail.com; s=zohoarc; b=WRhSeI1buYYMAcqtUz5hTa7Cn73yTJG4hfGejdazzUbSk0g2xFgDaFQAlcLeaLpuyoeSqN5LMsrE2tzEAoTbV8F4eawSOh1eQyRVMt7tfWkmjc04+63P0DuQpYQIDLXri2X9Q8cfpSaqbdsg2h7/VPDSo4jlGBHrzOjYMyufF1I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604874015; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=nMEwDA6q7/+ANMGT4q9xU52HjvF7sSsilp6NDuTdYrw=; b=U7YQaAUjBz2SZmXlzMIryh/Z6HVM9V44mjf3CfVC/St333KApkjpzdjtfmaoL6e5iq3F9kFEB7rYfW7+mDhmZcUfpeQowjm0zCUZKuei5LyiV3l8t+0d5qngnD3obHnC0PkjcjdpOfavTTtV4Enz2OCX2diVS9fhyRnhYvOaIXI= 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 1604874015815231.58260520765145; Sun, 8 Nov 2020 14:20:15 -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-240-R67vyuHBP5yK49lKW66qdA-1; Sun, 08 Nov 2020 17:20:13 -0500 Received: by mail-wr1-f72.google.com with SMTP id p16so831449wrx.4 for ; Sun, 08 Nov 2020 14:20:12 -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 z191sm10694054wme.30.2020.11.08.14.20.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Nov 2020 14:20:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604874014; 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=nMEwDA6q7/+ANMGT4q9xU52HjvF7sSsilp6NDuTdYrw=; b=c8BplfXu9Zcv5RytOpyN+4Hzg4TvNkngAEGhJ6wBtD8ZZnZDOidEYqxH77a1FTWxDDKkP1 TXDCveWaYR2Z6267He2Cr1G/YBtYsAFVvF/4RGPKGxUF1ofwVIFFdfcqf9ZCgmH7roK0DS AB9ilMBo7xtthDTgeBfuDs2K4PKspxk= X-MC-Unique: R67vyuHBP5yK49lKW66qdA-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=nMEwDA6q7/+ANMGT4q9xU52HjvF7sSsilp6NDuTdYrw=; b=iaQ3b0bLzF8/dII77CiCFHTJrNToTzdjI245GINjuXjvVtoaeJVssk+7rlKv8Pflza 5YUuibR8NXCuvGH7xR+pcp+hVMY0JeLXgrx5mU8QfmQajYHgdBReWNB89+VkCuRNGHCZ ZZasfTtc5Aoqc5xVDTiBaxOq0PmsI5Y1gXVjlp51qcPo0jj8proscagrgVsnjEg4WPMW ki6EWoRunY4G7mMp2S60QWFwk9/ts8qf7nNXF+Mss+h+R1d4lWjgFS2Gzt164K+qaRua +so5otVC9gr9gaXBqroza9t5IbVd18A4vMARqbAlhzN56h8BO3m5pahN+lXazFijpCZp e/tw== X-Gm-Message-State: AOAM531L5AOTdm53f1hfIgR4njwkQbTm6wj8gtS+ba9WLTx+Q7uNQFVs bstS/ZHS+tUvMWV2Dfzbw4AQ0uxkTOpPExLzEjVbPCv7gRwZKz1bX6AI/7njTI28c4jiwNJTGxD yX8yM2xcoKe85oA== X-Received: by 2002:a1c:5f45:: with SMTP id t66mr11302215wmb.20.1604874011859; Sun, 08 Nov 2020 14:20:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJyy9kv0mhdwLWjKgLIaQ4b5eVaPCGdYw8DbwAXzgBCuzi1LXV0ekZj2UFq7Sn85mZieXspXwA== X-Received: by 2002:a1c:5f45:: with SMTP id t66mr11302209wmb.20.1604874011702; Sun, 08 Nov 2020 14:20:11 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , "Daniel P . Berrange" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta Subject: [PATCH v3 09/11] gitlab-ci: Add rules to select cross-jobs to build Date: Sun, 8 Nov 2020 23:19:23 +0100 Message-Id: <20201108221925.2344515-10-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201108221925.2344515-1-philmd@redhat.com> References: <20201108221925.2344515-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 | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index 701550f028c..017bc706689 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -1,6 +1,41 @@ .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~ /mips/ && ($CI_JOB_NAME =3D~ /mips/ || $IMAGE = =3D~ /mips/) + - 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, do not not execute the job automatically. Note t= he + # job is not excluded from the pipeline, user can still start it manua= lly. + # As the job is optional, we have to mark it 'allow_failure' to not bl= ock + # the pipeline. + - when: manual + allow_failure: true =20 .cross_system_build_job: extends: .cross_common_job --=20 2.26.2 From nobody Thu May 2 16:17:11 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=1604874020; cv=none; d=zohomail.com; s=zohoarc; b=mlfyhMs9xu6d0RZsjuatwvZ8WMDqIgNMYq5JdxrP94HG3GSSuOenOXXCZ0l67X0t/jCS+s0IU+9I84rkiVlXTqw3L3NSNssW3QHVBrc0xVO/FuAa2uHiHElnMI08u9/sRJLX1oR3Tu8nebeg0sIm9BDdCQsvsJBta4tFFRKk210= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604874020; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=s9HYoEsE1qhFP/tebpQUVu8Vr6nBKEoR4i6JyIk0oAs=; b=f/OnodbP8IujYDA3qPfyhgVifkgwbCb3bf7ihR4XPewoo1xc/NoMvjVMxJLC1KDYQtAhCSJWOFmAFWDn2A0vdAldb6kGWKrKMWa4tCWUD4+RzZimNat6hdF/Uy1UZBAGEEPj9wkhaw7+P1VeTkfqX//lR9ELwzfDFwJeNBacXEU= 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 1604874020940756.1061298938; Sun, 8 Nov 2020 14:20:20 -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-367-IEOd9zWWN5S3PNtI6DLAMg-1; Sun, 08 Nov 2020 17:20:17 -0500 Received: by mail-wr1-f70.google.com with SMTP id h11so3450105wrq.20 for ; Sun, 08 Nov 2020 14:20:17 -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 i10sm2386316wrs.22.2020.11.08.14.20.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Nov 2020 14:20:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604874020; 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=s9HYoEsE1qhFP/tebpQUVu8Vr6nBKEoR4i6JyIk0oAs=; b=V1uR4GnfPRK5CjTRLd8Hi00XarWYaUSKvhxqZgiQeaI72steH/JrsGOnUFkq13R1+ABe0h Y9OIw6kaA4UL53yk4XEScrxqVzbQm12n+F+Au3A063tUP1Dy5QE4S56Qd4A3ipDrwmShf0 u2azw+040loROyp7qd69bKQFrlqkeI0= X-MC-Unique: IEOd9zWWN5S3PNtI6DLAMg-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=s9HYoEsE1qhFP/tebpQUVu8Vr6nBKEoR4i6JyIk0oAs=; b=oouKJ8xnT3KESMRhX12GHr7WJlpDLaMIVbAB24ZfcwWtDQWNmWLYZSkd2Sdg5oHr1y yhEu9DnIXnMtqe2p/bpgiNXSzboy2hgZvP5+6JvQqAcw4qpwzABsBzkrlsVF3Aops4EA R/yvCVt11mc3d6xdFyDtmY4t0WC7sbX1yxpdW2xz0N0yKtyP3G1HOZqih4IDbZom0VRd OdvrqIz0/TvcBu93DQZctXCUIsRZ7UDLhIyeDjWSNR8DcaKmlSFDtrxXxcOIS5cfdWGa pgPzntJycJXP0m3qrkPwh6GT3npkHX7sgy2zsxOYKiTzuXZvyj1Q5L+DumwOOJtAOT6t qZQg== X-Gm-Message-State: AOAM533mT65UAGzAZEQxe0IYtIwyc/7yDh4dDfWeP1Q/OJ1H0PnVGeDG qtcIecENS/fIw1eg60vSKDKznWgVGNp19DzA734Rb5ewPZT571MonyKdTxo9CteI172LyJIAVrq 0Z95TrKdBvr4EOA== X-Received: by 2002:a1c:b006:: with SMTP id z6mr11183000wme.161.1604874016662; Sun, 08 Nov 2020 14:20:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJy19Rm7wxNJgkT5n4tCd100JRTPoqy9lUc2g/F0d1TXFBJtESZs8mo5dzhI/2cY6++QHMSKJw== X-Received: by 2002:a1c:b006:: with SMTP id z6mr11182984wme.161.1604874016470; Sun, 08 Nov 2020 14:20:16 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , "Daniel P . Berrange" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta Subject: [PATCH v3 10/11] gitlab-ci: Add rules to select building/testing native jobs Date: Sun, 8 Nov 2020 23:19:24 +0100 Message-Id: <20201108221925.2344515-11-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201108221925.2344515-1-philmd@redhat.com> References: <20201108221925.2344515-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 | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f708573884e..dd5f9a4c505 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,6 +15,49 @@ 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~ /mips/ && ($CI_JOB_NAME =3D~ /mips/ || $IMAGE = =3D~ /mips/) + - 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, do not not execute the job automatically. Note t= he + # job is not excluded from the pipeline, user can still start it manua= lly. + # As the job is optional, we have to mark it 'allow_failure' to not bl= ock + # the pipeline. + - when: manual + allow_failure: true =20 .native_build_job: extends: .native_common_job --=20 2.26.2 From nobody Thu May 2 16:17:11 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=1604874025; cv=none; d=zohomail.com; s=zohoarc; b=BysafQz/tFqeCDOEuIxlgLp3xk0V/qKNceCmJBSPPSzjtrVgIQE5dB5i2IMXa77W0170l6zLSAaQX5yeiI5vsIlOdfK79mVHqljnVK//6+VxaAmDz+IVsE+a6n+MlDVMjW6ASrnHj//XTjwlVBN/GN+YZooosHWL9uEtjJaTeXM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604874025; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=Sj6sIGQ+9d93c4eo42RqcVAC/Mp3MEsUUct8oxUxgjw=; b=T3SBLe8CNeYs6r/UFG+7Qpke17bRzR7gN0VipBWfuohRCTkdfXcdhR4Btn53nKwsCxwt+DdjvvW/aU2xQ3uADdkMTkp32UifynXul5dCTMz2HiH5KGwwBZMuWPWXRfv/Onkt/z7+lBF4dQwHlNAFP8pSk0RJv8NwReRvJYaiNzc= 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 1604874025416495.7887255740276; Sun, 8 Nov 2020 14:20:25 -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-27-Gr9vIodiPaq5IxV0QQTt2A-1; Sun, 08 Nov 2020 17:20:22 -0500 Received: by mail-wm1-f69.google.com with SMTP id z62so2844465wmb.1 for ; Sun, 08 Nov 2020 14:20:22 -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 b8sm10277743wmj.9.2020.11.08.14.20.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Nov 2020 14:20:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604874024; 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=Sj6sIGQ+9d93c4eo42RqcVAC/Mp3MEsUUct8oxUxgjw=; b=XUeVrr4BjqaGQQFeOPWPUKcZlCEoMmmhcO6qqD9fsBkZsbDggZkwi8RBz3p9qdwpR1o844 nGueJ2yznrzkFe2K+AoGKfK9cn/54LhbPmzxZYBQ2CExplES1BU4+1QgEDDtzPAnDZAP9j AjKXbeecUIzL3+6u0shM9D3JFmtwyIo= X-MC-Unique: Gr9vIodiPaq5IxV0QQTt2A-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=Sj6sIGQ+9d93c4eo42RqcVAC/Mp3MEsUUct8oxUxgjw=; b=hwnpCct+XRFrdypSIiJyXLNzT3glyE2/PnzaTbSmLaC8sC9pUO9zR6JzhyCL+44QmK vRX4TM00ZECCjR0vm7qfjJM36GxiAI6AnM4B+Stxmau14OcMMax0HYMlA8X80cktYI41 V3NwMavPH4RE/cFJuFDBWEncDxafybTik7ZLfijANzPsrtYQls+X0OMVx3NIp9NmiR6h 5w/1G72HiUInFGWwdwRGZ+wf2cSTHHhMstORZdEHAZet7a7iUPEhFwWq9LE+YbbZkizM slxYf6XGqa5g4XXU/ycGT5/P/VvPaV2vkfWtr+Jpp5hBag6NkAM/5tGgzeyj/O6Lhtmp 6PtA== X-Gm-Message-State: AOAM533t9TTg4XB02XwDVjujkt6d6LEJc2q+zQ6EdbfLWJjt7v2l1Tx9 iIsDY19zd3cCbUA/r7izyXP9u2SNP7zO8IHrtep7GDHF2xF9QDO+SbyS7su36Vd/caYqhmCdDy9 cWjyFK+/iK/hwNw== X-Received: by 2002:a1c:7301:: with SMTP id d1mr11098776wmb.141.1604874021466; Sun, 08 Nov 2020 14:20:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJwGsNFbiyKismeVoSLSRY7716hgfdpx1TS84pPTb6hztL7bjQRmgZm9HctpUVU5/SXdH23bAQ== X-Received: by 2002:a1c:7301:: with SMTP id d1mr11098767wmb.141.1604874021318; Sun, 08 Nov 2020 14:20:21 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , "Daniel P . Berrange" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta Subject: [PATCH v3 11/11] gitlab-ci: Move artifacts expiry rule to common 'native_build_job' Date: Sun, 8 Nov 2020 23:19:25 +0100 Message-Id: <20201108221925.2344515-12-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201108221925.2344515-1-philmd@redhat.com> References: <20201108221925.2344515-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 dd5f9a4c505..27a4cbc5171 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -79,6 +79,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 @@ -121,10 +125,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 @@ -151,10 +151,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 @@ -182,10 +178,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 @@ -213,10 +205,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 @@ -317,10 +305,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