From patchwork Mon May 22 17:41:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Camilla Conte X-Patchwork-Id: 1784596 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=JCzV8+DT; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QQ4YM4gkBz20PS for ; Tue, 23 May 2023 03:43:19 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q19Yb-0003WE-Vk; Mon, 22 May 2023 13:42:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q19YW-0003VM-KD for qemu-devel@nongnu.org; Mon, 22 May 2023 13:42:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q19YK-00048Q-83 for qemu-devel@nongnu.org; Mon, 22 May 2023 13:42:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684777350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8VJclHB32htPmq7Fz7pgxOVZnrTaw5OWW+2fPrt3P54=; b=JCzV8+DT18S6DAPMuwxMYaoHcVldaDu/MDihB1E30dx9JHweUvoIuRmywMStg3EvBhvbx0 RaRCSaSLMFcL9Yu7sKz4uiQqsxAfBZpdwChnm2ECyF0hYmaLNBTUD5pFXsU/J3Q41jIo8u d7G+/kkkOXu86rmgihJn7tzIHz3R+nw= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-582-52Fi6Ck7MCyy5RqJNQqV9Q-1; Mon, 22 May 2023 13:42:29 -0400 X-MC-Unique: 52Fi6Ck7MCyy5RqJNQqV9Q-1 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-3f422dc5fafso38470295e9.0 for ; Mon, 22 May 2023 10:42:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684777347; x=1687369347; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8VJclHB32htPmq7Fz7pgxOVZnrTaw5OWW+2fPrt3P54=; b=c0xqCa80HNUaL1xTqpNWH2G8eeb8sND+ap+90Ss2+Tdky3jNBhGSfEfVZYeps8V6TI bNJ87n0+ty8M8d0EOq4PeovKWA+rxI5iUddQdt7A12z1pacunE9/EZSx8W5KklvshoXw 0FzSX1rfOROVqENOLtMdRw1c/byOcQZlQBv+vtUX8Q4M8S8jRTsPGP7HWzLhnCq5n17O /SVfvaROYS1Dch3xkLa7p+2WG0QKhgo5lC749dLmQG3aeUN+muMypV0TbIjbBu4qeVde Nl9RM8I9/s1biaqJ9Mxqcqdh9n6LEKXpJr1CUwCzB0m9FmiJl5HnDuG2IIn+arijDrxF aPBA== X-Gm-Message-State: AC+VfDybU8f7ceNzVA4wKQDvqQUjoBaNB2DcsD3OEnLwgVw5i0YfuGQS HsboZSR5NxjfC2iLCaBsdeYdl8PDbY44oG5YPzAGQMcTlUlNS9bk11QLsA501aBIGi8pUrlrPov ITV+cGKp6sQpsuLegkoZsk5wwVHuMs1KliEAV+yVC5mvBddF2JpLlzMBNzSv7DQL50Di3NI7Y X-Received: by 2002:a1c:f30a:0:b0:3f1:6fb3:ffcc with SMTP id q10-20020a1cf30a000000b003f16fb3ffccmr7942048wmq.22.1684777347751; Mon, 22 May 2023 10:42:27 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6mg+lpYn3Ytq763ykUfiMVERmiy9RvhOGAQ40fPt1rsm+bwVLeRZ3lkH7gteTZcfx+iFqy0Q== X-Received: by 2002:a1c:f30a:0:b0:3f1:6fb3:ffcc with SMTP id q10-20020a1cf30a000000b003f16fb3ffccmr7942035wmq.22.1684777347464; Mon, 22 May 2023 10:42:27 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:ad4:d988:c2cd:bd04:c2d7:61e3]) by smtp.gmail.com with ESMTPSA id u7-20020a7bc047000000b003f3157988f8sm9030805wmc.26.2023.05.22.10.42.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 May 2023 10:42:27 -0700 (PDT) From: Camilla Conte To: qemu-devel@nongnu.org Cc: berrange@redhat.com, thuth@redhat.com, Camilla Conte Subject: [PATCH v2 1/5] Remove redundant CI variables Date: Mon, 22 May 2023 18:41:50 +0100 Message-Id: <20230522174153.46801-2-cconte@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230522174153.46801-1-cconte@redhat.com> References: <20230522174153.46801-1-cconte@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=cconte@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org These are not needed when using gitlab.com shared runners. Signed-off-by: Camilla Conte Reviewed-by: Daniel P. Berrangé --- .gitlab-ci.d/opensbi.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitlab-ci.d/opensbi.yml b/.gitlab-ci.d/opensbi.yml index 9a651465d8..13070575b6 100644 --- a/.gitlab-ci.d/opensbi.yml +++ b/.gitlab-ci.d/opensbi.yml @@ -48,9 +48,6 @@ docker-opensbi: variables: GIT_DEPTH: 3 IMAGE_TAG: $CI_REGISTRY_IMAGE:opensbi-cross-build - # We don't use TLS - DOCKER_HOST: tcp://docker:2375 - DOCKER_TLS_CERTDIR: "" before_script: - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY script: From patchwork Mon May 22 17:41:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Camilla Conte X-Patchwork-Id: 1784597 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=NCh3YwZZ; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QQ4YS5J6sz20PS for ; Tue, 23 May 2023 03:43:24 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q19Yt-0003X6-Hf; Mon, 22 May 2023 13:43:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q19Yk-0003Wr-9Y for qemu-devel@nongnu.org; Mon, 22 May 2023 13:43:03 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q19Yh-0004AL-KX for qemu-devel@nongnu.org; Mon, 22 May 2023 13:43:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684777378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=q9lpf4DJBf0TIKpy15n2M7nyjKZcr9QB+iScUFoDvFk=; b=NCh3YwZZsrEI1TGrnl4BBAniLk0oGCPkWlrNgWjWfhYyR0zjbj8mFtUfms8oRu18jcbUdV rKm2gxZDlA7srWz98YviUlbAdy2hvmd/ahZsSqWWibrKoUXr4sU2Q5iixQpry9od9Ni9cr KLkbJnM6R+hqLibVp91SmAn+tYfVSjc= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-185-KbcKy7XaOY2yewfvFV2Vhg-1; Mon, 22 May 2023 13:42:57 -0400 X-MC-Unique: KbcKy7XaOY2yewfvFV2Vhg-1 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-3f4dd7f13d0so24797445e9.3 for ; Mon, 22 May 2023 10:42:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684777376; x=1687369376; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=q9lpf4DJBf0TIKpy15n2M7nyjKZcr9QB+iScUFoDvFk=; b=dcBN2lSXTZS1sjCpIYkS5PNP87vvj+CX3g1r26mDOQBskBzHDjF857yp0mkkWqDhH9 XVkCHOw5kmyOCqdC4+zukmAjE55dpWMTMFEIqWGtY7XqUUvEXR77ixfBpcgrQOb27EzR b4n6tCIzV4BghPMGWXNaUSPOul8/Poxu3nRl1cwyr43fNOt67aIg3C8Cg9j7Od6ZUcws NKzChObXSi0TB3WGwDl8mS4jx+clRL0yhAP9fVjK8sR9YTA0uEt3C+24Xzg2L61x2wT7 rVDpvlqxMH8wUkIS+G2NZfPrp2esO5iT6S/2ZCpBHYJRls/JxGjzIKDtWialQYsLe9wa pshg== X-Gm-Message-State: AC+VfDwYxKiCWHil44TvKMxNnG3jq3W+bjeQ32UedDKzMC9LBajZmQ/j cyRLSUsDwpAvG0ye+5aPDg3oZDMF2Q9XmceQ7nvzWq1lmcDTVrIecChtHW7WEuJj6HdWFt7flei rFINu1R2O6XM4p5+MI3ti15eoGa1k+vdSdI984dwr9e+GCBgnFYrMZOekLIPBcfwOs4Zd9j1A X-Received: by 2002:a05:600c:2212:b0:3f0:a08e:811b with SMTP id z18-20020a05600c221200b003f0a08e811bmr8137592wml.13.1684777376141; Mon, 22 May 2023 10:42:56 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4MJkfLAijqaQCcYz7o0ajGBwLJDj5+H5rhpUUN2yWYF6be4+HQP6JT5iU5EUqecMKrHn8qOA== X-Received: by 2002:a05:600c:2212:b0:3f0:a08e:811b with SMTP id z18-20020a05600c221200b003f0a08e811bmr8137582wml.13.1684777375854; Mon, 22 May 2023 10:42:55 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:ad4:d988:c2cd:bd04:c2d7:61e3]) by smtp.gmail.com with ESMTPSA id u7-20020a7bc047000000b003f3157988f8sm9030805wmc.26.2023.05.22.10.42.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 May 2023 10:42:55 -0700 (PDT) From: Camilla Conte To: qemu-devel@nongnu.org Cc: berrange@redhat.com, thuth@redhat.com, Camilla Conte Subject: [PATCH v2 2/5] Use docker "stable" tag Date: Mon, 22 May 2023 18:41:51 +0100 Message-Id: <20230522174153.46801-3-cconte@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230522174153.46801-1-cconte@redhat.com> References: <20230522174153.46801-1-cconte@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.129.124; envelope-from=cconte@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Use the same tag in all jobs. Signed-off-by: Camilla Conte Reviewed-by: Daniel P. Berrangé --- .gitlab-ci.d/container-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.d/container-template.yml b/.gitlab-ci.d/container-template.yml index 519b8a9482..11569dd900 100644 --- a/.gitlab-ci.d/container-template.yml +++ b/.gitlab-ci.d/container-template.yml @@ -3,7 +3,7 @@ image: docker:stable stage: containers services: - - docker:dind + - docker:stable-dind before_script: - export TAG="$CI_REGISTRY_IMAGE/qemu/$NAME:latest" - export COMMON_TAG="$CI_REGISTRY/qemu-project/qemu/qemu/$NAME:latest" From patchwork Mon May 22 17:41:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Camilla Conte X-Patchwork-Id: 1784601 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=ifdQmkS2; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QQ4ZY6Wn6z20Q3 for ; Tue, 23 May 2023 03:44:21 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q19Yv-0003YH-7x; Mon, 22 May 2023 13:43:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q19Yn-0003X5-2R for qemu-devel@nongnu.org; Mon, 22 May 2023 13:43:06 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q19Yk-0004AT-3U for qemu-devel@nongnu.org; Mon, 22 May 2023 13:43:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684777381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MTYIXXmimrTIlllTqeWRNB2BffiFgHW9NJl6I5KnpN0=; b=ifdQmkS2lL5bNUsAMUodUwvYMW6Aofs7Y3T5pPZh+R3zN+6s5D1OqENqYv4EtO6tTbmVNu i8dLXOKytm0nq+r6Zje/zVRUIGE1EW7TmTiJAD7nSZWOAsX3nwOdlm9bq1Bv1selfhhBah IDHUbHpieR1GAQPMQ7x31LN8VZDyeM8= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-25-Wkb6raTJPCOlwrOyzAAUiQ-1; Mon, 22 May 2023 13:43:00 -0400 X-MC-Unique: Wkb6raTJPCOlwrOyzAAUiQ-1 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-3f60481749eso7076705e9.1 for ; Mon, 22 May 2023 10:42:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684777378; x=1687369378; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MTYIXXmimrTIlllTqeWRNB2BffiFgHW9NJl6I5KnpN0=; b=SbZzZ5vy5YgUaLXLEQCR0N1OhybK/765sCWB9G3If0tUEl2g7Kwt6WwJhjxG8Q3Pjn RIcxkyDpszoDksCiwd9mQv7BC67bYfQteiej3vCOuL6hxpQFJTzQj38IR+P0LD0DCqo9 vDcE7Py54EXivWzHl3Uw9BgZ6VbZkGKD4ZT6LFQOApDpImnU4p/nQa6oAuFxmvndlFL5 mQ3uD6clgZdqYAmPUMZr84oOmrRYuwGg/CMKBR/G6jmtSiQ5RzMCpRKSSAyQL1NOAxz5 0WRCC2UdTovE6ZcUEDDUFG9ydCVcnwRuI/4pX+sfiSJf0WH+39/G4DhqzhRq3E3ykQwL 2Gwg== X-Gm-Message-State: AC+VfDzLKePV7FCqzLXHAa6d+7waVFwzlvBl3GG5uY5C4apAQcQHqp+s pGCD/HOnyomsex/ZVJEeOmxWtYME62PHUOQZuMwpLn8maa7+kw7sJb2zX1f1K/OHAvV72Z5kYfv l4i7aqsy7RZj7pbDD+JR/8iJY/w+nBsPA7mp04BFG9XGHMWuGv7COXVnWCgQnIM0bx9dlRIkT X-Received: by 2002:a05:600c:3549:b0:3f5:a54:9f97 with SMTP id i9-20020a05600c354900b003f50a549f97mr8557279wmq.0.1684777378782; Mon, 22 May 2023 10:42:58 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4YAtConbzCWYFvHVIXVzFPCG5w1x28Xm16wiVMscpbHa6W/9aFHre2B2NDea06KmTuK0k+hQ== X-Received: by 2002:a05:600c:3549:b0:3f5:a54:9f97 with SMTP id i9-20020a05600c354900b003f50a549f97mr8557264wmq.0.1684777378525; Mon, 22 May 2023 10:42:58 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:ad4:d988:c2cd:bd04:c2d7:61e3]) by smtp.gmail.com with ESMTPSA id u7-20020a7bc047000000b003f3157988f8sm9030805wmc.26.2023.05.22.10.42.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 May 2023 10:42:58 -0700 (PDT) From: Camilla Conte To: qemu-devel@nongnu.org Cc: berrange@redhat.com, thuth@redhat.com, Camilla Conte Subject: [PATCH v2 3/5] Add loop over docker info Date: Mon, 22 May 2023 18:41:52 +0100 Message-Id: <20230522174153.46801-4-cconte@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230522174153.46801-1-cconte@redhat.com> References: <20230522174153.46801-1-cconte@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.129.124; envelope-from=cconte@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Wait for docker info to return successfuly to ensure that the docker server (daemon) started. This is needed for jobs running on Kubernetes. See https://wiki.qemu.org/Testing/CI/KubernetesRunners. Signed-off-by: Camilla Conte Reviewed-by: Daniel P. Berrangé --- .gitlab-ci.d/container-template.yml | 2 +- .gitlab-ci.d/opensbi.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.d/container-template.yml b/.gitlab-ci.d/container-template.yml index 11569dd900..9ac4a0ee25 100644 --- a/.gitlab-ci.d/container-template.yml +++ b/.gitlab-ci.d/container-template.yml @@ -8,8 +8,8 @@ - export TAG="$CI_REGISTRY_IMAGE/qemu/$NAME:latest" - export COMMON_TAG="$CI_REGISTRY/qemu-project/qemu/qemu/$NAME:latest" - apk add python3 - - docker info - docker login $CI_REGISTRY -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" + - until docker info; do sleep 1; done script: - echo "TAG:$TAG" - echo "COMMON_TAG:$COMMON_TAG" diff --git a/.gitlab-ci.d/opensbi.yml b/.gitlab-ci.d/opensbi.yml index 13070575b6..2e9d51764e 100644 --- a/.gitlab-ci.d/opensbi.yml +++ b/.gitlab-ci.d/opensbi.yml @@ -50,6 +50,7 @@ docker-opensbi: IMAGE_TAG: $CI_REGISTRY_IMAGE:opensbi-cross-build before_script: - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY + - until docker info; do sleep 1; done script: - docker pull $IMAGE_TAG || true - docker build --cache-from $IMAGE_TAG --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA From patchwork Mon May 22 17:41:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Camilla Conte X-Patchwork-Id: 1784600 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=goPwzGhJ; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QQ4ZY6S2Qz20PS for ; Tue, 23 May 2023 03:44:21 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q19Yw-0003Yf-LJ; Mon, 22 May 2023 13:43:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q19Ys-0003XW-6w for qemu-devel@nongnu.org; Mon, 22 May 2023 13:43:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q19Ym-0004Ai-SJ for qemu-devel@nongnu.org; Mon, 22 May 2023 13:43:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684777383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=x/dfQQP+Qk1Lx3YD64yyUjHQUxiwcv2SUZMQkz4wWjI=; b=goPwzGhJs6Z22bTlLehbOI6uOjWwhVplmImz9n3Ep+1UtX4Pg22VERJ4mBs64xwK3GIvdn GpShtFcCjodtlhzMasT3gU78OBLzT+jGKkdQR8uWlWiUBovq+lIfGBa+qJG+d5gJQAkqGt m8Oz4+okxOz/J/GqjOM63oJfBrwq7ik= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-417-jhbxIoQ3Nk2Tsam66tIVTQ-1; Mon, 22 May 2023 13:43:01 -0400 X-MC-Unique: jhbxIoQ3Nk2Tsam66tIVTQ-1 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-3f60481749eso7076785e9.1 for ; Mon, 22 May 2023 10:43:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684777380; x=1687369380; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=x/dfQQP+Qk1Lx3YD64yyUjHQUxiwcv2SUZMQkz4wWjI=; b=bHJfUjJFJPR+7rKOvvrDoQ9Yc5tdoddqV69laCvMa3WKW68dovXTwr83ghAp6mKjTP QhXPDC/el1BGyjqwl/DgfcXedcBTSrNJKwtbbUlbimkBUxsi6AqPUIEjLzMQya+HW/Gh c6aws/UmWl5gPIio8q7H7iDWb00cfOGs2/bgu9vOTlr5RVPi9IFn/3CGCahWVMtQFsuL Oovbf06UEC1BjEMY+/HhOz4ktkqe3z5/t3zee+husemB2rmzuxEnO4yS7EGIpEdiEACl lVaG5nXbdVmr5MlEsdZ+sCqq69cN+IIU76/LT3p5IoKCBrtxGl5zct/FKw85BC+YoVD9 SkYw== X-Gm-Message-State: AC+VfDy2gpYtljsomhX1nuUAE1WJc8XDuVEbm1iq5HufWwKnmZMMXCUY LGFIruVSPGHUSBh7YOz/WJ16gaPUX00nQc+PGijpnhI6A3uRGLDIEB3DYhkDx++WEyyPVuyrvtd DFLTbjLRxhJqfeWhqWt3bPb6327L/YDW+gnRNIJzhm1ebA5jHQgjy7v/QiuqHgoXHHK2WRDbH X-Received: by 2002:a7b:ca45:0:b0:3f4:2775:b45c with SMTP id m5-20020a7bca45000000b003f42775b45cmr8102467wml.3.1684777380354; Mon, 22 May 2023 10:43:00 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4ViepBi+vwqUyWzPaXRUhi6xo0MpfdWZhnzJ2/vojEPeVL+A9BJbbYxqxAdH+UrK0F4tqq8w== X-Received: by 2002:a7b:ca45:0:b0:3f4:2775:b45c with SMTP id m5-20020a7bca45000000b003f42775b45cmr8102455wml.3.1684777380095; Mon, 22 May 2023 10:43:00 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:ad4:d988:c2cd:bd04:c2d7:61e3]) by smtp.gmail.com with ESMTPSA id u7-20020a7bc047000000b003f3157988f8sm9030805wmc.26.2023.05.22.10.42.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 May 2023 10:42:59 -0700 (PDT) From: Camilla Conte To: qemu-devel@nongnu.org Cc: berrange@redhat.com, thuth@redhat.com, Camilla Conte Subject: [PATCH v2 4/5] Add CI variable RUNNER_TAG Date: Mon, 22 May 2023 18:41:53 +0100 Message-Id: <20230522174153.46801-5-cconte@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230522174153.46801-1-cconte@redhat.com> References: <20230522174153.46801-1-cconte@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.129.124; envelope-from=cconte@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_HELO_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This allows to set a job tag dinamically. We need this to be able to select the Kubernetes runner. See https://wiki.qemu.org/Testing/CI/KubernetesRunners. Signed-off-by: Camilla Conte Reviewed-by: Daniel P. Berrangé --- .gitlab-ci.d/qemu-project.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitlab-ci.d/qemu-project.yml b/.gitlab-ci.d/qemu-project.yml index a7ed447fe4..4d914c4897 100644 --- a/.gitlab-ci.d/qemu-project.yml +++ b/.gitlab-ci.d/qemu-project.yml @@ -1,6 +1,13 @@ # This file contains the set of jobs run by the QEMU project: # https://gitlab.com/qemu-project/qemu/-/pipelines +variables: + RUNNER_TAG: "" + +default: + tags: + - $RUNNER_TAG + include: - local: '/.gitlab-ci.d/base.yml' - local: '/.gitlab-ci.d/stages.yml' From patchwork Mon May 22 17:41:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Camilla Conte X-Patchwork-Id: 1784598 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=HrP5sXVJ; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QQ4Yn4vz8z20PS for ; Tue, 23 May 2023 03:43:41 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q19Yw-0003Ye-H9; Mon, 22 May 2023 13:43:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q19Yv-0003YF-3S for qemu-devel@nongnu.org; Mon, 22 May 2023 13:43:13 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q19Yo-0004Am-5q for qemu-devel@nongnu.org; Mon, 22 May 2023 13:43:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684777384; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eV5icg6UmB4voJH6eNVbqdN7St8XDqaIvFbM4fnM4ts=; b=HrP5sXVJUwS6D6xSJTuu8ttqa4Qpgt69Xol6RajF9ai0kUJz0N8sxEUFQ/f+7SFKMNtJlF HsfX/18bbi5i7YgcjRxhuMNiv/+HaDO2p+Rilf8aLW1fR1SiGAneXIMkkoox7zMF/TDh1v YWts1WKdWN4o1gsVdmd9wkcBeoEJOtw= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-674-BtzcKK9dPqWyNdzGGWLy4A-1; Mon, 22 May 2023 13:43:02 -0400 X-MC-Unique: BtzcKK9dPqWyNdzGGWLy4A-1 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-3f5ff240197so8580725e9.0 for ; Mon, 22 May 2023 10:43:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684777381; x=1687369381; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eV5icg6UmB4voJH6eNVbqdN7St8XDqaIvFbM4fnM4ts=; b=D0RQoEfTpPNuqMi2RwgR/mNzP9p43/i1yNP7wGqfiipw3Kl7ZGcGXnx4bLIxjseOxA pojbWaQ+0bWesSZLVjnYxJ0XJZCDBqChLwbFVFQTBY+yN52tJ+37cEJyg8EGY+NFq2Ux yf8loMpOo4cOMMJ5b5au/wqAQ8aey2Q7YJgYFF1hLAs2alzSeLtDzzXPjdSPqxbAaEZ/ S6G6h+g74OA02p+267QgR8ZHwlzZsW1MaPMF/LMsLZwxXeJuTATNXqSpfTqcl6+kQ2Ba T2wywnZK+ZZhO9Bbq7lsrENs0PzHHnhMSSkTpdL6fmm9bSAQw42oZRHhkZIWW5ZBq3Gu zanA== X-Gm-Message-State: AC+VfDwiBzxHrsSxdK1RPY/6xBduxjdJ4wCCDyaf3CKf3ugQOD1LQzAy Hp+ktjoR759hzZC/ckzHQwiZtHSzTn+KdH55w5Emj1ekvZnqKwmUKGjkdO31NG45diwSn4EgKrR Z47OzU/1qwxPmrtyg3T6artiuThQgYdmm65+6cc1usrt93nPB6/Dp84oDcFG7/EkHeqMiIs5G X-Received: by 2002:a05:600c:2150:b0:3f5:d0ba:3c1a with SMTP id v16-20020a05600c215000b003f5d0ba3c1amr7374238wml.4.1684777381687; Mon, 22 May 2023 10:43:01 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ79j5k9vXaeNjB1/uReRLc2rdtzEEeHnUjCKAH9XbU1hCRpKqdB69ARultk44BOpQr8oeTUNw== X-Received: by 2002:a05:600c:2150:b0:3f5:d0ba:3c1a with SMTP id v16-20020a05600c215000b003f5d0ba3c1amr7374226wml.4.1684777381487; Mon, 22 May 2023 10:43:01 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:ad4:d988:c2cd:bd04:c2d7:61e3]) by smtp.gmail.com with ESMTPSA id u7-20020a7bc047000000b003f3157988f8sm9030805wmc.26.2023.05.22.10.43.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 May 2023 10:43:01 -0700 (PDT) From: Camilla Conte To: qemu-devel@nongnu.org Cc: berrange@redhat.com, thuth@redhat.com, Camilla Conte Subject: [PATCH v2 5/5] Add Kubernetes runner configuration Date: Mon, 22 May 2023 18:41:54 +0100 Message-Id: <20230522174153.46801-6-cconte@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230522174153.46801-1-cconte@redhat.com> References: <20230522174153.46801-1-cconte@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=cconte@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Custom values for the gitlab-runner Helm chart. See https://wiki.qemu.org/Testing/CI/KubernetesRunners. Signed-off-by: Camilla Conte --- .../ci/gitlab-kubernetes-runners/values.yaml | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 scripts/ci/gitlab-kubernetes-runners/values.yaml diff --git a/scripts/ci/gitlab-kubernetes-runners/values.yaml b/scripts/ci/gitlab-kubernetes-runners/values.yaml new file mode 100644 index 0000000000..204a96a842 --- /dev/null +++ b/scripts/ci/gitlab-kubernetes-runners/values.yaml @@ -0,0 +1,30 @@ +gitlabUrl: "https://gitlab.com/" +runnerRegistrationToken: "" +rbac: + create: true +concurrent: 200 +runners: + privileged: true + config: | + [[runners]] + limit = 100 + environment = [ + "DOCKER_HOST=tcp://docker:2376", + "DOCKER_TLS_CERTDIR=/certs", + "DOCKER_TLS_VERIFY=1", + "DOCKER_CERT_PATH=/certs/client" + ] + [runners.kubernetes] + poll_timeout = 1200 + image = "ubuntu:20.04" + cpu_request = "0.5" + service_cpu_request = "0.5" + helper_cpu_request = "0.25" + cpu_request_overwrite_max_allowed = "7" + memory_request_overwrite_max_allowed = "30Gi" + [[runners.kubernetes.volumes.empty_dir]] + name = "docker-certs" + mount_path = "/certs/client" + medium = "Memory" + [runners.kubernetes.node_selector] + agentpool = "jobs"