From patchwork Tue May 25 13:24:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12278833 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-21.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 20873C2B9F8 for ; Tue, 25 May 2021 13:26:55 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C3DDE6105A for ; Tue, 25 May 2021 13:26:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C3DDE6105A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34462 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llX5B-00030b-W5 for qemu-devel@archiver.kernel.org; Tue, 25 May 2021 09:26:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59384) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llX2w-0000Pn-Bj for qemu-devel@nongnu.org; Tue, 25 May 2021 09:24:34 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:53162) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1llX2q-00017T-90 for qemu-devel@nongnu.org; Tue, 25 May 2021 09:24:29 -0400 Received: by mail-wm1-x333.google.com with SMTP id z130so16749648wmg.2 for ; Tue, 25 May 2021 06:24:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Fimz6uqMhxdm+Pr3YIAfXrQRcWggaG6gew/x6zwC65o=; b=ATxvSsllwughOtUWnx2r6T5kHXjAsSHexBzaqZap6fAK1lJ1BSQl6whhqlAZ2VNKaQ gpSE7s5EIImKxj+u/i53Y4IelwYzRNSALAop77eh/wlru37wJtvXgjq7RnwgaqroKGyl P0b96hklSEWmymwlhX4sg+U6RMJHAAJX/jHdl+WYAPgBgue4pmojRlIz3O1uUImkjwhB fCX8r6be1pF9toEbrebHJWss5A/3wME4Y9RRJ6i7FMz+aUTj3gjOJffzHfVGhE+sPRl2 HufBKmHyWRqULVZief/ETjC6aUYMOnAWkYUH7QrHymGiOyJYd5uZ5zkORgcPTImVe3LW BCkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Fimz6uqMhxdm+Pr3YIAfXrQRcWggaG6gew/x6zwC65o=; b=A2xW42e0OU+RQF/OCzkyFrwXwLxYiMXoBHVJNdp6MYnfUR6edLpaxCEAYs/V39I8V2 t4mV8zi0H9B4nOSvZbxjhLWlk7DmG14iKJG9I3+CtiM5Ob4OXwIK/4DhWIPo06pXqnJM Ohmt6jpGwr6TPFDlyVea28BgJmCTJT1t7sl3fDtkQO8RppsdHrXRi2J7bkAfeAE/MkTQ IrT6D7tJiOUNeN1pFM2CFfIdlF/b/Dh6UmmmhcG8o3mn2jy4ZJg046I56hiFXvDDnfbg l8TkOJWNU4xWcm72TO4MfD1+hjXWS8Bn6rHVtGl2EydUNc/TLW/Im8yAFvARPv7ZL4f+ ysSA== X-Gm-Message-State: AOAM530vYE4q34WKmekv4qIijGOwNClwj+GxrMLhi1dJycBlRBqa4ie9 g5aN60p2y0r+b1OebYqaJQsMik9zKdscLg== X-Google-Smtp-Source: ABdhPJyKZr09aMU0stnqSTXvYxEHvSqupg/tLpZ7gqeLy+yEvw/wCeZxBND24a4Tj6t39q3mGCUopA== X-Received: by 2002:a1c:638b:: with SMTP id x133mr3919599wmb.182.1621949066326; Tue, 25 May 2021 06:24:26 -0700 (PDT) Received: from localhost.localdomain (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id b10sm18949233wrr.27.2021.05.25.06.24.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 06:24:25 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Subject: [PATCH 1/2] !fixup gitlab: add special rule for the hexagon container Date: Tue, 25 May 2021 15:24:17 +0200 Message-Id: <20210525132418.4133235-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210525132418.4133235-1-f4bug@amsat.org> References: <20210525132418.4133235-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x333.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Willian Rampazzo , Thomas Huth , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Make the build-user-hexagon -> hexagon-cross-container optional to avoid on mainstream CI [*]: 'build-user-hexagon' job needs 'hexagon-cross-container' job but it was not added to the pipeline [*] https://gitlab.com/qemu-project/qemu/-/pipelines/309137207 Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Willian Rampazzo --- .gitlab-ci.d/containers.yml | 7 ++++--- .gitlab-ci.yml | 8 +++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 088c7e68c3b..59803453d50 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -106,9 +106,6 @@ armhf-debian-cross-container: hexagon-cross-container: image: docker:stable stage: containers - except: - variables: - - $CI_PROJECT_NAMESPACE == 'qemu-project' variables: NAME: debian-hexagon-cross GIT_DEPTH: 1 @@ -127,6 +124,10 @@ hexagon-cross-container: - docker push "$TAG" after_script: - docker logout + rules: + - if: '$CI_PROJECT_NAMESPACE == "qemu-project"' + when: never + - when: on_success hppa-debian-cross-container: extends: .container_job_template diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b2f929c758b..2b89143f81f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -417,12 +417,14 @@ build-user-static: MAKE_CHECK_ARGS: check-tcg # Because the hexagon cross-compiler takes so long to build we don't rely -# on the CI system to build it and hence this job has no dependency -# declared. The image is manually uploaded. +# on the CI system to build it. The image is manually uploaded. build-user-hexagon: extends: .native_build_job_template needs: - job: hexagon-cross-container + - job: hexagon-cross-container + # Only forks have the hexagon-cross-container job, + # keep it optional for mainstream. + optional: true variables: IMAGE: debian-hexagon-cross TARGETS: hexagon-linux-user From patchwork Tue May 25 13:24:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12278835 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-21.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A449DC2B9F8 for ; Tue, 25 May 2021 13:28:05 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3D9CD6140F for ; Tue, 25 May 2021 13:28:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3D9CD6140F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:36606 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llX6K-0004T2-Ea for qemu-devel@archiver.kernel.org; Tue, 25 May 2021 09:28:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59414) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llX2x-0000SK-Rg for qemu-devel@nongnu.org; Tue, 25 May 2021 09:24:35 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:41658) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1llX2w-00019J-4W for qemu-devel@nongnu.org; Tue, 25 May 2021 09:24:35 -0400 Received: by mail-wr1-x42e.google.com with SMTP id d11so32220427wrw.8 for ; Tue, 25 May 2021 06:24:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hcKUI6D/hdA20ddiBr+GZjA09YdghIV+DGZJsB1vITM=; b=Wav52WKIMC1sVCv2td8YmLwj/GJJGWTxrRz2rbd+80JGh6IxYUZx/plzp7Q5oqsJDb ftrVhMwrI9Duzyvc7Ji1r19CLBM2SbMJKQQ2LAc/wFGsJWT/fb/CPJkJ/MdIR1wh+Ggg kVbe4FXLDSFU+nbRdPslwxObELTTwtI/y2RzdascUxXmmBpfhktl+JPOvGS4EnW54E3Q QhykZnFkFDnZ0QYRT3dK6lHO6q60XWL/KbQ1tOGp0cZuAQwenk2LAmLnq3vUv8s8UMHa 7GHv8RLF4GJmoGqXsf8Ckw1NnMXNMvkIQ3DaTde/73lC6YXsRhiVhBIwgfgOkb5vdIr8 XByg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=hcKUI6D/hdA20ddiBr+GZjA09YdghIV+DGZJsB1vITM=; b=VaD8/BNZws73EyX8frUzicGpN91Dc3SDMNC1BaTLQZqCbp97BTfN3X1t4WFeTuDnyx 6bLOehiQV2CGk36Y8ngrPMq42YaF84+Kg9QMpeO0IgvgF+pP2PQPpmfd47Vdbm05XoQr FPLK5LpJ4k7wZZst1DKzyC/cRe8xA67Ogb6V2en7lq+4ikoXDCushcbXgPxWUOIT8ib3 IeBYKPXDc/XBWHWen/Txm8hk64Xfns8BTALdS3bT/0f+YqRqWWBkvQKuCVj8VgOFF/87 PKm3n+af5XsKdExKvubiva3SwS1ariQTA/Sn8+HK7Bkew4M8qyrwyJip3kJgdD1iIeOH FLdQ== X-Gm-Message-State: AOAM531Abe+m1eQbChLOz00ugaNBVL92hwJ+PZATuoMugDaBTz6uAsZq HdOY8YDyRifQUnZ7OzopE5c= X-Google-Smtp-Source: ABdhPJwMXjmo3s5RYt62xtTow6dE+dytW+nLPns6nDA7NJyXn3V0uAzJogVcDTMagRxqGCKy6C2EaA== X-Received: by 2002:adf:ee44:: with SMTP id w4mr26356559wro.415.1621949071016; Tue, 25 May 2021 06:24:31 -0700 (PDT) Received: from localhost.localdomain (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id c6sm16472031wru.50.2021.05.25.06.24.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 06:24:30 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Subject: [PATCH 2/2] gitlab-ci: Convert check-dco/check-patch jobs to the 'rules' syntax Date: Tue, 25 May 2021 15:24:18 +0200 Message-Id: <20210525132418.4133235-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210525132418.4133235-1-f4bug@amsat.org> References: <20210525132418.4133235-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42e.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Willian Rampazzo , Thomas Huth , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Per GitLab documentation [*]: "rules replaces only/except and they can’t be used together in the same job." Since the 'rules' syntax is more powerful and we are already using it, convert the check-dco/check-patch jobs so no job use the 'only/ except' syntax. [*] https://docs.gitlab.com/ee/ci/yaml/#rules Inspired-by: Daniel P. Berrangé Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Willian Rampazzo --- .gitlab-ci.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2b89143f81f..83e077d095c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -786,12 +786,13 @@ check-patch: needs: job: amd64-centos8-container script: .gitlab-ci.d/check-patch.py - except: - variables: - - $CI_PROJECT_NAMESPACE == 'qemu-project' && $CI_COMMIT_BRANCH == 'master' variables: GIT_DEPTH: 1000 - allow_failure: true + rules: + - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH == "master"' + when: never + - when: on_success + allow_failure: true check-dco: stage: build @@ -799,11 +800,12 @@ check-dco: needs: job: amd64-centos8-container script: .gitlab-ci.d/check-dco.py - except: - variables: - - $CI_PROJECT_NAMESPACE == 'qemu-project' && $CI_COMMIT_BRANCH == 'master' variables: GIT_DEPTH: 1000 + rules: + - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH == "master"' + when: never + - when: on_success build-libvhost-user: stage: build