From patchwork Mon Aug 5 07:16:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 3736 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 05 Aug 2024 09:18:11 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f192.google.com (mail-lj1-f192.google.com [209.85.208.192]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4757IAfL001453 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 5 Aug 2024 09:18:11 +0200 Received: by mail-lj1-f192.google.com with SMTP id 38308e7fff4ca-2ef1c0f5985sf23359781fa.2 for ; Mon, 05 Aug 2024 00:18:11 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1722842285; cv=pass; d=google.com; s=arc-20160816; b=qPLqWX7uXeVkiJQmStHsVEWXdGKmzVXFTDpPeFDZF5TPNcq3Xf8SrwTUspIOa3R4NR X7SNMhwvnYeV4QgMRgvUl7X6YpWafSoIOALC4LsVt0qBc/am8GuRtZzkdX07hTOr2QN9 ewGGgGXnTibYN/B7TbJR+N3S3igoPe5H4sdVJR91/OlU/mtfFlnx0ECARfnMLZoen4Ej 9B7TxgxqsIsS01vAmj/1lCfpBXOwHAvXTAyVm7U0+r/vLpfbbpOHB4F193uNPKIT1eYG YG0qEYZMJ3s5NdPpPY4koDbNiD4GaTKF3lAtkhMweU4xkCEpFjzTZbl1YSKjbQhCuoCJ G1BQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:to:from:sender:dkim-signature; bh=Z5fTedxtGApi1sx/lB23AhOj1E2UpzBMDGY4OhtDOEE=; fh=17pOzqcOzt+fmIj4Rj7e2aBwjt1T6hrKsig36aVt3MM=; b=adGUWryVm1fS8cg6HqRfgnUircPmlitwLiVKEAKNVx1Vy6cr8ADF/Rcs2CTyOFsEOI wM1lllna94KUxM1aGRRas849LqwK/fc287B24GIxnERty/CdxUZgNoBXogIM5GDfnk1y Ee7+9zIRZZjBlFHXuSMOvliHx9iQF1+FfVAzeKN5xyZVPKKuLXjk8Y3xycGQEUvXZ8kA r73TFGm8TKXivMawX3B3XhIud3PsXRp/lil1sDJPsQqNQepQlUmaa49/aS6zugQA0N5G jr+RHb/Uh68mvxscfOuPHeuVTjCtPoQnJ3mPYQZWuo80MGV8dl/kmIdyil5Ru+X5b3fB apug==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1722842285; x=1723447085; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:to:from :sender:from:to:cc:subject:date:message-id:reply-to; bh=Z5fTedxtGApi1sx/lB23AhOj1E2UpzBMDGY4OhtDOEE=; b=FQBy6nnfhhRGB/mvVHeRwIjefrEmsSWuavruOO/9vln79oA7LARisG5Csd3DBt1gWb WDxObL9gMAxkoWFOoT3V4DNUOT2NXVHTl2syduWIPLWqk91DixyxDESDp6wJ6U7rSRaU sdmiCIJ/xaODVifv1rLsFW1WICky4u2IXOElrgVcVnxhpyGQg+Av4Q+RNXo295uyUIjn 6i5j/TKd2Mr6LtKb4wwASg6OMbOH5MUhn3YGiW1PgwbNylV2Iog4EDzJU1uk0a4OjK0/ 14JPtV2sY79e5t22nZQz6qTTcvzHsMB7nhDcjWNwZk86jF0pP1/B7/lgMYm58uMTDFuX OVPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722842285; x=1723447085; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:to:from:x-beenthere:x-gm-message-state :sender:from:to:cc:subject:date:message-id:reply-to; bh=Z5fTedxtGApi1sx/lB23AhOj1E2UpzBMDGY4OhtDOEE=; b=Tpx7F7CQxH4Rrz883HfaTnbbtiaLWpX9nvWbez67fz/J5C26s/5oiMcscpbZDRoXOM 9LogNcW0b7U7XqFXhh0vb8Wo0CHb1lFFpJig9fBfO8nkGZiledZVaT6mMBzLiiCaqBdV w/ahwd6y4OmHfGobDSyd/r8iONg9wV9Tguzt1ZclQGGQTjtKREGtTXUM2uLqvPaWNEBj 3h6hWulJ02HGzLAvv/B7lLA3hN4nreZ3Bl4ruv5VdzKvMnEYMZTuOzJ0pr5ebN4WTfvU R2q7S5L0o4v/zGZ9qSx42XSKbpTaYZJKo42C1bYijmA0UEuFhzIFhwNHdJpFSf7nQSE1 0SFg== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCUIib54HOtY5BmzXTX1u74+7GGSz2Kjo/eJ62qDj8HvULOKfBwbvQHsBhPRoC43vVPZFX/o/1AiByKZYWOZe5paUxpPoSc= X-Gm-Message-State: AOJu0YwhiCEqXFN+WslP0a+GeDqK0qst+hJdE3XNOO5BbEUht+fM/uLj t1QVFeNcxvZX/BOd0FeQbeC6hJYt3sTWqQlBBBvCp+wfjQEN3iPp X-Google-Smtp-Source: AGHT+IEKBWWN/4YqgOHGfSAUmlafz0sCScCnf2gwylkJizz1sMDGdr1DZj+N/TYpcEyWCUwWOkKaWA== X-Received: by 2002:a05:6512:31c9:b0:52f:cad0:2d4a with SMTP id 2adb3069b0e04-530bb3bdc62mr4015557e87.9.1722842284354; Mon, 05 Aug 2024 00:18:04 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3d28:b0:52e:6e57:6ad5 with SMTP id 2adb3069b0e04-530c31fbd86ls866367e87.2.-pod-prod-04-eu; Mon, 05 Aug 2024 00:18:02 -0700 (PDT) X-Received: by 2002:a05:6512:31d0:b0:52e:9e70:d068 with SMTP id 2adb3069b0e04-530bb36306fmr6667882e87.4.1722842281989; Mon, 05 Aug 2024 00:18:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1722842281; cv=none; d=google.com; s=arc-20160816; b=tMSUvcTqnLoNNeTymzbsWW6lTgOFGN39qxYE9iSEZ9L3WXqR6asZ0ZOAP6CNpK/HZ9 bwIjQYXSFgk6doWddvnTAgyTrSfY1IskcKJc/K3Aq93PxnC333vvJZW5NyyQpNFnoP4h ymWokOFWOSdQcjUN4siZM05O4Ur6oRnORJpbuu2sORGK0BsXoEHLttohdZY4yJ+FVgUM 7niMGSni3jxgLD1ayTZIH+4n2F4Q/oevTrT7WhoZ1OggIR154nCK38ySFDZfyZHI6ADT SmkEckTYcUpGC57dKX4j0jndStGccgmjAN56NB9NTvQRMLHf3Ed2ELG5iYzicYnmpbcw IzUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from; bh=ZdMBr4phzQKy0Kz3Ej3ai6FqSoiq0jpGST5s3TyefyI=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=jc1iIzo2Tin0UnzQd4/yv1qiD6+8tRJQxnW34Sr0na65KdA9a9ZpzfD+awSvkGpQDE EbfRPkpP+iYPEojnu1DZ27IgGoKSmX8vKbo9vwsABYs+F/rDdaTcFh/o+fv0O/Kr7ACA ccrfde/wRAeSLFMzCRa6vE8eurVLmOk6TiZCw4/1uU4OnG6aFc4Iqe3QdZoFolsUO43M XjaYBmJHWxaJHPvT2AJ7/XSgzjZ9rUQEeWsQHCZyn3XG+/FbFPt7u33RayGtaQvkCVuI oZbNAEcCHy3b3k5v+XLvf8deXknzRpy2Xjh91V2ETx2H5y1G9aWagL3FvfmT2xF4Yk+O 6iwg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-42824af684dsi10089845e9.1.2024.08.05.00.18.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 05 Aug 2024 00:18:01 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from home.promwad.com (44-208-124-178-static.mgts.by [178.124.208.44] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 4757I0q5001436 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 5 Aug 2024 09:18:01 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH] ci: Add test cases for container fetching and loading Date: Mon, 5 Aug 2024 10:16:03 +0300 Message-ID: <20240805071755.19853-1-ubely@ilbers.de> X-Mailer: git-send-email 2.44.2 MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: ubely@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Jan Kiszka This plugs the two example recipes for loading container images into VM-based testing. The test consists of running 'true' in the installed alpine images. Rather than enabling the ci user to do password-less sudo, this uses su with the piped-in password. Another trick needed is to poll for the images because loading is performed asynchronously. Signed-off-by: Jan Kiszka Signed-off-by: Uladzimir Bely --- .../recipes-core/images/isar-image-ci.bb | 2 ++ testsuite/citest.py | 24 +++++++++++++++++++ 2 files changed, 26 insertions(+) This is a drop-in replacement of patch 4 from "[PATCH v4 0/5] Introduce container fetcher and pre-loader" series: - Fixed syntax errors (incorrectly escaped '\$') - Fixed long lines in order to pass flake8 diff --git a/meta-test/recipes-core/images/isar-image-ci.bb b/meta-test/recipes-core/images/isar-image-ci.bb index e5d51e6e..9133da74 100644 --- a/meta-test/recipes-core/images/isar-image-ci.bb +++ b/meta-test/recipes-core/images/isar-image-ci.bb @@ -16,6 +16,7 @@ IMAGE_INSTALL += "sshd-regen-keys" # qemuamd64-bookworm WKS_FILE:qemuamd64:debian-bookworm ?= "multipart-efi.wks" +IMAGE_INSTALL:append:qemuamd64:debian-bookworm = " prebuilt-docker-img prebuilt-podman-img" # qemuamd64-bullseye IMAGE_FSTYPES:append:qemuamd64:debian-bullseye ?= " cpio.gz tar.gz" @@ -51,3 +52,4 @@ IMAGER_INSTALL:append:qemuarm:debian-bookworm ?= " ${SYSTEMD_BOOTLOADER_INSTALL} # qemuarm64-bookworm IMAGE_FSTYPES:append:qemuarm64:debian-bookworm ?= " wic.xz" IMAGER_INSTALL:append:qemuarm64:debian-bookworm ?= " ${GRUB_BOOTLOADER_INSTALL}" +IMAGE_INSTALL:append:qemuarm64:debian-bookworm = " prebuilt-docker-img prebuilt-podman-img" diff --git a/testsuite/citest.py b/testsuite/citest.py index 7064c1e4..4a248a49 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -609,3 +609,27 @@ class VmBootTestFull(CIBaseTest): image='isar-image-ci', script='test_kernel_module.sh example_module', ) + + def test_amd64_bookworm_prebuilt_containers(self): + self.init() + self.vm_start( + 'amd64', 'bookworm', image='isar-image-ci', + cmd='echo root | su -c \'PATH=$PATH:/usr/sbin;' + 'for n in $(seq 30);' + ' do docker images | grep -q alpine && break; sleep 10; done;' + 'docker run --rm quay.io/libpod/alpine:3.10.2 true && ' + 'for n in $(seq 30);' + ' do podman images | grep -q alpine && break; sleep 10; done;' + 'podman run --rm quay.io/libpod/alpine:latest true\'') + + def test_arm64_bookworm_prebuilt_containers(self): + self.init() + self.vm_start( + 'arm64', 'bookworm', image='isar-image-ci', + cmd='echo root | su -c \'PATH=$PATH:/usr/sbin;' + 'for n in $(seq 30);' + ' do docker images | grep -q alpine && break; sleep 10; done;' + 'docker run --rm quay.io/libpod/alpine:3.10.2 true && ' + 'for n in $(seq 30);' + ' do podman images | grep -q alpine && break; sleep 10; done;' + 'podman run --rm quay.io/libpod/alpine:latest true\'')