From d603c386f939a30c45205fbcdda550e4be14770b Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Thu, 29 Aug 2024 11:21:01 +0200 Subject: [PATCH 1/2] prow: unstable-2020-04-01 -> 0-unstable-2024-08-27 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- .../networking/cluster/prow/default.nix | 105 ++++++++++-------- 1 file changed, 59 insertions(+), 46 deletions(-) diff --git a/pkgs/applications/networking/cluster/prow/default.nix b/pkgs/applications/networking/cluster/prow/default.nix index 1ef34b011ef8..55e138ccfcd6 100644 --- a/pkgs/applications/networking/cluster/prow/default.nix +++ b/pkgs/applications/networking/cluster/prow/default.nix @@ -1,58 +1,71 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ + lib, + buildGoModule, + fetchFromGitHub, + git, +}: buildGoModule rec { - pname = "prow-unstable"; - version = "2020-04-01"; - rev = "32e3b5ce7695fb622381421653db436cb57b47c5"; + pname = "prow"; + version = "0-unstable-2024-08-27"; + rev = "195f38540f39dd3ec95ca2d7086487ec19922e61"; src = fetchFromGitHub { inherit rev; - owner = "kubernetes"; - repo = "test-infra"; - hash = "sha256-ZNa7iAcN1qlBFT/UfziivW4q+9hjIt9WbHEOt6r1g1U="; + owner = "kubernetes-sigs"; + repo = "prow"; + hash = "sha256-/OhlJdxPa4rTuT7XIklx8vxprbENfasJYwiJxD4CeXY="; }; - vendorHash = "sha256-FJO8KVCZLehaN1Eku6uQpj/vgwOyO+Irqs0qJHJhzZk="; + vendorHash = "sha256-bJ0P/rHp+0zB/Dtp3F3n4AN3xF/A5qoq3lCQVBK+L4w="; - doCheck = false; + # doCheck = false; subPackages = [ - "prow/cmd/admission" - "prow/cmd/branchprotector" - "prow/cmd/checkconfig" - "prow/cmd/clonerefs" - "prow/cmd/cm2kc" - "prow/cmd/config-bootstrapper" - "prow/cmd/crier" - "prow/cmd/deck" - "prow/cmd/entrypoint" - "prow/cmd/exporter" - "prow/cmd/gcsupload" - "prow/cmd/gerrit" - "prow/cmd/hook" - "prow/cmd/horologium" - "prow/cmd/initupload" - "prow/cmd/jenkins-operator" - "prow/cmd/mkbuild-cluster" - "prow/cmd/mkpj" - "prow/cmd/mkpod" - "prow/cmd/peribolos" - "prow/cmd/phaino" - "prow/cmd/phony" - "prow/cmd/pipeline" - "prow/cmd/plank" - "prow/cmd/sidecar" - "prow/cmd/sinker" - "prow/cmd/status-reconciler" - "prow/cmd/sub" - "prow/cmd/tackle" - "prow/cmd/tide" - "prow/cmd/tot" + "cmd/admission" + "cmd/branchprotector" + "cmd/checkconfig" + "cmd/clonerefs" + "cmd/cm2kc" + "cmd/config-bootstrapper" + "cmd/crier" + "cmd/deck" + "cmd/entrypoint" + "cmd/exporter" + "cmd/external-plugins" + "cmd/gangway" + "cmd/gcsupload" + "cmd/generic-autobumper" + "cmd/gerrit" + "cmd/ghproxy" + "cmd/hmac" + "cmd/hook" + "cmd/horologium" + "cmd/initupload" + "cmd/invitations-accepter" + "cmd/jenkins-operator" + "cmd/mkpj" + "cmd/mkpod" + "cmd/moonraker" + "cmd/peribolos" + "cmd/phony" + "cmd/pipeline" + "cmd/prow-controller-manager" + "cmd/sidecar" + "cmd/sinker" + "cmd/status-reconciler" + "cmd/sub" + "cmd/tackle" + "cmd/tide" + "cmd/tot" + "cmd/webhook-server" ]; - meta = with lib; { - description = "Kubernetes based CI/CD system"; + nativeCheckInputs = [ git ]; + + meta = { + description = "Kubernetes based CI/CD system developed to serve the Kubernetes community"; longDescription = '' Prow is a Kubernetes based CI/CD system. Jobs can be triggered by various types of events and report their status to many different services. In @@ -60,9 +73,9 @@ buildGoModule rec { policy enforcement, chat-ops via /foo style commands, and automatic PR merging. ''; - homepage = "https://github.com/kubernetes/test-infra/tree/master/prow"; - license = licenses.asl20; - maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; + homepage = "https://github.com/kubernetes-sigs/prow"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ kalbasit ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } From 13419f08762836e22952968c82a10ff59176b72c Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Thu, 29 Aug 2024 11:25:08 +0200 Subject: [PATCH 2/2] prow: move to by-name Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- .../cluster/prow/default.nix => by-name/pr/prow/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/networking/cluster/prow/default.nix => by-name/pr/prow/package.nix} (100%) diff --git a/pkgs/applications/networking/cluster/prow/default.nix b/pkgs/by-name/pr/prow/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/prow/default.nix rename to pkgs/by-name/pr/prow/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f232039d14d8..e7fcca612764 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38917,8 +38917,6 @@ with pkgs; jx = callPackage ../applications/networking/cluster/jx { }; - prow = callPackage ../applications/networking/cluster/prow { }; - pv-migrate = callPackage ../applications/networking/cluster/pv-migrate { }; tagref = callPackage ../tools/misc/tagref { };