From patchwork Fri Apr 7 14:52:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Camilla Conte X-Patchwork-Id: 1766604 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=GnHFak6d; 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 4PtM8R5HhJz1yZ5 for ; Sat, 8 Apr 2023 01:04:06 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pkncE-0007Fl-In; Fri, 07 Apr 2023 11:03: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 1pknUW-00053v-7e for qemu-devel@nongnu.org; Fri, 07 Apr 2023 10:55:04 -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 1pknUU-000468-Fc for qemu-devel@nongnu.org; Fri, 07 Apr 2023 10:55:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680879301; 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; bh=dzFO32mdrAR/VUPVh3EYrQGRuh0hQbS52iKIdgPQxfk=; b=GnHFak6dUr88SbZjpKLl4NZNTy1InueDGMAZCQnTHTNsQKINB0f3qFXR5ey8CdMl2ds0gy ic6Ggs52hbbZ4edhEGN4OIKJqXxLDUCDI9Pw/UVEIY+K2uXELPcmZYlniCx3Yp1KvL4aLj c1I2PXx8zQjFY5VEg4MIDYrd7imGQUM= 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-135-oQnr7m0LOkixPUqD8NhCjw-1; Fri, 07 Apr 2023 10:53:09 -0400 X-MC-Unique: oQnr7m0LOkixPUqD8NhCjw-1 Received: by mail-wm1-f71.google.com with SMTP id o1-20020a05600c4fc100b003edecc610abso853309wmq.7 for ; Fri, 07 Apr 2023 07:53:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680879188; x=1683471188; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=dzFO32mdrAR/VUPVh3EYrQGRuh0hQbS52iKIdgPQxfk=; b=LxSx0ZkYFfOY5VxHZFqWW7Qb/g9lnIQOnetsZDB4/uABCRU5aSqOuSSCMHqUfxtiAf itnsAX9Mk3FNvmwBbejlJQiQokQMgMe0vkLJf45To7bUCBjp2mWvDArITuWmq0U8NOfL bK7z8JHMIz0qPvkiyXOa0Eez09M/uuNLUyAmkH05wZmI5Qkqt2rglX6uxMvU+GbyeZ2k SdRDQM//3cZQaO2W8R0guybI3n+Rk53/2nsXKOm9DKdymrr/ysZxbPsdTkWqpxQKeRz4 9zADvH+05ZSpJ/0Dis5gM1QTkB0ZOy++Y+D845zklk95/m84Ad9cZX81xl9XYSxPXntS 0icg== X-Gm-Message-State: AAQBX9f+6dMEVujnePAfsrSNjM3Zu9wW+EF1x0QOfz0M/rBXWN4+SmtI m/vYSL8B9KXcb7Z2RWx6s/g20TEAV9ZptGTek3zh61NmL8SkVF+EoWWYBZ9oF7Ers1vdSaW4/2F CJMBCQCw4CReJxAJgdKfC97vD8dDpztnbn0ey6w/cjmqvj8TJXhG9uWvBs+G3fYIu0waUL+i3 X-Received: by 2002:a7b:c018:0:b0:3f0:39ab:347c with SMTP id c24-20020a7bc018000000b003f039ab347cmr1455115wmb.23.1680879188349; Fri, 07 Apr 2023 07:53:08 -0700 (PDT) X-Google-Smtp-Source: AKy350ZsNfvI0BGt8eVATfUMTbJOZGwcpog9fWV4QDBnsqGsinx3vdtpzAOVMLkK0w1jneHzBMGwVg== X-Received: by 2002:a7b:c018:0:b0:3f0:39ab:347c with SMTP id c24-20020a7bc018000000b003f039ab347cmr1455104wmb.23.1680879188039; Fri, 07 Apr 2023 07:53:08 -0700 (PDT) Received: from pinkpad.lan ([2001:b07:ad4:d988:168b:4301:918a:373e]) by smtp.gmail.com with ESMTPSA id h4-20020a1ccc04000000b003ed2433aa4asm4812694wmb.41.2023.04.07.07.53.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Apr 2023 07:53:07 -0700 (PDT) From: Camilla Conte To: qemu-devel@nongnu.org Cc: Camilla Conte Subject: [PATCH 1/2] Add CI configuration for Kubernetes Date: Fri, 7 Apr 2023 15:52:51 +0100 Message-Id: <20230407145252.32955-1-cconte@redhat.com> X-Mailer: git-send-email 2.39.2 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 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Fri, 07 Apr 2023 11:02:57 -0400 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 Configure Gitlab CI to run on Kubernetes according to the official documentation. https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#docker-in-docker-with-tls-enabled-in-kubernetes These changes are needed because of the CI jobs using Docker-in-Docker (dind). As soon as Docker-in-Docker is replaced with Kaniko, these changes can be reverted. I documented what I did to set up the Kubernetes runner on the wiki: https://wiki.qemu.org/Testing/CI/KubernetesRunners Signed-off-by: Camilla Conte --- .gitlab-ci.d/container-template.yml | 6 +++--- .gitlab-ci.d/default.yml | 3 +++ .gitlab-ci.d/opensbi.yml | 8 +++----- .gitlab-ci.d/qemu-project.yml | 17 +++++++++++++++++ 4 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 .gitlab-ci.d/default.yml diff --git a/.gitlab-ci.d/container-template.yml b/.gitlab-ci.d/container-template.yml index 519b8a9482..f55a954741 100644 --- a/.gitlab-ci.d/container-template.yml +++ b/.gitlab-ci.d/container-template.yml @@ -1,14 +1,14 @@ .container_job_template: extends: .base_job_template - image: docker:stable + image: docker:20.10.16 stage: containers services: - - docker:dind + - docker:20.10.16-dind 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 info + - until docker info; do sleep 1; done - docker login $CI_REGISTRY -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" script: - echo "TAG:$TAG" diff --git a/.gitlab-ci.d/default.yml b/.gitlab-ci.d/default.yml new file mode 100644 index 0000000000..292be8b91c --- /dev/null +++ b/.gitlab-ci.d/default.yml @@ -0,0 +1,3 @@ +default: + tags: + - $RUNNER_TAG diff --git a/.gitlab-ci.d/opensbi.yml b/.gitlab-ci.d/opensbi.yml index 9a651465d8..5b0b47b57b 100644 --- a/.gitlab-ci.d/opensbi.yml +++ b/.gitlab-ci.d/opensbi.yml @@ -42,17 +42,15 @@ docker-opensbi: extends: .opensbi_job_rules stage: containers - image: docker:stable + image: docker:20.10.16 services: - - docker:stable-dind + - docker:20.10.16-dind 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 + - 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 diff --git a/.gitlab-ci.d/qemu-project.yml b/.gitlab-ci.d/qemu-project.yml index a7ed447fe4..57b175f5c2 100644 --- a/.gitlab-ci.d/qemu-project.yml +++ b/.gitlab-ci.d/qemu-project.yml @@ -1,7 +1,24 @@ # This file contains the set of jobs run by the QEMU project: # https://gitlab.com/qemu-project/qemu/-/pipelines +variables: + RUNNER_TAG: "" + +workflow: + rules: + # Set additional variables when running on Kubernetes. + # https://wiki.qemu.org/Testing/CI/KubernetesRunners + - if: $RUNNER_TAG == "k8s" + variables: + DOCKER_HOST: tcp://docker:2376 + DOCKER_TLS_CERTDIR: "/certs" + DOCKER_TLS_VERIFY: 1 + DOCKER_CERT_PATH: "$DOCKER_TLS_CERTDIR/client" + # Run the pipeline in other cases. + - when: always + include: + - local: '/.gitlab-ci.d/default.yml' - local: '/.gitlab-ci.d/base.yml' - local: '/.gitlab-ci.d/stages.yml' - local: '/.gitlab-ci.d/opensbi.yml' From patchwork Fri Apr 7 14:52:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Camilla Conte X-Patchwork-Id: 1766603 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=EohDrZSX; 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 4PtM8R5Llpz1yZF for ; Sat, 8 Apr 2023 01:04:06 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pkncD-0007F4-0d; Fri, 07 Apr 2023 11:03:01 -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 1pknTp-00050T-MM for qemu-devel@nongnu.org; Fri, 07 Apr 2023 10:54:21 -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 1pknTo-0003wJ-1n for qemu-devel@nongnu.org; Fri, 07 Apr 2023 10:54:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680879259; 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=htEWl4Mvn55vZP22dwBybomTrNrGx84tgkSEpE07Fxs=; b=EohDrZSXu/7D1gLtjm4oSG6/SgNv+DxXFN8/KZ/V4kk3FUfXfrvW+6OyG2YjbhhjI5XKRB FuE/kqJ8D0A/xMVjGSNvu0qzHuukgmOTQno0OwjSSLfEVx66UzOwVRc8fgyMtWduYM5z9E DxHmN/J9iTHTXhh/0Qsd4MHOOzwvC8o= 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-62-sgOT45TyNcGCiWALdGVAFg-1; Fri, 07 Apr 2023 10:53:10 -0400 X-MC-Unique: sgOT45TyNcGCiWALdGVAFg-1 Received: by mail-wm1-f69.google.com with SMTP id p10-20020a05600c358a00b003edf7d484d4so19843317wmq.0 for ; Fri, 07 Apr 2023 07:53:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680879189; x=1683471189; 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=htEWl4Mvn55vZP22dwBybomTrNrGx84tgkSEpE07Fxs=; b=WSa20o6sIR1lig2DAFukc9xrsbrxVr9AYdLKPaUBwxIr2ja5IiWokXX/3xk8jJ9TxR 2dtDsQ/RzQDV5ld/IiGCStmdTaie2/GcjP5Ace2FgmTb8MYZ/LiTT81Abkxxops6Wg2X BPQ5070zr+EHqf/WF1lFBdiCDZXn2+ZBXRCVLn9bZ3TLg5dIP4e8Avjb2tzArPz0K+4b 7BkEeNO5DSOJc87WYRR/gi0czpiytLPfAQbATyl9XbK0viWI2wCwqF8/prSIMk5gupxM O03/7zXzA7EqTIWDoA0TgEu+EdQiBNvVntrRrkUk6tU4GvsVQdL7hW8kU88qrTPevUBq Wh+Q== X-Gm-Message-State: AAQBX9dIctXrQ7js03dHW3Gg6SQLA565JCFOYiwFp1ChALIjOczhMgFw avboMLuA3LttjUz5bvZ9emR7aSJDEFEPsU7W+BU9R2u3YB30FqeVrqi15FC8WHJuRrXROnbz4OM fWK8JH8ru7L/1Q3pIyURQThPpIt5GiA4oSKY2aHvusWg3k9X0VPKhHqPyFgYqlCFhQXfII1Ba X-Received: by 2002:a05:600c:2192:b0:3ed:2b49:eefc with SMTP id e18-20020a05600c219200b003ed2b49eefcmr1577580wme.3.1680879188882; Fri, 07 Apr 2023 07:53:08 -0700 (PDT) X-Google-Smtp-Source: AKy350ZgBBjpgYzCwQC98O6wHa0eDo9ZGcQfv/aSDoL/hvPIetpiopcKFySOUDD8ROJb/mgWw8f+6Q== X-Received: by 2002:a05:600c:2192:b0:3ed:2b49:eefc with SMTP id e18-20020a05600c219200b003ed2b49eefcmr1577564wme.3.1680879188618; Fri, 07 Apr 2023 07:53:08 -0700 (PDT) Received: from pinkpad.lan ([2001:b07:ad4:d988:168b:4301:918a:373e]) by smtp.gmail.com with ESMTPSA id h4-20020a1ccc04000000b003ed2433aa4asm4812694wmb.41.2023.04.07.07.53.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Apr 2023 07:53:08 -0700 (PDT) From: Camilla Conte To: qemu-devel@nongnu.org Cc: Camilla Conte Subject: [PATCH 2/2] Raise crash-test-debian timeout to 90 minutes Date: Fri, 7 Apr 2023 15:52:52 +0100 Message-Id: <20230407145252.32955-2-cconte@redhat.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230407145252.32955-1-cconte@redhat.com> References: <20230407145252.32955-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 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Fri, 07 Apr 2023 11:02:56 -0400 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 When running on the Kubernetes runner, this CI job is timing out. Raise the limit to give the job enough time to run. Signed-off-by: Camilla Conte Reviewed-by: Thomas Huth --- .gitlab-ci.d/buildtest.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index ba6f551752..893f8c69b4 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -98,6 +98,7 @@ crash-test-debian: needs: - job: build-system-debian artifacts: true + timeout: 90m variables: IMAGE: debian-amd64 script: