From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18F6AC433E0 for ; Fri, 12 Mar 2021 18:08:33 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8E7DB64F42 for ; Fri, 12 Mar 2021 18:08:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8E7DB64F42 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45018 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKmD9-0002Hb-HS for qemu-devel@archiver.kernel.org; Fri, 12 Mar 2021 13:08:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58260) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKlWJ-0007Yv-Io for qemu-devel@nongnu.org; Fri, 12 Mar 2021 12:24:15 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:34745) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lKlWG-0000hR-RQ for qemu-devel@nongnu.org; Fri, 12 Mar 2021 12:24:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615569852; 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=uuIO2eGdt8JVyaXO9PJS3Ksym7cL+qi7MdjQn9vGnDk=; b=h8Am7k0UIyo11L/DMvldRZkkf7fAXcBMayjlddwKO7A/d0vQjSEb6uEIW76FDtEb/4F6uw ncCq03NQwuP1mEsWT/RgJb+sqfb1h60femzRvDIHIFmouODrjA/ctsvGEkJsZ5S59E0DtF 9iuXB/n4/f3/+jB7IrpF4/2ysbcqtKI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-158-o5nBp8IYM9OSg762wz38SA-1; Fri, 12 Mar 2021 12:24:09 -0500 X-MC-Unique: o5nBp8IYM9OSg762wz38SA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A08F4800D62; Fri, 12 Mar 2021 17:24:08 +0000 (UTC) Received: from thuth.com (ovpn-112-83.ams2.redhat.com [10.36.112.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id 942BF19744; Fri, 12 Mar 2021 17:24:07 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 6/9] gitlab-ci.yml: Merge check-crypto-old jobs into the build-crypto-old jobs Date: Fri, 12 Mar 2021 18:23:53 +0100 Message-Id: <20210312172356.968219-7-thuth@redhat.com> In-Reply-To: <20210312172356.968219-1-thuth@redhat.com> References: <20210312172356.968219-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Both, the build-crypto-old and the check-crypto-old jobs finish reasonably fast, and the build artifacts are only used for the single corresponding check jobs, so there is no reason for doing the check step in a separate job here. Thus let's stop wasting artifacts space and job scheduler over- head by simply merging the test step into the build jobs. Message-Id: <20210311142211.1547864-5-thuth@redhat.com> Reviewed-by: Richard Henderson Signed-off-by: Thomas Huth --- .gitlab-ci.yml | 45 ++++----------------------------------------- 1 file changed, 4 insertions(+), 41 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 45303cafdd..0ada3dbb90 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -585,7 +585,7 @@ build-coroutine-sigaltstack: # # These jobs test old gcrypt and nettle from RHEL7 # which had some API differences. -build-crypto-old-nettle: +crypto-old-nettle: <<: *native_build_job_definition needs: job: amd64-centos7-container @@ -593,22 +593,9 @@ build-crypto-old-nettle: IMAGE: centos7 TARGETS: x86_64-softmmu x86_64-linux-user CONFIGURE_ARGS: --disable-gcrypt --enable-nettle - MAKE_CHECK_ARGS: check-build - artifacts: - paths: - - build - -check-crypto-old-nettle: - <<: *native_test_job_definition - needs: - - job: build-crypto-old-nettle - artifacts: true - variables: - IMAGE: centos7 MAKE_CHECK_ARGS: check - -build-crypto-old-gcrypt: +crypto-old-gcrypt: <<: *native_build_job_definition needs: job: amd64-centos7-container @@ -616,22 +603,9 @@ build-crypto-old-gcrypt: IMAGE: centos7 TARGETS: x86_64-softmmu x86_64-linux-user CONFIGURE_ARGS: --disable-nettle --enable-gcrypt - MAKE_CHECK_ARGS: check-build - artifacts: - paths: - - build - -check-crypto-old-gcrypt: - <<: *native_test_job_definition - needs: - - job: build-crypto-old-gcrypt - artifacts: true - variables: - IMAGE: centos7 MAKE_CHECK_ARGS: check - -build-crypto-only-gnutls: +crypto-only-gnutls: <<: *native_build_job_definition needs: job: amd64-centos7-container @@ -639,20 +613,9 @@ build-crypto-only-gnutls: IMAGE: centos7 TARGETS: x86_64-softmmu x86_64-linux-user CONFIGURE_ARGS: --disable-nettle --disable-gcrypt --enable-gnutls - MAKE_CHECK_ARGS: check-build - artifacts: - paths: - - build - -check-crypto-only-gnutls: - <<: *native_test_job_definition - needs: - - job: build-crypto-only-gnutls - artifacts: true - variables: - IMAGE: centos7 MAKE_CHECK_ARGS: check + # We don't need to exercise every backend with every front-end build-trace-multi-user: <<: *native_build_job_definition -- 2.27.0