From nobody Tue Feb 10 19:09:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) client-ip=209.85.221.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1620718210; cv=none; d=zohomail.com; s=zohoarc; b=NmNnWtIDBXiwVjlisfAYhsiRraUARoyOiTNKc3fQVj94itGi6I5pFs49PQKNubzcwMPY8LN5lHv4/sZOCPjwxBdH/KKHjSunFEPP6cjN2VluiuCKmPQE3hpApFmdW9YOTGycj4MN2YVPiq27ZD6zA3c+/lYb94hSB+tWV2w/3qE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620718210; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=IZMKyCqMyO5bHC9zaYKJDMgMEQPBUUEp167PbRshw9g=; b=NT5QYYbIfjHUaQOLjHjQ45nTdgnf0/MCPJooKnB6tqreHqNDQtLrow/5S+r3BdhDbVFl8s6ICM6Jn8M3xdCXleqwX8OR7b9DMVIKwtW+4+XFaTKBXwZe1zq61kc0kgtx/9DI/f5oxUEQOUjPxq3UfFOh6XMEfCFrbf0JFUmWxPk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.zohomail.com with SMTPS id 1620718210919491.8620895434984; Tue, 11 May 2021 00:30:10 -0700 (PDT) Received: by mail-wr1-f45.google.com with SMTP id l2so19029902wrm.9 for ; Tue, 11 May 2021 00:30:10 -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 s15sm25779125wrt.19.2021.05.11.00.30.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 May 2021 00:30:08 -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=jrhMpAWT7XBRSY4S1eJkgi6NUF+eIdmpAOlSayloWLYkN7Iwg/FSKukr3jSbxQpzMR 3l0wZ4A3yxub4T58Icr4rqMS9Ymh6r/ZvGB3U/PBeT/DkshHVTxWgQh8imiU6Qm5nAVj 4eQSabSrAHGdnknUNiJQsAdYrJR6Qtq9x0XRN0LV2IU0SmqQXiCuzfdXxGwUdjUaYEax Yn+OMKYT2kSipyq706hssHKTuR5tbK/9N4cHSwpE6gKXDS/HVe7fXoRY8EPcKwPNfIYY TnEYjVEtKWz4sY2nMe8jGiLNqGd8KUBDZhup4bTU0GqpYG3uVUHFDWRb7G20xCDN1D2q cnSA== 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=iSFebkw9MVu5A6QMELQuv3DAKE8dQXvpDBmY2D65KSeY1UbpWdD0GrQtPCmZF3LJN9 aNecNECBpa+yyXqEla1ln3JH1RcnXYQ2Rs9HMi4saHE83ZOC5LQbkYyUg1cmn2D8T3Yo Q/LIWElQMBs2DQmhZtbhvEK10Z3lV/QnPqXmpKBIq+dneJxbCMnfVWg6lcGGpxGB4tsw Vbm5GnOW3WS/wCjzak+s0n4fZkwc994gmzFkJR0DsTPNJdB9qG2JzKzl9P/62KjxVcYV l3w7q8tzJD5Rl7bWQoAVYoVzxXRV4MszZmcDaZU1TWMrCeC1vqJaL6vMtMmeoNaaIQPy x1Lg== X-Gm-Message-State: AOAM530WzLVzpNhBQDaU4EJkx1SvctoIeivy34KkT+ZAtf41Ccalu4wI 2tX8Opchg4DQUs2fMedwZg0= X-Google-Smtp-Source: ABdhPJyOnr7vureBpXbqKCpB/z8JCajKgoheRFHe7fakX93LvMzvFjdc6wyS2i1Unp/Kq19dOPPGbg== X-Received: by 2002:adf:e552:: with SMTP id z18mr34851602wrm.226.1620718209151; Tue, 11 May 2021 00:30:09 -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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Willian Rampazzo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Cleber Rosa , Wainer dos Santos Moschetta Subject: [PATCH v2 03/10] gitlab-ci: Extract container job template to container-template.yml Date: Tue, 11 May 2021 09:29:45 +0200 Message-Id: <20210511072952.2813358-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210511072952.2813358-1-f4bug@amsat.org> References: <20210511072952.2813358-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 --- .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