From c78ef18e9c2a548082de547c80e5cbdd9c10de71 Mon Sep 17 00:00:00 2001
From: Jean-Francois Chevrette <jfchevrette@gmail.com>
Date: Wed, 4 Dec 2024 22:19:42 -0500
Subject: [PATCH] rosa: 1.2.46 -> 1.2.48 (#359440)

rosa: rosa: 1.2.46 -> 1.2.48
---
 pkgs/by-name/ro/rosa/package.nix | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/ro/rosa/package.nix b/pkgs/by-name/ro/rosa/package.nix
index 40a1cccaf1b2..95b1d9f68476 100644
--- a/pkgs/by-name/ro/rosa/package.nix
+++ b/pkgs/by-name/ro/rosa/package.nix
@@ -1,14 +1,14 @@
-{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, rosa, nix-update-script }:
+{ stdenv, lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, rosa, nix-update-script }:
 
 buildGoModule rec {
   pname = "rosa";
-  version = "1.2.46";
+  version = "1.2.48";
 
   src = fetchFromGitHub {
     owner = "openshift";
     repo = "rosa";
     rev = "v${version}";
-    hash = "sha256-XRoHapuH0MJNrtu+Rk/yxJqeqjNIbdGYqDB84q05rdA=";
+    hash = "sha256-qJKzJrCZKhaqoRxloTUqaRsR4/X/hoMxmDQCTNccTqk=";
   };
   vendorHash = null;
 
@@ -16,17 +16,19 @@ buildGoModule rec {
 
   __darwinAllowLocalNetworking = true;
 
-  postPatch = ''
-    # e2e tests require network access
-    rm -r tests/e2e
-  '';
+  # skip e2e tests package
+  excludedPackages = [ "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"
-  '';
+  # skip tests that require network access
+  checkFlags =
+    let
+      skippedTests = [
+        "TestCluster"
+        "TestRhRegionCommand"
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [ "TestCache" ];
+    in
+    [ "-skip=^${lib.concatStringsSep "$|^" skippedTests}$" ];
 
   nativeBuildInputs = [ installShellFiles ];
   postInstall = ''