From nobody Tue Feb 10 11:55:48 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) client-ip=209.85.221.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1622063942; cv=none; d=zohomail.com; s=zohoarc; b=oH78AH5E/TpW9xnnjiSqjY+pV5K8sIe836RcdYCqGi77P+wz/VIiHgilq16gX2ig9iprbQSkK1zxE5PmHxRbeXX4RZLeVMISMu9ISDyjdJhJT/CskMeubjlQniVnDyq/yDe3xFXpPbivxFVVes5OB59/qP6KbF3RjKVUl4bjANk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622063942; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wPWremnQeDbf5OKwcSsZMVVUeLqeVe3tozm8/BONWnc=; b=kvSIbRuBGWBUe7+Einzp7z3Iv3gcFQ02vK3PDm7F2k/Gt6K+mrYf2m9kD4FtNYeInee0ZDjUMWplZjh04oOUpBJzlk8ZooIFnhl1+ntW9ACo1JnQ2Y19m0sbgmu8zGkX2PoWu3/kL+uHhDf3ouS+yjHGMWNKyZ2zFFYezZ7896k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.zohomail.com with SMTPS id 1622063942654990.5078366228286; Wed, 26 May 2021 14:19:02 -0700 (PDT) Received: by mail-wr1-f43.google.com with SMTP id x7so2505195wrt.12 for ; Wed, 26 May 2021 14:19:02 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (235.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.235]) by smtp.gmail.com with ESMTPSA id m20sm8073513wmi.5.2021.05.26.14.18.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 14:19:00 -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=wPWremnQeDbf5OKwcSsZMVVUeLqeVe3tozm8/BONWnc=; b=WQoU7G/rEy3YKMInZMdagijCjD8TosqyKvf6GG/4Dm+9VhVFtaYESZFpb1z5ZLScfD klQUpuTdXZ+Df82c/dO6UPydjyv41+Unx/FwPIr1cQrwE9S10eLDLXNPAKhGY787xFDB L3H651tjf4y57KGykqILuKnZxqGGP2SSNPUGrXIrP2Yy8d2a04E+bK0UcaknaajMF1ZD Dy1uTiL19+qhMZNzYCBHaRy2PvTDslFdrzE5tzhOKeOwo4ezn3LYUoYJM6pRtGSVwrUF iBc2ca7fWBZIxmVNJHhHYjOf9oVzorp1hSSldurmH71VdeA3JE49K2kYESNF8eSm1bKj rHmA== 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=wPWremnQeDbf5OKwcSsZMVVUeLqeVe3tozm8/BONWnc=; b=G5Vr0dHiCq2KDGCyXLCF/N56eulVZ6+NRtr0ApedRv+VkBUZC34Ow1NNumlOwk9jlc aH45hzTalNEiwHbxkwBlrTYej8wZs/5sf5uId89ahhjhykvgxKzIHQ2l1P3m2CyAHyN7 Iefw5A5uPFn+aosZCw8buAPyPJaarP+d6hDc2+5iwFdOX6HzcklVymUhNAt2Dy/U9wOh c6aP0yjAoT/lxrVBADbeTqVn1x0R9tF7oXj0AeF6MRxoPemBddlP+ZlF3WRWetgXLcQw 3d+yQTnWTD4rXiEZE2VfCQSlBl+NjY5qNVOto5CzyBEXUBbiAnf4xKfaf5yetYgd7mWC lXSA== X-Gm-Message-State: AOAM530cp/Dijfx99bJCruFnNoU3wMyRPbEb01/4uV7z4UJ7mVZU+BiS W0FfebqtXYjp4kZ1NZJ/iukmErwZvPgMkQ== X-Google-Smtp-Source: ABdhPJwksHf4gqMVUEnBod0YcLkWGVKCyxvvV66ocSxlXkt1k3pfzUbF4EzpPHfNc1lYAMyGjYnJXQ== X-Received: by 2002:a5d:4443:: with SMTP id x3mr26513wrr.62.1622063940897; Wed, 26 May 2021 14:19:00 -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: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta Subject: [PULL 04/19] gitlab: Extract container job template to container-template.yml Date: Wed, 26 May 2021 23:18:23 +0200 Message-Id: <20210526211838.421716-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210526211838.421716-1-f4bug@amsat.org> References: <20210526211838.421716-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 Reviewed-by: Willian Rampazzo Message-Id: <20210519185504.2198573-4-f4bug@amsat.org> Signed-off-by: Thomas Huth --- .gitlab-ci.d/container-template.yml | 21 +++++++++++++++++++++ .gitlab-ci.d/containers.yml | 23 ++--------------------- 2 files changed, 23 insertions(+), 21 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..1baecd94606 --- /dev/null +++ b/.gitlab-ci.d/container-template.yml @@ -0,0 +1,21 @@ +.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" + - ./tests/docker/docker.py --engine docker build + -t "qemu/$NAME" -f "tests/docker/dockerfiles/$NAME.docker" + -r $CI_REGISTRY/qemu-project/qemu + - 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 7b7ca3790df..2b06763d73b 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -1,24 +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" - - ./tests/docker/docker.py --engine docker build - -t "qemu/$NAME" -f "tests/docker/dockerfiles/$NAME.docker" - -r $CI_REGISTRY/qemu-project/qemu - - 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