From mboxrd@z Thu Jan 1 00:00:00 1970 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=-15.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 AE0A5C433ED for ; Mon, 19 Apr 2021 16:23:36 +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 1321861246 for ; Mon, 19 Apr 2021 16:23:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1321861246 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:43266 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYWgR-0003vD-5r for qemu-devel@archiver.kernel.org; Mon, 19 Apr 2021 12:23:35 -0400 Received: from eggs.gnu.org ([209.51.188.92]:38572) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYWfU-0003Q7-Jj for qemu-devel@nongnu.org; Mon, 19 Apr 2021 12:22:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:56145) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYWfS-0001SZ-MC for qemu-devel@nongnu.org; Mon, 19 Apr 2021 12:22:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618849353; h=from:from:reply-to: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=+tkwInV8kiOfqxYOM3e+UKlDbWFGIpfOEOjsclAlHdA=; b=aDdF/is4q+l4ioYOmycpkP8G0BDVKQ6jy7iFqirCqMYlKlHk5LT+MnywgSJQTxwTV0Vpjm 1Dn97H4690LTc5nEq2WtnJmL4EXKtxymT5fqJcb4HD3bDkBUUgWOuZKMB2N8oaM9MyrYLs +0/GkdtjHvRpaBV4/nY9DcfS+VUsjZM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-194-WzzSS9GdOfKMGrQDckeRVw-1; Mon, 19 Apr 2021 12:22:30 -0400 X-MC-Unique: WzzSS9GdOfKMGrQDckeRVw-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ECB91801971; Mon, 19 Apr 2021 16:22:29 +0000 (UTC) Received: from redhat.com (ovpn-114-178.ams2.redhat.com [10.36.114.178]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8D6BB10013D7; Mon, 19 Apr 2021 16:22:27 +0000 (UTC) Date: Mon, 19 Apr 2021 17:22:24 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Alex =?utf-8?Q?Benn=C3=A9e?= Subject: Re: [RFC PATCH 14/15] gitlab-ci: Allow forks to use different set of jobs Message-ID: References: <20210418233448.1267991-1-f4bug@amsat.org> <20210418233448.1267991-15-f4bug@amsat.org> <877dky9rqt.fsf@linaro.org> MIME-Version: 1.0 In-Reply-To: <877dky9rqt.fsf@linaro.org> User-Agent: Mutt/2.0.5 (2021-01-21) X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Cc: Thomas Huth , Erik Skultety , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-devel@nongnu.org, Willian Rampazzo , Cleber Rosa , Miroslav Rezanina Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Mon, Apr 19, 2021 at 04:57:55PM +0100, Alex Bennée wrote: > > Philippe Mathieu-Daudé writes: > > > Forks run the same jobs than mainstream, which might be overkill. > > Allow them to easily rebase their custom set, while keeping using > > the mainstream templates, and ability to pick specific jobs from > > the mainstream set. > > > > To switch to your set, simply add your .gitlab-ci.yml as > > .gitlab-ci.d/${CI_PROJECT_NAMESPACE}.yml (where CI_PROJECT_NAMESPACE > > is your gitlab 'namespace', usually username). This file will be > > used instead of the default mainstream set. > > > > Signed-off-by: Philippe Mathieu-Daudé > > --- > > .gitlab-ci.yml | 7 ++++++- > > 1 file changed, 6 insertions(+), 1 deletion(-) > > > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > > index 718c8e004be..35fd35075db 100644 > > --- a/.gitlab-ci.yml > > +++ b/.gitlab-ci.yml > > @@ -9,7 +9,12 @@ generate-config: > > paths: > > - generated-config.yml > > script: > > - - cp .gitlab-ci.d/qemu-project.yml generated-config.yml > > + - if test -e .gitlab-ci.d/${CI_PROJECT_NAMESPACE}.yml ; > > + then > > + cp .gitlab-ci.d/${CI_PROJECT_NAMESPACE}.yml generated-config.yml ; > > + else > > + cp .gitlab-ci.d/qemu-project.yml generated-config.yml ; > > + fi > > This is going to be a little clunky. I can see a use for the static > forks that Danial proposes but I guess what is needed is a little > expressiveness. So how to express things like: > > - I've only touched stuff in linux-user, so run only linux-user tests This can be done with "rules" matching on files, but *only* if the pipeline trigger is a merge request - specifically not a git branch push, as the latter doesn't have the semantics you expect wrt determining the "ancestor" to compare against. It only looks at commits in the push, not those which may already have previously been pushed on the branch. > - I'm working on KVM, run all KVM enabled builds and tests > > - I've changed the core TCG code, run everything that exercises that > > - I'm working on ARM, only build and run jobs that have ARM targets If the stuff you work on is fairly static, we could potentially allow env variables to be set by the user in their fork, which the CI jobs use to filter jobs. > I think we should define a minimum set of lightweight smoke tests that > get the most bang for buck for catching sillies. I think checkpatch and > dco checking should probably be in there - and maybe one of the bog > standard build everything builds (maybe a random ../configure; make; > make check on one of the supported LTS targets). Could we have allow an env var "QEMU_CI_SMOKE_TEST=1" which can be set when pushing: git push -o ci.variable="QEMU_CI_SMOKE_TEST=1" which causes it to only do the minimum neccessary. Alternatively, invert this, so do minimum smoke test by default and require an env to run the full test. QEMU_CI_MAX=1 Potentially allow also "QEMU_CI_EXTRA_JOBS=foo,bar,wizz" to match against job jnames ? > Then there is the question of defaults. Should we default to a minimised > set unless asked or should the default be the full fat run everything? With the direction gitlab is taking towards limiting CI minuts, it is probably a safer bet to do a minimal smoke test by default and only do the full test when definitely needed. > We could I guess only switch to running everything for the staging > branch and anything that is associated with a tag or a branch that has > pull in the name? Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|