From 5f3e8db69144e291a3bfc74e205825b5bfd22ff0 Mon Sep 17 00:00:00 2001 From: Jean-Francois Chevrette Date: Fri, 3 May 2024 22:49:56 -0400 Subject: [PATCH] rosa: 1.2.36 -> 1.2.38 (#308534) * rosa: 1.2.36 -> 1.2.38 * disable tests requiring network access - e2e tests require network access - TestRhRegionCommand require network access --- pkgs/by-name/ro/rosa/package.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ro/rosa/package.nix b/pkgs/by-name/ro/rosa/package.nix index c50ca87e821b..b9156afa9df8 100644 --- a/pkgs/by-name/ro/rosa/package.nix +++ b/pkgs/by-name/ro/rosa/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rosa"; - version = "1.2.36"; + version = "1.2.38"; src = fetchFromGitHub { owner = "openshift"; repo = "rosa"; rev = "v${version}"; - hash = "sha256-jdLMQLbk446QJ+8+HjTCTjtlCuLlZZsLUBInRg4UMH0="; + hash = "sha256-eS9mK5iK/fXWMpgA/RF7wYybcJtPDW/pIWo9Iw0I+K8="; }; vendorHash = null; @@ -16,6 +16,18 @@ buildGoModule rec { __darwinAllowLocalNetworking = true; + postPatch = '' + # e2e tests require network access + rm -r tests/e2e + ''; + + preCheck = '' + # Workaround for cmd/list/rhRegion/cmd_test.go:39 + # Failed to get OCM regions: Can't retrieve shards: Get "https://api.stage.openshift.com/static/ocm-shards.json": dial tcp: lookup api.stage.openshift.com on [::1]:53: read udp [::1]:55793->[::1]:53: read: connection refused + substituteInPlace "cmd/list/rhRegion/cmd_test.go" \ + --replace-fail "TestRhRegionCommand" "SkipRhRegionCommand" + ''; + nativeBuildInputs = [ installShellFiles ]; postInstall = '' installShellCompletion --cmd rosa \