From nobody Sat May 18 19:12:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1685609963; cv=none; d=zohomail.com; s=zohoarc; b=kGE+Ax/Gbn0D7ffebkhNu2nao+AuzuWODRKv57v0/mjSkxxXR80Jv/C5uqyi16FbSfK7oglBdHp/Epi+Hu00iaGU0QIaA0tEtGj+EB6A+IavKB/i5TnXKF1Jq+jXVDhS/n199iYEPw/VFTEsYs//IBBj67kUp2PhK3iu9cO8LUY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685609963; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=VGB5b/HEdunulAO4vga5+gTcYvBFFn/eVrqQ2Xb9of8=; b=dP3LxedUUQ0Yiu1EX2Tg47U3NfpSLBtT5xn33MuZo2J0dTqKDy/4urWWiA/XUWGaTCCOHqI5O73DiqzXF6oEODm9DuY6KdDULYSFj0AqGDvS9zDlb24b+jgWmj8gfoKMlToSqxzxyFVz8JwmOcPpAKgVF8vQc3PoU4pCvWyHpbs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1685609963106158.66468665560262; Thu, 1 Jun 2023 01:59:23 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-653-rK4G9zENNQ6UdnjqRMUetA-1; Thu, 01 Jun 2023 04:59:17 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1C942101A58B; Thu, 1 Jun 2023 08:59:15 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 58384202696C; Thu, 1 Jun 2023 08:59:14 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2BB2A194E11D; Thu, 1 Jun 2023 08:59:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 143A0194E11C for ; Thu, 1 Jun 2023 08:59:13 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id F1E91C154D9; Thu, 1 Jun 2023 08:59:12 +0000 (UTC) Received: from ridgehead.redhat.com (unknown [10.45.225.183]) by smtp.corp.redhat.com (Postfix) with ESMTP id 71B2DC154D7; Thu, 1 Jun 2023 08:59:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685609960; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=VGB5b/HEdunulAO4vga5+gTcYvBFFn/eVrqQ2Xb9of8=; b=fOrcHoIHttMCLsQvDo2rh/qsrzVE5MlG5XmcKI1ASdnEqJKLX5v/3ocSx4k4k0l+TdjOmK RwFqDzXGi8pgxPymLju9E3VeX30+I23pTK1+kO5qSlkN/7jiOu9Tl8pfj4jF5M4Y+abIaO ouXsyy5dQGqnpvyFBL5KpedquCJUnVA= X-MC-Unique: rK4G9zENNQ6UdnjqRMUetA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2] ci: refresh with latest lcitool manifest Date: Thu, 1 Jun 2023 10:59:11 +0200 Message-Id: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1685609963541100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Main lcitool changes: - added Alpine 3.17 and 3.18 targets - dropped Alpine 3.15 and 3.16 Note that we're not actively testing all Alpine targets due to CI quota, so only 3.17 is used as a replacement for 3.15 in this patch. Signed-off-by: Erik Skultety Reviewed-by: Andrea Bolognani --- ci/buildenv/{alpine-315.sh =3D> alpine-317.sh} | 1 + .../{alpine-315.Dockerfile =3D> alpine-317.Dockerfile} | 3 ++- ci/gitlab/builds.yml | 12 ++++++------ ci/gitlab/container-templates.yml | 2 +- ci/gitlab/containers.yml | 4 ++-- ci/manifest.yml | 2 +- 6 files changed, 13 insertions(+), 11 deletions(-) rename ci/buildenv/{alpine-315.sh =3D> alpine-317.sh} (99%) rename ci/containers/{alpine-315.Dockerfile =3D> alpine-317.Dockerfile} (9= 7%) diff --git a/ci/buildenv/alpine-315.sh b/ci/buildenv/alpine-317.sh similarity index 99% rename from ci/buildenv/alpine-315.sh rename to ci/buildenv/alpine-317.sh index 975914a7c2..e3f36ff8c6 100644 --- a/ci/buildenv/alpine-315.sh +++ b/ci/buildenv/alpine-317.sh @@ -60,6 +60,7 @@ function install_buildenv() { python3 \ qemu-img \ readline-dev \ + rpcgen \ samurai \ sed \ util-linux-dev \ diff --git a/ci/containers/alpine-315.Dockerfile b/ci/containers/alpine-317= .Dockerfile similarity index 97% rename from ci/containers/alpine-315.Dockerfile rename to ci/containers/alpine-317.Dockerfile index bad7e87c2b..162ae5671b 100644 --- a/ci/containers/alpine-315.Dockerfile +++ b/ci/containers/alpine-317.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci =20 -FROM docker.io/library/alpine:3.15 +FROM docker.io/library/alpine:3.17 =20 RUN apk update && \ apk upgrade && \ @@ -61,6 +61,7 @@ RUN apk update && \ python3 \ qemu-img \ readline-dev \ + rpcgen \ samurai \ sed \ util-linux-dev \ diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 96f8d3fb43..8910a19c79 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -51,22 +51,22 @@ x86_64-almalinux-8-clang-local-env: RPM: skip =20 =20 -x86_64-alpine-315-prebuilt-env: +x86_64-alpine-317-prebuilt-env: extends: .native_build_job_prebuilt_env needs: - - job: x86_64-alpine-315-container + - job: x86_64-alpine-317-container optional: true allow_failure: false variables: - NAME: alpine-315 + NAME: alpine-317 =20 -x86_64-alpine-315-local-env: +x86_64-alpine-317-local-env: extends: .native_build_job_local_env needs: [] allow_failure: false variables: - IMAGE: docker.io/library/alpine:3.15 - NAME: alpine-315 + IMAGE: docker.io/library/alpine:3.17 + NAME: alpine-317 =20 =20 x86_64-alpine-edge-prebuilt-env: diff --git a/ci/gitlab/container-templates.yml b/ci/gitlab/container-templa= tes.yml index edb4aba676..adc8a1a312 100644 --- a/ci/gitlab/container-templates.yml +++ b/ci/gitlab/container-templates.yml @@ -14,7 +14,7 @@ # Note: never publish from merge requests since they have non-committed co= de # .container_job: - image: docker:stable + image: docker:latest stage: containers interruptible: false needs: [] diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index 3be84a2106..671483813e 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -14,11 +14,11 @@ x86_64-almalinux-8-container: NAME: almalinux-8 =20 =20 -x86_64-alpine-315-container: +x86_64-alpine-317-container: extends: .container_job allow_failure: false variables: - NAME: alpine-315 + NAME: alpine-317 =20 =20 x86_64-alpine-edge-container: diff --git a/ci/manifest.yml b/ci/manifest.yml index 85d699bfae..4504068a64 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -19,7 +19,7 @@ targets: RPM: skip CC: clang =20 - alpine-315: x86_64 + alpine-317: x86_64 =20 alpine-edge: jobs: --=20 2.40.1