lol

Merge pull request #143375 from Synthetica9/google-cloud-sdk

authored by

Patrick Hilhorst and committed by
GitHub
7dd44412 bc193f80

+4 -17
-1
nixos/tests/all-tests.nix
··· 157 157 gobgpd = handleTest ./gobgpd.nix {}; 158 158 gocd-agent = handleTest ./gocd-agent.nix {}; 159 159 gocd-server = handleTest ./gocd-server.nix {}; 160 - google-cloud-sdk = handleTest ./google-cloud-sdk.nix {}; 161 160 google-oslogin = handleTest ./google-oslogin {}; 162 161 gotify-server = handleTest ./gotify-server.nix {}; 163 162 grafana = handleTest ./grafana.nix {};
-13
nixos/tests/google-cloud-sdk.nix
··· 1 - import ./make-test-python.nix ({ pkgs, ... }: { 2 - name = "google-cloud-sdk"; 3 - meta = with pkgs.lib.maintainers; { maintainers = [ iammrinal0 ]; }; 4 - 5 - machine = { pkgs, ... }: { 6 - environment.systemPackages = [ pkgs.google-cloud-sdk ]; 7 - }; 8 - 9 - testScript = '' 10 - import json 11 - assert "${pkgs.google-cloud-sdk.version}" in json.loads(machine.succeed("gcloud version --format json"))["Google Cloud SDK"] 12 - ''; 13 - })
+4 -3
pkgs/tools/admin/google-cloud-sdk/default.nix
··· 117 117 runHook postInstall 118 118 ''; 119 119 120 - passthru = { 121 - tests = { inherit (nixosTests) google-cloud-sdk; }; 122 - }; 120 + doInstallCheck = true; 121 + installCheckPhase = '' 122 + $out/bin/gcloud version --format json | jq '."Google Cloud SDK"' | grep "${version}" 123 + ''; 123 124 124 125 meta = with lib; { 125 126 description = "Tools for the google cloud platform";