From nobody Tue May 7 17:19:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) client-ip=209.85.221.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1616114584; cv=none; d=zohomail.com; s=zohoarc; b=GLjliBUXV0jA8VdfLLnDyQw/IM2NjIASv9QfVBMQ9qeVZMQgLoJI+5wz0FCOlYdO86jQcmCzy6Ho42Ri+lG/vOwS9GliDwxTZ6IbnSjNhKWtxNEvu26AHb7lwG3Na9cJgfyR8pbzopToDLKUjkYPArJxzIx5CjuYPMk7wZPHEvI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616114584; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Sender:Subject:To; bh=zH9kaQjzJp5vdS3KDxE+3MxnvzsnBKZ9oFGHTD7znmQ=; b=R0LMTJTQVNbIO9unyhm2SKQUzX10F/wzGfkDuRWtfz8Jc1YMc32r3aVkKyAnOiNS7N5kDi56lDVuoj+f+KUQZ3+ffUJs0S6GAMB+6cKN9VS31sLVXVwszgeqQtYCfT1F0c4XKOhIBV/1jWq8NsERQdl8f3IqFupFvETOE1iLmpw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.zohomail.com with SMTPS id 1616114584952712.1643331291485; Thu, 18 Mar 2021 17:43:04 -0700 (PDT) Received: by mail-wr1-f54.google.com with SMTP id x13so7386567wrs.9 for ; Thu, 18 Mar 2021 17:43:04 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id e18sm5384089wru.73.2021.03.18.17.43.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Mar 2021 17:43:02 -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:mime-version :content-transfer-encoding; bh=zH9kaQjzJp5vdS3KDxE+3MxnvzsnBKZ9oFGHTD7znmQ=; b=SpkeDY7OxWn/zO7HKu8Apc3hFOmWbXsuGryy0ndEDLFtgNDcS4RBkCEHFolgt9lZ0O 0DNQt5iyTjF4ILDQTJJDZnO+v5KdYMKFM3y0vzh3FUlizoAxwdywvb/sfy4VhdVqTHXP 3/zqnxRKxXLvL7iiwaqAPTuDTu6100gLGCXc9EC5LH9N3aSgRBb2qcK7HPqm8D+mHNm7 51L6nSA5a82jmmG3Ki9NKu2eDGm79j9bHHC+cSbTBBUZ788CLgdljnPHXYu6aHx+wKG6 qHTdRPH0MkP75/F6rRJgKn3CbrKBAtsAemgaPcP7ucFWtU1eNlGCeXZWoFTx93xzTXv0 vwAg== 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 :mime-version:content-transfer-encoding; bh=zH9kaQjzJp5vdS3KDxE+3MxnvzsnBKZ9oFGHTD7znmQ=; b=GMOzQXPVqzeoZ8im4qmVsZY1xjVayA+ndhIByCAYsmDcUVeyLoxMVXBd0iktLYU6YN vwZSk3pfbmxSC/swGVCfYeeH3zzwItsnp9iqOhTAy0mAv6lWxWwLnqbweoV7C8aa6AId Vzw++DcIoETERaRJug7fQqM0fjBtw66HpIYjIBLV75LrkCcUYPuq6+Yv5oThItvkIH0f nZz0LVWp5KEBWahvLa0fFisQGHfe4zNZAnut56wnbFbTOtqUuMftyp91FvsD2C8LcQnm RvBLDRbyTAZiR/MDL90rAiVdtiPVMqM2L1w79z3iXnKMYTD/w6CuDp6tSROJxcRe8Flz boJQ== X-Gm-Message-State: AOAM530FQLF1oz/N+uRGPDvDoJhxkDVq7m701wUuTb7jiNbh8wnBAQyQ SDkKq8oP0WSGwD1SjTeG3Q4= X-Google-Smtp-Source: ABdhPJyBwBjsE58vAlX9hWiBIqA8QJroqBRtDK3j0BGaUxpTazd3Sn1xophF/d7Ur6z5zCHmwJTKLw== X-Received: by 2002:adf:c641:: with SMTP id u1mr1759558wrg.332.1616114583080; Thu, 18 Mar 2021 17:43:03 -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: "Daniel P . Berrange" , Thomas Huth , Bin Meng , Cleber Rosa , Wainer dos Santos Moschetta , Laszlo Ersek , Willian Rampazzo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH] gitlab-ci: Restrict jobs using Docker to runners having 'docker' tag Date: Fri, 19 Mar 2021 01:43:00 +0100 Message-Id: <20210319004300.3800583-1-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) When a job is based on a Docker image [1], or is using a Docker service, it requires a runner with Docker installed. Gitlab shared runners provide the 'docker' tag when they have it installed. Are Gitlab shared runners are limited resources, we'd like to add more runners to QEMU repositories hosted on Gitlab. If a runner doesn't provide Docker, our jobs requiring it will fail. Use the standard 'docker' tag to mark the jobs requiring Docker on the runner. [1] https://docs.gitlab.com/ee/ci/yaml/#image [2] https://docs.gitlab.com/ee/ci/yaml/#services Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- If someone is interested in testing or filling the documentation gap, what I ran is: $ sudo usermod -aG docker,kvm gitlab-runner $ sudo gitlab-runner --log-format text --log-level debug \ register \ --non-interactive \ --url https://gitlab.com --registration-token MYTOKEN --description myrunn= er \ --tag-list 'docker,linux,x86_64,kvm' --run-untagged --limit 2 \ --executor docker --docker-image docker:dind --docker-cpus 4 \ --docker-volumes /var/run/docker.sock:/var/run/docker.sock \ --docker-dns 8.8.8.8 --docker-volumes is for docker:dind else it was not working This comes from this 3 year old thread: https://gitlab.com/gitlab-org/gitlab-runner/-/issues/1986 We can not use the 'docker:dind' tag for a runner having docker:dind and /var/run/docker.sock volume because this is not a tag used by the shared runners, so we can't use them anymore. --- .gitlab-ci.d/containers.yml | 2 ++ .gitlab-ci.d/crossbuilds.yml | 4 ++++ .gitlab-ci.d/edk2.yml | 4 ++++ .gitlab-ci.d/opensbi.yml | 4 ++++ .gitlab-ci.yml | 4 ++++ 5 files changed, 18 insertions(+) diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 33e4046e233..8e2a6a99889 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -1,4 +1,6 @@ .container_job_template: &container_job_definition + tags: + - docker image: docker:stable stage: containers services: diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index d5098c986b8..e59fbfdc73f 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -1,4 +1,6 @@ .cross_system_build_job: + tags: + - docker stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest timeout: 80m @@ -18,6 +20,8 @@ # KVM), and set extra options (such disabling other accelerators) via the # $ACCEL_CONFIGURE_OPTS variable. .cross_accel_build_job: + tags: + - docker stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest timeout: 30m diff --git a/.gitlab-ci.d/edk2.yml b/.gitlab-ci.d/edk2.yml index ba7280605c4..afbd8e4d915 100644 --- a/.gitlab-ci.d/edk2.yml +++ b/.gitlab-ci.d/edk2.yml @@ -5,6 +5,8 @@ docker-edk2: - .gitlab-ci.d/edk2.yml - .gitlab-ci.d/edk2/Dockerfile when: always + tags: + - docker image: docker:19.03.1 services: - docker:19.03.1-dind @@ -24,6 +26,8 @@ docker-edk2: - docker push $IMAGE_TAG =20 build-edk2: + tags: + - docker stage: build needs: ['docker-edk2'] rules: # Only run this job when ... diff --git a/.gitlab-ci.d/opensbi.yml b/.gitlab-ci.d/opensbi.yml index f66cd1d9089..a4a93222c2d 100644 --- a/.gitlab-ci.d/opensbi.yml +++ b/.gitlab-ci.d/opensbi.yml @@ -5,6 +5,8 @@ docker-opensbi: - .gitlab-ci.d/opensbi.yml - .gitlab-ci.d/opensbi/Dockerfile when: always + tags: + - docker image: docker:19.03.1 services: - docker:19.03.1-dind @@ -24,6 +26,8 @@ docker-opensbi: - docker push $IMAGE_TAG =20 build-opensbi: + tags: + - docker stage: build needs: ['docker-opensbi'] rules: # Only run this job when ... diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f65cb11c4d3..d4511cf7dea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,6 +14,8 @@ include: - local: '/.gitlab-ci.d/crossbuilds.yml' =20 .native_build_job_template: &native_build_job_definition + tags: + - docker stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest before_script: @@ -38,6 +40,8 @@ include: fi =20 .native_test_job_template: &native_test_job_definition + tags: + - docker stage: test image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest script: --=20 2.26.2