From: "Knop, Ryszard" <ryszard.knop@intel.com>
To: "igt-dev@lists.freedesktop.org" <igt-dev@lists.freedesktop.org>,
"Hajda, Andrzej" <andrzej.hajda@intel.com>
Cc: "rk@dragonic.eu" <rk@dragonic.eu>,
"adrinael@adrinael.net" <adrinael@adrinael.net>,
"kamil.konieczny@linux.intel.com"
<kamil.konieczny@linux.intel.com>
Subject: Re: [v2,5/5] CI: remove podman login
Date: Wed, 11 Jun 2025 12:34:10 +0000 [thread overview]
Message-ID: <b5acaa0173e2bc2be4b6fce60b05ee97375fd9df.camel@intel.com> (raw)
In-Reply-To: <20250611-bump_docker_distros-v2-5-90791ecb953d@intel.com>
Reviewed-by: Ryszard Knop <ryszard.knop@intel.com>
On Wed, 2025-06-11 at 13:06 +0200, Andrzej Hajda wrote:
> "podman login" is issued for every container job even if it is usually
> not required. Let's drop it in favor of credentials provided
> to commands requiring it.
>
> Signed-off-by: Andrzej Hajda <andrzej.hajda@intel.com>
> ---
> .gitlab-ci.yml | 5 -----
> .gitlab-ci/pull-or-rebuild.sh | 4 ++--
> 2 files changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index ab6968b549d0026869fe38f063f60f57b5e9d75c..519edab5ff9c79eae0de71e71e3f3645431a1459 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -48,7 +48,6 @@ build-containers:build-debian:
> stage: build-containers
> image: $BUILD_CONTAINERS_IMAGE
> script:
> - - podman login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
> - .gitlab-ci/pull-or-rebuild.sh base Dockerfile.build-debian-minimal build-debian-minimal
> - .gitlab-ci/pull-or-rebuild.sh base Dockerfile.build-debian build-debian
>
> @@ -56,21 +55,18 @@ build-containers:build-debian-armhf:
> stage: build-containers
> image: $BUILD_CONTAINERS_IMAGE
> script:
> - - podman login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
> - .gitlab-ci/pull-or-rebuild.sh base Dockerfile.build-debian-armhf build-debian-armhf
>
> build-containers:build-debian-arm64:
> stage: build-containers
> image: $BUILD_CONTAINERS_IMAGE
> script:
> - - podman login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
> - .gitlab-ci/pull-or-rebuild.sh base Dockerfile.build-debian-arm64 build-debian-arm64
>
> build-containers:build-fedora:
> stage: build-containers
> image: $BUILD_CONTAINERS_IMAGE
> script:
> - - podman login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
> - .gitlab-ci/pull-or-rebuild.sh base Dockerfile.build-fedora build-fedora
>
> #################### BUILD #########################
> @@ -263,5 +259,4 @@ containers:igt:
> variables:
> FORCE_REBUILD: 1
> script:
> - - podman login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
> - .gitlab-ci/pull-or-rebuild.sh igt Dockerfile igt
> diff --git a/.gitlab-ci/pull-or-rebuild.sh b/.gitlab-ci/pull-or-rebuild.sh
> index 4f77431b52b06fd5971b47ea1aadcf0e85e4edad..aa1bddcde88d927a892501071dc848a36b2f2f85 100755
> --- a/.gitlab-ci/pull-or-rebuild.sh
> +++ b/.gitlab-ci/pull-or-rebuild.sh
> @@ -47,7 +47,7 @@ if [ "$TYPE" = "base" ]; then
> else
> echo "Building!"
> $PODMAN_BUILD --squash -t $DOCKERNAME -f $DOCKERFILE .
> - podman push $DOCKERNAME
> + podman push --creds $CI_REGISTRY_USER:$CI_REGISTRY_PASSWORD $DOCKERNAME
> fi
>
> skopeo copy --dest-creds $CI_REGISTRY_USER:$CI_REGISTRY_PASSWORD \
> @@ -57,7 +57,7 @@ elif [ "$TYPE" = "igt" ]; then
> # we always rebuild
> set -e
> $PODMAN_BUILD -t $COMMITNAME -f $DOCKERFILE .
> - podman push $COMMITNAME
> + podman push --creds $CI_REGISTRY_USER:$CI_REGISTRY_PASSWORD $COMMITNAME
> skopeo copy --dest-creds $CI_REGISTRY_USER:$CI_REGISTRY_PASSWORD \
> docker://$COMMITNAME docker://$REFNAME
> else
next prev parent reply other threads:[~2025-06-11 12:34 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-11 11:06 [PATCH v2 0/5] CI/build: bump container images, OS and meson versions Andrzej Hajda
2025-06-11 11:06 ` [PATCH v2 1/5] CI: create own base buildah image instead of wayland's Andrzej Hajda
2025-06-11 12:33 ` [v2,1/5] " Knop, Ryszard
2025-06-11 11:06 ` [PATCH v2 2/5] Dockerfile: bump debian version Andrzej Hajda
2025-06-11 12:33 ` [v2,2/5] " Knop, Ryszard
2025-06-11 11:06 ` [PATCH v2 3/5] Dockerfile: bump fedora version Andrzej Hajda
2025-06-11 12:30 ` [v2,3/5] " Knop, Ryszard
2025-06-12 11:56 ` Hajda, Andrzej
2025-06-11 11:06 ` [PATCH v2 4/5] meson: bump required and tested version of meson Andrzej Hajda
2025-06-11 12:32 ` [v2,4/5] " Knop, Ryszard
2025-06-11 11:06 ` [PATCH v2 5/5] CI: remove podman login Andrzej Hajda
2025-06-11 12:34 ` Knop, Ryszard [this message]
2025-06-11 20:27 ` ✓ i915.CI.BAT: success for CI/build: bump container images, OS and meson versions Patchwork
2025-06-11 20:50 ` ✓ Xe.CI.BAT: " Patchwork
2025-06-12 0:29 ` ✓ i915.CI.Full: " Patchwork
2025-06-12 4:22 ` ✗ Xe.CI.Full: failure " Patchwork
2025-06-12 10:26 ` Kamil Konieczny
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b5acaa0173e2bc2be4b6fce60b05ee97375fd9df.camel@intel.com \
--to=ryszard.knop@intel.com \
--cc=adrinael@adrinael.net \
--cc=andrzej.hajda@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=kamil.konieczny@linux.intel.com \
--cc=rk@dragonic.eu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.