From patchwork Wed May 31 15:08:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Camilla Conte X-Patchwork-Id: 1788413 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=AeVht15a; 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 4QWXjN3SPlz20QB for ; Thu, 1 Jun 2023 01:09:12 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4NRj-0001CH-LL; Wed, 31 May 2023 11:09:07 -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 1q4NRa-00011M-Tu for qemu-devel@nongnu.org; Wed, 31 May 2023 11:08:59 -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 1q4NRZ-0004E3-Ev for qemu-devel@nongnu.org; Wed, 31 May 2023 11:08:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685545736; 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=E8yX6wUKUNL3b0AwG+fZ1PjWIcb66Z5UX8v/bLKwjtQ=; b=AeVht15aS81FOVXBVzL2zXqb088VP6XqRmn5bYXHlh1qL7WeMMc1E4TBYz7rC1VsjhQK6g GmqFKhMP2gas1+bRqe08PWU07zk8YOWTiiYD0vSr6wzXpr8hkntZuNUaS4Z8gXEVpulMN8 phcEc3NYvmqb20OXMwNKnRrrd1cJHMA= 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-468-fu5za5Z8NXSxwj0tjgyRjg-1; Wed, 31 May 2023 11:08:48 -0400 X-MC-Unique: fu5za5Z8NXSxwj0tjgyRjg-1 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-3f6f58e269eso28814245e9.1 for ; Wed, 31 May 2023 08:08:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685545726; x=1688137726; 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=E8yX6wUKUNL3b0AwG+fZ1PjWIcb66Z5UX8v/bLKwjtQ=; b=PauiM6O0JiIjoRdinJHa1Yts825MiFymuXbw0kE1HV4bbfMrqjn2g8TPKu+cll7avP s+87V5NlKhBs1QJ9T6ZLqRbMVbR/VkXjZuqIughXXvBEaSl8Kuqn7ZBx5AoZdD/wAwEs yOH6QaltPHp2XPcOj4hbd06TrlIVrMjLGoSBpIADFa8N1OAdl/o29WhCBL3XRvcxXQ52 B/yo1HIjWgut1mlomDjIQPoh4lkAi3K5myX1dxe8+SWmt2RexUR339Jjx0oO5MXUuCpj Nz93JBcXunEs8052UoHVEe70eG/R44qKzd858HJ0yehpagkYRSPEMcsg8jdCMhbTPmzq LpiQ== X-Gm-Message-State: AC+VfDwgnQdTiZOFSrxGKpWsEHzYwtDfWk66MvwHwNd6rXWmi6HSN7sW hKWXvmBj8lPlCvvkOxSLys/K1697NDYCYT4xWPHhYf991p8HC/EHSh2qTs4rxyu/+vDHUgCDKUN IHY1ivA3flWDdnz2Brdd+tShXrKnpofUMgMT0REwk6RQZd4hd+HfaJ61JsOmqZ3lbomenfwXA X-Received: by 2002:a7b:ce05:0:b0:3f6:3bb:5132 with SMTP id m5-20020a7bce05000000b003f603bb5132mr4803730wmc.24.1685545726793; Wed, 31 May 2023 08:08:46 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5YwAgbhImiWplJ22IUsC9T+hCc7vgFVrUBEHTxzUqH9tgu6DjKe/IJrMVhci56j+lJxKviIA== X-Received: by 2002:a7b:ce05:0:b0:3f6:3bb:5132 with SMTP id m5-20020a7bce05000000b003f603bb5132mr4803709wmc.24.1685545726474; Wed, 31 May 2023 08:08:46 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:ad4:d988:c2cd:bd04:c2d7:61e3]) by smtp.gmail.com with ESMTPSA id g15-20020adff40f000000b00307972e46fasm7090499wro.107.2023.05.31.08.08.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 May 2023 08:08:46 -0700 (PDT) From: Camilla Conte To: qemu-devel@nongnu.org Cc: berrange@redhat.com, richard.henderson@linaro.org, alex.bennee@linaro.org, Camilla Conte Subject: [PATCH 1/5] gitlab-ci: Remove unused Python package Date: Wed, 31 May 2023 16:08:20 +0100 Message-Id: <20230531150824.32349-2-cconte@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230531150824.32349-1-cconte@redhat.com> References: <20230531150824.32349-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: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.163, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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 Python should have been removed in this commit: https://gitlab.com/qemu-project/qemu/-/commit/94b8b146df84ba472f461398d93fb9cdf0db8f94 Signed-off-by: Camilla Conte Reviewed-by: Daniel P. Berrangé --- .gitlab-ci.d/container-template.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.d/container-template.yml b/.gitlab-ci.d/container-template.yml index 9ac4a0ee25..fd7deb1c29 100644 --- a/.gitlab-ci.d/container-template.yml +++ b/.gitlab-ci.d/container-template.yml @@ -7,7 +7,6 @@ before_script: - export TAG="$CI_REGISTRY_IMAGE/qemu/$NAME:latest" - export COMMON_TAG="$CI_REGISTRY/qemu-project/qemu/qemu/$NAME:latest" - - apk add python3 - docker login $CI_REGISTRY -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" - until docker info; do sleep 1; done script: From patchwork Wed May 31 15:08:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Camilla Conte X-Patchwork-Id: 1788411 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=Kq3T97SK; 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 4QWXjK39vXz20QB for ; Thu, 1 Jun 2023 01:09:09 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4NRb-0000zu-Af; Wed, 31 May 2023 11:08:59 -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 1q4NRY-0000rp-5b for qemu-devel@nongnu.org; Wed, 31 May 2023 11:08:56 -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 1q4NRW-0004DF-BO for qemu-devel@nongnu.org; Wed, 31 May 2023 11:08:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685545730; 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=isVeXj2ZRSeKcqWYbUBK8rUm96hsmSNFmyK+1e5/1HY=; b=Kq3T97SKHsEmmrfTh9GfDPU4rnk9WTpGVq/U4CCTUlhZ0CNDuZppY/Y0N9qcD63VpTplD2 4o76XpAL5d4KuKoTlRih2wC08NljHjRVaA2SkAlybyEKfOjLRGtINYeuJofyWO9XuAmVE5 CIHjZuJTpZJbKvVUEMQVJjGMU17xm0o= 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-265-ljzrm8w4NA6cdvQpUXCmCw-1; Wed, 31 May 2023 11:08:49 -0400 X-MC-Unique: ljzrm8w4NA6cdvQpUXCmCw-1 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-3f612a1b0fdso34142405e9.2 for ; Wed, 31 May 2023 08:08:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685545727; x=1688137727; 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=isVeXj2ZRSeKcqWYbUBK8rUm96hsmSNFmyK+1e5/1HY=; b=mH0OTJHtSI4lWonlmaY0F7BvYmPwNe0qfKhDumSpPCH3u0YoU4Ldhs/WpSH5PPEGRo uzeRoj77XzOLUvpz1+4QwKm518XbLe10tXExSMNbDiYQ1V41dKHK1m1PZZeTPDQVb3p3 9fV6iJFo6beZaIXZxTnrQvlRKwVQFGeHpKkQu3eCv0K2Jf8DbCjDCHApjgoPrV8BLsHz xmBe1ld2MnxNkAaYM3lTUuBRAkfhnzbhPRsgbqZKr8xy/B4fYyWRAMp91Zh2PeKD3Fxe HPOpAxnG9BupK2yCBFJA1Vke5ukxmVDGg3fsozSO4IbPe8RrWYBn8MfezG5M852fb/s8 KvjQ== X-Gm-Message-State: AC+VfDy5mpFwJ1hcNMj/uCZZCGs1TRsEAfU63ESH/oIUOolGmIjPB7kg PpJDCAFmjhIPDAIdezoxObmOL45sRI/HYsxV6DEc5UHXmSUnq2Wsk1mol2B9/cuohVWSpmdiNXZ U1Yc7L9vdOXSd8npJCV46HKsIy6eGBY/HvST2IrN/hSxV/HGYUclsFQtguM+BEkP0uoUNpMeo X-Received: by 2002:adf:ec12:0:b0:30a:d867:da29 with SMTP id x18-20020adfec12000000b0030ad867da29mr4853297wrn.33.1685545727760; Wed, 31 May 2023 08:08:47 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4Gn6zSJMIXGi4dyrgQnEO4lLGc5QDobkGrETyYXTXHEqVA4f0aJv3m25CCiJH1B1KYWMjRbQ== X-Received: by 2002:adf:ec12:0:b0:30a:d867:da29 with SMTP id x18-20020adfec12000000b0030ad867da29mr4853280wrn.33.1685545727578; Wed, 31 May 2023 08:08:47 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:ad4:d988:c2cd:bd04:c2d7:61e3]) by smtp.gmail.com with ESMTPSA id g15-20020adff40f000000b00307972e46fasm7090499wro.107.2023.05.31.08.08.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 May 2023 08:08:47 -0700 (PDT) From: Camilla Conte To: qemu-devel@nongnu.org Cc: berrange@redhat.com, richard.henderson@linaro.org, alex.bennee@linaro.org, Camilla Conte Subject: [PATCH 2/5] gitlab-ci: Reference rules instead of extends Date: Wed, 31 May 2023 16:08:21 +0100 Message-Id: <20230531150824.32349-3-cconte@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230531150824.32349-1-cconte@redhat.com> References: <20230531150824.32349-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: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.163, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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 This allows for the jobs to extend different templates while having a shared template for rules. Docs: https://docs.gitlab.com/ee/ci/jobs/job_control.html#reuse-rules-in-different-jobs Signed-off-by: Camilla Conte Reviewed-by: Daniel P. Berrangé --- .gitlab-ci.d/opensbi.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.d/opensbi.yml b/.gitlab-ci.d/opensbi.yml index 2e9d51764e..d0221632f6 100644 --- a/.gitlab-ci.d/opensbi.yml +++ b/.gitlab-ci.d/opensbi.yml @@ -40,7 +40,8 @@ when: on_success docker-opensbi: - extends: .opensbi_job_rules + rules: + - !reference [.opensbi_job_rules, rules] stage: containers image: docker:stable services: @@ -59,7 +60,8 @@ docker-opensbi: - docker push $IMAGE_TAG build-opensbi: - extends: .opensbi_job_rules + rules: + - !reference [.opensbi_job_rules, rules] stage: build needs: ['docker-opensbi'] artifacts: From patchwork Wed May 31 15:08:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Camilla Conte X-Patchwork-Id: 1788412 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=Bf5Fho7D; 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 4QWXjK3rcTz20QD for ; Thu, 1 Jun 2023 01:09:09 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4NRa-0000xD-9v; Wed, 31 May 2023 11:08:58 -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 1q4NRX-0000ri-Op for qemu-devel@nongnu.org; Wed, 31 May 2023 11:08:55 -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 1q4NRW-0004DM-4t for qemu-devel@nongnu.org; Wed, 31 May 2023 11:08:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685545731; 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=OBfSt4Me5C/XPY7LY682rlFuKztjSBtY5pm75ZUXSxM=; b=Bf5Fho7DYGqnR49ObLtCNnkKWMsjv7Ndt1238qU/tPkcjxAKGijXPwJVi4ebyx9kyyoE+N l2KrIDNEgaEKzzqvXcltnilKrgFZtFGzSjAdY+xXjSLPjKQCViagqFnLHAgTo/SoJcyoa0 qFgC7Od8Lte2cDbsHHmKv/T5/tq/70A= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-547-3SVYcAdXOVaSzUKm9BLrrA-1; Wed, 31 May 2023 11:08:50 -0400 X-MC-Unique: 3SVYcAdXOVaSzUKm9BLrrA-1 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-30ab548ba06so7954029f8f.1 for ; Wed, 31 May 2023 08:08:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685545728; x=1688137728; 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=OBfSt4Me5C/XPY7LY682rlFuKztjSBtY5pm75ZUXSxM=; b=FHjJqgv0Hp/OOt/DT6K8WWylfR4/+eBLDdcQ+41st3EBqEZMBsOGRjAn557I968Z3i j7mtjlXk2SeqxiUELKp8V93MPkBxkgVAFbtAClgabJMA7MpA8+GWb+eUb40NNGN99ljV M6y6hWkv0Hjq1v0HW9bFOXca3nSgSmtJD3xBvgCXWW3AqEyCra3/mffjFinISBNDc4lx hPDKMXzkOFETnThvMBLsnjvrE8Z4Z6MmV/VlTU+sJl3r+MbTZ+yeojC1eBijEGraucrn 0ukL94RojAVRd6Cp3o+bC9LeJD17MlamOOuXBUQsUxmawTDuqnrcbZLtHObByLEpFe+m zhSg== X-Gm-Message-State: AC+VfDx/C8XCBmtCuUEP+BsU8n8kmdY8IrbKDCZIHLLORS+V7IyAzXpF DgE33+KtYas/Jg0x862qgxCHAFwVrl3GzPCmsK+OxwuPAaZcPoHjvjgfXTqZv76uXQr8KUOHR1o CHyML6BC5PBvxQaIUlgrZr6y8EL39NzeSpEi/niiJhjfkGeE7MZ5owuDPTlsfXbmLzkc3NfI6 X-Received: by 2002:a5d:474b:0:b0:306:4031:63c5 with SMTP id o11-20020a5d474b000000b00306403163c5mr4640419wrs.51.1685545728718; Wed, 31 May 2023 08:08:48 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ66QlsAqhDlleChZ4z4P2K3hAWGyvhj29ECEsZbU4FAeghqZvbcSmc+WcoleWozS4MBdA9gmg== X-Received: by 2002:a5d:474b:0:b0:306:4031:63c5 with SMTP id o11-20020a5d474b000000b00306403163c5mr4640391wrs.51.1685545728393; Wed, 31 May 2023 08:08:48 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:ad4:d988:c2cd:bd04:c2d7:61e3]) by smtp.gmail.com with ESMTPSA id g15-20020adff40f000000b00307972e46fasm7090499wro.107.2023.05.31.08.08.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 May 2023 08:08:48 -0700 (PDT) From: Camilla Conte To: qemu-devel@nongnu.org Cc: berrange@redhat.com, richard.henderson@linaro.org, alex.bennee@linaro.org, Camilla Conte Subject: [PATCH 3/5] gitlab-ci: Move variables outside script Date: Wed, 31 May 2023 16:08:22 +0100 Message-Id: <20230531150824.32349-4-cconte@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230531150824.32349-1-cconte@redhat.com> References: <20230531150824.32349-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: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.163, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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 Also split long line for clarity. Docs: https://docs.gitlab.com/ee/ci/variables/#use-cicd-variables-in-other-variables Signed-off-by: Camilla Conte --- .gitlab-ci.d/container-template.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.d/container-template.yml b/.gitlab-ci.d/container-template.yml index fd7deb1c29..d146d1d197 100644 --- a/.gitlab-ci.d/container-template.yml +++ b/.gitlab-ci.d/container-template.yml @@ -1,20 +1,27 @@ .container_job_template: extends: .base_job_template - image: docker:stable stage: containers + image: docker:stable services: - docker:stable-dind + variables: + TAG: "$CI_REGISTRY_IMAGE/qemu/$NAME:latest" + COMMON_TAG: "$CI_REGISTRY/qemu-project/qemu/qemu/$NAME:latest" + DOCKERFILE: "$CI_PROJECT_DIR/tests/docker/dockerfiles/$NAME.docker" + BUILD_CONTEXT: "$CI_PROJECT_DIR" before_script: - - export TAG="$CI_REGISTRY_IMAGE/qemu/$NAME:latest" - - export COMMON_TAG="$CI_REGISTRY/qemu-project/qemu/qemu/$NAME:latest" - 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" - - docker build --tag "$TAG" --cache-from "$TAG" --cache-from "$COMMON_TAG" + - > + docker build + --tag "$TAG" + --cache-from "$TAG" + --cache-from "$COMMON_TAG" --build-arg BUILDKIT_INLINE_CACHE=1 - -f "tests/docker/dockerfiles/$NAME.docker" "." + -f "$DOCKERFILE" "$BUILD_CONTEXT" - docker push "$TAG" after_script: - docker logout From patchwork Wed May 31 15:08:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Camilla Conte X-Patchwork-Id: 1788416 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=FTmhx9Hn; 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 4QWXkN1jxNz20QB for ; Thu, 1 Jun 2023 01:10:04 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4NRe-00014J-9p; Wed, 31 May 2023 11:09:02 -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 1q4NRZ-0000tB-M8 for qemu-devel@nongnu.org; Wed, 31 May 2023 11:08:57 -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 1q4NRX-0004Dd-Hg for qemu-devel@nongnu.org; Wed, 31 May 2023 11:08:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685545734; 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=bTaWo4gLPbMdtV/vSjQMW6kRyuL7BB1+PhhPoxdkGmA=; b=FTmhx9HnE3bticER4GaNpsLpqqXliU7GuiWE3mxbkTeiKK4FX9FJLVC80ytB5O0fgwnGb6 wgQ3IL4cud8T5hYNkoeCsUSvfQF51vRE5Xm1Df/B/UA2SvSw7XItFBt8GMW5TEvEqfhpBN ci46X/oo4ZfBaYXJ1YuSA0G+Tz2uVC0= 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-646-iZWkD89FPVuMa0apaOhm8A-1; Wed, 31 May 2023 11:08:51 -0400 X-MC-Unique: iZWkD89FPVuMa0apaOhm8A-1 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-3f41a04a297so26136975e9.3 for ; Wed, 31 May 2023 08:08:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685545729; x=1688137729; 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=bTaWo4gLPbMdtV/vSjQMW6kRyuL7BB1+PhhPoxdkGmA=; b=DwZkvZNFX+bdexLEdlZawggC8SeZ5igP7FF3i+jdpIZkK/NBc64RDr5ld2s1oF9HNQ FWuy5DdRHX2D217UxJU5UgPocJbfEs5gIlGWTeWbhZqrnNTOHFVZXQx5e+JKbrth+IeR tufn2iQjJzYZZ+MAybkJ3dOkxCJHRWolFw0peokNTFKjWE0s/edA7lBwNGoS0zhYai89 ZqI6ZbWX4Hy8mS6uMTvf7e8LEGl9NehFebLcFhUF/ur5R16javGnCI8V0Nw+y1Era0+t gytfaMuDx4Gx45M8ZRtj7QGcJk1vzlsndNYJBfP02T221axUtQifbNqZ1DlXMkM43dPv piBw== X-Gm-Message-State: AC+VfDwgEge82np8P5owYa7IuiUu3VdR33TPZcDTfWvBNjga9uW2y8gu AZ/CJDngS2rew8fh1p2wVFYF9o/a1pOuGt0x8ZzTXH62m1wZBpY16EbpC0FOLKykQDetslKO/yF rlA75vaBmJOMDT9fHFXbT9EP3DT2LeWjZRqkZzDF2X4a8gMTKcrjK4zIVPmeEqeNDL3pfr/dk X-Received: by 2002:a05:6000:4c:b0:306:2aa0:ce81 with SMTP id k12-20020a056000004c00b003062aa0ce81mr4909643wrx.30.1685545729559; Wed, 31 May 2023 08:08:49 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6WhjUZ5zN5Gtmwt30KP+osdwk8UDJqKm/GuBD2o5izinC3zkH6wejHyyj8KIcAQWrH8uq/SA== X-Received: by 2002:a05:6000:4c:b0:306:2aa0:ce81 with SMTP id k12-20020a056000004c00b003062aa0ce81mr4909628wrx.30.1685545729303; Wed, 31 May 2023 08:08:49 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:ad4:d988:c2cd:bd04:c2d7:61e3]) by smtp.gmail.com with ESMTPSA id g15-20020adff40f000000b00307972e46fasm7090499wro.107.2023.05.31.08.08.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 May 2023 08:08:49 -0700 (PDT) From: Camilla Conte To: qemu-devel@nongnu.org Cc: berrange@redhat.com, richard.henderson@linaro.org, alex.bennee@linaro.org, Camilla Conte Subject: [PATCH 4/5] gitlab-ci: Use container template for opensbi Date: Wed, 31 May 2023 16:08:23 +0100 Message-Id: <20230531150824.32349-5-cconte@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230531150824.32349-1-cconte@redhat.com> References: <20230531150824.32349-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: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.163, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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 template for all the jobs in the "container" stage. Changes the URL of the "opensbi-cross-build" images by using the same URL pattern as the other images. Removes pushing the image to the additional CI_COMMIT_SHA tag. It seems unnecessary. Example of the old URLs: - registry.gitlab.com/qemu-project/qemu:00a0bdc... - registry.gitlab.com/qemu-project/qemu:opensbi-cross-build Example of the new URL: - registry.gitlab.com/qemu-project/qemu/qemu/opensbi-cross-build Signed-off-by: Camilla Conte Reviewed-by: Daniel P. Berrangé --- .gitlab-ci.d/opensbi.yml | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.d/opensbi.yml b/.gitlab-ci.d/opensbi.yml index d0221632f6..bb90c56bcf 100644 --- a/.gitlab-ci.d/opensbi.yml +++ b/.gitlab-ci.d/opensbi.yml @@ -1,3 +1,6 @@ +include: + - local: '/.gitlab-ci.d/container-template.yml' + # All jobs needing docker-opensbi must use the same rules it uses. .opensbi_job_rules: rules: @@ -40,24 +43,14 @@ when: on_success docker-opensbi: + extends: .container_job_template rules: - !reference [.opensbi_job_rules, rules] - stage: containers - image: docker:stable - services: - - docker:stable-dind variables: GIT_DEPTH: 3 - 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 - --tag $IMAGE_TAG .gitlab-ci.d/opensbi - - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA - - docker push $IMAGE_TAG + NAME: opensbi-cross-build + DOCKERFILE: "$CI_PROJECT_DIR/.gitlab-ci.d/opensbi/Dockerfile" + BUILD_CONTEXT: "$CI_PROJECT_DIR/.gitlab-ci.d/opensbi" build-opensbi: rules: @@ -72,7 +65,7 @@ build-opensbi: - opensbi32-generic-stderr.log - opensbi64-generic-stdout.log - opensbi64-generic-stderr.log - image: $CI_REGISTRY_IMAGE:opensbi-cross-build + image: $CI_REGISTRY_IMAGE/qemu/opensbi-cross-build:latest variables: GIT_DEPTH: 3 script: # Clone the required submodules and build OpenSBI From patchwork Wed May 31 15:08:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Camilla Conte X-Patchwork-Id: 1788415 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=d2DuxI/q; 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 4QWXjh2PWQz20QB for ; Thu, 1 Jun 2023 01:09:28 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4NRg-00015w-Ej; Wed, 31 May 2023 11:09:07 -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 1q4NRZ-0000t9-M7 for qemu-devel@nongnu.org; Wed, 31 May 2023 11:08:57 -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 1q4NRW-0004DY-W8 for qemu-devel@nongnu.org; Wed, 31 May 2023 11:08:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685545734; 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=HVuzBMnkfJNSJsyI+pl3jmQ0YmPp+bKGi9FVckju4oA=; b=d2DuxI/qOFjm4z0LFJW9indHGbilMHPdVMBKm2NkJQlK2u2oa7O9VSvc+yIL5gRj3uq7yi lKZWVjq7D1Lvnmdq9aHgPNe3KiUAYnB3QnvZnNbc3jitcag1BKc3rSbEPEQNP5lBChc6Eg UC1cJy27lOC5igBk+/GIaa8D3pphCnQ= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-106-4hWFgmunMbqnAPYmzvTbpA-1; Wed, 31 May 2023 11:08:52 -0400 X-MC-Unique: 4hWFgmunMbqnAPYmzvTbpA-1 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-3f42bcef2acso27295085e9.2 for ; Wed, 31 May 2023 08:08:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685545730; x=1688137730; 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=HVuzBMnkfJNSJsyI+pl3jmQ0YmPp+bKGi9FVckju4oA=; b=FaTi5OC/oePLkYobEblITY+3CVMxUYMIGTkaY5mtY5EInK3CpC8ia7OTcsaXLjOE9i hu3g96L31LRway9IRq5fycGT2AAs9X4DhA3sQhvYGsPIk4ENC6RAyv0DBYv80i23IajJ rTXMXF733ZWb6Ir1KrloM89V+MflNbrkWHH+YivagYkUgJ1EwZZguiV8lD+KTKcg44Li O3c0EcD8r5EoKO5vFiJaxionM6ETsntDrzjVM+dNQqfjF51WqjnkerW9W5Xt4alonQWO UJIh+T7QC/ppqUG7YRQZbHIuExIpjTo3rUHIeIc6LmJ0XKQOullGYkTK9u00wKIFlzEA bmOw== X-Gm-Message-State: AC+VfDztSl3VrXgZ5LJUjh6MsZdnm2kvsu4qHKXLxxnoV8yqHpDDCqHr 0JGPMH1tCgeGZ5IFG9S3P6fs/NArnnsJ046r5VUx+DUJyZdYsXovGZH6fDytLCQs0FYtX2oyEb/ Na1xDx3iPp8vBUCmhWhUPWEWsCgIid3E2Z8nmmxUF8GQrMCJf6kL71lkIUcC4oDxkpb30qq5S X-Received: by 2002:a05:600c:2294:b0:3f1:8c5f:dfc5 with SMTP id 20-20020a05600c229400b003f18c5fdfc5mr4169904wmf.39.1685545730349; Wed, 31 May 2023 08:08:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4bb9T0iYTICI52GbprKZ1zhoeDrwixgrhlyH23QDZgMArn1bjcufLnLm20NYxZHWzAT7hbDA== X-Received: by 2002:a05:600c:2294:b0:3f1:8c5f:dfc5 with SMTP id 20-20020a05600c229400b003f18c5fdfc5mr4169891wmf.39.1685545730178; Wed, 31 May 2023 08:08:50 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:ad4:d988:c2cd:bd04:c2d7:61e3]) by smtp.gmail.com with ESMTPSA id g15-20020adff40f000000b00307972e46fasm7090499wro.107.2023.05.31.08.08.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 May 2023 08:08:49 -0700 (PDT) From: Camilla Conte To: qemu-devel@nongnu.org Cc: berrange@redhat.com, richard.henderson@linaro.org, alex.bennee@linaro.org, Camilla Conte Subject: [PATCH 5/5] gitlab-ci: Replace Docker with Kaniko Date: Wed, 31 May 2023 16:08:24 +0100 Message-Id: <20230531150824.32349-6-cconte@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230531150824.32349-1-cconte@redhat.com> References: <20230531150824.32349-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: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.163, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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 Previous attempt by Alex Bennée, for the records: https://lore.kernel.org/qemu-devel/20230330101141.30199-12-alex.bennee@linaro.org/ Does not enable caching, as suggested in a previous review: https://lore.kernel.org/qemu-devel/ZCVpMDLPJcdnkAJz@redhat.com/ Does not specify a context since no Dockerfile is using COPY or ADD instructions. Does not enable reproducible builds as that results in builds failing with an out of memory error. See issue "Using --reproducible loads entire image into memory": https://github.com/GoogleContainerTools/kaniko/issues/862 Signed-off-by: Camilla Conte --- .gitlab-ci.d/container-template.yml | 25 +++++-------------- .gitlab-ci.d/opensbi.yml | 1 - .../ci/gitlab-kubernetes-runners/values.yaml | 12 --------- 3 files changed, 6 insertions(+), 32 deletions(-) diff --git a/.gitlab-ci.d/container-template.yml b/.gitlab-ci.d/container-template.yml index d146d1d197..0e93f5f13e 100644 --- a/.gitlab-ci.d/container-template.yml +++ b/.gitlab-ci.d/container-template.yml @@ -1,27 +1,14 @@ .container_job_template: extends: .base_job_template stage: containers - image: docker:stable - services: - - docker:stable-dind + image: + name: gcr.io/kaniko-project/executor:debug + entrypoint: [""] variables: TAG: "$CI_REGISTRY_IMAGE/qemu/$NAME:latest" - COMMON_TAG: "$CI_REGISTRY/qemu-project/qemu/qemu/$NAME:latest" DOCKERFILE: "$CI_PROJECT_DIR/tests/docker/dockerfiles/$NAME.docker" - BUILD_CONTEXT: "$CI_PROJECT_DIR" - before_script: - - 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" - - > - docker build - --tag "$TAG" - --cache-from "$TAG" - --cache-from "$COMMON_TAG" - --build-arg BUILDKIT_INLINE_CACHE=1 - -f "$DOCKERFILE" "$BUILD_CONTEXT" - - docker push "$TAG" - after_script: - - docker logout + - /kaniko/executor + --dockerfile "$DOCKERFILE" + --destination "$TAG" diff --git a/.gitlab-ci.d/opensbi.yml b/.gitlab-ci.d/opensbi.yml index bb90c56bcf..e531ce2728 100644 --- a/.gitlab-ci.d/opensbi.yml +++ b/.gitlab-ci.d/opensbi.yml @@ -50,7 +50,6 @@ docker-opensbi: GIT_DEPTH: 3 NAME: opensbi-cross-build DOCKERFILE: "$CI_PROJECT_DIR/.gitlab-ci.d/opensbi/Dockerfile" - BUILD_CONTEXT: "$CI_PROJECT_DIR/.gitlab-ci.d/opensbi" build-opensbi: rules: diff --git a/scripts/ci/gitlab-kubernetes-runners/values.yaml b/scripts/ci/gitlab-kubernetes-runners/values.yaml index 204a96a842..ed6c5894bc 100644 --- a/scripts/ci/gitlab-kubernetes-runners/values.yaml +++ b/scripts/ci/gitlab-kubernetes-runners/values.yaml @@ -4,27 +4,15 @@ 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"