From patchwork Tue Dec 19 12:40:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eelco Chaudron X-Patchwork-Id: 1877928 X-Patchwork-Delegate: echaudro@redhat.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=EHdKDqkb; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SvbsH2sWJz20Gb for ; Tue, 19 Dec 2023 23:41:07 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 51C2482D12; Tue, 19 Dec 2023 12:41:05 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 51C2482D12 Authentication-Results: smtp1.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=EHdKDqkb X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2pimyfY4otUQ; Tue, 19 Dec 2023 12:41:04 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id 8410E829A9; Tue, 19 Dec 2023 12:41:03 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 8410E829A9 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 5BA71C0072; Tue, 19 Dec 2023 12:41:03 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id EB6D9C0037 for ; Tue, 19 Dec 2023 12:41:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id C6FF682CD4 for ; Tue, 19 Dec 2023 12:41:02 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org C6FF682CD4 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lKfVcAwF1Ece for ; Tue, 19 Dec 2023 12:41:02 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp1.osuosl.org (Postfix) with ESMTPS id 1A2A782998 for ; Tue, 19 Dec 2023 12:41:01 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 1A2A782998 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702989661; h=from:from: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=4cmLkBp/7FRmCC6Yd5TfbdDBFDJVTCyFWKFzKdztioI=; b=EHdKDqkblKYoFpcwZAhNEKMvh5JiptiM1qET7Ii1O7gC1vHKXMfeHw4JQT/pDj+Q6RwA05 skrVW64toGUKM8XKNo1KhSaTLqb+yVkov9tG21QdhagD2Etwjv1yGyYcCI0Mzz/2C9yQMw 6vtfksg03xfINEUEUw7NokQmfAZF0wA= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-593-biIM8slXNhS6v767k5KmCA-1; Tue, 19 Dec 2023 07:40:57 -0500 X-MC-Unique: biIM8slXNhS6v767k5KmCA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4725B88F560; Tue, 19 Dec 2023 12:40:57 +0000 (UTC) Received: from localhost.localdomain (unknown [10.39.193.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8DB88492BF0; Tue, 19 Dec 2023 12:40:56 +0000 (UTC) From: Eelco Chaudron To: dev@openvswitch.org Date: Tue, 19 Dec 2023 13:40:30 +0100 Message-ID: <170298963031.1693084.13737971547550864055.stgit@ebuild> In-Reply-To: <170298960827.1693084.7524216970225185214.stgit@ebuild> References: <170298960827.1693084.7524216970225185214.stgit@ebuild> User-Agent: StGit/1.5 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: david.marchand@redhat.com, i.maximets@ovn.org Subject: [ovs-dev] [PATCH v5 01/12] ci: Add JOBS variable to replace all the '-j4' instances. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Add a JOBS variable, which defaults to '-j4' but can be overwritten with the same environment variable. This can be useful if you use this linux-build.sh script outside of GitHub actions on a machine with many cores. Signed-off-by: Eelco Chaudron Acked-by: Simon Horman --- .ci/linux-build.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh index aa2ecc505..67c01a644 100755 --- a/.ci/linux-build.sh +++ b/.ci/linux-build.sh @@ -6,6 +6,7 @@ set -x CFLAGS_FOR_OVS="-g -O2" SPARSE_FLAGS="" EXTRA_OPTS="--enable-Werror" +JOBS=${JOBS:-"-j4"} function install_dpdk() { @@ -46,7 +47,7 @@ function build_ovs() configure_ovs $OPTS make selinux-policy - make -j4 + make ${JOBS} } if [ "$DEB_PACKAGE" ]; then @@ -122,8 +123,8 @@ if [ "$TESTSUITE" = 'test' ]; then configure_ovs export DISTCHECK_CONFIGURE_FLAGS="$OPTS" - make distcheck -j4 CFLAGS="${CFLAGS_FOR_OVS}" \ - TESTSUITEFLAGS=-j4 RECHECK=yes + make distcheck ${JOBS} CFLAGS="${CFLAGS_FOR_OVS}" \ + TESTSUITEFLAGS=${JOBS} RECHECK=yes else build_ovs for testsuite in $TESTSUITE; do @@ -134,7 +135,7 @@ else export DPDK_EAL_OPTIONS="--lcores 0@1,1@1,2@1" run_as_root="sudo -E PATH=$PATH" fi - $run_as_root make $testsuite TESTSUITEFLAGS=-j4 RECHECK=yes + $run_as_root make $testsuite TESTSUITEFLAGS=${JOBS} RECHECK=yes done fi From patchwork Tue Dec 19 12:41:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eelco Chaudron X-Patchwork-Id: 1877929 X-Patchwork-Delegate: echaudro@redhat.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=A6IMGWSd; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Svbt128y3z20Gb for ; Tue, 19 Dec 2023 23:41:45 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 5280461454; Tue, 19 Dec 2023 12:41:43 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 5280461454 Authentication-Results: smtp3.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=A6IMGWSd X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LZn2ByTbs_Uv; Tue, 19 Dec 2023 12:41:42 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id 7E76E6143D; Tue, 19 Dec 2023 12:41:41 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 7E76E6143D Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 4CFC1C0072; Tue, 19 Dec 2023 12:41:41 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 651FAC0037 for ; Tue, 19 Dec 2023 12:41:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 2490F6143D for ; Tue, 19 Dec 2023 12:41:38 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 2490F6143D X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LlmpOSo3JAHc for ; Tue, 19 Dec 2023 12:41:37 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp3.osuosl.org (Postfix) with ESMTPS id 6E9BB61415 for ; Tue, 19 Dec 2023 12:41:37 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 6E9BB61415 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702989696; h=from:from: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=5czaJVPtx0QHJ27N8yRX148GLoEnjzFg9E1m6pey3pI=; b=A6IMGWSdsibNVSwtVuChocFJoqT0RzkhHYbHckplYjQv0YtNjRVqR+AQKTMYkTXHiRAydR jABX5p/HYjF0B3M3ht3WH5DdUtqm28rNnVCV0hIRjYD/5dIHCEG8nqpfNoU7RChHZ8KwU8 2wes3MpuIGSc59pdUQZEDBlHV8Kivyc= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-47-rDSEqZloP2CY6mBL2an9NA-1; Tue, 19 Dec 2023 07:41:33 -0500 X-MC-Unique: rDSEqZloP2CY6mBL2an9NA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BBB96185A782; Tue, 19 Dec 2023 12:41:32 +0000 (UTC) Received: from localhost.localdomain (unknown [10.39.193.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id 133CC2026D66; Tue, 19 Dec 2023 12:41:31 +0000 (UTC) From: Eelco Chaudron To: dev@openvswitch.org Date: Tue, 19 Dec 2023 13:41:02 +0100 Message-ID: <170298966244.1693084.1327185803575317295.stgit@ebuild> In-Reply-To: <170298960827.1693084.7524216970225185214.stgit@ebuild> References: <170298960827.1693084.7524216970225185214.stgit@ebuild> User-Agent: StGit/1.5 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: david.marchand@redhat.com, i.maximets@ovn.org Subject: [ovs-dev] [PATCH v5 02/12] ci: Add make check-ovsdb-cluster tests to GitHub action ci. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" This patch adds 'make check-ovsdb-cluster' tests to GitHub action ci. In addition, this patch also makes sure this test and 'make check' do not run as root. Signed-off-by: Eelco Chaudron Acked-by: Simon Horman --- .ci/linux-build.sh | 5 ++++- .github/workflows/build-and-test.yml | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh index 67c01a644..bb540703e 100755 --- a/.ci/linux-build.sh +++ b/.ci/linux-build.sh @@ -129,11 +129,14 @@ else build_ovs for testsuite in $TESTSUITE; do run_as_root= + if [ "$testsuite" != "check" ] && \ + [ "$testsuite" != "check-ovsdb-cluster" ] ; then + run_as_root="sudo -E PATH=$PATH" + fi if [ "${testsuite##*dpdk}" != "$testsuite" ]; then sudo sh -c 'echo 1024 > /proc/sys/vm/nr_hugepages' || true [ "$(cat /proc/sys/vm/nr_hugepages)" = '1024' ] export DPDK_EAL_OPTIONS="--lcores 0@1,1@1,2@1" - run_as_root="sudo -E PATH=$PATH" fi $run_as_root make $testsuite TESTSUITEFLAGS=${JOBS} RECHECK=yes done diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 09654205e..5d441157c 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -164,6 +164,9 @@ jobs: m32: m32 opts: --disable-ssl + - compiler: gcc + testsuite: check-ovsdb-cluster + steps: - name: checkout uses: actions/checkout@v3 From patchwork Tue Dec 19 12:41:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eelco Chaudron X-Patchwork-Id: 1877930 X-Patchwork-Delegate: echaudro@redhat.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=iaSV8bPt; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SvbtR62PTz20Gb for ; Tue, 19 Dec 2023 23:42:07 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 06CE282E4C; Tue, 19 Dec 2023 12:42:06 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 06CE282E4C Authentication-Results: smtp1.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=iaSV8bPt X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EyVjUH4ozdSZ; Tue, 19 Dec 2023 12:42:05 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id 4E1AA80A7F; Tue, 19 Dec 2023 12:42:04 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 4E1AA80A7F Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 1910CC008E; Tue, 19 Dec 2023 12:42:04 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 3B880C0037 for ; Tue, 19 Dec 2023 12:42:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 4D8AA6141C for ; Tue, 19 Dec 2023 12:41:58 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 4D8AA6141C Authentication-Results: smtp3.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=iaSV8bPt X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id loP5NwGNbed5 for ; Tue, 19 Dec 2023 12:41:57 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp3.osuosl.org (Postfix) with ESMTPS id A212561462 for ; Tue, 19 Dec 2023 12:41:57 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org A212561462 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702989716; h=from:from: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=kex9TTCLFQ6pvtg4nT76tOirBAqok+kdaLr117mtUiQ=; b=iaSV8bPtlhI5eFCAjdzX72SCc59R+/Oce1nzrWG25rcYV05VvamYLJX7q00KnNp0fAJ3cb 6noWJ4ExLmfRGlw//f8HLKQw6Q46M1zWqMvGv86Vl1PehlWyOQl9ocky3vsU2FZ2xxB6Ks mUaQthQTws4pYPhuqqTd3HQPeifmnyU= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-524-zOXD5v6sNFyysrrx_bBWfQ-1; Tue, 19 Dec 2023 07:41:53 -0500 X-MC-Unique: zOXD5v6sNFyysrrx_bBWfQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 04C621D6BEEE; Tue, 19 Dec 2023 12:41:53 +0000 (UTC) Received: from localhost.localdomain (unknown [10.39.193.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id 515632026D66; Tue, 19 Dec 2023 12:41:52 +0000 (UTC) From: Eelco Chaudron To: dev@openvswitch.org Date: Tue, 19 Dec 2023 13:41:37 +0100 Message-ID: <170298969792.1693084.18268968270803249280.stgit@ebuild> In-Reply-To: <170298960827.1693084.7524216970225185214.stgit@ebuild> References: <170298960827.1693084.7524216970225185214.stgit@ebuild> User-Agent: StGit/1.5 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: david.marchand@redhat.com, i.maximets@ovn.org Subject: [ovs-dev] [PATCH v5 03/12] ci: Update the GitHub Ubuntu runner image to Ubuntu 22.04. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Updating this image is a requirement for the kernel system-traffic tests to pass on Ubuntu. In addition, 20.04 might be replaced, as soon as 24.04 comes out. Or we need to do this when it becomes EOL in April 2025. Signed-off-by: Eelco Chaudron Acked-by: Simon Horman --- .github/workflows/build-and-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 5d441157c..acb57ac46 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -12,7 +12,7 @@ jobs: name: dpdk gcc outputs: dpdk_key: ${{ steps.gen_dpdk_key.outputs.key }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 timeout-minutes: 30 steps: @@ -89,7 +89,7 @@ jobs: TESTSUITE: ${{ matrix.testsuite }} name: linux ${{ join(matrix.*, ' ') }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 timeout-minutes: 30 strategy: From patchwork Tue Dec 19 12:41:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eelco Chaudron X-Patchwork-Id: 1877931 X-Patchwork-Delegate: echaudro@redhat.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=NXGOeCcn; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Svbtj02rlz20Gb for ; Tue, 19 Dec 2023 23:42:20 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 2753082ED1; Tue, 19 Dec 2023 12:42:19 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 2753082ED1 Authentication-Results: smtp1.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=NXGOeCcn X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZK1XE_Xgda6B; Tue, 19 Dec 2023 12:42:18 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp1.osuosl.org (Postfix) with ESMTPS id 0B4A482EA5; Tue, 19 Dec 2023 12:42:16 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 0B4A482EA5 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id C7B5BC0072; Tue, 19 Dec 2023 12:42:16 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 34D19C0037 for ; Tue, 19 Dec 2023 12:42:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id C1A72435A6 for ; Tue, 19 Dec 2023 12:42:13 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org C1A72435A6 Authentication-Results: smtp2.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=NXGOeCcn X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CH-3dQPoY7tM for ; Tue, 19 Dec 2023 12:42:12 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp2.osuosl.org (Postfix) with ESMTPS id A5CCD435A4 for ; Tue, 19 Dec 2023 12:42:12 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org A5CCD435A4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702989731; h=from:from: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=AAcZUvTOp7Fu6TsWxzmXOBy81I7jixXBPPJn8ey9Z7c=; b=NXGOeCcnx5g7qZo8FOVCr/ld5Gyokclr18tscnUwrqmplotybn2mrBNcG/1mnvIjJBftYb +V1sjDewAvPuIFXKFmie13tieBAAz0c050vSyRf9C3csZofCpt3Ai+CgMJIuDyLKDo/UbY T+jgk7e2uoOonVAVBPXjRZt9krdAACw= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-369-4Qs74zJ9PFu9hsAOdGtD0g-1; Tue, 19 Dec 2023 07:42:07 -0500 X-MC-Unique: 4Qs74zJ9PFu9hsAOdGtD0g-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 424CB3CBE320; Tue, 19 Dec 2023 12:42:07 +0000 (UTC) Received: from localhost.localdomain (unknown [10.39.193.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8DFB63C25; Tue, 19 Dec 2023 12:42:06 +0000 (UTC) From: Eelco Chaudron To: dev@openvswitch.org Date: Tue, 19 Dec 2023 13:41:58 +0100 Message-ID: <170298971817.1693084.5322289823597780314.stgit@ebuild> In-Reply-To: <170298960827.1693084.7524216970225185214.stgit@ebuild> References: <170298960827.1693084.7524216970225185214.stgit@ebuild> User-Agent: StGit/1.5 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: david.marchand@redhat.com, i.maximets@ovn.org Subject: [ovs-dev] [PATCH v5 04/12] ci: Exclude tests that show random failures through GitHub actions. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" I ran 80 series of full tests, and the following tests showed failures: 802.1ad - vlan_limit +2023-11-20T10:32:11.245Z|00001|dpif_netdev(revalidator5)|ERR|internal error parsing flow key recirc_id(0),dp_hash(0),skb_priority(0), in_port(2),skb_mark(0),ct_state(0),ct_zone(0),ct_mark(0),ct_label(0), packet_type(ns=0,id=0),eth(src=42:7e:4b:46:68:1b,dst=33:33:ff:46:68:1b), eth_type(0x88a8),vlan(vid=4094,pcp=0),encap(eth_type(0x8100), vlan(vid=100,pcp=0),encap(eth_type(0x86dd),ipv6( src=::,dst=ff02::1:ff46:681b,label=0,proto=58,tclass=0,hlimit=255, frag=no),icmpv6(type=135,code=0),nd(target=fe80::407e:4bff:fe46:681b, sll=00:00:00:00:00:00,tll=00:00:00:00:00:00))) +2023-11-20T10:32:11.245Z|00002|dpif(revalidator5)|WARN|netdev@ovs-netdev: failed to put[modify] (Invalid argument) ufid:ef1ca90c-dbd0-4ca7-9869-411bdffd1ece recirc_id(0),dp_hash(0/0), skb_priority(0/0),in_port(2),skb_mark(0/0),ct_state(0/0),ct_zone(0/0), ct_mark(0/0),ct_label(0/0),packet_type(ns=0,id=0), eth(src=42:7e:4b:46:68:1b,dst=33:33:ff:46:68:1b),eth_type(0x88a8), vlan(vid=4094,pcp=0/0x0),encap(eth_type(0x8100), vlan(vid=100/0x0,pcp=0/0x0),encap(eth_type(0x86dd), ipv6(src=::/::,dst=ff02::1:ff46:681b/::,label=0/0,proto=58/0, tclass=0/0,hlimit=255/0,frag=no),icmpv6(type=135/0,code=0/0), nd(target=fe80::407e:4bff:fe46:681b/::, sll=00:00:00:00:00:00/00:00:00:00:00:00, tll=00:00:00:00:00:00/00:00:00:00:00:00))), actions:drop conntrack - zones from other field, more tests +2023-11-20T10:45:43.015Z|00001|dpif(handler5)|WARN|system@ovs-system: execute ct(commit),3 failed (Invalid argument) on packet tcp, vlan_tci=0x0000,dl_src=42:7e:4b:46:68:1b,dl_dst=ba:72:4c:a5:31:6b, nw_src=10.1.1.1,nw_dst=10.1.1.2,nw_tos=0,nw_ecn=0,nw_ttl=64, nw_frag=no,tp_src=53738,tp_dst=80,tcp_flags=psh|ack tcp_csum:e4a conntrack - limit by zone ./system-traffic.at:5154: ovs-appctl dpctl/ct-get-limits zone=0,1,2,3,4,5 --- - 2023-11-20 10:51:09.965375141 +0000 +++ /home/runner/work/ovs/ovs/tests/system-kmod-testsuite.dir/at-groups/ 114/stdout 2023-11-20 10:51:09.956723756 +0000 @@ -1,5 +1,5 @@ default limit=10 -zone=0,limit=5,count=5 +zone=0,limit=5,count=6 As I do not see those failures when running these stand alone on the same Ubuntu distribution, I've disabled them. This patch also adds the 'CHECK_GITHUB_ACTION' macro to skip tests that won't execute successfully through GitHub actions. We could not use the -k !keyword option, as it can not be combined with a range of tests. Signed-off-by: Eelco Chaudron Reviewed-by: Simon Horman --- tests/system-common-macros.at | 4 ++++ tests/system-traffic.at | 3 +++ 2 files changed, 7 insertions(+) diff --git a/tests/system-common-macros.at b/tests/system-common-macros.at index 0113aae8b..0620be0c7 100644 --- a/tests/system-common-macros.at +++ b/tests/system-common-macros.at @@ -365,3 +365,7 @@ m4_define([OVS_CHECK_IPROUTE_ENCAP], # OVS_CHECK_CT_CLEAR() m4_define([OVS_CHECK_CT_CLEAR], [AT_SKIP_IF([! grep -q "Datapath supports ct_clear action" ovs-vswitchd.log])]) + +# OVS_CHECK_GITHUB_ACTION +m4_define([OVS_CHECK_GITHUB_ACTION], + [AT_SKIP_IF([test "$GITHUB_ACTIONS" = "true"])]) diff --git a/tests/system-traffic.at b/tests/system-traffic.at index 0d6f8cf21..09308ac6b 100644 --- a/tests/system-traffic.at +++ b/tests/system-traffic.at @@ -3311,6 +3311,7 @@ AT_CLEANUP AT_SETUP([conntrack - zones from other field, more tests]) CHECK_CONNTRACK() +OVS_CHECK_GITHUB_ACTION() OVS_TRAFFIC_VSWITCHD_START() ADD_NAMESPACES(at_ns0, at_ns1) @@ -5270,6 +5271,7 @@ AT_CLEANUP AT_SETUP([conntrack - limit by zone]) CHECK_CONNTRACK() +OVS_CHECK_GITHUB_ACTION() OVS_TRAFFIC_VSWITCHD_START() ADD_NAMESPACES(at_ns0, at_ns1) @@ -8099,6 +8101,7 @@ AT_CLEANUP AT_BANNER([802.1ad]) AT_SETUP([802.1ad - vlan_limit]) +OVS_CHECK_GITHUB_ACTION() OVS_TRAFFIC_VSWITCHD_START([set Open_vSwitch . other_config:vlan-limit=0]) OVS_CHECK_8021AD() From patchwork Tue Dec 19 12:42:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eelco Chaudron X-Patchwork-Id: 1877932 X-Patchwork-Delegate: echaudro@redhat.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=dnzQFx2D; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Svbv72f2mz20Gb for ; Tue, 19 Dec 2023 23:42:43 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 85E7C82F49; Tue, 19 Dec 2023 12:42:41 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 85E7C82F49 Authentication-Results: smtp1.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=dnzQFx2D X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PT-nP0Kd84pD; Tue, 19 Dec 2023 12:42:40 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp1.osuosl.org (Postfix) with ESMTPS id 23D4E82EC7; Tue, 19 Dec 2023 12:42:39 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 23D4E82EC7 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id E25E6C0072; Tue, 19 Dec 2023 12:42:38 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 25E7FC0037 for ; Tue, 19 Dec 2023 12:42:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id B3B9E82EE1 for ; Tue, 19 Dec 2023 12:42:27 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org B3B9E82EE1 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qGNd8JXBtWY7 for ; Tue, 19 Dec 2023 12:42:26 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp1.osuosl.org (Postfix) with ESMTPS id 36DFE82EF0 for ; Tue, 19 Dec 2023 12:42:26 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 36DFE82EF0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702989745; h=from:from: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=6ideDvfmQSWE1uKBJC8HVvKvJOsknCjX3HGlxtezZbQ=; b=dnzQFx2Di37X32pOeQaCKn8nlWGlllMj3vFNGRFTdhDsAZa978uFb6ym8e8SqTLDO9Ue5s cf0aAbA1NYVajdu2fkH0RDp9SCkyBWs4Z3mW6WzCcyKTJNKUp3JIjNbkasrWMyPqaCp3xF pHoMKVBgSOGNsR8fC6ziZkn2ktDcv2I= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-323-vYw8OOgnOs6lLHUTJuaG_w-1; Tue, 19 Dec 2023 07:42:22 -0500 X-MC-Unique: vYw8OOgnOs6lLHUTJuaG_w-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D641087B2A3; Tue, 19 Dec 2023 12:42:21 +0000 (UTC) Received: from localhost.localdomain (unknown [10.39.193.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id 13FE33C25; Tue, 19 Dec 2023 12:42:20 +0000 (UTC) From: Eelco Chaudron To: dev@openvswitch.org Date: Tue, 19 Dec 2023 13:42:12 +0100 Message-ID: <170298973243.1693084.14322102911267720848.stgit@ebuild> In-Reply-To: <170298960827.1693084.7524216970225185214.stgit@ebuild> References: <170298960827.1693084.7524216970225185214.stgit@ebuild> User-Agent: StGit/1.5 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: david.marchand@redhat.com, i.maximets@ovn.org Subject: [ovs-dev] [PATCH v5 05/12] ci: Fixed tests that show random failures through GitHub actions. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" I ran 80 series of full tests, and the following tests showed failures: conntrack - Multiple ICMP traverse ./system-traffic.at:7571: ovs-appctl dpctl/dump-conntrack | ... -e 's/state=[0-9_A-Z]*/state=/g' | sort | uniq --- - 2023-11-20 15:36:02.591051192 +0000 +++ /home/runner/work/ovs/ovs/tests/system-kmod-testsuite.dir/... @@ -1,2 +1,9 @@ +tcp,orig=(src=10.1.1.7,dst=13.107.43.16,sport=, dport=),reply=(src=13.107.43.16,dst=10.1.1.7,sport=, dport=),protoinfo=(state=) +tcp,orig=(src=10.1.1.7,dst=168.63.129.16,sport=, dport=),reply=(src=168.63.129.16,dst=10.1.1.7,sport=, dport=),protoinfo=(state=) ... +tcp,orig=(src=20.22.98.201,dst=10.1.1.7,sport=,dport=), reply=(src=10.1.1.7,dst=20.22.98.201,sport=,dport=), protoinfo=(state=) conntrack - ct flush +++ /home/runner/work/ovs/ovs/tests/system-kmod-testsuite.dir/... @@ -1,3 +1,5 @@ +tcp,orig=(src=10.1.1.154,dst=13.107.42.16,sport=45300,dport=443), reply=(src=13.107.42.16,dst=10.1.1.154,sport=443,dport=45300), protoinfo=(state=ESTABLISHED) +tcp,orig=(src=10.1.1.154,dst=20.72.125.48,sport=45572,dport=443), reply=(src=20.72.125.48,dst=10.1.1.154,sport=443,dport=45572), protoinfo=(state=ESTABLISHED) These tests showed local IP addresses in the results. The tests were modified to only include the IP addresses relevant to the test case. Signed-off-by: Eelco Chaudron Reviewed-by: Simon Horman --- tests/system-traffic.at | 54 ++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/tests/system-traffic.at b/tests/system-traffic.at index 09308ac6b..3cdd2f125 100644 --- a/tests/system-traffic.at +++ b/tests/system-traffic.at @@ -2706,170 +2706,170 @@ AT_CHECK([ovs-ofctl -O OpenFlow13 packet-out br0 "in_port=1 packet=50540000000a5 AT_CHECK([ovs-ofctl -O OpenFlow13 packet-out br0 "in_port=2 packet=50540000000a50540000000908004500001c000000000011a4cd0a0101020a0101010002000100080000 actions=resubmit(,0)"]) -AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1" | sort], [0], [dnl +AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1," | sort], [0], [dnl udp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=1,dport=2),reply=(src=10.1.1.2,dst=10.1.1.1,sport=2,dport=1),mark=170 udp,orig=(src=10.1.1.2,dst=10.1.1.1,sport=2,dport=1),reply=(src=10.1.1.1,dst=10.1.1.2,sport=1,dport=2),zone=5,labels=0xaa00000000 ]) AT_CHECK([FLUSH_CMD 'ct_nw_proto=17,ct_tp_src=1']) -AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1"], [0], [dnl +AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1,"], [0], [dnl udp,orig=(src=10.1.1.2,dst=10.1.1.1,sport=2,dport=1),reply=(src=10.1.1.1,dst=10.1.1.2,sport=1,dport=2),zone=5,labels=0xaa00000000 ]) AT_CHECK([FLUSH_CMD 'ct_nw_proto=17,ct_tp_src=2']) -AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1"], [1]) +AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1,"], [1]) dnl Test UDP from port 1 and 2, partial flush by dst port AT_CHECK([ovs-ofctl -O OpenFlow13 packet-out br0 "in_port=1 packet=50540000000a50540000000908004500001c000000000011a4cd0a0101010a0101020001000200080000 actions=resubmit(,0)"]) AT_CHECK([ovs-ofctl -O OpenFlow13 packet-out br0 "in_port=2 packet=50540000000a50540000000908004500001c000000000011a4cd0a0101020a0101010002000100080000 actions=resubmit(,0)"]) -AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1" | sort], [0], [dnl +AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1," | sort], [0], [dnl udp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=1,dport=2),reply=(src=10.1.1.2,dst=10.1.1.1,sport=2,dport=1),mark=170 udp,orig=(src=10.1.1.2,dst=10.1.1.1,sport=2,dport=1),reply=(src=10.1.1.1,dst=10.1.1.2,sport=1,dport=2),zone=5,labels=0xaa00000000 ]) AT_CHECK([FLUSH_CMD 'ct_nw_proto=17,ct_tp_dst=2']) -AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1"], [0], [dnl +AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1,"], [0], [dnl udp,orig=(src=10.1.1.2,dst=10.1.1.1,sport=2,dport=1),reply=(src=10.1.1.1,dst=10.1.1.2,sport=1,dport=2),zone=5,labels=0xaa00000000 ]) AT_CHECK([FLUSH_CMD 'ct_nw_proto=17,ct_tp_dst=1']) -AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1"], [1]) +AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1,"], [1]) dnl Test UDP from port 1 and 2, partial flush by src address AT_CHECK([ovs-ofctl -O OpenFlow13 packet-out br0 "in_port=1 packet=50540000000a50540000000908004500001c000000000011a4cd0a0101010a0101020001000200080000 actions=resubmit(,0)"]) AT_CHECK([ovs-ofctl -O OpenFlow13 packet-out br0 "in_port=2 packet=50540000000a50540000000908004500001c000000000011a4cd0a0101020a0101010002000100080000 actions=resubmit(,0)"]) -AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1" | sort], [0], [dnl +AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1," | sort], [0], [dnl udp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=1,dport=2),reply=(src=10.1.1.2,dst=10.1.1.1,sport=2,dport=1),mark=170 udp,orig=(src=10.1.1.2,dst=10.1.1.1,sport=2,dport=1),reply=(src=10.1.1.1,dst=10.1.1.2,sport=1,dport=2),zone=5,labels=0xaa00000000 ]) AT_CHECK([FLUSH_CMD 'ct_nw_src=10.1.1.1']) -AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1"], [0], [dnl +AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1,"], [0], [dnl udp,orig=(src=10.1.1.2,dst=10.1.1.1,sport=2,dport=1),reply=(src=10.1.1.1,dst=10.1.1.2,sport=1,dport=2),zone=5,labels=0xaa00000000 ]) AT_CHECK([FLUSH_CMD 'ct_nw_src=10.1.1.2']) -AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1"], [1]) +AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1,"], [1]) dnl Test UDP from port 1 and 2, partial flush by dst address AT_CHECK([ovs-ofctl -O OpenFlow13 packet-out br0 "in_port=1 packet=50540000000a50540000000908004500001c000000000011a4cd0a0101010a0101020001000200080000 actions=resubmit(,0)"]) AT_CHECK([ovs-ofctl -O OpenFlow13 packet-out br0 "in_port=2 packet=50540000000a50540000000908004500001c000000000011a4cd0a0101020a0101010002000100080000 actions=resubmit(,0)"]) -AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1" | sort], [0], [dnl +AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1," | sort], [0], [dnl udp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=1,dport=2),reply=(src=10.1.1.2,dst=10.1.1.1,sport=2,dport=1),mark=170 udp,orig=(src=10.1.1.2,dst=10.1.1.1,sport=2,dport=1),reply=(src=10.1.1.1,dst=10.1.1.2,sport=1,dport=2),zone=5,labels=0xaa00000000 ]) AT_CHECK([FLUSH_CMD 'ct_nw_dst=10.1.1.2']) -AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1"], [0], [dnl +AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1,"], [0], [dnl udp,orig=(src=10.1.1.2,dst=10.1.1.1,sport=2,dport=1),reply=(src=10.1.1.1,dst=10.1.1.2,sport=1,dport=2),zone=5,labels=0xaa00000000 ]) AT_CHECK([FLUSH_CMD 'ct_nw_dst=10.1.1.1']) -AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1"], [1]) +AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1,"], [1]) dnl Test UDP from port 1 and 2, partial flush by src address in reply direction AT_CHECK([ovs-ofctl -O OpenFlow13 packet-out br0 "in_port=1 packet=50540000000a50540000000908004500001c000000000011a4cd0a0101010a0101020001000200080000 actions=resubmit(,0)"]) AT_CHECK([ovs-ofctl -O OpenFlow13 packet-out br0 "in_port=2 packet=50540000000a50540000000908004500001c000000000011a4cd0a0101020a0101010002000100080000 actions=resubmit(,0)"]) -AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1" | sort], [0], [dnl +AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1," | sort], [0], [dnl udp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=1,dport=2),reply=(src=10.1.1.2,dst=10.1.1.1,sport=2,dport=1),mark=170 udp,orig=(src=10.1.1.2,dst=10.1.1.1,sport=2,dport=1),reply=(src=10.1.1.1,dst=10.1.1.2,sport=1,dport=2),zone=5,labels=0xaa00000000 ]) AT_CHECK([FLUSH_CMD '' 'ct_nw_src=10.1.1.2']) -AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1"], [0], [dnl +AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1,"], [0], [dnl udp,orig=(src=10.1.1.2,dst=10.1.1.1,sport=2,dport=1),reply=(src=10.1.1.1,dst=10.1.1.2,sport=1,dport=2),zone=5,labels=0xaa00000000 ]) AT_CHECK([FLUSH_CMD zone=5 '' 'ct_nw_src=10.1.1.1']) -AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1"], [1]) +AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1,"], [1]) dnl Test UDP from port 1 and 2, flush without arguments AT_CHECK([ovs-ofctl -O OpenFlow13 packet-out br0 "in_port=1 packet=50540000000a50540000000908004500001c000000000011a4cd0a0101010a0101020001000200080000 actions=resubmit(,0)"]) AT_CHECK([ovs-ofctl -O OpenFlow13 packet-out br0 "in_port=2 packet=50540000000a50540000000908004500001c000000000011a4cd0a0101020a0101010002000100080000 actions=resubmit(,0)"]) -AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1" | sort], [0], [dnl +AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1," | sort], [0], [dnl udp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=1,dport=2),reply=(src=10.1.1.2,dst=10.1.1.1,sport=2,dport=1),mark=170 udp,orig=(src=10.1.1.2,dst=10.1.1.1,sport=2,dport=1),reply=(src=10.1.1.1,dst=10.1.1.2,sport=1,dport=2),zone=5,labels=0xaa00000000 ]) AT_CHECK([FLUSH_CMD]) -AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1"], [1]) +AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1,"], [1]) dnl Test SCTP flush based on port. AT_CHECK([ovs-ofctl -O OpenFlow13 packet-out br0 "in_port=1 packet=50540000000a50540000000908004500003400010000408464410a0101010a01010200010002000000009178f7d30100001470e18ccc00000000000a000a00000000 actions=resubmit(,0)"]) AT_CHECK([ovs-ofctl -O OpenFlow13 packet-out br0 "in_port=2 packet=50540000000950540000000a08004500003400010000408464410a0101020a010101000200010000000098f29e470100001470e18ccc00000000000a000a00000000 actions=resubmit(,0)"]) -AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1" | sed "s/,protoinfo=.*$//" | sort], [0], [dnl +AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1," | sed "s/,protoinfo=.*$//" | sort], [0], [dnl sctp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=1,dport=2),reply=(src=10.1.1.2,dst=10.1.1.1,sport=2,dport=1),mark=170 sctp,orig=(src=10.1.1.2,dst=10.1.1.1,sport=2,dport=1),reply=(src=10.1.1.1,dst=10.1.1.2,sport=1,dport=2),zone=5,labels=0xaa00000000 ]) AT_CHECK([FLUSH_CMD 'ct_nw_src=10.1.1.1,ct_nw_proto=132,ct_tp_src=1,ct_tp_dst=2']) -AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1" | sed "s/,protoinfo=.*$//" | sort], [0], [dnl +AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1," | sed "s/,protoinfo=.*$//" | sort], [0], [dnl sctp,orig=(src=10.1.1.2,dst=10.1.1.1,sport=2,dport=1),reply=(src=10.1.1.1,dst=10.1.1.2,sport=1,dport=2),zone=5,labels=0xaa00000000 ]) AT_CHECK([FLUSH_CMD 'ct_nw_src=10.1.1.2,ct_nw_proto=132,ct_tp_src=2,ct_tp_dst=1']) -AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1"], [1]) +AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1,"], [1]) dnl Test UDP from port 1 and 2, partial flush by mark and labels. AT_CHECK([ovs-ofctl -O OpenFlow13 packet-out br0 "in_port=1 packet=50540000000a50540000000908004500001c000000000011a4cd0a0101010a0101020001000200080000 actions=resubmit(,0)"]) AT_CHECK([ovs-ofctl -O OpenFlow13 packet-out br0 "in_port=2 packet=50540000000a50540000000908004500001c000000000011a4cd0a0101020a0101010002000100080000 actions=resubmit(,0)"]) -AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1" | sort], [0], [dnl +AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1," | sort], [0], [dnl udp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=1,dport=2),reply=(src=10.1.1.2,dst=10.1.1.1,sport=2,dport=1),mark=170 udp,orig=(src=10.1.1.2,dst=10.1.1.1,sport=2,dport=1),reply=(src=10.1.1.1,dst=10.1.1.2,sport=1,dport=2),zone=5,labels=0xaa00000000 ]) AT_CHECK([FLUSH_CMD mark=0xaa]) -AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1"], [0], [dnl +AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1,"], [0], [dnl udp,orig=(src=10.1.1.2,dst=10.1.1.1,sport=2,dport=1),reply=(src=10.1.1.1,dst=10.1.1.2,sport=1,dport=2),zone=5,labels=0xaa00000000 ]) AT_CHECK([FLUSH_CMD labels=0xaa00000000]) -AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1"], [1]) +AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1,"], [1]) AT_CHECK([ovs-ofctl -O OpenFlow13 packet-out br0 "in_port=1 packet=50540000000a50540000000908004500001c000000000011a4cd0a0101010a0101020001000200080000 actions=resubmit(,0)"]) AT_CHECK([ovs-ofctl -O OpenFlow13 packet-out br0 "in_port=2 packet=50540000000a50540000000908004500001c000000000011a4cd0a0101020a0101010002000100080000 actions=resubmit(,0)"]) -AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1" | sort], [0], [dnl +AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1," | sort], [0], [dnl udp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=1,dport=2),reply=(src=10.1.1.2,dst=10.1.1.1,sport=2,dport=1),mark=170 udp,orig=(src=10.1.1.2,dst=10.1.1.1,sport=2,dport=1),reply=(src=10.1.1.1,dst=10.1.1.2,sport=1,dport=2),zone=5,labels=0xaa00000000 ]) AT_CHECK([FLUSH_CMD mark=2/2]) -AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1"], [0], [dnl +AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1,"], [0], [dnl udp,orig=(src=10.1.1.2,dst=10.1.1.1,sport=2,dport=1),reply=(src=10.1.1.1,dst=10.1.1.2,sport=1,dport=2),zone=5,labels=0xaa00000000 ]) AT_CHECK([FLUSH_CMD labels=0x0200000000/0x0200000000]) -AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1"], [1]) +AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1,"], [1]) dnl Test flush with invalid arguments. @@ -7852,7 +7852,7 @@ NS_CHECK_EXEC([at_ns0], [$PYTHON3 $srcdir/sendpkt.py p0 f0 00 00 01 01 02 f0 00 sleep 1 dnl ensure CT picked up the packet -AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1)], [0], [dnl +AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl icmp,orig=(src=10.1.1.1,dst=10.1.1.2,id=,type=8,code=0),reply=(src=10.1.1.2,dst=10.1.1.1,id=,type=0,code=0) ]) From patchwork Tue Dec 19 12:42:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eelco Chaudron X-Patchwork-Id: 1877933 X-Patchwork-Delegate: echaudro@redhat.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=IsF3I9ta; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SvbvG3JWlz20Gb for ; Tue, 19 Dec 2023 23:42:50 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id A381182FEA; Tue, 19 Dec 2023 12:42:48 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org A381182FEA Authentication-Results: smtp1.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=IsF3I9ta X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qNsGMjUOm52R; Tue, 19 Dec 2023 12:42:47 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id C692A82FAE; Tue, 19 Dec 2023 12:42:46 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org C692A82FAE Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id AC3CCC0072; Tue, 19 Dec 2023 12:42:46 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 054F9C0037 for ; Tue, 19 Dec 2023 12:42:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 9776F61463 for ; Tue, 19 Dec 2023 12:42:42 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 9776F61463 Authentication-Results: smtp3.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=IsF3I9ta X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KcDOw5GVlxZq for ; Tue, 19 Dec 2023 12:42:42 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp3.osuosl.org (Postfix) with ESMTPS id C48AC6145D for ; Tue, 19 Dec 2023 12:42:41 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org C48AC6145D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702989760; h=from:from: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=7WgcCNaG9uDHiT669uTQU2ErSXjUhEwWHy9FPAAbyTs=; b=IsF3I9taztJx0lQUZvA5BZzwYmgcf1QB2R8ZFa2E24jzDeH2Lg4CJTNbNmHmEkNoPJ+f9j 7DXBYPuvwtP2XVmtat5hDOOQbJ9Wau9oiWd2whdR6ozIynewyEO895Tqrx/pJsMZQAzBBj 7WJlrlaq0QSsFdkfwpJUiGCIgA/PsUU= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-313-K1aR8AUoPJuz-5OV5Uu40A-1; Tue, 19 Dec 2023 07:42:36 -0500 X-MC-Unique: K1aR8AUoPJuz-5OV5Uu40A-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 457AB185A781; Tue, 19 Dec 2023 12:42:36 +0000 (UTC) Received: from localhost.localdomain (unknown [10.39.193.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8E5C0C159B0; Tue, 19 Dec 2023 12:42:35 +0000 (UTC) From: Eelco Chaudron To: dev@openvswitch.org Date: Tue, 19 Dec 2023 13:42:27 +0100 Message-ID: <170298974703.1693084.17716611524565434881.stgit@ebuild> In-Reply-To: <170298960827.1693084.7524216970225185214.stgit@ebuild> References: <170298960827.1693084.7524216970225185214.stgit@ebuild> User-Agent: StGit/1.5 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: david.marchand@redhat.com, i.maximets@ovn.org Subject: [ovs-dev] [PATCH v5 06/12] ci: Add make check-kernel to GitHub actions ci. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" This patch adds 'make check-kernel' to the GitHub actions ci. However, to do this, some additional changes were needed. First, some of the missing test and package dependencies had to be added. Finally, we added an option to the GitHub run matrix that allows the tests to be split up, to avoid lengthy single test runs. Signed-off-by: Eelco Chaudron Acked-by: Simon Horman --- .ci/linux-build.sh | 3 ++- .github/workflows/build-and-test.yml | 11 ++++++++++- python/test_requirements.txt | 4 +++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh index bb540703e..05b944ead 100755 --- a/.ci/linux-build.sh +++ b/.ci/linux-build.sh @@ -138,7 +138,8 @@ else [ "$(cat /proc/sys/vm/nr_hugepages)" = '1024' ] export DPDK_EAL_OPTIONS="--lcores 0@1,1@1,2@1" fi - $run_as_root make $testsuite TESTSUITEFLAGS=${JOBS} RECHECK=yes + $run_as_root make $testsuite TESTSUITEFLAGS="${JOBS} ${TEST_RANGE}" \ + RECHECK=yes done fi diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index acb57ac46..0b881ca91 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -76,7 +76,8 @@ jobs: env: dependencies: | automake libtool gcc bc libjemalloc2 libjemalloc-dev libssl-dev \ - llvm-dev libnuma-dev libpcap-dev selinux-policy-dev libbpf-dev + llvm-dev libnuma-dev libpcap-dev selinux-policy-dev libbpf-dev \ + lftp libreswan ASAN: ${{ matrix.asan }} UBSAN: ${{ matrix.ubsan }} CC: ${{ matrix.compiler }} @@ -87,6 +88,7 @@ jobs: OPTS: ${{ matrix.opts }} STD: ${{ matrix.std }} TESTSUITE: ${{ matrix.testsuite }} + TEST_RANGE: ${{ matrix.test_range }} name: linux ${{ join(matrix.*, ' ') }} runs-on: ubuntu-22.04 @@ -167,6 +169,13 @@ jobs: - compiler: gcc testsuite: check-ovsdb-cluster + - compiler: gcc + testsuite: check-kernel + test_range: "-100" + - compiler: gcc + testsuite: check-kernel + test_range: "100-" + steps: - name: checkout uses: actions/checkout@v3 diff --git a/python/test_requirements.txt b/python/test_requirements.txt index 6aaee13e3..c85ce41ad 100644 --- a/python/test_requirements.txt +++ b/python/test_requirements.txt @@ -1,3 +1,5 @@ -pytest netaddr +pyftpdlib pyparsing +pytest +tftpy From patchwork Tue Dec 19 12:42:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eelco Chaudron X-Patchwork-Id: 1877934 X-Patchwork-Delegate: echaudro@redhat.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=g4s+eBrr; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Svbvv4zQvz20Gb for ; Tue, 19 Dec 2023 23:43:23 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id CEC62435AD; Tue, 19 Dec 2023 12:43:21 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org CEC62435AD Authentication-Results: smtp2.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=g4s+eBrr X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DEvhA4jsudpE; Tue, 19 Dec 2023 12:43:20 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp2.osuosl.org (Postfix) with ESMTPS id A3650435A4; Tue, 19 Dec 2023 12:43:19 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org A3650435A4 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 88893C0072; Tue, 19 Dec 2023 12:43:19 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 057B6C0037 for ; Tue, 19 Dec 2023 12:43:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id C8DE6435A7 for ; Tue, 19 Dec 2023 12:42:56 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org C8DE6435A7 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CN_PRwtMAG-f for ; Tue, 19 Dec 2023 12:42:55 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp2.osuosl.org (Postfix) with ESMTPS id BA620435CC for ; Tue, 19 Dec 2023 12:42:55 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org BA620435CC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702989774; h=from:from: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=aClckPqlxABp+oiPdeOfo8R3Hja9YRIA1iUhrV+LEjc=; b=g4s+eBrrT9AH1FontToCGgBf07uXzz+nRboYWwQlV/1v8BtGtlmqCDddzE2ewiEs7YC9LA 59uohpI8yqTLp7xCO5Mei86bkN1jqU3gPt6h5QLAxTwOzX49fCkPWY5RNpFvygeoOTiDyD DB9fD6GK2HONBRHQgvnd9exKG/v7O8g= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-677-A3oCUle4NgCMgk4XhFx8mg-1; Tue, 19 Dec 2023 07:42:50 -0500 X-MC-Unique: A3oCUle4NgCMgk4XhFx8mg-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 44C0387B2A0; Tue, 19 Dec 2023 12:42:50 +0000 (UTC) Received: from localhost.localdomain (unknown [10.39.193.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8D364492BC6; Tue, 19 Dec 2023 12:42:49 +0000 (UTC) From: Eelco Chaudron To: dev@openvswitch.org Date: Tue, 19 Dec 2023 13:42:41 +0100 Message-ID: <170298976144.1693084.2729584951535041024.stgit@ebuild> In-Reply-To: <170298960827.1693084.7524216970225185214.stgit@ebuild> References: <170298960827.1693084.7524216970225185214.stgit@ebuild> User-Agent: StGit/1.5 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: david.marchand@redhat.com, i.maximets@ovn.org Subject: [ovs-dev] [PATCH v5 07/12] ci: Add make check-offloads to GitHub actions ci. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" This patch also adds the 'CHECK_GITHUB_ACTION' macro to skip tests that won't execute successfully through GitHub actions. We could not use the -k !keyword option, as it can not be combined with a range of tests. Signed-off-by: Eelco Chaudron Acked-by: Simon Horman --- .ci/linux-build.sh | 2 +- .github/workflows/build-and-test.yml | 7 +++++++ tests/system-offloads-traffic.at | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh index 05b944ead..90581c10b 100755 --- a/.ci/linux-build.sh +++ b/.ci/linux-build.sh @@ -131,7 +131,7 @@ else run_as_root= if [ "$testsuite" != "check" ] && \ [ "$testsuite" != "check-ovsdb-cluster" ] ; then - run_as_root="sudo -E PATH=$PATH" + run_as_root="sudo -E PATH=$PATH GITHUB_ACTIONS=$GITHUB_ACTIONS" fi if [ "${testsuite##*dpdk}" != "$testsuite" ]; then sudo sh -c 'echo 1024 > /proc/sys/vm/nr_hugepages' || true diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 0b881ca91..586b0cdd9 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -176,6 +176,13 @@ jobs: testsuite: check-kernel test_range: "100-" + - compiler: gcc + testsuite: check-offloads + test_range: "-100" + - compiler: gcc + testsuite: check-offloads + test_range: "100-" + steps: - name: checkout uses: actions/checkout@v3 diff --git a/tests/system-offloads-traffic.at b/tests/system-offloads-traffic.at index 0bedee753..6bd49a3ee 100644 --- a/tests/system-offloads-traffic.at +++ b/tests/system-offloads-traffic.at @@ -192,6 +192,7 @@ AT_CLEANUP AT_SETUP([offloads - check interface meter offloading - offloads disabled]) AT_KEYWORDS([dp-meter]) AT_SKIP_IF([test $HAVE_NC = "no"]) +OVS_CHECK_GITHUB_ACTION() OVS_TRAFFIC_VSWITCHD_START() AT_CHECK([ovs-ofctl -O OpenFlow13 add-meter br0 'meter=1 pktps bands=type=drop rate=1']) @@ -240,6 +241,7 @@ AT_CLEANUP AT_SETUP([offloads - check interface meter offloading - offloads enabled]) AT_KEYWORDS([offload-meter]) +OVS_CHECK_GITHUB_ACTION() CHECK_TC_INGRESS_PPS() AT_SKIP_IF([test $HAVE_NC = "no"]) OVS_TRAFFIC_VSWITCHD_START([], [], [-- set Open_vSwitch . other_config:hw-offload=true]) From patchwork Tue Dec 19 12:42:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eelco Chaudron X-Patchwork-Id: 1877935 X-Patchwork-Delegate: echaudro@redhat.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=KLSSAki3; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SvbwB4sDfz20Gb for ; Tue, 19 Dec 2023 23:43:38 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id CB8D281423; Tue, 19 Dec 2023 12:43:36 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org CB8D281423 Authentication-Results: smtp1.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=KLSSAki3 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zVOvqXZdj0-O; Tue, 19 Dec 2023 12:43:35 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id C3F8282521; Tue, 19 Dec 2023 12:43:34 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org C3F8282521 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 97D84C008E; Tue, 19 Dec 2023 12:43:34 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 35B1EC0037 for ; Tue, 19 Dec 2023 12:43:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 6D3774097B for ; Tue, 19 Dec 2023 12:43:09 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 6D3774097B Authentication-Results: smtp4.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=KLSSAki3 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id csxjjVDvc9t2 for ; Tue, 19 Dec 2023 12:43:08 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp4.osuosl.org (Postfix) with ESMTPS id C35E3401A2 for ; Tue, 19 Dec 2023 12:43:08 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org C35E3401A2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702989787; h=from:from: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=699d41bDwCBOYqUaMPWJJlsJneINns8ZYl4+grr8yZE=; b=KLSSAki3P2EOqmbIFSBwxe6jM1aG4sra2X8X2iAQFAQ6hMx4Y7ueaHoGj1knFM1xm75u13 xBUYV2ljJNMO5tZfCOEaF4dL/LaIaiYdEKAfrit7U65BdZg0U4X1K77/SJd4OQGXOZ3vUR Uepf2QHZsOIwuaE3SbCNk+T09+4X+Jo= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-626-sIv_84TxNSKBQt159UqJAA-1; Tue, 19 Dec 2023 07:43:04 -0500 X-MC-Unique: sIv_84TxNSKBQt159UqJAA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 84E31101AA49; Tue, 19 Dec 2023 12:43:04 +0000 (UTC) Received: from localhost.localdomain (unknown [10.39.193.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id CB379492BF0; Tue, 19 Dec 2023 12:43:03 +0000 (UTC) From: Eelco Chaudron To: dev@openvswitch.org Date: Tue, 19 Dec 2023 13:42:55 +0100 Message-ID: <170298977544.1693084.2015219069752403022.stgit@ebuild> In-Reply-To: <170298960827.1693084.7524216970225185214.stgit@ebuild> References: <170298960827.1693084.7524216970225185214.stgit@ebuild> User-Agent: StGit/1.5 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: david.marchand@redhat.com, i.maximets@ovn.org Subject: [ovs-dev] [PATCH v5 08/12] ci: Add make check-system-userspace to GitHub actions ci. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" This patch adds 'make check-system-userspace' to the GitHub actions ci. The tests are not split into two seperate test runs as they complete in around 10 minutes. Signed-off-by: Eelco Chaudron Acked-by: Simon Horman --- .github/workflows/build-and-test.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 586b0cdd9..db0a1ac39 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -183,6 +183,10 @@ jobs: testsuite: check-offloads test_range: "100-" + - compiler: gcc + dpdk: dpdk + testsuite: check-system-userspace + steps: - name: checkout uses: actions/checkout@v3 From patchwork Tue Dec 19 12:43:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eelco Chaudron X-Patchwork-Id: 1877936 X-Patchwork-Delegate: echaudro@redhat.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=YhldskLI; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SvbxC2YM2z20Gb for ; Tue, 19 Dec 2023 23:44:31 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 8A66B41E33; Tue, 19 Dec 2023 12:44:29 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 8A66B41E33 Authentication-Results: smtp4.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=YhldskLI X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id P3SONrvQWnsu; Tue, 19 Dec 2023 12:44:28 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp4.osuosl.org (Postfix) with ESMTPS id AC27741E19; Tue, 19 Dec 2023 12:44:27 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org AC27741E19 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 816C2C008E; Tue, 19 Dec 2023 12:44:27 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 4ACCBC0072 for ; Tue, 19 Dec 2023 12:44:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 230BB61484 for ; Tue, 19 Dec 2023 12:44:05 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 230BB61484 Authentication-Results: smtp3.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=YhldskLI X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rm8VDxqFXznH for ; Tue, 19 Dec 2023 12:44:04 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp3.osuosl.org (Postfix) with ESMTPS id 737D561458 for ; Tue, 19 Dec 2023 12:44:04 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 737D561458 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702989843; h=from:from: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=fsvMyfm6meXtfXCBYW7WToP68XF8xOR2eTijuyi8Hn0=; b=YhldskLImw/n55/4UwFovHuc3IC2b5jiRo+Os6UYF9+6/yAtRS6Q1syd1wvLcBa+8XLlI1 XPzX2HHSWQcNGfcXfqbgLrBaKa1pUgFvXI/tHiPARxNtsyzCMOqnyOJRG8orRz9y75MQJQ mpYBjCqe82yblC5wlGWvOlU3CIlhaEQ= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-135-VIHopCMBOpi8GdinMYHW4A-1; Tue, 19 Dec 2023 07:44:00 -0500 X-MC-Unique: VIHopCMBOpi8GdinMYHW4A-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 42EF1832D1B; Tue, 19 Dec 2023 12:44:00 +0000 (UTC) Received: from localhost.localdomain (unknown [10.39.193.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8DE121121306; Tue, 19 Dec 2023 12:43:59 +0000 (UTC) From: Eelco Chaudron To: dev@openvswitch.org Date: Tue, 19 Dec 2023 13:43:09 +0100 Message-ID: <170298978969.1693084.6678333231090756351.stgit@ebuild> In-Reply-To: <170298960827.1693084.7524216970225185214.stgit@ebuild> References: <170298960827.1693084.7524216970225185214.stgit@ebuild> User-Agent: StGit/1.5 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: david.marchand@redhat.com, i.maximets@ovn.org Subject: [ovs-dev] [PATCH v5 09/12] ci: Add make check-system-tso to GitHub actions ci. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" This patch adds 'make check-system-tso' to the GitHub actions ci. Signed-off-by: Eelco Chaudron Acked-by: Simon Horman --- .github/workflows/build-and-test.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index db0a1ac39..d74668f61 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -187,6 +187,10 @@ jobs: dpdk: dpdk testsuite: check-system-userspace + - compiler: gcc + dpdk: dpdk + testsuite: check-system-tso + steps: - name: checkout uses: actions/checkout@v3 From patchwork Tue Dec 19 12:44:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eelco Chaudron X-Patchwork-Id: 1877937 X-Patchwork-Delegate: echaudro@redhat.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=geVgNnrQ; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SvbxZ6fjZz20Gb for ; Tue, 19 Dec 2023 23:44:50 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 2A3C741E39; Tue, 19 Dec 2023 12:44:49 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 2A3C741E39 Authentication-Results: smtp4.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=geVgNnrQ X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wP3zxG_C-ivF; Tue, 19 Dec 2023 12:44:48 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp4.osuosl.org (Postfix) with ESMTPS id 6E4784026F; Tue, 19 Dec 2023 12:44:47 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 6E4784026F Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 546A6C008E; Tue, 19 Dec 2023 12:44:47 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 0B55FC0037 for ; Tue, 19 Dec 2023 12:44:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id BF26682EB4 for ; Tue, 19 Dec 2023 12:44:27 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org BF26682EB4 Authentication-Results: smtp1.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=geVgNnrQ X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9OtmIa9vq4ww for ; Tue, 19 Dec 2023 12:44:27 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp1.osuosl.org (Postfix) with ESMTPS id 0562F82F57 for ; Tue, 19 Dec 2023 12:44:26 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 0562F82F57 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702989865; h=from:from: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=owdaUbRi2JpDOag+jChkfSUvMrnYdJ2AXQ3gwfV4vHQ=; b=geVgNnrQqZpCZgC4D3wcoma6nX10CIV+VAePClJbUJwGN5JaueFJfuMTx3EnsvTqExwld7 kGnICIVyTIODbSV78JNkkyfDZ/WYlbj507vrxrtQJQenYYYqmcIt/xlLECNBXiPmJFdQ3y 0szaHvx4USzthko6pcy5nMZX8DVZ18s= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-372-9XoRh-fmNoud_Hn5J8LNqw-1; Tue, 19 Dec 2023 07:44:24 -0500 X-MC-Unique: 9XoRh-fmNoud_Hn5J8LNqw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 422EE3812583; Tue, 19 Dec 2023 12:44:24 +0000 (UTC) Received: from localhost.localdomain (unknown [10.39.193.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8D8E251D5; Tue, 19 Dec 2023 12:44:23 +0000 (UTC) From: Eelco Chaudron To: dev@openvswitch.org Date: Tue, 19 Dec 2023 13:44:05 +0100 Message-ID: <170298984542.1693084.5034519954309077305.stgit@ebuild> In-Reply-To: <170298960827.1693084.7524216970225185214.stgit@ebuild> References: <170298960827.1693084.7524216970225185214.stgit@ebuild> User-Agent: StGit/1.5 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: david.marchand@redhat.com, i.maximets@ovn.org Subject: [ovs-dev] [PATCH v5 10/12] ci: Fix dpdk build cache key generation. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" When new drivers are introduced, the cache key is not accurately computed. Before the commit 1a1b3106d90e ("ci: Separate DPDK from OVS build."), the DPDK build process was integrated in .ci/linux-{setup,build}.sh scripts, where specific lines were employed to generate the key. Since it is now separated in .ci/dpdk-{setup,build}.sh, this patch computes the key based on the content of those dedicated scripts. Fixes: 4e90baca89f0 ("system-dpdk: Run traffic tests.") Signed-off-by: Eelco Chaudron Acked-by: Simon Horman Reviewed-by: David Marchand --- .github/workflows/build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index d74668f61..e9a2714fb 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -30,7 +30,7 @@ jobs: # This also allows us to use cache from any branch as long as version # and a way we're building DPDK stays the same. run: | - grep -irE 'RTE_|DPDK|meson|ninja' .ci/dpdk-* > dpdk-ci-signature + cat .ci/dpdk-* > dpdk-ci-signature grep -rwE 'DPDK_GIT|DPDK_VER' .github/ >> dpdk-ci-signature if [ "${DPDK_VER##refs/*/}" != "${DPDK_VER}" ]; then git ls-remote --heads $DPDK_GIT $DPDK_VER >> dpdk-ci-signature From patchwork Tue Dec 19 12:44:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eelco Chaudron X-Patchwork-Id: 1877938 X-Patchwork-Delegate: echaudro@redhat.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=RuQIzrO5; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Svbyk6PlTz1ydg for ; Tue, 19 Dec 2023 23:45:50 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 544786146F; Tue, 19 Dec 2023 12:45:48 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 544786146F Authentication-Results: smtp3.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=RuQIzrO5 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yCae5iyswzB4; Tue, 19 Dec 2023 12:45:47 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp3.osuosl.org (Postfix) with ESMTPS id 4E37C60A7A; Tue, 19 Dec 2023 12:45:46 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 4E37C60A7A Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 26AD3C0072; Tue, 19 Dec 2023 12:45:46 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) by lists.linuxfoundation.org (Postfix) with ESMTP id E75E5C0037 for ; Tue, 19 Dec 2023 12:45:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id C322D4026F for ; Tue, 19 Dec 2023 12:45:44 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org C322D4026F Authentication-Results: smtp4.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=RuQIzrO5 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bFxDLsgIjiHZ for ; Tue, 19 Dec 2023 12:45:43 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp4.osuosl.org (Postfix) with ESMTPS id B219C401B8 for ; Tue, 19 Dec 2023 12:45:43 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org B219C401B8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702989942; h=from:from: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=1tq0Y7K/b2C2DXbvc8tmqJZgzRnYQDxKxkFQMYcUNFo=; b=RuQIzrO5syRtnhOSy1EYE8e/xQr1txUBGRC7M2LNFtlF5q2LsmvZliARmUBV/rGj/azKi9 Ng92AzfGPEUnwD23Nn71UtnvAhJiphXvvoyxVEcVWX+biCfebc9fwkCVFHEAllT4hCTG+e DmUc+51+v9H4IT+NQKJnN0DbQHYPMeM= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-365-oMP63A7sMfedDyVEU5uUnw-1; Tue, 19 Dec 2023 07:45:39 -0500 X-MC-Unique: oMP63A7sMfedDyVEU5uUnw-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4794A88F560; Tue, 19 Dec 2023 12:45:39 +0000 (UTC) Received: from localhost.localdomain (unknown [10.39.193.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8FDA1492BC6; Tue, 19 Dec 2023 12:45:38 +0000 (UTC) From: Eelco Chaudron To: dev@openvswitch.org Date: Tue, 19 Dec 2023 13:44:29 +0100 Message-ID: <170298986942.1693084.8364060269011072888.stgit@ebuild> In-Reply-To: <170298960827.1693084.7524216970225185214.stgit@ebuild> References: <170298960827.1693084.7524216970225185214.stgit@ebuild> User-Agent: StGit/1.5 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: david.marchand@redhat.com, i.maximets@ovn.org Subject: [ovs-dev] [PATCH v5 11/12] ci: Allow make check-dpdk to run the MFEX tests. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Currently, if you use the python/test_requirements.txt file to set up your test environment the MFEX tests will be skipped due to the Scapy package not being included. This is fixed as part of this patch. The test case change will make sure the 'MFEX Configuration' test will run without the need for Scapy and its auto-generated tests. In addition, we exclude the traffic-related MFEX tests from running on GitHub actions due to limited resources. Signed-off-by: Eelco Chaudron Acked-by: Simon Horman --- .ci/dpdk-build.sh | 2 +- .github/workflows/build-and-test.yml | 2 +- python/test_requirements.txt | 1 + tests/system-dpdk.at | 6 +++--- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.ci/dpdk-build.sh b/.ci/dpdk-build.sh index aa83e4464..d4c178ee0 100755 --- a/.ci/dpdk-build.sh +++ b/.ci/dpdk-build.sh @@ -38,7 +38,7 @@ function build_dpdk() # any DPDK driver. # check-dpdk unit tests requires testpmd and some net/ driver. DPDK_OPTS="$DPDK_OPTS -Denable_apps=test-pmd" - enable_drivers="net/null,net/af_xdp,net/tap,net/virtio" + enable_drivers="net/null,net/af_xdp,net/tap,net/virtio,net/pcap" DPDK_OPTS="$DPDK_OPTS -Denable_drivers=$enable_drivers" # Install DPDK using prefix. diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index e9a2714fb..1e92a0e2b 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -5,7 +5,7 @@ on: [push, pull_request] jobs: build-dpdk: env: - dependencies: gcc libbpf-dev libnuma-dev ninja-build pkgconf + dependencies: gcc libbpf-dev libnuma-dev libpcap-dev ninja-build pkgconf CC: gcc DPDK_GIT: https://dpdk.org/git/dpdk-stable DPDK_VER: 22.11.1 diff --git a/python/test_requirements.txt b/python/test_requirements.txt index c85ce41ad..5043c71e2 100644 --- a/python/test_requirements.txt +++ b/python/test_requirements.txt @@ -2,4 +2,5 @@ netaddr pyftpdlib pyparsing pytest +scapy tftpy diff --git a/tests/system-dpdk.at b/tests/system-dpdk.at index af092a200..d19062d98 100644 --- a/tests/system-dpdk.at +++ b/tests/system-dpdk.at @@ -819,6 +819,7 @@ dnl -------------------------------------------------------------------------- dnl MFEX Autovalidator AT_SETUP([OVS-DPDK - MFEX Autovalidator]) AT_KEYWORDS([dpdk]) +OVS_CHECK_GITHUB_ACTION() OVS_DPDK_PRE_CHECK() OVS_DPDK_START([--no-pci]) AT_CHECK([ovs-vsctl add-br br0 -- set bridge br0 datapath_type=netdev]) @@ -852,6 +853,7 @@ dnl -------------------------------------------------------------------------- dnl MFEX Autovalidator Fuzzy AT_SETUP([OVS-DPDK - MFEX Autovalidator Fuzzy]) AT_KEYWORDS([dpdk]) +OVS_CHECK_GITHUB_ACTION() OVS_DPDK_PRE_CHECK() OVS_DPDK_START([--no-pci]) AT_CHECK([ovs-vsctl add-br br0 -- set bridge br0 datapath_type=netdev]) @@ -886,13 +888,11 @@ dnl -------------------------------------------------------------------------- AT_SETUP([OVS-DPDK - MFEX Configuration]) AT_KEYWORDS([dpdk]) OVS_DPDK_PRE_CHECK() -AT_SKIP_IF([! $PYTHON3 -c "import scapy"], [], []) -AT_CHECK([$PYTHON3 $srcdir/mfex_fuzzy.py test_traffic.pcap 1], [], [stdout]) OVS_DPDK_START([--no-pci]) AT_CHECK([ovs-vsctl --no-wait set Open_vSwitch . other_config:pmd-cpu-mask=0x1]) dnl Add userspace bridge and attach it to OVS AT_CHECK([ovs-vsctl add-br br0 -- set bridge br0 datapath_type=netdev]) -AT_CHECK([ovs-vsctl add-port br0 p1 -- set Interface p1 type=dpdk options:dpdk-devargs=net_pcap1,rx_pcap=test_traffic.pcap,infinite_rx=1], [], [stdout], [stderr]) +AT_CHECK([ovs-vsctl add-port br0 p1 -- set Interface p1 type=dpdk options:dpdk-devargs=net_null0,no-rx=1], [], [stdout], [stderr]) AT_CHECK([ovs-vsctl show], [], [stdout]) AT_CHECK([ovs-appctl dpif-netdev/miniflow-parser-set scalar 1], [2], From patchwork Tue Dec 19 12:45:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eelco Chaudron X-Patchwork-Id: 1877956 X-Patchwork-Delegate: echaudro@redhat.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=HoaLt813; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SvcVd0ZShz20H4 for ; Wed, 20 Dec 2023 00:10:01 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 288D941D9F; Tue, 19 Dec 2023 13:09:59 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 288D941D9F Authentication-Results: smtp4.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=HoaLt813 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8zPIdW4nyS3H; Tue, 19 Dec 2023 13:09:58 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp4.osuosl.org (Postfix) with ESMTPS id 5CDB341D73; Tue, 19 Dec 2023 13:09:57 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 5CDB341D73 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 2056DC0077; Tue, 19 Dec 2023 13:09:57 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 69CE5C0037 for ; Tue, 19 Dec 2023 13:09:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 43F254098F for ; Tue, 19 Dec 2023 13:09:56 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 43F254098F Authentication-Results: smtp2.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=HoaLt813 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vPVXDBba100k for ; Tue, 19 Dec 2023 13:09:55 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp2.osuosl.org (Postfix) with ESMTPS id 6BD01404D8 for ; Tue, 19 Dec 2023 13:09:55 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 6BD01404D8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702991394; h=from:from: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=YzURxAIwtrE2QY7my22YlMV1E/IIVcZeizZRBytL/Rs=; b=HoaLt8134YgVPEWdRpt7CAX5TvwdlHCExR9iElqtOGunXMdCWgJAtBIVri4mTGCW7hRjXr /gSA7Sjdsw5ZH/tgyATiZW8+mJNVIPl+BPfcHwydbqzWqSz9hwUHd3rQayJcAq+tz23l5+ W+Ri2wzuOE96RGWxAJfa92tMY6iLbP0= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-96-NRXQqS-tMxOWRUWCWkX-fQ-1; Tue, 19 Dec 2023 08:09:51 -0500 X-MC-Unique: NRXQqS-tMxOWRUWCWkX-fQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E0E27836F21; Tue, 19 Dec 2023 13:09:50 +0000 (UTC) Received: from localhost.localdomain (unknown [10.39.193.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id 318EB3C32; Tue, 19 Dec 2023 13:09:50 +0000 (UTC) From: Eelco Chaudron To: dev@openvswitch.org Date: Tue, 19 Dec 2023 13:45:44 +0100 Message-ID: <170298994445.1693084.4376709021822835455.stgit@ebuild> In-Reply-To: <170298960827.1693084.7524216970225185214.stgit@ebuild> References: <170298960827.1693084.7524216970225185214.stgit@ebuild> User-Agent: StGit/1.5 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: david.marchand@redhat.com, i.maximets@ovn.org Subject: [ovs-dev] [PATCH v5 12/12] ci: Add make check-afxdp to GitHub actions ci. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" This patch adds 'make check-afxdp' to the GitHub actions ci. The tests are not split into two seperate test runs as they complete in around 10 minutes. Signed-off-by: Eelco Chaudron Acked-by: Simon Horman --- .github/workflows/build-and-test.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 1e92a0e2b..710757693 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -191,6 +191,10 @@ jobs: dpdk: dpdk testsuite: check-system-tso + - compiler: gcc + dpdk: dpdk + testsuite: check-afxdp + steps: - name: checkout uses: actions/checkout@v3