From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id qK7ACzqTumH4tgAAgWs5BA (envelope-from ) for ; Thu, 16 Dec 2021 02:15:38 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id gIBIBzqTumERBQAAbx9fmQ (envelope-from ) for ; Thu, 16 Dec 2021 01:15:38 +0000 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 aspmx1.migadu.com (Postfix) with ESMTPS id C8542310B3 for ; Thu, 16 Dec 2021 02:15:37 +0100 (CET) Received: from localhost ([::1]:49186 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mxfMu-0005uo-VX for larch@yhetil.org; Wed, 15 Dec 2021 20:15:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42320) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxfMN-0005uX-Ip for guix-patches@gnu.org; Wed, 15 Dec 2021 20:15:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50751) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mxfMM-00053t-Lo for guix-patches@gnu.org; Wed, 15 Dec 2021 20:15:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mxfMM-00061e-8v for guix-patches@gnu.org; Wed, 15 Dec 2021 20:15:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52532] [PATCH] ci: Restrict substitute search to guix jobset. Resent-From: Andrew Whatson Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 16 Dec 2021 01:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52532 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52532@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163961725923086 (code B ref -1); Thu, 16 Dec 2021 01:15:02 +0000 Received: (at submit) by debbugs.gnu.org; 16 Dec 2021 01:14:19 +0000 Received: from localhost ([127.0.0.1]:34064 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mxfLe-00060I-JV for submit@debbugs.gnu.org; Wed, 15 Dec 2021 20:14:18 -0500 Received: from lists.gnu.org ([209.51.188.17]:50840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mxfLd-00060A-4y for submit@debbugs.gnu.org; Wed, 15 Dec 2021 20:14:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42250) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxfLd-0005sR-0b for guix-patches@gnu.org; Wed, 15 Dec 2021 20:14:17 -0500 Received: from [2607:f8b0:4864:20::b35] (port=42650 helo=mail-yb1-xb35.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mxfLb-0004BK-79 for guix-patches@gnu.org; Wed, 15 Dec 2021 20:14:16 -0500 Received: by mail-yb1-xb35.google.com with SMTP id j2so60002233ybg.9 for ; Wed, 15 Dec 2021 17:14:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:from:date:message-id:subject:to; bh=SuLrehA/DVqr0fpEpfmAEfHzIEm5GKFpmKlwpmZ25OM=; b=nyi8gi0bEtIXO4KqA8KOCRRprjcDV3uYliaviWnLH2RkR+ZXN4U0HGRmN8didPuEHR pGYaxaN4GGJdQ/Vx6Jr/3mJLawBv0rOGadMIKCAff4WjzbMInoM0wUHJt75LyvgzX8U6 3hnF6aZFW2HA2Majv1so0JdcRUCwCtB938O2gjG9XDA3RYB6z0x8IImqFfTOszHPeBql ynkrp+96W4cMnC6n9CGtP7yS4zbQbqNgBpiFucwDwQYWxwr+Q0PvEE6PJofu5Yb9sIJo 1zwiVdCr8U1G9kdUDjSofYZMMRCbAxiBGNC4fwmH+ho/z82kRldzUlepQnyeNLedr7un PU/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=SuLrehA/DVqr0fpEpfmAEfHzIEm5GKFpmKlwpmZ25OM=; b=LwGSlHkpZNLu4ZXsJjj5QVje7zEzDse+RnTMp7DLLBMTkoWmmvO4cMCwcEVaqHMm2+ X8Ie1CcNjsBDNtSUTezrxsA/kfMGJN/kp6cwwO845CLDQQ6W+ym75zuh9WLcyfpDHmkt 5Nq5nKHIn4+jBO54Ly3Nq6jOP7jOaLkUhlk4obBvwELGbvIlFDtOWZXTsLqn9ZucfaDS z9+U+bvqbk1EEMjNPCUKinmACHkmegsmgtuqR1nMXWXAbcn1x0EmNCo3Mkw2LqiZBdCV yn1QnPdCe9lsoDCg+ffgb74BwaGj5AoBmXsfxv2xtS0poEyk0KZA2ubpEPHD7JNpDkYy 1VJQ== X-Gm-Message-State: AOAM530ByiVzUNt6+mfEinuPNz7MU5XYm2Aqxd1f0zR2jOXzoFF97kLL 4H0UUufi9opRPFDJaRdxf9++s+wbgltl5UsjHevesA9x X-Google-Smtp-Source: ABdhPJw9kKfdP16SXmZ584suuJ8rQgUASOVnbGCWWwt5lXeY+9wArXlh5aePglP4lhmo+/pbhfEmx+XhEQlft7uba4U= X-Received: by 2002:a5b:904:: with SMTP id a4mr9699265ybq.727.1639617253406; Wed, 15 Dec 2021 17:14:13 -0800 (PST) MIME-Version: 1.0 From: Andrew Whatson Date: Thu, 16 Dec 2021 01:14:02 +0000 Message-ID: Content-Type: multipart/mixed; boundary="000000000000f52c2705d33923f4" X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::b35 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::b35; envelope-from=whatson@gmail.com; helo=mail-yb1-xb35.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1639617337; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=SuLrehA/DVqr0fpEpfmAEfHzIEm5GKFpmKlwpmZ25OM=; b=diqGSOhzyGjXyPft4zU7ptx1ys9LT3u0pa2/43HpOnHgKcbU+D87XwnFPYQq6KN+/fc1MO +foYkqMHJIqadi7zqKiBY6ufNVHT6Tz6THv+KXvdVqC0uRVNhlGKejTCjl+kCGYgl3tY2b OKrcqOdHWtlXFgulE+rsTrSfXmNY2tYWLanxP8TCqt2lg/ST2ei86bInLpZFBRA7qAtb8X wt+/XteCA7DfBsjRiv3WHSS3u4yLgTeuHUZBS4JrdbcKNnrKckoLQ6qdZWnwDtbbqmJnad U2r8CwPRMK567AhSLMrk5BD2Cd6nkDtGwKpnbAey6zS22q79smqsUyHy9c0FEw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1639617337; a=rsa-sha256; cv=none; b=MKi1G5kV+OMvqKscfEaE/T/jsDSAMTUPMZLebhX1JqrV4ff7llyyzKMVSJa9IT5zHknucZ K8li0Zkt+tOhdWg7jU/2LbRrxY8e7X35ZSC2J5GtH/pZFRkHumeZ/E5YsBPKFyqmPiij7I XTrjjHY2s2dJ5RGX3OAvIZunBBQAfwik/zGasqIZB6OvSLjj5Ss3vwyi9Bo1kI1+TJacFg fyodLWwY4vsmTcQ7/CW0TJkWIWul5U7Uh328Q76zyYPTLIlwHN5M7zKXb1uB/z41ZVUcmU 8w0LMfq2+ymI+8KBOcvJm8cgAdtw1Zkw5XiYClOOhcyZ6c9+3T3Xbef6MGOhTw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=nyi8gi0b; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -0.99 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=nyi8gi0b; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: C8542310B3 X-Spam-Score: -0.99 X-Migadu-Scanner: scn0.migadu.com X-TUID: 6iPHXDptzohq --000000000000f52c2705d33923f4 Content-Type: text/plain; charset="UTF-8" Hi! I've been using channel-with-substitutes-available recently, and noticed that at one point it's returned a commit from the staging branch instead of master. On further investigation, it seems the API needs a jobset parameter to restrict the results to only main guix builds. eg. http://ci.guix.gnu.org/api/latestbuilds?nr=5&job=guix.x86_64-linux vs. http://ci.guix.gnu.org/api/latestbuilds?nr=5&job=guix.x86_64-linux&jobset=guix Hopefully the above shows the problem, the first link includes builds with jobset "staging" which probably shouldn't be returned as a suitable guix revision for guix pull. This patch adds a jobset parameter to restrict the substitute search. Cheers, Andrew --000000000000f52c2705d33923f4 Content-Type: text/x-patch; charset="US-ASCII"; name="guix-restrict-substitute-jobset.patch" Content-Disposition: attachment; filename="guix-restrict-substitute-jobset.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kx89rgaw0 Y29tbWl0IDIyMDZjYWY4ODUxMDY4MTA5MDc4YTQ4YmQ2NjUxZjRhOWIwZDdlZjMKQXV0aG9yOiBB bmRyZXcgV2hhdHNvbiA8d2hhdHNvbkBnbWFpbC5jb20+CkRhdGU6ICAgVGh1IERlYyAxNiAxMTow MDozNSAyMDIxICsxMDAwCgogICAgY2k6IFJlc3RyaWN0IHN1YnN0aXR1dGUgc2VhcmNoIHRvIGd1 aXggam9ic2V0LgogICAgCiAgICAqIGd1aXgvY2kuc2NtIChsYXRlc3QtYnVpbGRzKTogQWRkIGpv YnNldCBrZXl3b3JkLgogICAgKGZpbmQtbGF0ZXN0LWNvbW1pdC13aXRoLXN1YnN0aXR1dGVzKTog UGFzcyBqb2JzZXQgImd1aXgiLgoKZGlmZiAtLWdpdCBhL2d1aXgvY2kuc2NtIGIvZ3VpeC9jaS5z Y20KaW5kZXggMDFiNDkzYjNhZi4uODhiODBmNzgxZCAxMDA2NDQKLS0tIGEvZ3VpeC9jaS5zY20K KysrIGIvZ3VpeC9jaS5zY20KQEAgLTIwOCw3ICsyMDgsNyBAQCAoZGVmaW5lKiAocXVldWVkLWJ1 aWxkcyB1cmwgIzpvcHRpb25hbCAobGltaXQgJXF1ZXJ5LWxpbWl0KSkKICAgICAobWFwIGpzb24t PmJ1aWxkICh2ZWN0b3ItPmxpc3QgcXVldWUpKSkpCiAKIChkZWZpbmUqIChsYXRlc3QtYnVpbGRz IHVybCAjOm9wdGlvbmFsIChsaW1pdCAlcXVlcnktbGltaXQpCi0gICAgICAgICAgICAgICAgICAg ICAgICAjOmtleSBldmFsdWF0aW9uIHN5c3RlbSBqb2Igc3RhdHVzKQorICAgICAgICAgICAgICAg ICAgICAgICAgIzprZXkgZXZhbHVhdGlvbiBzeXN0ZW0gam9iIGpvYnNldCBzdGF0dXMpCiAgICJS ZXR1cm4gdGhlIGxhdGVzdCBidWlsZHMgcGVyZm9ybWVkIGJ5IHRoZSBDSSBzZXJ2ZXIgYXQgVVJM LiAgSWYgRVZBTFVBVElPTgogaXMgYW4gaW50ZWdlciwgcmVzdHJpY3QgdG8gYnVpbGRzIG9mIEVW QUxVQVRJT04uICBJZiBTWVNURU0gaXMgdHJ1ZSAoYSBzeXN0ZW0KIHN0cmluZyBzdWNoIGFzIFwi eDg2XzY0LWxpbnV4XCIpLCByZXN0cmljdCB0byBidWlsZHMgZm9yIFNZU1RFTS4iCkBAIC0yMTgs NiArMjE4LDcgQEAgKGRlZmluZSogKGxhdGVzdC1idWlsZHMgdXJsICM6b3B0aW9uYWwgKGxpbWl0 ICVxdWVyeS1saW1pdCkKICAgICAgICAgICAgICAgICAgYCgiZXZhbHVhdGlvbiIgLGV2YWx1YXRp b24pCiAgICAgICAgICAgICAgICAgIGAoInN5c3RlbSIgLHN5c3RlbSkKICAgICAgICAgICAgICAg ICAgYCgiam9iIiAsam9iKQorICAgICAgICAgICAgICAgICBgKCJqb2JzZXQiICxqb2JzZXQpCiAg ICAgICAgICAgICAgICAgIGAoInN0YXR1cyIgLHN0YXR1cykpKSkKICAgICA7OyBOb3RlOiBIeWRy YSBkb2VzIG5vdCBwcm92aWRlIGEgImRlcml2YXRpb24iIGZpZWxkIGZvciBlbnRyaWVzIGluCiAg ICAgOzsgJ2xhdGVzdGJ1aWxkcycsIGJ1dCBDdWlyYXNzIGRvZXMuCkBAIC0yODYsNiArMjg3LDcg QEAgKGRlZmluZSAoZmluZC1sYXRlc3QtY29tbWl0LXdpdGgtc3Vic3RpdHV0ZXMgdXJsKQogICAo bGV0KiAoKGpvYi1uYW1lIChzdHJpbmctYXBwZW5kICJndWl4LiIgKCVjdXJyZW50LXN5c3RlbSkp KQogICAgICAgICAgKGJ1aWxkIChtYXRjaCAobGF0ZXN0LWJ1aWxkcyB1cmwgMQogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAjOmpvYiBqb2ItbmFtZQorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAjOmpvYnNldCAiZ3VpeCIKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIzpzdGF0dXMgMCkgO3N1Y2Nlc3MKICAgICAgICAgICAg ICAgICAgICgoYnVpbGQpIGJ1aWxkKQogICAgICAgICAgICAgICAgICAgKF8gI2YpKSkK --000000000000f52c2705d33923f4--