From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 24AB1431D5 for ; Sun, 22 Oct 2023 16:23:25 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A94BF402C2; Sun, 22 Oct 2023 16:23:24 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41]) by mails.dpdk.org (Postfix) with ESMTP id 0916940284 for ; Sun, 22 Oct 2023 16:23:23 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TewXYsc52OOUp9XFSwxCg4JbVyDWm9z/+axSE+GqYsB9GdgD3pToQ2FphPakth4zFrl8X7xS80KENus7kdiSwOIrqfQvRk1f5sy7X6J1ZuAKXv5Gys249hEadgo8l1he1yYm/b2wxjmqo2IJ9EqevRPCCBBAhn9hif5lwiiwiVaeNO3GZSETLMyBIx10RhKMPwUQsRPqASCDTxCeWjtv3F3pD/uAtmD/q1ukRMdBHriVVxp9kZTfO53C0eXaW/GFkqoGQjr0dXlaA3wtIcIfFHJShVqMHz1KN0s08QP+F3flSJfe1pCDw1YNw9h8UDzHkIYJo+ostq0vQLcbZ5//1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=QX4A/MK6jOeMR925F/hGB2o5qXfPN3G0sTYzolXVWQQ=; b=kMTrlAKQszQrPxrzR8Fc0vFrW2W0VKXYF+zBa5kpWnRJgGU07KJvytjgHWPvxJQ4ClQ+CL459TBxpkZx6kSFXoTyT7DPgQbosCoIVpP4Ss3gQQp1YDQ+BiGZlt0h7u1VipplmsNNWL8V/lxOVJUZpEfClSc5FSv5pMnpg6EzbpuUoRQoGl4W/vLLp8QmtEiyShUvXqckgOYufuw4ozVBgeV42cj4PbPnfA+r68wbpZt3GIzjQ+Mpzh9op7VQLeuPXQig7q4REFKOAL7GkIhOMpO6P2AWMsrZW5oD7T5B5PvgSJC8ZDryAsY1B1NY8a6Kr28YanyQYZ1wWbdmffa5XA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=redhat.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QX4A/MK6jOeMR925F/hGB2o5qXfPN3G0sTYzolXVWQQ=; b=YG58coEaCECpwfYL5zbLAiaa8WGe+AixE3dF/Ba/PTu7NrRwDLykcjBDfR9Um21HBOVwZ9MSqgnDytB+8y3M1nJ7WaeeFGkqFAY1jqpSPwHyIjYYT8F1KtcFuSYYDiNFpRcdXRGoOmLr6AxqX58t6V/s6cu6R5LAOcw144g92qqjY3nApoXbi/H0vJCJBSoEI53E+996ZBQXN/jiYBisvrudsrKCue2uNyvoZ+R4zSodK6qSY4XU8tOpcKATwTWQnwx2DQn52BoXPX4BoIYgJgDiVs2Of2VXLUGiy3h2qeKB0ckaBPpug61w/3g9KqZHVbVWXurElAnZQytnoUDHQw== Received: from BYAPR11CA0041.namprd11.prod.outlook.com (2603:10b6:a03:80::18) by LV3PR12MB9187.namprd12.prod.outlook.com (2603:10b6:408:194::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.47; Sun, 22 Oct 2023 14:23:21 +0000 Received: from CO1PEPF000042A9.namprd03.prod.outlook.com (2603:10b6:a03:80:cafe::39) by BYAPR11CA0041.outlook.office365.com (2603:10b6:a03:80::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.29 via Frontend Transport; Sun, 22 Oct 2023 14:23:20 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CO1PEPF000042A9.mail.protection.outlook.com (10.167.243.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Sun, 22 Oct 2023 14:23:20 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 22 Oct 2023 07:23:10 -0700 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 22 Oct 2023 07:23:09 -0700 From: Xueming Li To: David Marchand CC: Aaron Conole , dpdk stable Subject: patch 'ci: fix race on container image name' has been queued to stable release 22.11.4 Date: Sun, 22 Oct 2023 22:20:30 +0800 Message-ID: <20231022142250.10324-2-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231022142250.10324-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000042A9:EE_|LV3PR12MB9187:EE_ X-MS-Office365-Filtering-Correlation-Id: 76d02101-0682-43bc-de57-08dbd30a712f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IeB67uILfhKihuwf4O2imIKvhMcDq7wwYHML6B8zK5Qo5/yfQZcG2KjmP1eyqVxGUc7swhmpodC5UczOa1QyxiCyL5Yfg8KSFMjGtt0PBPP+Ro7vLO7XVbGrWMkufTdWREsksxAyzvhtIYovpZjG1jHLm5XY0M64vRFeMngAs3lra0Qn9QD1B7hfy1zd2dKVPRPPBBgi5zUMz9yq6LSi87Q87Gn1EQowJWPEyeaY44k65BdJt7xwu2+azHLDj2V6Oc6TDFJ22XQBpon5ITebHMXu9T/7ZGv0d6lfj05+SVlvHB1yt5Cpqw2bzo5YkB0Ahg7saT6fbugnkvrJuAhKQjedP7RA6yVY3Gvf2CQULooWDCmgRtnlFGSbMomQnLQCzN7Xuc6Oxl08curkxiExEcPZnfQvZz+JnAdQrdLuw1LRIOy1TInomq+nTNPZaRqWAZDj7BG655I3a+PKuXSNT7/RuTtK9ZL60nU9nG/pcq84nITx4wBorxNo7Bt7pfSFjIAazZnAsT3rCIXWW5xh20QRdl+jHqW3nSYwSvnAFKYjB78wPd2vthw1Z2WVkRwXBPBukMOwysq5/OyKC1knNtq/fSZG9vopcr4DGLSwgyWdWKvr8s/LNbpP04yt/3rOHNKy1HAApxCzGxbuV+L4UDAstnj0VR0OzWsLzOX8pnfbuOnbQOl/Kfzu7CmRtgFZefLinJoPUx5lXjqfER7IlY8hZ/AAtnNRq5ZwqVW8qFKahCeFfa7ADgrgXyYMg262g+tkiRq4xkBTtkqw1X5EhA== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(396003)(39860400002)(136003)(376002)(346002)(230922051799003)(1800799009)(186009)(82310400011)(451199024)(64100799003)(46966006)(36840700001)(40470700004)(36756003)(26005)(478600001)(966005)(53546011)(6666004)(7696005)(1076003)(16526019)(2906002)(70206006)(6286002)(8676002)(83380400001)(2616005)(316002)(41300700001)(70586007)(8936002)(4326008)(54906003)(5660300002)(6916009)(36860700001)(47076005)(86362001)(4001150100001)(7636003)(82740400003)(356005)(426003)(336012)(40460700003)(55016003)(40480700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2023 14:23:20.3590 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 76d02101-0682-43bc-de57-08dbd30a712f X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000042A9.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR12MB9187 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 22.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/15/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=36001100ff14e89798d6553914cf3c41e2bb60d4 Thanks. Xueming Li --- >From 36001100ff14e89798d6553914cf3c41e2bb60d4 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Wed, 2 Aug 2023 08:43:48 +0200 Subject: [PATCH] ci: fix race on container image name Cc: Xueming Li [ upstream commit 9836014d4c2b1b2c29948c928fd386b2944b6bcf ] We had a race on the container image name when the prepare job was running a day before the build job was triggered. Example: - a prepare job generated image name on 2023/08/01: 2023-08-01T23:59:32.9711845Z ++ date -u +%Y-%m-%d 2023-08-01T23:59:32.9713485Z + echo image=image-fedora:37-2023-08-01 - a few seconds later, the build jobs tried to use a different image name on 2023/08/02: 2023-08-02T00:01:29.9103180Z ++ date -u +%Y-%m-%d 2023-08-02T00:01:29.9113486Z + echo image=image-fedora:37-2023-08-02 Fix this by directly reusing the prepare job output. Fixes: b35c4b0aa2bc ("ci: add Fedora 35 container in GHA") Signed-off-by: David Marchand Acked-by: Aaron Conole --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9512219a05..8bd8f57513 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -145,6 +145,8 @@ jobs: prepare-container-images: name: ${{ join(matrix.config.*, '-') }} runs-on: ubuntu-latest + outputs: + image: ${{ steps.get_keys.outputs.image }} strategy: fail-fast: false @@ -210,14 +212,13 @@ jobs: id: get_keys run: | echo 'ccache=ccache-${{ matrix.config.image }}-${{ matrix.config.compiler }}-'$(date -u +%Y-w%W) >> $GITHUB_OUTPUT - echo 'image=image-${{ matrix.config.image }}-'$(date -u +%Y-%m-%d) >> $GITHUB_OUTPUT echo 'logs=meson-logs-${{ join(matrix.config.*, '-') }}' | tr -d ':' >> $GITHUB_OUTPUT - name: Retrieve image cache id: image_cache uses: actions/cache@v3 with: path: ~/.image - key: ${{ steps.get_keys.outputs.image }} + key: ${{ needs.prepare-container-images.outputs.image }} - name: Fail if no image (not supposed to happen) if: steps.image_cache.outputs.cache-hit != 'true' run: | -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-22 22:17:34.522409900 +0800 +++ 0001-ci-fix-race-on-container-image-name.patch 2023-10-22 22:17:34.126723700 +0800 @@ -1 +1 @@ -From 9836014d4c2b1b2c29948c928fd386b2944b6bcf Mon Sep 17 00:00:00 2001 +From 36001100ff14e89798d6553914cf3c41e2bb60d4 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 9836014d4c2b1b2c29948c928fd386b2944b6bcf ] @@ -24 +26,0 @@ -Cc: stable@dpdk.org @@ -33 +35 @@ -index 2c1eda9b18..7a2ac0ceee 100644 +index 9512219a05..8bd8f57513 100644 @@ -36 +38 @@ -@@ -148,6 +148,8 @@ jobs: +@@ -145,6 +145,8 @@ jobs: @@ -45 +47 @@ -@@ -214,14 +216,13 @@ jobs: +@@ -210,14 +212,13 @@ jobs: