From nobody Wed Nov 19 22:23:33 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) client-ip=209.85.128.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1618788922; cv=none; d=zohomail.com; s=zohoarc; b=KFK4FF9bgJcRK3jv7V1S7/tfBjPYISrFIKu4j11svKTW8f+UletTChueeckuYhaPiJnTQnl+cmUcgRfkNRi4q5d43+Dh5GQaXEP1G2/nnjridgO00QvBG2t1LoAx63nGsg6RpEB9FOSHxIGyCi4fdO1VmPDWA9mMKUQuFvIhVWA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618788922; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=IZMKyCqMyO5bHC9zaYKJDMgMEQPBUUEp167PbRshw9g=; b=NcDB3Gv1bPhs9n4ijVdH7QRE6y4bvJDJo9cuPgxDFklEc1AtyCvLlAN/SC8fW1muvMJFc88q+muoHKAqrK12GNY02t1u5xJcrws5y5DU7zX31vxSJPNdRlu1y1hZ/XdslW8ypAtbbAsCL0tibuG0r6RGGd+c7XSE3dQ7YSIDwzQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.zohomail.com with SMTPS id 1618788922795268.43976034582465; Sun, 18 Apr 2021 16:35:22 -0700 (PDT) Received: by mail-wm1-f52.google.com with SMTP id t14-20020a05600c198eb029012eeb3edfaeso7175544wmq.2 for ; Sun, 18 Apr 2021 16:35:22 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id o12sm11079262wmq.21.2021.04.18.16.35.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Apr 2021 16:35:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IZMKyCqMyO5bHC9zaYKJDMgMEQPBUUEp167PbRshw9g=; b=JRzyvRaIgVduiKXSWdzn/SYoIhyNKinnWaHrByMEw1yGdhdon3Sz6EMBkxllp5RC6p urjTb7gd7qO2vExG0RMdExbwLeY2LrlPuehSgtzQzDKs9arsQQz8I8V8fFsco2wvua6d CpZpcdVLLsOb9JqJiwBDT6eZXlZo+Ad+GF1FvfsVbe7RVxfKQ3S1vvZ8MDkxK1TaQlz1 pYY74icrWnhYfbImuXA3q2Rg67oZsf8v1r0SuvVUOQ++77FUV+XsFsT0BFq8Qd5E+6eZ ZkmKRoxWSJy8YfR1awSi1mp/LsVDNDtuPaGUW7ROGotnmwTWm4wopaqcgm34SmSGj97J 3bqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=IZMKyCqMyO5bHC9zaYKJDMgMEQPBUUEp167PbRshw9g=; b=p1nYkYKjX+KCqXGmQJeOxm+SF64eOgyeNEcJ6hNTLvZoVHTTAps6POqcibuhHElyPc hl5vpCrdr2FlVTumpZ5dqoyG8DeA4F2fq0JeDDTOpzaCUuMXoBUaVto1XcfTxIv7lLR1 lIpL3TdqCHqmgB5tLGXhNp43Msa5t2O0fW0IpTJN71dgwE6I4e/mdKIRJvh9KL93sSK0 ObxWvyYGi2kzpoObPi2cCJU1zPFnn+IcdQhywvuYVamHdFUI0nXi9VXw7gwGTZ7VkbHh HkXeM2/me9VULTD+/WnkzuT5CP4PJeF2bn8tNWka8EZ1ym295JGa+EEt1ufyzQ5YZswP 0W7Q== X-Gm-Message-State: AOAM533Xmb1Ls6ByKyhWVYbOdWfeAIFQUkIGkXzJoi+LFJQeDU7+uWas M6NzVlU/nBc7W1DWGQYNeuU= X-Google-Smtp-Source: ABdhPJx2ngVZ6mivhw8Xtv4B2x49q2Ox3RqRCjLHcXxRaMPX8eOcYlz1dqyFr3co8R56R0LXUWN5EA== X-Received: by 2002:a1c:7f16:: with SMTP id a22mr17791114wmd.17.1618788921072; Sun, 18 Apr 2021 16:35:21 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Erik Skultety , Thomas Huth , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Miroslav Rezanina , Wainer dos Santos Moschetta , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cleber Rosa Subject: [PATCH 06/15] gitlab-ci: Extract container job template to container-template.yml Date: Mon, 19 Apr 2021 01:34:39 +0200 Message-Id: <20210418233448.1267991-7-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210418233448.1267991-1-f4bug@amsat.org> References: <20210418233448.1267991-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Extract the container job template to a new file (container-template.yml) to be able to reuse it without having to run all the jobs included, which are mainly useful for mainstream CI. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.d/container-template.yml | 22 ++++++++++++++++++++++ .gitlab-ci.d/containers.yml | 24 ++---------------------- 2 files changed, 24 insertions(+), 22 deletions(-) create mode 100644 .gitlab-ci.d/container-template.yml diff --git a/.gitlab-ci.d/container-template.yml b/.gitlab-ci.d/container-t= emplate.yml new file mode 100644 index 00000000000..9e3f3ae3c26 --- /dev/null +++ b/.gitlab-ci.d/container-template.yml @@ -0,0 +1,22 @@ +.container_job_template: + image: docker:stable + stage: containers + services: + - docker:dind + before_script: + - export TAG=3D"$CI_REGISTRY_IMAGE/qemu/$NAME:latest" + - export COMMON_TAG=3D"$CI_REGISTRY/qemu-project/qemu/$NAME:latest" + - apk add python3 + - docker info + - docker login $CI_REGISTRY -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PA= SSWORD" + script: + - echo "TAG:$TAG" + - echo "COMMON_TAG:$COMMON_TAG" + - docker pull "$TAG" || docker pull "$COMMON_TAG" || true + - ./tests/docker/docker.py --engine docker build + -t "qemu/$NAME" -f "tests/docker/dockerfiles/$NAME.docker" + -r $CI_REGISTRY_IMAGE + - docker tag "qemu/$NAME" "$TAG" + - docker push "$TAG" + after_script: + - docker logout diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 4ef76d1f54d..0bf4899df10 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -1,25 +1,5 @@ -.container_job_template: - image: docker:stable - stage: containers - services: - - docker:dind - before_script: - - export TAG=3D"$CI_REGISTRY_IMAGE/qemu/$NAME:latest" - - export COMMON_TAG=3D"$CI_REGISTRY/qemu-project/qemu/$NAME:latest" - - apk add python3 - - docker info - - docker login $CI_REGISTRY -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PA= SSWORD" - script: - - echo "TAG:$TAG" - - echo "COMMON_TAG:$COMMON_TAG" - - docker pull "$TAG" || docker pull "$COMMON_TAG" || true - - ./tests/docker/docker.py --engine docker build - -t "qemu/$NAME" -f "tests/docker/dockerfiles/$NAME.docker" - -r $CI_REGISTRY_IMAGE - - docker tag "qemu/$NAME" "$TAG" - - docker push "$TAG" - after_script: - - docker logout +include: + - local: '/.gitlab-ci.d/container-template.yml' =20 amd64-alpine-container: extends: .container_job_template --=20 2.26.3