Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

jenkins-job-builder: fix build #363535

Closed
wants to merge 4 commits into from
Closed

jenkins-job-builder: fix build #363535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
34c32ee
python3Packages.openstackdocstheme: add missing 'distutils' dependency
bjornfor Dec 9, 2024
d2d8860
nixos/tests/jenkins: increase disk size to 2 GiB
bjornfor Dec 9, 2024
99b1068
python3Packages.jenkins-job-builder: add missing runtime dependency '…
bjornfor Dec 9, 2024
f56dd5e
python3Packages.jenkins-job-builder: add passthru.tests
bjornfor Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions nixos/tests/jenkins.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@ import ./make-test-python.nix ({ pkgs, ...} : {
users.users.jenkins.extraGroups = [ "users" ];

systemd.services.jenkins.serviceConfig.TimeoutStartSec = "6min";

# Increase disk space to prevent this issue:
#
# WARNING h.n.DiskSpaceMonitorDescriptor#markNodeOfflineOrOnline: Making Built-In Node offline temporarily due to the lack of disk space
virtualisation.diskSize = 2 * 1024;
};

slave =
Expand Down
5 changes: 5 additions & 0 deletions pkgs/development/python-modules/jenkins-job-builder/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
fetchPypi,
fasteners,
jinja2,
packaging,
pbr,
python-jenkins,
pyyaml,
Expand All @@ -14,6 +15,7 @@
fetchpatch,
testtools,
pytest-mock,
nixosTests,
}:

buildPythonPackage rec {
Expand All @@ -39,6 +41,7 @@ buildPythonPackage rec {
'';

dependencies = [
packaging
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is only required from version 6.4.2 and onwards https://opendev.org/jjb/jenkins-job-builder/commit/7bf0dacd80d6da7b8562db05f9187140e42947c8

pbr
python-jenkins
pyyaml
Expand All @@ -54,6 +57,8 @@ buildPythonPackage rec {
pytest-mock
];

passthru.tests = { inherit (nixosTests) jenkins; };

meta = {
description = "Jenkins Job Builder is a system for configuring Jenkins jobs using simple YAML files stored in Git";
mainProgram = "jenkins-jobs";
Expand Down
5 changes: 2 additions & 3 deletions pkgs/development/python-modules/openstackdocstheme/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchPypi,
distutils,
dulwich,
pbr,
sphinx,
Expand All @@ -14,9 +15,6 @@ buildPythonPackage rec {
version = "3.4.0";
pyproject = true;

# breaks on import due to distutils import through pbr.packaging
disabled = pythonAtLeast "3.12";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

openstack is very picky about versions and generally there is usually something that breaks in pbr or maybe in other parts up to openstackclient-full and I am pretty confident that 3.13 will most likely break some dependency again.


src = fetchPypi {
inherit pname version;
hash = "sha256-YA3nY7Q6UM9sviGRUh08EwwLEjneO2KAh4Hsr/hn25U=";
Expand All @@ -29,6 +27,7 @@ buildPythonPackage rec {
build-system = [ setuptools ];

dependencies = [
distutils
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is wrong. distutils should go to pbr like I did in #362467 because openstackdocstheme has no direct dependency on it and this likely also fixes other packages which I didn't explicitly tested https://github.com/search?q=repo%3Aopenstack%2Fopenstackdocstheme%20distutils%20&type=code

dulwich
pbr
sphinx
Expand Down
Loading