From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6675607771369439232 X-Received: by 2002:a2e:361a:: with SMTP id d26mr108395lja.21.1554316658065; Wed, 03 Apr 2019 11:37:38 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:2990:: with SMTP id p16ls393067ljp.13.gmail; Wed, 03 Apr 2019 11:37:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqxKCkD/isyYm8xzIrCAayGCUO73WNdaWNYEIydBN8GRmAVxZn4m14sheB7J3Mofoi1hWJqK X-Received: by 2002:a2e:8881:: with SMTP id k1mr107688lji.7.1554316657594; Wed, 03 Apr 2019 11:37:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554316657; cv=none; d=google.com; s=arc-20160816; b=W5rzyPWBhTcFl6Yuiy0suRVNMiP/v6gIVDpD/EoSccWqKszzhqmo2Y7ncniSIxX1Ue GDEKTkGWkllU/EtFX4J49i7WlhfJLssjnJihuC+ERdj/bfpinRVQdjr0I1NnSlE5aft7 q24dUWE5JdDQDZqmYE2pGAcuQT9ebhAalh9gTH34KvUPG9o8l2gqJElTIxyXF9gNiNB6 rT/Fsi2upc5rnyfrGDrSXATu1NHJkx5XVfwn+WJIjV4hBAP6Fb7K4Fg0kcbTgKhItR7m bm+Gs3tdQ0gycMCpMz6g7KbuLnkzSwk1F5X4GyEXhowZx1xailp598KDKOH0gAnBVdmr S72Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:organization:references:to:from:subject; bh=at3UkqF5oO9nhclRU8WNgr8l0lqDdCYHRqNn4sclw1U=; b=DPQroq/qXTmGmFGh8p+8sbn/QLV1XrBjFbrXTV79KMGD1ujteX988nQGJs9L8bP/5G K12n8jH+zL9wmnvv5mqgtpyO0UbiNAhzHwbNJoVyT5lFuBo4vV/Un+xJolcuK5A771Xj eaQjgV77PkUGjMsQ6HRH87EIyVwM40pYHKA4kP+P7sKLChYl6uISUfmXc8zPu1tGMW7p etJvfRXKkIN1nJmIklHQV9J1inKLcKhVdvSQjhGq6s25yM7JchDGQ2PvhHXEpAfmxKGR HjfRydxOvA8yBLWmWRCgXuoIl6AJmOnTR+FuH9PCVeK0pjUBK4eOKcyOVYkOXlw2Wowz JSDw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of mosipov@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id a22si615234lfl.3.2019.04.03.11.37.37 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 Apr 2019 11:37:37 -0700 (PDT) Received-SPF: pass (google.com: domain of mosipov@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of mosipov@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from [192.168.1.29] (4.28-242-81.adsl-dyn.isp.belgacom.be [81.242.28.4]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id x33IbaZr008659 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 3 Apr 2019 20:37:36 +0200 Subject: Re: [PATCH] isar: Update CONTRIBUTING From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com References: <20190403100703.6990-1-mosipov@ilbers.de> Organization: ilbers GmbH Message-ID: <91ffb0cd-35c6-3af7-0c42-1196bf6c82be@ilbers.de> Date: Wed, 3 Apr 2019 20:37:30 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190403100703.6990-1-mosipov@ilbers.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: WeU5EPUs1kbG On 4/3/19 12:07 PM, Maxim Yu. Osipov wrote: > This patch > * adds CI tests launching procedure description > * adds the section "Trunk based development guidelines" > * updates maintainers contacts Applied to the 'next'. > > Closes: #45 > Signed-off-by: Baurzhan Ismagulov > Signed-off-by: Maxim Yu. Osipov > --- > CONTRIBUTING.md | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++------ > 1 file changed, 51 insertions(+), 6 deletions(-) > > diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md > index d520902..9ad6bf3 100644 > --- a/CONTRIBUTING.md > +++ b/CONTRIBUTING.md > @@ -21,6 +21,19 @@ All technical communication about Isar should take place on `isar-users` > mailing list. Please be polite and respect opinions and contributions of > others. > > +## Trunk based development guidelines > + > +We adapt trunk based development technique > + > +* `master` is the main development branch and not a stable release. > + > +* `next` is a branch for CI (Continous Integration), testing and early feedback. > + > +* `next` is sync'ed with `master` once in about two weeks (or more often whenever appropriate). > + > +If a major problem exists in `master`, it will be handled with priority. > +If a major change has been recently merged into `next`, allow time to collect feedback and resolve issues. > +Plan merges to `master` so that both fit the two-week window; short extensions should be an exception. > > ## Development > > @@ -64,6 +77,35 @@ others. > > * Seemingly unaffected boards still build. > > + * It's highly suggested to test your patchset before submitting it to the mailing > + by launching CI tests scripts. The procedure is described below: > + > + First, run "fast" CI > +``` > + scripts/ci_build.sh -q -f > + ... > + source isar-init-build-env > + scripts/vm_smoke_test -f > +``` > + Currently "fast" CI launches > + * parallel cross build of QEMU arm/arm64/amd64 Debian stretch and Raspberry Pi 1 Raspbian stretch targets > + * cross build of one of the supported boards which includes compilation of Linux kernel/U-Boot for it > + * Launches login prompt check tests for built QEMU targets > + > + Second, run standard CI > +``` > + scripts/ci_build.sh -q > + ... > + source isar-init-build-env > + scripts/vm_smoke_test -q > +``` > + Currently standard CI launches > + * parallel native build of QEMU arm/arm64/i386/amd64 Debian stretch/buster and Raspberry Pi 1 Raspbian stretch targets > + * Launches login prompt check tests for built QEMU targets > + > + Active developers may request from maintainers an account on isar-build.org > + to analyze CI logs or to launch their own CI builds there. > + > 4. Structure patches logically, in small increments. > > * One separable fix / improvement / addition - one patch. Do not provide > @@ -143,7 +185,7 @@ others. > > * Check with your employer when not working on your own. > > - * Base patches on top of the lastest master. > + * Base patches on top of the latest 'next' branch > > * Every file should carry the copyright and licensing information: > > @@ -171,7 +213,7 @@ others. > > 1. Patches are reviewed on the mailing list. > > - * At least by maintainters, but everyone is invited, so the process can be > + * At least by maintainers, but everyone is invited, so the process can be > recurrent. > > * Feedback has to consider design, functionality and style. > @@ -179,10 +221,13 @@ others. > * Simpler and clearer code is preferred, even if the original code works > fine. > > -2. After the review, patches are applied to the testing branch and CI checks > - are executed. > +2. After the review, patches are applied to the maintainers testing branch and > + CI checks are executed. > + > +3. If CI tests are passed OK and no new comments have appeared, > + the patches are merged into the `next` branch and later (normally in two weeks) > + into `master`. > > -3. If no new comments have appeared, the patches are merged to master branch. > > GitHub facilities other than issues are not used for the review process, so > that people can follow all changes and related discussions at one stop, the > @@ -193,7 +238,7 @@ mailing list. This may change in the future. > > 1. Maintainers: > > - * Alexander Smirnov > + * Maxim Yu. Osipov > > * Baurzhan Ismagulov > > -- Maxim Osipov ilbers GmbH Maria-Merian-Str. 8 85521 Ottobrunn Germany +49 (151) 6517 6917 mosipov@ilbers.de http://ilbers.de/ Commercial register Munich, HRB 214197 General Manager: Baurzhan Ismagulov