From patchwork Fri Oct 6 09:40:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 9988819 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A65F76029B for ; Fri, 6 Oct 2017 09:41:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 888FC28C9A for ; Fri, 6 Oct 2017 09:41:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7D74328D8B; Fri, 6 Oct 2017 09:41:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EB43828C9A for ; Fri, 6 Oct 2017 09:41:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5940B6E28E; Fri, 6 Oct 2017 09:41:08 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 238CA6E28E for ; Fri, 6 Oct 2017 09:41:06 +0000 (UTC) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Oct 2017 02:41:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.42,482,1500966000"; d="scan'208";a="907376187" Received: from jnikula-mobl2.fi.intel.com (HELO localhost) ([10.237.72.62]) by FMSMGA003.fm.intel.com with ESMTP; 06 Oct 2017 02:41:05 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Fri, 6 Oct 2017 12:40:31 +0300 Message-Id: <20171006094032.22695-1-jani.nikula@intel.com> X-Mailer: git-send-email 2.11.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Cc: jani.nikula@intel.com Subject: [Intel-gfx] [drm-rerere PATCH 1/2] nightly.conf: add url lists to all repos X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP dim has supported picking up the first match from a list of urls since 61df7dc31c63 ("dim: allow a space separated list of URLs for each repo in drm_tip_repos"). This way we don't have to have a complicated set of rules for converting between ssh, git and https protocol URLs, and we can configure the preferred URLs with /drm/ in them while retaining backwards compatibility for URLs without /drm/. https://cgit.freedesktop.org/ does not list https:// URLs for drm-amd or drm-upstream, so don't add them yet. Signed-off-by: Jani Nikula --- nightly.conf | 41 ++++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/nightly.conf b/nightly.conf index d2bcd3ebec53..b826c9c194d2 100644 --- a/nightly.conf +++ b/nightly.conf @@ -1,18 +1,45 @@ -# drm-intel-nightly configuration +# drm-tip configuration # # sourced as a bash script from dim # -# drm-tip to associative array (declared in dim) +# drm-tip to associative array (declared in dim) # # (the key) is a symbolic name used for drm_tip_config, must match # [a-z-]+ # -drm_tip_repos[drm-intel]="ssh://git.freedesktop.org/git/drm-intel" -drm_tip_repos[drm-misc]="ssh://git.freedesktop.org/git/drm-misc" -drm_tip_repos[drm-amd]="ssh://git.freedesktop.org/git/drm/drm-amd" -drm_tip_repos[drm-upstream]="git://people.freedesktop.org/~airlied/linux" -drm_tip_repos[sound-upstream]="git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git" +# (the value) is a space separated list of accepted URLs in order of +# preference +# +# dim users may freely choose the remote names and URLs from this list. +# +drm_tip_repos[drm-intel]=" +ssh://git.freedesktop.org/git/drm/drm-intel +ssh://git.freedesktop.org/git/drm-intel +git://anongit.freedesktop.org/drm/drm-intel +git://anongit.freedesktop.org/drm-intel +https://anongit.freedesktop.org/git/drm/drm-intel.git +" +drm_tip_repos[drm-misc]=" +ssh://git.freedesktop.org/git/drm/drm-misc +ssh://git.freedesktop.org/git/drm-misc +git://anongit.freedesktop.org/drm/drm-misc +git://anongit.freedesktop.org/drm-misc +https://anongit.freedesktop.org/git/drm/drm-misc.git +" +drm_tip_repos[drm-amd]=" +ssh://git.freedesktop.org/git/drm/drm-amd +git://anongit.freedesktop.org/drm/drm-amd +" +drm_tip_repos[drm-upstream]=" +ssh://people.freedesktop.org/~airlied/linux +git://people.freedesktop.org/~airlied/linux +" +drm_tip_repos[sound-upstream]=" +git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git +https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git +https://kernel.googlesource.com/pub/scm/linux/kernel/git/tiwai/sound.git +" # # drm-tip branch configuration array (declared in dim)