From nobody Mon Nov 17 13:59:35 2025 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=1604529969; cv=none; d=zohomail.com; s=zohoarc; b=GHqMlkNmKyq3KeW0IbILwI/vua940TfIhMYBkDe5EBd6cILy9hEXeSRSrfIrEQzUhMXe0WUEXeDnpKS+6KVQzdnzeD4LuhRrdSWnO3n36tlcHwAqJmmAr0FOAjNEtbHDzwd+wwg7GmhZ76hMJM4PGy4sQcWKB0c8vpCkd4NdO9g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604529969; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=HkmWM8pdBxBAkh2ux+VVNAnnOD7tHToqsp9wNXfrvV8=; b=B0I3T2cm/+rm0G/cz1AzQiSzobdE8XMl6QmFYDqblayKisQG5Sfe8/7P1iRuXTKIuOvkUoTbDEk/jvKNyVKCVOF3KXR43eIpixMYQ/7M9bQBy/gFErXUqcywHw+EW5/GcMd5270jEKUMGy2rpK9S/IGCbEwxuB3YrZtGaSQ4Js0= 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 1604529969968583.9944506005104; Wed, 4 Nov 2020 14:46:09 -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-83-nroYZTzdO3277-NDGGs-EQ-1; Wed, 04 Nov 2020 17:46:07 -0500 Received: by mail-wr1-f69.google.com with SMTP id u1so17765wri.6 for ; Wed, 04 Nov 2020 14:46:06 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id u3sm4784514wrq.19.2020.11.04.14.46.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 14:46:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604529969; 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=gPo4SPUFg/GZJmhAVVzA2pLfEuzN/OZ9KxszorhN/APH4JJsxM63FU9X5/wZX5dbbAffVM qaVsZnXIDGRp7fWPrQ4XQG+hJppGtmAy1Qs9+MhLpwl59iZL5PrYUiHgFCA/rFm/AJ/igm ct2GPBn4nv4UEDmdln/6jAtDt4my/xU= X-MC-Unique: nroYZTzdO3277-NDGGs-EQ-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=Foxe45d/BMqIB2j2A9t7gCElb9kRVCIrcngGWb5iojbIeAtOw45swaoP+4VBTrZQBF AZtBCjMq5cEtLj58LDBY2lK8ExLF6/9sHo9gjE8YvI4RMpi2yZAAy4+fS9/gQ+vdVOhF XRjsdYlDLC9Nb0d92/NLtV6EVFy0bkZcmZc/FZHx3xl5z02hiqfNcYcEkIbLh458daT0 kUyofIgh1pNT6C9OBTWbnxSk8BSq7ueaU+g/MbGwsJ+FV8NLNvY0c0qTOlELYMrAPhe/ FJt7dsezfEDUVdGLiOwnJWcK2FSSryINqMHgBlTbYyw4uP/pi4nxSKmnPkyHlDmFRMJh qLTA== X-Gm-Message-State: AOAM532tDwiwje9V1hy/XPsY7cZiidijCjiNiXR0KVT9nGDFWPDZezPJ zP7og4QosNdSpBTdwopxzZ7YpKvOfUCAufDEXNUlWnVjVw5Q/ZV7HZcdRL+FtLaC3aKm0eWWUPT kUA2poedDpGT0mQ== X-Received: by 2002:a05:600c:4147:: with SMTP id h7mr6864310wmm.186.1604529966051; Wed, 04 Nov 2020 14:46:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJy9CzAY/sUwvhSvOe/xNEi44Xc5Kj5A8DVnSOaxnZpa4iKK/TTktmtoGsI/BfPzECzsQrnNYA== X-Received: by 2002:a05:600c:4147:: with SMTP id h7mr6864290wmm.186.1604529965826; Wed, 04 Nov 2020 14:46:05 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Daniel P . Berrange" , John Snow , Cornelia Huck , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Thomas Huth , Peter Maydell Subject: [RFC PATCH 1/9] gitlab-ci: Replace YAML anchors by extends (cross_system_build_job) Date: Wed, 4 Nov 2020 23:45:50 +0100 Message-Id: <20201104224558.3384595-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201104224558.3384595-1-philmd@redhat.com> References: <20201104224558.3384595-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 Mon Nov 17 13:59:35 2025 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=1604529975; cv=none; d=zohomail.com; s=zohoarc; b=WfvvkcmmVKs65Vuil8hDlOMCSI2CFr/NYlEjpaiYoEHP1tuWaisdzUlEo1dadrnAFCAFxvl5r9h9wBhbzNHZSryjNLHjxoqFRT4G0f/9YXf0VMmJd283JlBS0TV6y+2NyB5Fx2L18RBnqzGoX4IbwkHlXYIvi18Biv1Y3aMyvYk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604529975; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=vsIvdkHwnKN3ES/j+SRDmVheqNblhIaZFAjIMTXNIXk=; b=OuWFxOgqKDOQFIoZSYRvA+bFKYpFwd9+upjc7yffi7zGBtbl+p/9nK1ZVgWR1lyYklHSTYHyAyWBpKvIM+F5bHx9H1gu90Lb4Nvwgg/9bhjnJb0+JT6PszhaVdo9S/48dhDY91MpIVGu9StuP3v5uw9uF/IAmypDXSqGKEurNZk= 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 1604529975449777.8299256925355; Wed, 4 Nov 2020 14:46:15 -0800 (PST) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-490-jDu68b6iMt6gS0K9aNqvRQ-1; Wed, 04 Nov 2020 17:46:12 -0500 Received: by mail-wm1-f70.google.com with SMTP id y187so1812385wmy.3 for ; Wed, 04 Nov 2020 14:46:12 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id t74sm3778774wmt.8.2020.11.04.14.46.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 14:46:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604529974; 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=vsIvdkHwnKN3ES/j+SRDmVheqNblhIaZFAjIMTXNIXk=; b=BC7cpdqvDzDi+CKsjfEK0i7j3fwQyYgiLQ+fkDDWLlCrE90wbURWsueKVo27xClApAdW+A //3Mi8GJN6uzh3Yx0oFHdQ50DOgLi4Oe8Flfmf74d9jvwAESjkA++vfanKa2aaty1xD+9a 4X6BSfQllI+Qai6rFs+W65pqaU1lE2Y= X-MC-Unique: jDu68b6iMt6gS0K9aNqvRQ-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=vsIvdkHwnKN3ES/j+SRDmVheqNblhIaZFAjIMTXNIXk=; b=KTr9jUSiMST0aDt2GZzsZmS0nBRWX9MRB5sES2i2MK6ljCmCNO8Ds5TsTbB2gciS+h yKz7qL3OdA9qvOvVN8oJA3oIQAPtI2Jb3a00emse9YQjqJN6VGnUIKl3sM7oGZtc4wD5 2JAnL2XYxh4MFXGX+ajgpkY8NC6DiQUQo1pu5+fPwLqVVLSGCGCElEFz+DSSr4Eth3r6 EjuoWPrwgvARz+nKOcrpLbrdWq7KNNxm1F6QdyOzen0n7K4VEVrLADwRh/lXLnnuf+D4 DfeybkYyBYnJFy+91UpgPpzrrrBChYd7zUxByy+hhgCklEGZ7BcLzmxCoaOMe/PKDeqQ RNmg== X-Gm-Message-State: AOAM532SqDCem0JG2jTpFBvGEZcrrNyrk7HUQksPhlkm+rVfE3e0ReYM 7ghn0I87OhjsrsZ4LBzCYBWyxcrQ30PKYFwboWs9UZmqt9pfF///J+SbQJmpVGIGrrChcKFXurA t/kfWX6tHEGG3gg== X-Received: by 2002:a1c:4c0a:: with SMTP id z10mr5756189wmf.96.1604529971300; Wed, 04 Nov 2020 14:46:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJw3sDhuJuuobcSW+Fw6a4iU+c/lDx9jzHthNB2Hi4OpfK0MQKD5Q5ir9eznjmIGZAKG9NlAZA== X-Received: by 2002:a1c:4c0a:: with SMTP id z10mr5756179wmf.96.1604529971141; Wed, 04 Nov 2020 14:46:11 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Daniel P . Berrange" , John Snow , Cornelia Huck , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Thomas Huth , Peter Maydell Subject: [RFC PATCH 2/9] gitlab-ci: Replace YAML anchors by extends (native_build_job) Date: Wed, 4 Nov 2020 23:45:51 +0100 Message-Id: <20201104224558.3384595-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201104224558.3384595-1-philmd@redhat.com> References: <20201104224558.3384595-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 3b15ae5c302..ff3a8bd58cf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,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: @@ -74,7 +74,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 @@ -105,7 +105,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 @@ -136,7 +136,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 @@ -168,7 +168,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 @@ -200,7 +200,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 @@ -225,7 +225,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: @@ -245,7 +245,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 @@ -255,7 +255,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 @@ -263,7 +263,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++ @@ -273,7 +273,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 @@ -298,7 +298,7 @@ check-deprecated: allow_failure: true =20 build-oss-fuzz: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: fedora script: @@ -316,7 +316,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: @@ -341,7 +341,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 @@ -362,7 +362,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 @@ -383,7 +383,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 Mon Nov 17 13:59:35 2025 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=1604529980; cv=none; d=zohomail.com; s=zohoarc; b=V//AAq583UWM3wTiuPMNzyIS6B0wb5xAWIrgTbSWAlZgVVtnSnIM2IUAmlPLxpvXOUI0XvacoSUZs1NjVtBzdtLcYD+PvzJ+CgGzZfGpTyHQsY3W5edth9bByr6CMiSXg1SIaUQMzn0S0JCK8RF0QrmndOv4QJAr3soJYI4deZ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604529980; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=PCN6dfpZymVLf09y3AxbAjVnHuY6KWlk5zsogr0z+5M=; b=Z0/LjZJd/nhxkP9N07slmXU3iSNS6ZW+TyW18MUpZ9zJKKXqSuiJhs9P+AUC5UmDmsDaDwXJow5wBc1cA1qMFj3a1+eptDicMfN4gwQjKUnKn/+r5smOkGZ6OOPq1ufirrTaE3c+4yqY6dG8f4UQYq04sLvQoKM5fhvznGrCGs4= 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 1604529980741418.1508951978328; Wed, 4 Nov 2020 14:46:20 -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-37-dqyRVaI6Ooe5ImWjHfVxDA-1; Wed, 04 Nov 2020 17:46:17 -0500 Received: by mail-wm1-f69.google.com with SMTP id z7so1803313wme.8 for ; Wed, 04 Nov 2020 14:46:17 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id h7sm5214396wrt.45.2020.11.04.14.46.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 14:46:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604529979; 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=PCN6dfpZymVLf09y3AxbAjVnHuY6KWlk5zsogr0z+5M=; b=dlRn8gM6eJ2IAo/jHuZplyPA60of2suW40k03LyVY5kWxCNlg8qJRFfw1A7VxhAnUFSrIY yDorFNagdewhmQd2nlSwQTqpkieeD1AMkE7yzWOwnU4wWNVyrfrpm2Umd0di6rWOUDF7Zf n1YYK5FEe/Jg6MLsvBItCQgkg6+4x9M= X-MC-Unique: dqyRVaI6Ooe5ImWjHfVxDA-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=PCN6dfpZymVLf09y3AxbAjVnHuY6KWlk5zsogr0z+5M=; b=RpOg4ymuZi0dWZ8+UI9Q55b6BmQdgE0os83l76MpsxpZGCx81yJWSDIAM2leO3RLWu h1a+herZxEKpmxyO2JfVAfD40WotzkvpY6iwauKhH53v0KRQz5O2/GT9bnnWwmpVymUS 57ZBsQiSuT5OL4wabhCWk2OocgF/CYH9JdpUujl0fRwfR7YYef3qkmtM31IWelzumjJw 6wn5xp3dG46LzDfx5uVRhSqIM3/CQGTLvRUZsVVg/M8yfC5JM4dz6dP8jgdAWhvW9aGa dJLq3qViyspv+2HwupC84t1ZUSgc/QPvF/TX0NF34Er0+qmJCYtdpz2PUf/9yMcPqgZ7 AODg== X-Gm-Message-State: AOAM530hsGKyMcJzlSUFlzmxzc5iwRr+8n55/kKL4SJYOxGAU7+3tIJZ Muo28UGh3+8VArYNiyWfCG+brYWgi5CDtf0uPSNuUvmTs4qysAvtpBCZ2AnUbjSU2xAOe+9MLDx oYJFw3Z3MaOcyNA== X-Received: by 2002:adf:e5c4:: with SMTP id a4mr290247wrn.56.1604529976679; Wed, 04 Nov 2020 14:46:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJzQDxcp6PICXbfuovv6Dl9od1DCN1BfOTrENibDvKE0fFbxw1qSS8+S67r0rDJpGKalyPZ4dA== X-Received: by 2002:adf:e5c4:: with SMTP id a4mr290238wrn.56.1604529976532; Wed, 04 Nov 2020 14:46:16 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Daniel P . Berrange" , John Snow , Cornelia Huck , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Thomas Huth , Peter Maydell Subject: [RFC PATCH 3/9] gitlab-ci: Replace YAML anchors by extends (native_test_job) Date: Wed, 4 Nov 2020 23:45:52 +0100 Message-Id: <20201104224558.3384595-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201104224558.3384595-1-philmd@redhat.com> References: <20201104224558.3384595-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 ff3a8bd58cf..83beefa2c85 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,7 +40,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: @@ -86,7 +86,7 @@ build-system-ubuntu: - build =20 check-system-ubuntu: - <<: *native_test_job_definition + extends: .native_test_job needs: - job: build-system-ubuntu artifacts: true @@ -95,7 +95,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 @@ -117,7 +117,7 @@ build-system-debian: - build =20 check-system-debian: - <<: *native_test_job_definition + extends: .native_test_job needs: - job: build-system-debian artifacts: true @@ -126,7 +126,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 @@ -149,7 +149,7 @@ build-system-fedora: - build =20 check-system-fedora: - <<: *native_test_job_definition + extends: .native_test_job needs: - job: build-system-fedora artifacts: true @@ -158,7 +158,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 @@ -181,7 +181,7 @@ build-system-centos: - build =20 check-system-centos: - <<: *native_test_job_definition + extends: .native_test_job needs: - job: build-system-centos artifacts: true @@ -190,7 +190,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 @@ -288,7 +288,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 @@ -352,7 +352,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 @@ -373,7 +373,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 @@ -394,7 +394,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 Mon Nov 17 13:59:35 2025 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=1604529986; cv=none; d=zohomail.com; s=zohoarc; b=P5slX5lylzcNmyS9ZqDhFzjz6uTeAXeENzXZYgB7HEjIBey88MvpCrdQlWvnYOq48o/d9Arq2NOu12yNFJ3iHOGLbl7BqMc3KWjYMo49iL7zoRGiyhCYHaIBWRvgYO21MyJQmjUNLCbgleIiEd987PgMWrm5B/GlCMaZKiDJihY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604529986; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=ZKfst5p/Yonp+OSkXV2uundvG0uzrAH2pf1hHzEsgM4=; b=gQarN9AlG9VO2ui0srLgrylOww02YO+S5ugWnApX4w3z0MFwkuTmO2EMqnDib9YqNXCVAnY/iig3EPsuWBL5/bCrULL6MFxI4uj7XRbCXRAioNA78xtNr7Di9wbR06G27ANkOxeEyu0RNGYiv1IGoRVoPeR+hOKWF0Vpbsw6kY8= 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 1604529986329406.10952239421624; Wed, 4 Nov 2020 14:46:26 -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-18-70LbTr4ROu2MGXIU933WFA-1; Wed, 04 Nov 2020 17:46:23 -0500 Received: by mail-wm1-f69.google.com with SMTP id y26so1084098wmj.7 for ; Wed, 04 Nov 2020 14:46:23 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id y10sm4813357wru.94.2020.11.04.14.46.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 14:46:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604529985; 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=ZKfst5p/Yonp+OSkXV2uundvG0uzrAH2pf1hHzEsgM4=; b=hfnORgKAyH4OJodCb8yIDi4OolJSkvIMFZjbezGofU5VRyTlBfY9R50jf+X8o1e6M04y0Y J/CWgpH9aVPy/91AniuqggqJXJ2LetAhbMC4DCyQZ6LP/H4Li2RRoRgrIXxUC9Zjf3FKAb gjQJd96AVhr6V4ATgZ4QB1MTe1K5Qtw= X-MC-Unique: 70LbTr4ROu2MGXIU933WFA-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=ZKfst5p/Yonp+OSkXV2uundvG0uzrAH2pf1hHzEsgM4=; b=LsjnLUInvmXoDlsw5cx2ieHqu4K6HN/a/rx9/YElUvvbO4qmem4RLLiBQF23ooNvQX caIRITyPvsNLfVuOMPKwuHczawe7336DXwkcwfwZDxSRUCoKeJDPSxpHD8KTqok+HX8q NkPPNNtCLhm2X+Dng/dXnCravUsbjjxmKPqdwMIkcDkrA8mFsnSj7bMmpGl5aTtg8DtB +s5sB4B9STHCOhOGP9AtA5b0guty4RGHTcz8CwYvpFOohj34jNIDujuKoW7RJSfcV2oK 6IhWy9DsLIFL3TqVHn77LjkgLFRGf9Mj9vEDAauD/z8yYPF9QOb9iYQ5GONSs4qgFv4Q bNMw== X-Gm-Message-State: AOAM530G9ox2crPNGEvxqxtbkoyx3kjpX6Px8IV7gzxu4r79wpWMRZ0y DEEa3sMfGMUV8+v/Dnn/BAh7zeoDHria2LdOW6EzMrPT8D9qGWUVD2G+dDGNSK2GBkyYjnattJd UFccKIw/BdmGivQ== X-Received: by 2002:adf:9d44:: with SMTP id o4mr237734wre.229.1604529982197; Wed, 04 Nov 2020 14:46:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJyLWgFBRsIxOORcIl8oGxoHMtQohAZNd6JQsf9KAYKSjAODunQq//FHmHWUQ5ouji8micahOg== X-Received: by 2002:adf:9d44:: with SMTP id o4mr237719wre.229.1604529982047; Wed, 04 Nov 2020 14:46:22 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Daniel P . Berrange" , John Snow , Cornelia Huck , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Thomas Huth , Peter Maydell Subject: [RFC PATCH 4/9] gitlab-ci: Replace YAML anchors by extends (acceptance_test_job) Date: Wed, 4 Nov 2020 23:45:53 +0100 Message-Id: <20201104224558.3384595-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201104224558.3384595-1-philmd@redhat.com> References: <20201104224558.3384595-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 83beefa2c85..5c64e477c9d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,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: @@ -95,14 +96,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 @@ -126,14 +126,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 @@ -158,14 +157,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 @@ -190,14 +188,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 Mon Nov 17 13:59:35 2025 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=1604529993; cv=none; d=zohomail.com; s=zohoarc; b=Fhsaebq/q9CZqEgn2u6jtvIeMKyCwSMnW8HeGXF3EFe1YlDzHhTBE8gmSA9iC5T1D9tsg38wxMf/4rIK/x83hLconpyQ6d8eFMR0becJ2U9wQzeXH1OqNUaHlGlA3/945sNs+bwcSpcvzTqEgYGSv8Kh1cb63R4PjyuUgkh44Qs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604529993; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=m7pizr2OhXI85zkuQe5QkflRj9AoLh16xj+zmAhsSGc=; b=YX/+cV8pZCgiZC1e5TRyT2fnrIS4aaHRsCd7ZuBNJVWKXYDqvWOCh0Tocs5QlNolBMYXwJnCdWMXW2qm1qWhve0r2wnVDCKFm0kVK62oJf1ds3tbE6gFFpuyAo84t66KAajkXZRnwYAsKBDP8gYtgbhSI+DSdQENDB+x5TtNQxI= 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 1604529993297248.54412038302416; Wed, 4 Nov 2020 14:46:33 -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-257-vrs9kGb7MGGIoHGa6i-Fcw-1; Wed, 04 Nov 2020 17:46:28 -0500 Received: by mail-wr1-f70.google.com with SMTP id w3so14188wrt.11 for ; Wed, 04 Nov 2020 14:46:28 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id h4sm2177593wrq.3.2020.11.04.14.46.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 14:46:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604529992; 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=m7pizr2OhXI85zkuQe5QkflRj9AoLh16xj+zmAhsSGc=; b=hU/MWPqbdOrUcCHX4xB9TXW8Ls4Un1AmXAdxoMrQxUMKTLnFr3bt3ut0d+awSorCzZGEr9 2VYa1Jd+2SOdwzsnE6k8RC8SRMD4JHsOOqXoOcLC+eYGb8xH7h3vTs/BNYzxiNeewDxS3V dIO2duNrjeyjrJfUeqCBA5uOjDKnGeg= X-MC-Unique: vrs9kGb7MGGIoHGa6i-Fcw-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=m7pizr2OhXI85zkuQe5QkflRj9AoLh16xj+zmAhsSGc=; b=rB5CZOcA9xLWeJ304wsk7AOkDtyNZZloG4KK3wfOd+f9PMrrutqY/yLOjkcPXCyTPs RXMdVFdP0m8HYm6NSoF+r+zv5bAfdqRbizEUM86H6HO1j0D6s8KMuAsQqaTL2yhL7dSc 5zqGHPQDoMtSuOtaGAmlZ3UObCEF0ZUTMO4vMb5UdawLXSi2XsXv+7pKIo5x1V4uDtiD QQ5lKtheOzzB8QFIkCTcKHGYzZEYnr0N6df+vjWSuZzTwpZnnrnzMQlY/pQgMuyxG5EH RHwguDCQs/pv3paYnvKVnkrNRFV+TpEjtfK+IURJLe5Vwm+SW3QVU8Twyt7C7U1gRjby vQ5Q== X-Gm-Message-State: AOAM532QJjjDwzfgRjU3vEGYdmkJNyFqdST1QbB1vAfhczh5aOZD4M88 pEIsLH9KG49xHXipykA+DxDkmisNHysxv+priZZd0Du1M1bHoaGj5UPj5iz069BC6RthwlXubZl zniGyO5PhnkY8yg== X-Received: by 2002:a1c:9c51:: with SMTP id f78mr7329945wme.189.1604529987521; Wed, 04 Nov 2020 14:46:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJxJbxgUHHAUD3PaxivQLKXRHgwEyVxxcmXheuOiqXe/78F5oZR4xlUFLjX2wflvN0CnCzHG0Q== X-Received: by 2002:a1c:9c51:: with SMTP id f78mr7329931wme.189.1604529987325; Wed, 04 Nov 2020 14:46:27 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Daniel P . Berrange" , John Snow , Cornelia Huck , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Thomas Huth , Peter Maydell Subject: [RFC PATCH 5/9] gitlab-ci: Rename acceptance_test_job -> integration_test_job Date: Wed, 4 Nov 2020 23:45:54 +0100 Message-Id: <20201104224558.3384595-6-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201104224558.3384595-1-philmd@redhat.com> References: <20201104224558.3384595-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 5c64e477c9d..0b77a90dd73 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,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" @@ -95,8 +95,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 @@ -125,8 +125,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 @@ -156,8 +156,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 @@ -187,8 +187,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 Mon Nov 17 13:59:35 2025 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=1604529997; cv=none; d=zohomail.com; s=zohoarc; b=N6Ft1qfOaLCszvXKTt6Dot9f1E4eEeG+kmVS2HZ4Wc33nEvskJTxL4Nza3Zv2/7t9u9Q6P3klNNnUewy1MujyJoR2yCL4EYCPxjG5AmE/XqYlnnBPMX3uRvbkxzQA3ubMFk+8LHBazGKZYU3nd2vhyf6x2ewcOWEhCKahj1MQi8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604529997; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=r+24Qtjsem3z7nn8q0n3COy79qpz54BrkmBsMuZl5LU=; b=h0rK/1tk/5HHd5Ud2xC1uC2l1mhvympk2WPcAmOl3Yoyyek45FERF+rOV9Zc5sJ6ciEPptQcjFiqXopLcMX0/5bOi6U1aPOlBxqrY/sYTqBpKDvD3wlJVtSdbZ7GCrDEvRXhHZaZ+hS1M8gHh/CSobyPH/skF8lDxJawQbha+K0= 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 1604529997537739.2635781210425; Wed, 4 Nov 2020 14:46:37 -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-500-EHaki7VcO1enqiA0TFkNoQ-1; Wed, 04 Nov 2020 17:46:34 -0500 Received: by mail-wr1-f70.google.com with SMTP id r16so2514wrw.22 for ; Wed, 04 Nov 2020 14:46:33 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id o3sm4502572wru.15.2020.11.04.14.46.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 14:46:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604529996; 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=ilubzx2avMqTYumjlFCh5toCK8FMSqjqmt4FNTtCSlZFch4UPBH9tfRsM+Pff1xvZsAYWg KvE6UFZ74wGD6zjZhe/mWwwVhclx6I3I5Sq3WknpB2IbdAuoeYUTgXdd5W5dHpCwP0PngE huIBhLnH7aR+XyFBkCBnO/mF/Bc8A0M= X-MC-Unique: EHaki7VcO1enqiA0TFkNoQ-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=EX4eAovNgvae7pHO/3sehbzKvzAGchttifKsXvecW9QkLy4ceIw8k7OwXbHW28CO1J Gs7LRJgtAVo7Cysg7rSplN97Gv66k9VfdkA9/k1nRaFX8YFFMc/aHgAQPMkpYimTF8f1 L5joq29N2HmpGo/byKCizOBg3CfnscEB7DP9ogvZLkGyX96XvpdDMA/DdbDMYzC7kJzO Th0qUVUQ0WbO1WnvpI4/wlYK4vX4b+AaGr+ZwZWHW/REVMFPrRwgo/72u5Y5DGErmBLg wEm8JGWKC02nag8Q9fc2hbEwES5elK8Clp0KQ3B1d+U1qFwU7frpHYExKZw9GiO7BxBK L0cA== X-Gm-Message-State: AOAM532UYlte0F/ybzAaSeKq+BQPJMr50udiCsmH1eI+Y0Jla6sMFSyI 6Ec7hVy4N8LDmXXCiO8BuM40PCAa9JIJ6a4JFJGRr5afNHARzgUSvZpSmNix5DD36xAeGs6c7Tk mGcI/Qb6uF15G0A== X-Received: by 2002:adf:804e:: with SMTP id 72mr274289wrk.114.1604529992804; Wed, 04 Nov 2020 14:46:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJyoqEIJlICdXi9aLQrC+AalYxUawOa4VgrsMJCszoi1YeaLR2L1VdYivyoH/zVt4CmQv0Al7w== X-Received: by 2002:adf:804e:: with SMTP id 72mr274272wrk.114.1604529992674; Wed, 04 Nov 2020 14:46:32 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Daniel P . Berrange" , John Snow , Cornelia Huck , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Thomas Huth , Peter Maydell Subject: [RFC PATCH 6/9] gitlab-ci: Extract common job definition as 'cross_common_job' Date: Wed, 4 Nov 2020 23:45:55 +0100 Message-Id: <20201104224558.3384595-7-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201104224558.3384595-1-philmd@redhat.com> References: <20201104224558.3384595-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 Mon Nov 17 13:59:35 2025 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=1604530014; cv=none; d=zohomail.com; s=zohoarc; b=PKCsgsnNYzvCJoC7JhtHtFDLG+/1SKrKJIvuq/CvsE6+BlPxotAC8vrdD/GbbTUE8g2QWNNPbjhvnSialHUn6wbDIDnxkrcNnRdOpZifcTYFp83pSWn+6COVN3KLzu9XhtLViVVjWYYnITpMbSB7I3NCn5tocKaZ4SAFBqN3hss= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604530014; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=11lY/RGidWh4E+Dz/TixgXDK1Sn2olK+Ru2uFDMNMxs=; b=eOIg8JLmQHAHZzYhdKi4frU2kKlJSd/W1FULzD6YnYV4HcZd43FTC217ezTe7GmPYngRBx2DkAM8CorBe739OAc/ZQp83SimcDXexboPQNlkPzEVVnah3Jv8q1bsec7A5ZJGYzK8cPfWpXdUtMUyq5PaVsA945UU6JrsBItExP8= 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 1604530014443239.9642214274362; Wed, 4 Nov 2020 14:46:54 -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-11-jBsRVD3jPmmomCl5iCvbeQ-1; Wed, 04 Nov 2020 17:46:39 -0500 Received: by mail-wr1-f71.google.com with SMTP id t17so12427wrm.13 for ; Wed, 04 Nov 2020 14:46:39 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id t23sm4096810wmn.13.2020.11.04.14.46.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 14:46:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604530013; 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=11lY/RGidWh4E+Dz/TixgXDK1Sn2olK+Ru2uFDMNMxs=; b=L3miVVeAwJXDhXrw/lefgah3WH2Dsi7C7M+2omlEw3CnNpVAc0vFJpijNEqXXR/3fc9h/Y A/mg+Um6I5yU3HzrzsM8h6Sm6UEcPxlUBDoJhw9RvDKDFx6HLu2VrDUT7vuKCSJDrhQ8d9 6v2GXWCa045ct9d7e9E5FbH4voq5s0w= X-MC-Unique: jBsRVD3jPmmomCl5iCvbeQ-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=11lY/RGidWh4E+Dz/TixgXDK1Sn2olK+Ru2uFDMNMxs=; b=Vq/olrTxGF46ZW6gkTEtGMYhyB/5A5cCBW/42N7S8Vw6/6a7dZLywhXnECCWBmeAs4 H8oesruvBwFgtnX2WdL7/vsQLb2E83Sxv0sjjCM0xaTdT0ssVKIAQQ5K4ccJlzK0yIJr tjyBamaRvvKU/4/S5OdN/8BTHpLsqgnH0+tHf8EpZVqJDpixw+Z3U1JGvY85ddSG+f4T Ucyx3z9MWHyJcy0tOZAtOVsDUrKLtwDqDKeAEDDfUED2CYCrbWPFs43Q0ALSB5dxghYW xodaRSl7T2lE87JdGqBGvRYVM2DhG60Rrd+K8DGD6vkp9xhNBgSDkZTVr0ErbraKCymd 9yWA== X-Gm-Message-State: AOAM531TciqPYzV/wNVcWzouI7QFZ4xOMrAzB6V6AIyMIoCMvyd9hXhZ VYUQ7Id0c1MooN7Ap9pGu7+u8Y64EmWka5EkthEJrKbzwX1Ba+fk6btMznNSrvN+9bsD7915dbv P339UtXlINWwWLQ== X-Received: by 2002:a7b:c2ef:: with SMTP id e15mr7338025wmk.180.1604529998250; Wed, 04 Nov 2020 14:46:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJyODpSqnyI9EbB/njgYOa87vdZh8HgEhdBt8QSAE952wM4G23Scni4+0ZdTCbOIdN0T6yHFQQ== X-Received: by 2002:a7b:c2ef:: with SMTP id e15mr7338008wmk.180.1604529998046; Wed, 04 Nov 2020 14:46:38 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Daniel P . Berrange" , John Snow , Cornelia Huck , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Thomas Huth , Peter Maydell Subject: [RFC PATCH 7/9] gitlab-ci: Extract common job definition as 'native_common_job' Date: Wed, 4 Nov 2020 23:45:56 +0100 Message-Id: <20201104224558.3384595-8-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201104224558.3384595-1-philmd@redhat.com> References: <20201104224558.3384595-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 0b77a90dd73..961070d2cbe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,9 +19,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 @@ -41,8 +44,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 Mon Nov 17 13:59:35 2025 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=1604530007; cv=none; d=zohomail.com; s=zohoarc; b=e9XfBhKxnQb+XWjJJMCiEAlqoXbKCu6rG+Vx1rBDMarfsTvVNIp4XwAfXfhH0mC7FIkdCXKSJjYZU7xHgpsGw045PUV69th+wgykHCkghd/BwmjDFjMAbqf0UoEtgXOU2l+4ggIdWIAFXmPkb85XiTGi09Cdu5HBKXSoEUaUBOQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604530007; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=MWl5vDwzLcy8Zov/XDOnc/IDx3/z+3tMGxYwpmBuCno=; b=OKfsdMBszv43+fsTj0XUohJNaDx78pjxb9gXrtNDrD2TBoOoh6aeZ/CUHH4RMpDW0QSoXBN0/uOWOo2iJRIGL2rw2qiAct8ivZeHKHDpe65h0l3TJeS+4c3Masp9UVCE750czz0+kjNbmLzUS4s/mmitumKLvGf/tYXoy4KevO4= 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 1604530007313448.04208398382093; Wed, 4 Nov 2020 14:46:47 -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-152-XYFAjX9zPoWKN0owcR6icQ-1; Wed, 04 Nov 2020 17:46:44 -0500 Received: by mail-wm1-f69.google.com with SMTP id c10so1808779wmh.6 for ; Wed, 04 Nov 2020 14:46:44 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id e6sm4663274wrs.7.2020.11.04.14.46.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 14:46:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604530006; 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=MWl5vDwzLcy8Zov/XDOnc/IDx3/z+3tMGxYwpmBuCno=; b=HW8N8XZZzc5xrad93sRIgnpHpPlbl/h67XsMjbNau0yugE56HTFwhEFr9JY37uLcRv+mcP tUfIGpBtPhueCPv4jFpN9DcijtUavD4/j1vK/ymMJKsS6wPyFPn9Bv0wAgjS95QXcsOuqx oS2jEF/SKyUXZfqM4LQ2xt99hHRqMRM= X-MC-Unique: XYFAjX9zPoWKN0owcR6icQ-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=MWl5vDwzLcy8Zov/XDOnc/IDx3/z+3tMGxYwpmBuCno=; b=aFn8Qehi9C4rXaYmc/m5GzesgZSoHcH2GC4dsSR/sqcVFcBHc8v4QPIFwRynv5J1qC pp6P0QmGQWc8nqhYv5O4huu5MbyLfN2WCWWmNrtElEa/o3+QSGpSe+L1n6frrJfJvT47 pTEII3jEuoRZ6TJiibvW9QVRmSy+HdtypFnlydAOfUvdIQoPSQJ0cPVzNzYuM25g0OJa EAHskzXKEJygQ8HImuldqUogKiTh0MO0AX5Qun3pJDWirj2hEmVLxqPhn8osVP4eU3W/ 9+N29esk0pFgozdMWwfrE8nu0Jw1DyXm89kaPJDPd/67DuyidoxpXNqpy04Q5DRQcLwo Yn0A== X-Gm-Message-State: AOAM531VGZbFFmrQdB1NytF2Qa44nDhyXgu3ePpV623b3I1EUIwbxnZH Lokz5vL/HUJnnogzvFc2n7NHrcb9M04s3o/O1YAQW9JVyab3Xmc3Sgs2+rq0CXz6O1iSTQJiP/a 39iZOgVMK2FwPvw== X-Received: by 2002:a1c:9a8d:: with SMTP id c135mr6725663wme.173.1604530003491; Wed, 04 Nov 2020 14:46:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJwSOQxvQSTa+LBitUJ5i0cYXK8vrDRaB3lyc2khopQC1QgTTAL5JMfPmSD3NhpMZ0zKLDYMwg== X-Received: by 2002:a1c:9a8d:: with SMTP id c135mr6725648wme.173.1604530003334; Wed, 04 Nov 2020 14:46:43 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Daniel P . Berrange" , John Snow , Cornelia Huck , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Thomas Huth , Peter Maydell Subject: [RFC PATCH 8/9] gitlab-ci: Add rules to skip building cross-jobs Date: Wed, 4 Nov 2020 23:45:57 +0100 Message-Id: <20201104224558.3384595-9-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201104224558.3384595-1-philmd@redhat.com> References: <20201104224558.3384595-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 skip some crossbuild jobs. The following tags are available to skip CI jobs: - cross (skip all cross-jobs) - system (skip all cross-system jobs) - user (skip all cross-user jobs) Developers can combine tags in the SKIP_BUILD variable when pushing a branch (or tag) to repositories. Examples: $ git push -o ci.variable=3D"SKIP_BUILD=3Duser" myrepo mybranch $ git push -o ci.variable=3D"SKIP_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 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index 701550f028c..08f27649eb2 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -1,6 +1,16 @@ .cross_common_job: stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + rules: + # If the if statement is true, the job is excluded from a pipeline. + - if: $SKIP_BUILD =3D~ /cross/ + when: never + - if: $CI_JOB_NAME =3D~ /system/ && $SKIP_BUILD =3D~ /system/ + when: never + - if: $CI_JOB_NAME =3D~ /user/ && $SKIP_BUILD =3D~ /user/ + when: never + # In all other cases, the job is added to the pipeline. + - when: on_success =20 .cross_system_build_job: extends: .cross_common_job --=20 2.26.2 From nobody Mon Nov 17 13:59:35 2025 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=1604530013; cv=none; d=zohomail.com; s=zohoarc; b=Ep4QqBh4+NxRn0eJdl1uPLF89F7iVhmv1gE88+Wi2PD2bfSMHqRX9ViWu/y5sRB34N/Ox3eVRQ548PxWHfBEwLy1FYEBbULwpSPRImmBo1+CLOX889+iVSNGQ8br6Ev0szU94gQzPnaN9fgqBt4mattC/gr6XqnY5DB/1QE8mcM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604530013; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=FpLX9DyDtPv5J9Kb6VvonpOVnvS/v0Bt0CgJMTWK7g4=; b=E5mbdgfITIliK5pcOMvny/rsJqF9Ms5Z/trOJbbnBSQzBOHGFp6Ai11g8F1I0XzGmpdBuFnK0LDJ+ElUDf7mqZVd9xBwbWhKtkQ9FD9qd7GR9fsTxuJuBwhrFyn+B3WEmtnCdmrUXtX+hEIbGR7OqkGTMhds/sLL4WnwCX7Ls3s= 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 1604530013341729.6820866463074; Wed, 4 Nov 2020 14:46:53 -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-285-2_uL4rUENb2mTW0N7p1n3Q-1; Wed, 04 Nov 2020 17:46:50 -0500 Received: by mail-wm1-f71.google.com with SMTP id 3so1802658wms.9 for ; Wed, 04 Nov 2020 14:46:49 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id f7sm4892993wrx.64.2020.11.04.14.46.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 14:46:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604530012; 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=FpLX9DyDtPv5J9Kb6VvonpOVnvS/v0Bt0CgJMTWK7g4=; b=SSu1Dkt7gBqgXCz2q8oORNItcFJ95Ay5RmkpWFkVebTs6sxAcjSsEQKLVYrXve2KT4DQ5r QHRg4nGuc78f3MbzmeIJov4Yoqg1Ote7dYcxai2kA2RZy9ggLfUgMjUeMmzwuzEG1/2FiH wWldc2H7n687flhCyPUUMPDQ6FoRS3M= X-MC-Unique: 2_uL4rUENb2mTW0N7p1n3Q-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=FpLX9DyDtPv5J9Kb6VvonpOVnvS/v0Bt0CgJMTWK7g4=; b=SUhuXoplT6AfyjAXjibj0X+CwmjdrF7HA0PimDbJdaBefoCFAhpw1AK6nH5Fei+IKL XP4cvo9OnGrLJzwX3JJ2B0MX9/BswQg3v3IbPZDXaSLxKCxh842ixhtJA7wkMHYmPvGT BasiOzYLPM5TPEStbGzcEpy44ILAF9Odr34QdSHaMBDhjZJpeuHVIcDnkkRcZrw76r1A /k6W09ZbDnlEXDrGc3n4c4sbqYFq1q4tmqVP+UIJbNkkrO9FWf37KE6GtPgkh6SS7LMj HtT5nyVkSnG1LOYh2U6D17lwC19YKBDKY53chl4MarZ2A4ktiz4WrsRvI9C49gKnqHoN /hMQ== X-Gm-Message-State: AOAM531pQPB0V/hVks3b7aqtwpR8T42VNp2PFdNgxv7wbRhHpZBTH0PS 0dRFpZBuAbRt/CLz6pvnIMnr/sYd3QhR/nAm5uJv1ZfrRyJlVttb+MqzDaNNE+oljhCd2RZ2cKQ PDlqTVuXXsTzA5Q== X-Received: by 2002:adf:f74e:: with SMTP id z14mr244705wrp.312.1604530008659; Wed, 04 Nov 2020 14:46:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJwWTMC/bJuH0Z5OZNDyRUvcEPOfkIl0/Y9YW1vv2gMMsssf/xwYgpj+BZKuFUdP0aCo3rpSbA== X-Received: by 2002:adf:f74e:: with SMTP id z14mr244687wrp.312.1604530008509; Wed, 04 Nov 2020 14:46:48 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Daniel P . Berrange" , John Snow , Cornelia Huck , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Thomas Huth , Peter Maydell Subject: [RFC PATCH 9/9] gitlab-ci: Add rules to skip building/testing native jobs Date: Wed, 4 Nov 2020 23:45:58 +0100 Message-Id: <20201104224558.3384595-10-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201104224558.3384595-1-philmd@redhat.com> References: <20201104224558.3384595-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 skip various build/test jobs. The following tags are available to skip 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) Developers can combine tags in the SKIP_BUILD variable when pushing a branch (or tag) to repositories. Examples: $ git push -o ci.variable=3D"SKIP_BUILD=3Duser" myrepo= mybranch $ git push -o ci.variable=3D"SKIP_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 | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 961070d2cbe..432daccf590 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,6 +21,30 @@ include: =20 .native_common_job: image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + rules: + # If the if statement is true, the job is excluded from a pipeline. + - if: ($TARGETS =3D~ /softmmu/ || $CONFIGURE_ARGS =3D~ /disable-user/)= && $SKIP_BUILD =3D~ /system/ + when: never + - if: ($TARGETS =3D~ /user/ || $CONFIGURE_ARGS =3D~ /disable-system/) = && $SKIP_BUILD =3D~ /user/ + when: never + - if: $IMAGE =3D~ /^centos/ && $SKIP_BUILD =3D~ /centos/ + when: never + - if: $IMAGE =3D~ /^debian/ && $SKIP_BUILD =3D~ /debian/ + when: never + - if: $IMAGE =3D~ /^fedora/ && $SKIP_BUILD =3D~ /fedora/ + when: never + - if: $IMAGE =3D~ /^ubuntu/ && $SKIP_BUILD =3D~ /ubuntu/ + when: never + - if: $CI_JOB_NAME =3D~ /crypto/ && $SKIP_BUILD =3D~ /crypto/ + when: never + - if: $CI_JOB_NAME =3D~ /tci/ && $SKIP_BUILD =3D~ /tci/ + when: never + - if: $CI_JOB_NAME =3D~ /fuzz/ && $SKIP_BUILD =3D~ /fuzz/ + when: never + - if: $CI_JOB_NAME =3D~ /^acceptance/ && $SKIP_BUILD =3D~ /integration/ + when: never + # In all other cases, the job is added to the pipeline. + - when: on_success =20 .native_build_job: extends: .native_common_job --=20 2.26.2