A couple of minor tweaks to the gitlab-runner-helper-images package

Axel von Bertoldirequested to merge
avonbertoldi/add-version-to-helper-image-dependency into main
  • Change gitlab-runner-helper-images package arch to noarch. It looks like fpm maps all no noarch anyway, and packagecloud at least only recognized noarch (and not all/any), so noarch is more direct.
  • Specify gitlab-runner-helper-images version in dependency. We want the gitlab-runner package to depend on a specific version of the gitlab-runner-helper-images package; the same version as the gitlab-runner package!

Testing

Deb 
> apt show ./gitlab-runner_amd64.deb ./gitlab-runner-helper-images_17.7.0-1_all.deb ./gitlab-runner-helper-images.deb              
Package: gitlab-runner
Version: 17.8.0-1 					<-----------------------
Priority: optional
Section: admin
Maintainer: GitLab Inc. <support@gitlab.com>
Installed-Size: 108 MB
Provides: gitlab-ci-multi-runner
Depends: ca-certificates, gitlab-runner-helper-images (= 17.8.0-1), git, curl, tar <---------------------------------
Suggests: docker-engine
Conflicts: gitlab-runner-beta, gitlab-ci-multi-runner, gitlab-ci-multi-runner-beta
Replaces: gitlab-ci-multi-runner
Homepage: https://gitlab.com/gitlab-org/gitlab-runner
License: MIT
Vendor: GitLab Inc.
Download-Size: 26.0 MB
APT-Sources: /pkgs/gitlab-runner_amd64.deb
Description: GitLab Runner

Package: gitlab-runner-helper-images
Version: 17.7.0-1  <-------------------------------------
Priority: optional
Section: admin
Maintainer: GitLab Inc. <support@gitlab.com>
Installed-Size: 511 MB
Provides: gitlab-runner-helper-images
Homepage: https://gitlab.com/gitlab-org/gitlab-runner
License: MIT
Vendor: GitLab Inc.
Download-Size: 514 MB
APT-Sources: /pkgs/gitlab-runner-helper-images_17.7.0-1_all.deb
Description: GitLab Runner Helper Docker Images

Package: gitlab-runner-helper-images
Version: 17.8.0-1 <-----------------------------------
Priority: optional
Section: admin
Maintainer: GitLab Inc. <support@gitlab.com>
Installed-Size: 506 MB
Provides: gitlab-runner-helper-images
Replaces: gitlab-runner
Homepage: https://gitlab.com/gitlab-org/gitlab-runner
License: MIT
Vendor: GitLab Inc.
Download-Size: 508 MB
APT-Sources: /pkgs/gitlab-runner-helper-images.deb
Description: GitLab Runner Helper Docker Images

> apt-get install ./gitlab-runner_amd64.deb ./gitlab-runner-helper-images_17.7.0-1_all.deb 
Reading package lists... Done
Building dependency tree... Done
Reading state information... Done
Note, selecting 'gitlab-runner' instead of './gitlab-runner_amd64.deb'
Note, selecting 'gitlab-runner-helper-images' instead of './gitlab-runner-helper-images_17.7.0-1_all.deb'
Some packages could not be installed. This may mean that you have
requested an impossible situation or if you are using the unstable
distribution that some required packages have not yet been created
or been moved out of Incoming.
The following information may help to resolve the situation:

The following packages have unmet dependencies:
 gitlab-runner : Depends: gitlab-runner-helper-images (= 17.8.0-1) but 17.7.0-1 is to be installed
E: Unable to correct problems, you have held broken packages.

> apt-get install ./gitlab-runner_amd64.deb ./gitlab-runner-helper-images 
gitlab-runner-helper-images.deb               gitlab-runner-helper-images_17.7.0-1_all.deb  
root@8d9555c2f8a0:/pkgs# apt-get install ./gitlab-runner_amd64.deb ./gitlab-runner-helper-images.deb 
Reading package lists... Done
Building dependency tree... Done
Reading state information... Done
Note, selecting 'gitlab-runner' instead of './gitlab-runner_amd64.deb'
Note, selecting 'gitlab-runner-helper-images' instead of './gitlab-runner-helper-images.deb'
The following additional packages will be installed:
  ...
0 upgraded, 50 newly installed, 0 to remove and 0 not upgraded.
Need to get 26.2 MB/560 MB of archives.
After this operation, 739 MB of additional disk space will be used.
Do you want to continue? [Y/n]
RPM 
> rpm -qip --requires gitlab-runner_amd64.rpm gitlab-runner-helper-images-17.7.0-1.noarch.rpm gitlab-runner-helper-images.rpm
Name        : gitlab-runner
Version     : 17.8.0 <-----------------------------
Release     : 1
Architecture: x86_64
Install Date: (not installed)
Group       : default
Size        : 108255838
License     : MIT
Signature   : (none)
Source RPM  : gitlab-runner-17.8.0-1.src.rpm
Build Date  : Wed Jan  8 20:14:08 2025
Build Host  : 6b3d1fe0f25c
Relocations : / 
Packager    : GitLab Inc. <support@gitlab.com>
Vendor      : GitLab Inc.
URL         : https://gitlab.com/gitlab-org/gitlab-runner
Summary     : GitLab Runner
Description :
GitLab Runner
/bin/sh
/bin/sh
curl
git
gitlab-runner-helper-images = 17.8.0 <-----------------------------------------
rpmlib(CompressedFileNames) <= 3.0.4-1
rpmlib(FileDigests) <= 4.6.0-1
rpmlib(PayloadFilesHavePrefix) <= 4.0-1
rpmlib(PayloadIsBzip2) <= 3.0.5-1
tar

Name        : gitlab-runner-helper-images
Version     : 17.7.0 <----------------------------
Release     : 1
Architecture: noarch
Install Date: (not installed)
Group       : default
Size        : 511265212
License     : MIT
Signature   : RSA/SHA512, Thu Dec 19 20:44:47 2024, Key ID 6c57c29c6ba75a4e
Source RPM  : gitlab-runner-helper-images-17.7.0-1.src.rpm
Build Date  : Thu Dec 19 20:43:29 2024
Build Host  : runner-quqpofsc-project-250833-concurrent-0
Relocations : / 
Packager    : GitLab Inc. <support@gitlab.com>
Vendor      : GitLab Inc.
URL         : https://gitlab.com/gitlab-org/gitlab-runner
Summary     : GitLab Runner Helper Docker Images
Description :
GitLab Runner Helper Docker Images
rpmlib(CompressedFileNames) <= 3.0.4-1
rpmlib(FileDigests) <= 4.6.0-1
rpmlib(PayloadFilesHavePrefix) <= 4.0-1
rpmlib(PayloadIsBzip2) <= 3.0.5-1

Name        : gitlab-runner-helper-images
Version     : 17.8.0 <------------------------------
Release     : 1
Architecture: noarch
Install Date: (not installed)
Group       : default
Size        : 505842464
License     : MIT
Signature   : (none)
Source RPM  : gitlab-runner-helper-images-17.8.0-1.src.rpm
Build Date  : Wed Jan  8 20:32:13 2025
Build Host  : 6b3d1fe0f25c
Relocations : / 
Packager    : GitLab Inc. <support@gitlab.com>
Vendor      : GitLab Inc.
URL         : https://gitlab.com/gitlab-org/gitlab-runner
Summary     : GitLab Runner Helper Docker Images
Description :
GitLab Runner Helper Docker Images
rpmlib(CompressedFileNames) <= 3.0.4-1
rpmlib(FileDigests) <= 4.6.0-1
rpmlib(PayloadFilesHavePrefix) <= 4.0-1
rpmlib(PayloadIsBzip2) <= 3.0.5-1

> dnf install ./gitlab-runner_amd64.rpm ./gitlab-runner-helper-images-17.7.0-1.noarch.rpm 
Last metadata expiration check: 0:02:10 ago on Wed Jan  8 21:11:09 2025.
Error: 
 Problem: cannot install both gitlab-runner-helper-images-17.7.0-1.noarch from @commandline and gitlab-runner-helper-images-17.7.0-1.noarch from runner_gitlab-runner
  - package gitlab-runner-17.8.0-1.x86_64 from @commandline requires gitlab-runner-helper-images = 17.8.0-1, but none of the providers can be installed
  - conflicting requests
(try to add '--allowerasing' to command line to replace conflicting packages or '--skip-broken' to skip uninstallable packages)

> dnf install ./gitlab-runner_amd64.rpm ./gitlab-runner-helper-images.rpm 
Last metadata expiration check: 0:02:42 ago on Wed Jan  8 21:11:09 2025.
Dependencies resolved.
==============================================================================================================================================================================
 Package                                            Architecture                  Version                                           Repository                           Size
==============================================================================================================================================================================
Installing:
  ...
Transaction Summary
==============================================================================================================================================================================
Install  80 Packages

Total size: 529 M
Total download size: 19 M
Installed size: 662 M
Is this ok [y/N]:
Edited by Axel von Bertoldi

Merge request reports